[Beeg] Updates attack_verbs for simple present tense (#17002)

tgstation · Jan 29, 2025 · 4c63237 · 4c63237
1 parent 5da5ee4
commit 4c63237
Show file tree

Hide file tree

Showing 56 changed files with 137 additions and 137 deletions.
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -126,7 +126,7 @@
 
 /mob/living/attacked_by(obj/item/attacking_item, mob/living/user, def_zone)
 
-	var/message_verb = "attacked"
+	var/message_verb = "attacks"
 	if(LAZYLEN(attacking_item.attack_verb))
 		message_verb = pick(attacking_item.attack_verb)
 	var/message_hit_area
@@ -354,7 +354,7 @@
  * def_zone: targetted area that will be attacked
  */
 /mob/living/proc/attacked_by_alternate(obj/item/I, mob/living/user, def_zone)
-	var/message_verb = "attacked"
+	var/message_verb = "attacks"
 	if(LAZYLEN(I.attack_verb))
 		message_verb = pick(I.attack_verb)
 	var/message_hit_area

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -26,7 +26,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan
 	var/attack_speed = 11
 	///Byond tick delay between right click alternate attacks
 	var/attack_speed_alternate = 11
-	///Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
+	///Used in attackby() to say how something was attacked "[x] [z.attack_verb] [y] with their [z]!" Should be in simple present tense!
 	var/list/attack_verb
 
 	///whether this item cuts

diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
@@ -7,4 +7,4 @@
 		slot_r_hand_str = 'icons/mob/inhands/equipment/engineering_right.dmi',
 	)
 	icon_state = "blueprints"
-	attack_verb = list("attacked", "bapped", "hit")
+	attack_verb = list("attacks", "baps", "hits")
diff --git a/code/game/objects/items/books/book.dm b/code/game/objects/items/books/book.dm
@@ -8,7 +8,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL		 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
-	attack_verb = list("bashed", "whacked", "educated")
+	attack_verb = list("bashes", "whacks", "educates")
 	var/dat			 // Actual page content
 	var/due_date = 0 // Game time in 1/10th seconds
 	var/author		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned

diff --git a/code/game/objects/items/frames/table_rack.dm b/code/game/objects/items/frames/table_rack.dm
@@ -17,7 +17,7 @@
 	)
 	worn_icon_state = "table_parts"
 	atom_flags = CONDUCT
-	attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	attack_verb = list("slams", "bashes", "batters", "bludgeons", "thrashes", "whacks")
 	var/table_type = /obj/structure/table //what type of table it creates when assembled
 	var/deconstruct_type = /obj/item/stack/sheet/metal
 	/// How much of `deconstruct_type` will be spawned on wrench?

diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
@@ -8,7 +8,7 @@
 	throw_speed = 1
 	throw_range = 4
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("called", "rang")
+	attack_verb = list("calls", "rings")
 	hitsound = 'sound/weapons/ring.ogg'
 
 /obj/item/clock
@@ -68,7 +68,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("bludgeoned", "whacked", "disciplined")
+	attack_verb = list("bludgeons", "whacks", "disciplines")
 
 /obj/item/staff/broom
 	name = "broom"
@@ -82,7 +82,7 @@
 	icon = 'icons/obj/items/items.dmi'
 	icon_state = "skub"
 	w_class = WEIGHT_CLASS_BULKY
-	attack_verb = list("skubbed")
+	attack_verb = list("skubs")
 
 /obj/item/ectoplasm
 	name = "ectoplasm"

diff --git a/code/game/objects/items/plantable_flags.dm b/code/game/objects/items/plantable_flags.dm
@@ -23,7 +23,7 @@
 	w_class = WEIGHT_CLASS_HUGE
 	force = 55
 	attack_speed = 15
-	attack_verb = list("stabbed", "thrust", "smashed", "thumped", "bashed", "attacked", "clubbed", "speared", "jabbed", "torn", "gored")
+	attack_verb = list("stabs", "thrusts", "smashes", "thumps", "bashes", "attacks", "clubs", "spears", "jabs", "tears", "gores")
 	sharp = IS_SHARP_ITEM_BIG
 	throw_speed = 1
 	throw_range = 2

diff --git a/code/game/objects/items/shards.dm b/code/game/objects/items/shards.dm
@@ -15,7 +15,7 @@
 		slot_r_hand_str = 'icons/mob/inhands/items/civilian_right.dmi',
 	)
 	worn_icon_state = "shard-glass"
-	attack_verb = list("stabbed", "slashed", "sliced", "cut")
+	attack_verb = list("stabs", "slashes", "slices", "cuts")
 	var/source_sheet_type = /obj/item/stack/sheet/glass/glass
 	var/shardsize
 

diff --git a/code/game/objects/items/stacks/barbed_wire.dm b/code/game/objects/items/stacks/barbed_wire.dm
@@ -10,7 +10,7 @@
 	throwforce = 5
 	throw_speed = 5
 	throw_range = 20
-	attack_verb = list("hit", "whacked", "sliced")
+	attack_verb = list("hits", "whacks", "slices")
 	max_amount = 20
 	merge_type = /obj/item/stack/barbed_wire
 
@@ -57,7 +57,7 @@
 	force = 15
 	throwforce = 10
 	throw_range = 5
-	attack_verb = list("hit", "whacked", "sliced")
+	attack_verb = list("hits", "whacks", "slices")
 	singular_name = "bundle"
 	max_amount = 10
 	merge_type = /obj/item/stack/razorwire

diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
@@ -10,7 +10,7 @@
 	throw_speed = 5
 	throw_range = 20
 	max_amount = 60
-	attack_verb = list("hit", "bludgeoned", "whacked")
+	attack_verb = list("hits", "bludgeons", "whacks")
 
 
 /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob)

diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm
@@ -16,7 +16,7 @@
 	throw_speed = 5
 	throw_range = 20
 	max_amount = 50
-	attack_verb = list("hit", "bludgeoned", "whacked")
+	attack_verb = list("hits", "bludgeons", "whacks")
 	number_of_extra_variants = 3
 
 
@@ -79,7 +79,7 @@
 	throw_speed = 5
 	throw_range = 20
 	max_amount = 25
-	attack_verb = list("hit", "bludgeoned", "whacked")
+	attack_verb = list("hits", "bludgeons", "whacks")
 	merge_type = /obj/item/stack/sandbags
 
 

diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -11,7 +11,7 @@
 	max_amount = 50
 	throw_speed = 3
 	throw_range = 3
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+	attack_verb = list("bashes", "batters", "bludgeons", "thrashes", "smashes")
 	var/perunit = 3750
 	var/sheettype = null //this is used for girders in the creation of walls/false walls
 

diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -71,7 +71,7 @@
 	icon_state = "tile_e"
 	force = 3
 	throwforce = 5
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+	attack_verb = list("bashes", "batters", "bludgeons", "thrashes", "smashes")
 	turf_type = /turf/open/floor/light
 	var/on = 1
 	var/state = LIGHT_TILE_OK

diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -8,7 +8,7 @@
 	worn_icon_state = "utility"
 	item_state_worn = TRUE
 	equip_slot_flags = ITEM_SLOT_BELT
-	attack_verb = list("whipped", "lashed", "disciplined")
+	attack_verb = list("whips", "lashes", "disciplines")
 	w_class = WEIGHT_CLASS_BULKY
 	storage_type = /datum/storage/belt
 

diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
@@ -327,7 +327,7 @@
 	desc = "A large, vibrantly colored katana scabbard used to carry a japanese sword. It can be strapped to the back, waist or armor. Because of the sturdy wood casing of the scabbard, it makes an okay defensive weapon in a pinch."
 	icon_state = "katana_holster"
 	force = 12
-	attack_verb = list("bludgeoned", "struck", "cracked")
+	attack_verb = list("bludgeons", "strikes", "cracks")
 	equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_BACK
 	holsterable_allowed = list(/obj/item/weapon/sword/katana)
 

diff --git a/code/game/objects/items/storage/kitchen_tray.dm b/code/game/objects/items/storage/kitchen_tray.dm
@@ -17,7 +17,7 @@
 	atom_flags = CONDUCT
 	hitsound = 'sound/items/trayhit1.ogg'
 	storage_type = /datum/storage/kitchen_tray
-	attack_verb = list("attacked", "slammed", "slapped")
+	attack_verb = list("attacks", "slams", "slaps")
 	/// Shield bash cooldown. based on world.time
 	var/cooldown = 0
 
@@ -30,7 +30,7 @@
 	. = ..()
 	if(!length(contents))
 		return
-	
+
 	for(var/obj/item/thing in src)
 		var/image/item_image = image("icon" = thing.icon, "icon_state" = thing.icon_state, "layer" = layer+0.01)
 		item_image.pixel_x = rand(-10, 10)

diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
@@ -13,7 +13,7 @@
 	throw_speed = 1
 	throw_range = 7
 	w_class = WEIGHT_CLASS_BULKY
-	attack_verb = list("robusted")
+	attack_verb = list("robusts")
 
 
 /obj/item/storage/toolbox/emergency

diff --git a/code/game/objects/items/tools/cleaning_tools.dm b/code/game/objects/items/tools/cleaning_tools.dm
@@ -12,7 +12,7 @@
 	throw_speed = 5
 	throw_range = 10
 	w_class = WEIGHT_CLASS_NORMAL
-	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
+	attack_verb = list("mops", "bashes", "bludgeons", "whacks")
 	var/mopping = 0
 	var/mopcount = 0
 
@@ -60,7 +60,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("warned", "cautioned", "smashed")
+	attack_verb = list("warns", "cautions", "smashes")
 
 /obj/item/clothing/head/warning_cone
 	name = "warning cone"
@@ -73,7 +73,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("warned", "cautioned", "smashed")
+	attack_verb = list("warns", "cautions", "smashes")
 	soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, FIRE = 20, ACID = 20)
 
 

diff --git a/code/game/objects/items/tools/extinguisher.dm b/code/game/objects/items/tools/extinguisher.dm
@@ -15,7 +15,7 @@
 	throw_speed = 2
 	throw_range = 10
 	force = 10
-	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
+	attack_verb = list("slams", "whacks", "bashes", "thunks", "batters", "bludgeos", "thrashes")
 	var/max_water = 50
 	var/last_use = 1
 	var/safety = 1

diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm
@@ -107,7 +107,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/burnt = FALSE
 	var/smoketime = 5
 	w_class = WEIGHT_CLASS_TINY
-	attack_verb = list("burnt", "singed")
+	attack_verb = list("burns", "singes")
 
 /obj/item/tool/match/process()
 	smoketime--
@@ -285,7 +285,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	turn_light(null, TRUE)
 	heat = 1000
 	name = "lit [name]"
-	attack_verb = list("burnt", "singed")
+	attack_verb = list("burns", "singes")
 	damtype = BURN
 	if(reagents.get_reagent_amount(/datum/reagent/toxin/phoron)) // the phoron explodes when exposed to fire
 		var/datum/effect_system/reagents_explosion/e = new()
@@ -567,7 +567,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	throwforce = 4
 	atom_flags = CONDUCT
 	equip_slot_flags = ITEM_SLOT_BELT
-	attack_verb = list("burnt", "singed")
+	attack_verb = list("burns", "singes")
 
 /obj/item/tool/lighter/zippo
 	name = "\improper Zippo lighter"

diff --git a/code/game/objects/items/tools/hydro_tools.dm b/code/game/objects/items/tools/hydro_tools.dm
@@ -88,7 +88,7 @@
 	force = 5
 	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("slashed", "sliced", "cut", "clawed")
+	attack_verb = list("slashes", "slices", "cuts", "claws")
 
 //Hatchets and things to kill kudzu
 /obj/item/tool/hatchet
@@ -104,7 +104,7 @@
 	throw_range = 4
 	sharp = IS_SHARP_ITEM_BIG
 	edge = 1
-	attack_verb = list("chopped", "torn", "cut")
+	attack_verb = list("chops", "tears", "cuts")
 
 /obj/item/tool/hatchet/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1)
@@ -122,7 +122,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	atom_flags = CONDUCT
 	equip_slot_flags = ITEM_SLOT_BACK
-	attack_verb = list("chopped", "sliced", "cut", "reaped")
+	attack_verb = list("chops", "slices", "cuts", "reaps")
 
 /obj/item/tool/scythe/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity) return

diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm
@@ -27,7 +27,7 @@
 	throw_speed = 3
 	throw_range = 5
 	atom_flags = CONDUCT
-	attack_verb = list("attacked", "stabbed", "poked")
+	attack_verb = list("attacks", "stabs", "pokes")
 	sharp = 0
 	/// Is there something on this utensil?
 	var/image/loaded
@@ -89,13 +89,13 @@
 	name = "spoon"
 	desc = "It's a spoon. You can see your own upside-down face in the reflection."
 	icon_state = "spoon"
-	attack_verb = list("attacked", "poked")
+	attack_verb = list("attacks", "pokes")
 
 /obj/item/tool/kitchen/utensil/pspoon
 	name = "plastic spoon"
 	desc = "It's a plastic spoon. How dull."
 	icon_state = "pspoon"
-	attack_verb = list("attacked", "poked")
+	attack_verb = list("attacks", "pokes")
 
 /*
 * Knives
@@ -141,7 +141,7 @@
 	throwforce = 6
 	throw_speed = 3
 	throw_range = 6
-	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	attack_verb = list("slashes", "stabs", "slices", "tears", "rips", "dices", "cuts")
 
 /obj/item/tool/kitchen/knife/suicide_act(mob/user)
 	user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] wrists with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \
@@ -168,7 +168,7 @@
 	throwforce = 25
 	throw_speed = 3
 	throw_range = 6
-	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	attack_verb = list("cleaves", "slashes", "stabs", "slices", "tears", "rips", "dices", "cuts")
 	sharp = IS_SHARP_ITEM_ACCURATE
 	edge = 1
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -186,4 +186,4 @@
 	throw_speed = 2
 	throw_range = 7
 	w_class = WEIGHT_CLASS_NORMAL
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	attack_verb = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
@@ -8,7 +8,7 @@
 	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
 	usesound = 'sound/items/ratchet.ogg'
-	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+	attack_verb = list("bashes", "batters", "bludgeons", "whacks")
 	tool_behaviour = TOOL_WRENCH
 
 
@@ -23,7 +23,7 @@
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
-	attack_verb = list("stabbed")
+	attack_verb = list("stabs")
 	tool_behaviour = TOOL_SCREWDRIVER
 	/// If the item should be assigned a random color
 	var/random_color = TRUE
@@ -71,7 +71,7 @@
 	throw_speed = 2
 	throw_range = 9
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("pinched", "nipped")
+	attack_verb = list("pinches", "nips")
 	sharp = IS_SHARP_ITEM_SIMPLE
 	edge = 1
 	tool_behaviour = TOOL_WIRECUTTER
@@ -338,7 +338,7 @@
 	throwforce = 7
 	worn_icon_state = "crowbar"
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+	attack_verb = list("attacks", "bashes", "batters", "bludgeons", "whacks")
 	pry_capable = IS_PRY_CAPABLE_CROWBAR
 	tool_behaviour = TOOL_CROWBAR
 	usesound = 'sound/items/crowbar.ogg'

diff --git a/code/game/objects/items/tools/mining_tools.dm b/code/game/objects/items/tools/mining_tools.dm
@@ -14,7 +14,7 @@
 	worn_icon_state = "pickaxe"
 	w_class = WEIGHT_CLASS_BULKY
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
-	attack_verb = list("hit", "pierced", "sliced", "attacked")
+	attack_verb = list("hits", "pierces", "slices", "attacks")
 	var/drill_sound = 'sound/weapons/genhit.ogg'
 	var/drill_verb = "picking"
 	sharp = IS_SHARP_ITEM_SIMPLE
@@ -91,7 +91,7 @@
 	damtype = BURN
 	digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction
 	drill_verb = "cutting"
-	attack_verb = list("dissolves", "disintegrates", "liquefies", "subliminates", "vaporizes")
+	attack_verb = list("dissolves", "disintegrates", "liquefies", "subliminates", "vaporizes") //See PC did the verbs correctly the first time around.
 	heat = 3800
 	light_system = MOVABLE_LIGHT
 	light_range = 2