diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 64851ffbd7a..83abaffaf95 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -172,21 +172,22 @@ return clamp(w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100 /mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart) - var/message_verb = "attacked" - if(length(I.attack_verb)) - message_verb = "[pick(I.attack_verb)]" - else if(!I.force) + var/message_verb_continuous = length(I.attack_verb_continuous) ? "[pick(I.attack_verb_continuous)]" : "attacks" + var/message_verb_simple = length(I.attack_verb_simple) ? "[pick(I.attack_verb_simple)]" : "attack" + if(!I.force) return var/message_hit_area = "" if(hit_area) message_hit_area = " in the [hit_area]" - var/attack_message = "[src] is [message_verb][message_hit_area] with [I]!" - var/attack_message_local = "You're [message_verb][message_hit_area] with [I]!" + var/attack_message_spectator = "[src] [message_verb_continuous][message_hit_area] with [I]!" + var/attack_message_victim = "You're [message_verb_continuous][message_hit_area] with [I]!" + var/attack_message_attacker = "You [message_verb_simple] [src][message_hit_area] with [I]!" if(user in viewers(src, null)) - attack_message = "[user] [message_verb] [src][message_hit_area] with [I]!" - attack_message_local = "[user] [message_verb] you[message_hit_area] with [I]!" + attack_message_spectator = "[user] [message_verb_continuous] [src][message_hit_area] with [I]!" + attack_message_victim = "[user] [message_verb_continuous] you[message_hit_area] with [I]!" if(user == src) - attack_message_local = "You [message_verb] yourself[message_hit_area] with [I]" - visible_message("[attack_message]",\ - "[attack_message_local]", null, COMBAT_MESSAGE_RANGE) + attack_message_victim = "You [message_verb_simple] yourself[message_hit_area] with [I]" + visible_message("[attack_message_spectator]",\ + "[attack_message_victim]", null, COMBAT_MESSAGE_RANGE, user) + to_chat(user, "[attack_message_attacker]") return 1 diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 75e80df4cd9..4487b4742e9 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -152,7 +152,8 @@ slot_flags = ITEM_SLOT_BACK throwforce = 20 throw_speed = 2 - attack_verb = list("smashed", "slammed", "whacked", "thwacked") + attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks") + attack_verb_simple = list("smash", "slam", "whack", "thwack") icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bostaff0" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index a82a9f61faf..0119724e71a 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -62,7 +62,7 @@ force_on = 0 throwforce_on = 0 hitsound = null - attack_verb_on = list("slipped") + attack_verb_on = list("slips") clumsy_check = FALSE sharpness = SHARP_NONE sword_color = "yellow" diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index c382f192f6b..800878aab48 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -860,7 +860,8 @@ GLOBAL_LIST_EMPTY(allCasters) lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' w_class = WEIGHT_CLASS_SMALL - attack_verb = list("bapped") + attack_verb_continuous = list("baps") + attack_verb_simple = list("bap") resistance_flags = FLAMMABLE var/screen = 0 var/pages = 0 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index df4e95c6860..0e6708d1f18 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -128,7 +128,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb var/breakouttime = 0 ///Used in [atom/proc/attackby] to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" - var/list/attack_verb + var/list/attack_verb_continuous + var/list/attack_verb_simple ///list() of species types, if a species cannot put items in a certain slot, but species type is in list, it will be able to wear that item var/list/species_exception = null @@ -189,8 +190,10 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb /obj/item/Initialize() - if(attack_verb) - attack_verb = typelist("attack_verb", attack_verb) + if(attack_verb_continuous) + attack_verb_continuous = typelist("attack_verb_continuous", attack_verb_continuous) + if(attack_verb_simple) + attack_verb_simple = typelist("attack_verb_simple", attack_verb_simple) . = ..() for(var/path in actions_types) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index d90b99471f7..d82090c86a1 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -7,7 +7,8 @@ name = "area modification item" icon = 'icons/obj/items_and_weapons.dmi' icon_state = "blueprints" - attack_verb = list("attacked", "bapped", "hit") + attack_verb_continuous = list("attacks", "baps", "hits") + attack_verb_simple = list("attack", "bap", "hit") var/fluffnotice = "Nobody's gonna read this stuff!" var/in_use = FALSE diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm index f1b5072f7d8..26dc1be948e 100644 --- a/code/game/objects/items/broom.dm +++ b/code/game/objects/items/broom.dm @@ -13,7 +13,8 @@ throw_speed = 3 throw_range = 7 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("swept", "brushed off", "bludgeoned", "whacked") + attack_verb_continuous = list("sweeps", "brushes off", "bludgeons", "whacks") + attack_verb_simple = list("sweep", "brush off", "bludgeon", "whack") resistance_flags = FLAMMABLE /obj/item/pushbroom/Initialize() diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 42986bef5fb..e63e7a41d0b 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -14,7 +14,8 @@ throw_speed = 2 throw_range = 4 custom_materials = list(/datum/material/iron=13000) - attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") + attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") + attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") hitsound = "swing_hit" sharpness = SHARP_EDGED actions_types = list(/datum/action/item_action/startchainsaw) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index ca33f67b58e..925d754e51f 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -48,7 +48,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM inhand_icon_state = "cigon" name = "lit [initial(name)]" desc = "A [initial(name)]. This one is lit." - attack_verb = list("burnt","singed") + attack_verb_continuous = list("burns", "sings") + attack_verb_simple = list("burn", "sing") START_PROCESSING(SSobj, src) update_icon() @@ -62,7 +63,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM inhand_icon_state = "cigoff" name = "burnt [initial(name)]" desc = "A [initial(name)]. This one has seen better days." - attack_verb = list("flicked") + attack_verb_continuous = list("flicks") + attack_verb_simple = list("flick") STOP_PROCESSING(SSobj, src) /obj/item/match/extinguish() @@ -184,7 +186,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = TRUE name = "lit [name]" - attack_verb = list("burnt", "singed") + attack_verb_continuous = list("burns", "sings") + attack_verb_simple = list("burn", "sing") hitsound = 'sound/items/welder.ogg' damtype = "fire" force = 4 @@ -220,7 +223,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!lit) return name = copytext_char(name, 5) //5 == length_char("lit ") + 1 - attack_verb = null + attack_verb_continuous = null + attack_verb_simple = null hitsound = null damtype = BRUTE force = 0 @@ -668,13 +672,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM force = 5 damtype = "fire" hitsound = 'sound/items/welder.ogg' - attack_verb = list("burnt", "singed") + attack_verb_continuous = list("burns", "sings") + attack_verb_simple = list("burn", "sing") set_light(1) START_PROCESSING(SSobj, src) else hitsound = "swing_hit" force = 0 - attack_verb = null //human_defense.dm takes care of it + attack_verb_continuous = null //human_defense.dm takes care of it + attack_verb_simple = null set_light(0) STOP_PROCESSING(SSobj, src) update_icon() diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 5ae4ead27e7..944464f1b34 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -173,7 +173,8 @@ slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT throw_speed = 3 throw_range = 7 - attack_verb = list("HONKED") + attack_verb_continuous = list("HONKS") + attack_verb_simple = list("HONK") /obj/item/bikehorn/Initialize() . = ..() diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm index 2f034d99ccd..1bfe05ed185 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -10,7 +10,8 @@ force = 5 throwforce = 6 w_class = WEIGHT_CLASS_SMALL - attack_verb = list("bashed", "battered", "judged", "whacked") + attack_verb_continuous = list("bashes", "batters", "judges", "whacks") + attack_verb_simple = list("bash", "batter", "judge", "whack") resistance_flags = FLAMMABLE /obj/item/gavelhammer/suicide_act(mob/user) diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index eb44f881eee..aac3b5446cd 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -4,7 +4,8 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "suspiciousphone" w_class = WEIGHT_CLASS_SMALL - attack_verb = list("dumped") + attack_verb_continuous = list("dumps") + attack_verb_simple = list("dump") var/dumped = FALSE /obj/item/suspiciousphone/attack_self(mob/user) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 7c8e4c064d2..37e179fc2ea 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -28,7 +28,8 @@ var/crayon_color = "red" w_class = WEIGHT_CLASS_TINY - attack_verb = list("attacked", "coloured") + attack_verb_continuous = list("attacks", "colours") + attack_verb_simple = list("attack", "colour") grind_results = list() var/paint_color = "#FF0000" //RGB diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index 7a9b8f9c31f..9673df27400 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -130,7 +130,8 @@ icon_state = "banjo" inhand_icon_state = "banjo" instrumentExt = "ogg" - attack_verb = list("scruggs-styled", "hum-diggitied", "shin-digged", "clawhammered") + attack_verb_continuous = list("scruggs-styles", "hum-diggitys", "shin-digs", "clawhammers") + attack_verb_simple = list("scruggs-style", "hum-diggity", "shin-dig", "clawhammer") hitsound = 'sound/weapons/banjoslap.ogg' instrumentId = "banjo" @@ -140,7 +141,8 @@ icon_state = "guitar" inhand_icon_state = "guitar" instrumentExt = "ogg" - attack_verb = list("played metal on", "serenaded", "crashed", "smashed") + attack_verb_continuous = list("plays metal on", "serenades", "crashes", "smashes") + attack_verb_simple = list("play metal on", "serenade", "crash", "smash") hitsound = 'sound/weapons/stringsmash.ogg' instrumentId = "guitar" @@ -150,7 +152,8 @@ icon_state = "eguitar" inhand_icon_state = "eguitar" force = 12 - attack_verb = list("played metal on", "shredded", "crashed", "smashed") + attack_verb_continuous = list("plays metal on", "shreds", "crashes", "smashes") + attack_verb_simple = list("play metal on", "shred", "crash", "smash") hitsound = 'sound/weapons/stringsmash.ogg' instrumentId = "eguitar" instrumentExt = "ogg" @@ -183,7 +186,8 @@ inhand_icon_state = "spectral_trumpet" force = 0 instrumentId = "trombone" - attack_verb = list("played","jazzed","trumpeted","mourned","dooted","spooked") + attack_verb_continuous = list("plays", "jazzes", "trumpets", "mourns", "doots", "spooks") + attack_verb_simple = list("play", "jazz", "trumpet", "mourn", "doot", "spook") /obj/item/instrument/trumpet/spectral/Initialize() . = ..() @@ -207,7 +211,8 @@ inhand_icon_state = "saxophone" instrumentId = "saxophone" force = 0 - attack_verb = list("played","jazzed","saxxed","mourned","dooted","spooked") + attack_verb_continuous = list("plays", "jazzes", "saxxes", "mourns", "doots", "spooks") + attack_verb_simple = list("play", "jazz", "sax", "mourn", "doot", "spook") /obj/item/instrument/saxophone/spectral/Initialize() . = ..() @@ -231,7 +236,8 @@ icon_state = "trombone" inhand_icon_state = "trombone" force = 0 - attack_verb = list("played","jazzed","tromboned","mourned","dooted","spooked") + attack_verb_continuous = list("plays", "jazzes", "trombones", "mourns", "doots", "spooks") + attack_verb_simple = list("play", "jazz", "trombone", "mourn", "doot", "spook") /obj/item/instrument/trombone/spectral/Initialize() . = ..() @@ -280,7 +286,8 @@ inhand_icon_state = "bike_horn" lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi' - attack_verb = list("beautifully honks") + attack_verb_continuous = list("beautifully honks") + attack_verb_simple = list("beautifully honk") instrumentId = "bikehorn" instrumentExt = "ogg" w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 5916a196e74..dc3de0a6312 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -188,7 +188,8 @@ effective or pretty fucking useless. inhand_icon_state = "utility" worn_icon_state = "utility" slot_flags = ITEM_SLOT_BELT - attack_verb = list("whipped", "lashed", "disciplined") + attack_verb_continuous = list("whips", "lashes", "disciplines") + attack_verb_simple = list("whip", "lash", "discipline") var/mob/living/carbon/human/user = null var/charge = 300 diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 4559bcf91d9..e05f2c0ccbc 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -17,7 +17,8 @@ hitsound = "swing_hit" armour_penetration = 35 light_color = LIGHT_COLOR_ELECTRIC_GREEN - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") block_chance = 75 max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index ff60cd1df80..b0a55aa5bb1 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -12,7 +12,8 @@ throw_range = 7 force = 10 custom_materials = list(/datum/material/iron = 90) - attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") + attack_verb_continuous = list("slams", "whacks", "bashes", "thunks", "batters", "bludgeons", "thrashes") + attack_verb_simple = list("slam", "whack", "bash", "thunk", "batter", "bludgeon", "thrash") dog_fashion = /datum/dog_fashion/back resistance_flags = FIRE_PROOF var/max_water = 50 diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index ba47631e118..2505c6e8db6 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -11,7 +11,8 @@ throwforce = 15 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK - attack_verb = list("attacked", "chopped", "cleaved", "tore", "lacerated", "cut") + attack_verb_continuous = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts") + attack_verb_simple = list("attack", "chop", "cleave", "tear", "lacerate", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED max_integrity = 200 diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index dba90466a14..1d7ce969ffe 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -30,7 +30,8 @@ force = 6 hitsound = 'sound/items/welder.ogg' name = "lit [initial(name)]" - attack_verb = list("burnt") + attack_verb_continuous = list("burns") + attack_verb_simple = list("burn") set_light(l_range = 2, l_power = 2) damtype = "fire" START_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index fa639266aca..09870737b63 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -14,7 +14,8 @@ icon = 'icons/obj/items_and_weapons.dmi' w_class = WEIGHT_CLASS_GIGANTIC force = 12 - attack_verb = list("robusted") + attack_verb_continuous = list("robusts") + attack_verb_simple = list("robust") hitsound = 'sound/weapons/smash.ogg' var/awakened = FALSE var/bloodthirst = HIS_GRACE_SATIATED diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 647003ff002..48de0189a5b 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -276,7 +276,8 @@ w_class = WEIGHT_CLASS_HUGE hitsound = 'sound/weapons/sear.ogg' damtype = BURN - attack_verb = list("punched", "cross countered", "pummeled") + attack_verb_continuous = list("punches", "cross counters", "pummels") + attack_verb_simple = list("punch", "cross counter", "pummel") /obj/item/nullrod/godhand/Initialize() . = ..() @@ -318,7 +319,8 @@ block_chance = 30 sharpness = SHARP_EDGED hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") /obj/item/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK) @@ -343,7 +345,8 @@ name = "sacred chainsaw sword" desc = "Suffer not a heretic to live." slot_flags = ITEM_SLOT_BELT - attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") + attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") + attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1.5 //slower than a real saw @@ -406,7 +409,8 @@ force = 4.13 throwforce = 1 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") /obj/item/nullrod/scythe icon_state = "scythe1" @@ -419,7 +423,8 @@ armour_penetration = 35 slot_flags = ITEM_SLOT_BACK sharpness = SHARP_EDGED - attack_verb = list("chopped", "sliced", "cut", "reaped") + attack_verb_continuous = list("chops", "slices", "cuts", "reaps") + attack_verb_simple = list("chop", "slice", "cut", "reap") /obj/item/nullrod/scythe/Initialize() . = ..() @@ -432,7 +437,8 @@ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' name = "high frequency blade" desc = "Bad references are the DNA of the soul." - attack_verb = list("chopped", "sliced", "cut", "zandatsu'd") + attack_verb_continuous = list("chops", "slices", "cuts", "zandatsu's") + attack_verb_simple = list("chop", "slice", "cut", "zandatsu") hitsound = 'sound/weapons/rapierhit.ogg' /obj/item/nullrod/scythe/spellblade @@ -452,7 +458,8 @@ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' name = "possessed blade" desc = "When the station falls into chaos, it's nice to have a friend by your side." - attack_verb = list("chopped", "sliced", "cut") + attack_verb_continuous = list("chops", "slices", "cuts") + attack_verb_simple= list("chop", "slice", "cut") hitsound = 'sound/weapons/rapierhit.ogg' var/possessed = FALSE @@ -504,7 +511,8 @@ chaplain_spawnable = FALSE force = 30 slot_flags = ITEM_SLOT_BELT - attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") + attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") + attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 0.5 //faster than normal saw @@ -518,7 +526,8 @@ desc = "This war hammer cost the chaplain forty thousand space dollars." slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_HUGE - attack_verb = list("smashed", "bashed", "hammered", "crunched") + attack_verb_continuous = list("smashes", "bashes", "hammers", "crunches") + attack_verb_simple = list("smash", "bash", "hammer", "crunch") /obj/item/nullrod/chainsaw name = "chainsaw hand" @@ -530,7 +539,8 @@ w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT sharpness = SHARP_EDGED - attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") + attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") + attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 2 //slower than a real saw @@ -548,7 +558,8 @@ desc = "Used for absolutely hilarious sacrifices." hitsound = 'sound/items/bikehorn.ogg' sharpness = SHARP_EDGED - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") /obj/item/nullrod/pride_hammer icon_state = "pride" @@ -558,7 +569,8 @@ throwforce = 15 w_class = 4 slot_flags = ITEM_SLOT_BACK - attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked") + attack_verb_continuous = list("attacks", "smashes", "crushes", "splatters", "cracks") + attack_verb_simple = list("attack", "smash", "crush", "splatter", "crack") hitsound = 'sound/weapons/blade1.ogg' /obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) @@ -579,7 +591,8 @@ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' slot_flags = ITEM_SLOT_BELT - attack_verb = list("whipped", "lashed") + attack_verb_continuous = list("whips", "lashes") + attack_verb_simple = list("whip", "lash") hitsound = 'sound/weapons/chainhit.ogg' /obj/item/nullrod/fedora @@ -594,7 +607,8 @@ throw_range = 7 throwforce = 30 sharpness = SHARP_EDGED - attack_verb = list("enlightened", "redpilled") + attack_verb_continuous = list("enlightens", "redpills") + attack_verb_simple = list("enlighten", "redpill") /obj/item/nullrod/armblade name = "dark blessing" @@ -629,7 +643,8 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' force = 15 - attack_verb = list("bitten", "eaten", "fin slapped") + attack_verb_continuous = list("bites", "eats", "fin slaps") + attack_verb_simple = list("bite", "eat", "fin slap") hitsound = 'sound/weapons/bite.ogg' var/used_blessing = FALSE @@ -649,7 +664,8 @@ slot_flags = ITEM_SLOT_BACK sharpness = SHARP_NONE hitsound = "swing_hit" - attack_verb = list("smashed", "slammed", "whacked", "thwacked") + attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks") + attack_verb_simple = list("smash", "slam", "whack", "thwack") icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bostaff0" inhand_icon_state = "bostaff0" @@ -668,7 +684,8 @@ sharpness = SHARP_EDGED slot_flags = null hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") item_flags = SLOWS_WHILE_IN_HAND /obj/item/nullrod/tribal_knife/Initialize(mapload) @@ -694,7 +711,8 @@ name = "unholy pitchfork" w_class = WEIGHT_CLASS_NORMAL desc = "Holding this makes you look absolutely devilish." - attack_verb = list("poked", "impaled", "pierced", "jabbed") + attack_verb_continuous = list("pokes", "impales", "pierces", "jabs") + attack_verb_simple = list("poke", "impale", "pierce", "jab") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED @@ -707,7 +725,8 @@ lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("bashes", "smacks", "whacks") + attack_verb_continuous = list("bashes", "smacks", "whacks") + attack_verb_simple = list("bash", "smack", "whack") /obj/item/nullrod/hypertool icon = 'icons/obj/device.dmi' @@ -720,7 +739,8 @@ desc = "A tool so powerful even you cannot perfectly use it." armour_penetration = 35 damtype = BRAIN - attack_verb = list("pulsed", "mended", "cut") + attack_verb_continuous = list("pulses", "mends", "cuts") + attack_verb_simple = list("pulse", "mend", "cut") hitsound = 'sound/effects/sparks4.ogg' /obj/item/nullrod/spear @@ -735,5 +755,6 @@ armour_penetration = 10 sharpness = SHARP_POINTY w_class = WEIGHT_CLASS_BULKY - attack_verb = list("stabbed", "poked", "slashed", "clocked") + attack_verb_continuous = list("stabs", "pokes", "slashes", "clocks") + attack_verb_simple = list("stab", "poke", "slash", "clock") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 598576a208f..060cea358d9 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -26,7 +26,8 @@ throw_range = 5 custom_materials = list(/datum/material/iron=80) flags_1 = CONDUCT_1 - attack_verb = list("attacked", "stabbed", "poked") + attack_verb_continuous = list("attacks", "stabs", "pokes") + attack_verb_simple = list("attack", "stab", "poke") hitsound = 'sound/weapons/bladeslice.ogg' armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) item_flags = EYE_STAB @@ -84,7 +85,8 @@ throw_speed = 3 throw_range = 6 custom_materials = list(/datum/material/iron=12000) - attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") sharpness = SHARP_EDGED armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) item_flags = EYE_STAB @@ -117,7 +119,8 @@ throwforce = 0 throw_range = 5 custom_materials = list(/datum/material/plastic = 100) - attack_verb = list("prodded", "whiffed","scratched", "poked") + attack_verb_continuous = list("prods", "whiffs", "scratches", "pokes") + attack_verb_simple = list("prod", "whiff", "scratch", "poke") sharpness = SHARP_EDGED custom_price = 50 var/break_chance = 25 @@ -168,7 +171,8 @@ force = 15 throwforce = 10 custom_materials = list(/datum/material/iron=18000) - attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("cleaves", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("cleave", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") w_class = WEIGHT_CLASS_NORMAL custom_price = 600 @@ -188,7 +192,8 @@ embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) force = 20 throwforce = 20 - attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "cut") + attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "cuts") + attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "cut") bayonet = TRUE /obj/item/kitchen/knife/combat/survival @@ -228,7 +233,8 @@ desc = "A makeshift glass shiv." force = 8 throwforce = 12 - attack_verb = list("shanked", "shivved") + attack_verb_continuous = list("shanks", "shivs") + attack_verb_simple = list("shank", "shiv") armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) custom_materials = list(/datum/material/glass=400) @@ -254,7 +260,8 @@ throw_range = 7 custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks") + attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack") custom_price = 200 /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 952d5f667cb..6291494cf86 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -78,7 +78,7 @@ w_class_on = WEIGHT_CLASS_HUGE flags_1 = CONDUCT_1 armour_penetration = 100 - attack_verb_off = list("attacked", "chopped", "cleaved", "tore", "lacerated", "cut") + attack_verb_off = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts") attack_verb_on = list() light_color = LIGHT_COLOR_LIGHT_CYAN @@ -95,7 +95,7 @@ force = 3 throwforce = 5 hitsound = "swing_hit" //it starts deactivated - attack_verb_off = list("tapped", "poked") + attack_verb_off = list("taps", "pokes") throw_speed = 3 throw_range = 5 sharpness = SHARP_EDGED diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 8b1607095d2..199874bfdc7 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -23,7 +23,8 @@ wound_bonus = 15 bare_wound_bonus = 10 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("flogged", "whipped", "lashed", "disciplined") + attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines") + attack_verb_simple = list("flog", "whip", "lash", "discipline") hitsound = 'sound/weapons/chainhit.ogg' custom_materials = list(/datum/material/iron = 1000) @@ -43,7 +44,8 @@ force = 20 throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") sharpness = SHARP_EDGED /obj/item/melee/synthetic_arm_blade/Initialize() @@ -65,7 +67,8 @@ block_chance = 50 armour_penetration = 75 sharpness = SHARP_EDGED - attack_verb = list("slashed", "cut") + attack_verb_continuous = list("slashes", "cuts") + attack_verb_simple = list("slash", "cut") hitsound = 'sound/weapons/rapierhit.ogg' custom_materials = list(/datum/material/iron = 1000) wound_bonus = 10 @@ -149,7 +152,8 @@ throwforce = 10 block_chance = 20 armour_penetration = 65 - attack_verb = list("slashed", "stung", "prickled", "poked") + attack_verb_continuous = list("slashes", "stings", "prickles", "pokes") + attack_verb_simple = list("slash", "sting", "prickle", "poke") hitsound = 'sound/weapons/rapierhit.ogg' /obj/item/melee/beesword/afterattack(atom/target, mob/user, proximity) @@ -377,7 +381,8 @@ inhand_icon_state = on_inhand_icon_state w_class = weight_class_on force = force_on - attack_verb = list("smacked", "struck", "cracked", "beaten") + attack_verb_continuous = list("smacks", "strikes", "cracks", "beats") + attack_verb_simple = list("smack", "strike", "crack", "beat") else to_chat(user, desc["local_off"]) icon_state = off_icon_state @@ -385,7 +390,8 @@ slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL force = force_off - attack_verb = list("hit", "poked") + attack_verb_continuous = list("hits", "pokes") + attack_verb_simple = list("hit", "poke") playsound(src.loc, on_sound, 50, TRUE) add_fingerprint(user) @@ -531,7 +537,8 @@ slot_flags = ITEM_SLOT_BELT force = 15 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("flogged", "whipped", "lashed", "disciplined") + attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines") + attack_verb_simple = list("flog", "whip", "lash", "discipline") hitsound = 'sound/weapons/whip.ogg' /obj/item/melee/curator_whip/afterattack(target, mob/user, proximity_flag) @@ -550,7 +557,8 @@ w_class = WEIGHT_CLASS_SMALL item_flags = NONE force = 0 - attack_verb = list("hit", "poked") + attack_verb_continuous = list("hits", "pokes") + attack_verb_simple = list("hit", "poke") var/obj/item/reagent_containers/food/snacks/sausage/held_sausage var/static/list/ovens var/on = FALSE @@ -666,7 +674,8 @@ throwforce = 8 block_chance = 10 armour_penetration = 50 - attack_verb = list("smacked", "struck", "cracked", "beaten") + attack_verb_continuous = list("smacks", "strikes", "cracks", "beats") + attack_verb_simple = list("smack", "strike", "crack", "beat") var/overlay_state = "mace_handle" var/mutable_appearance/overlay diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index c6fe6c4eda4..17640b3ef59 100644 --- a/code/game/objects/items/melee/transforming.dm +++ b/code/game/objects/items/melee/transforming.dm @@ -6,8 +6,8 @@ var/throwforce_on = 20 var/icon_state_on = "axe1" var/hitsound_on = 'sound/weapons/blade1.ogg' - var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") - var/list/attack_verb_off = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + var/list/attack_verb_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + var/list/attack_verb_off = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") w_class = WEIGHT_CLASS_SMALL var/bonus_active = FALSE //If the faction damage bonus is active var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects @@ -20,10 +20,10 @@ . = ..() if(active) if(attack_verb_on.len) - attack_verb = attack_verb_on + attack_verb_continuous = attack_verb_on else if(attack_verb_off.len) - attack_verb = attack_verb_off + attack_verb_continuous = attack_verb_off if(embedding) updateEmbedding() if(sharpness) @@ -54,7 +54,7 @@ hitsound = hitsound_on throw_speed = 4 if(attack_verb_on.len) - attack_verb = attack_verb_on + attack_verb_continuous = attack_verb_on icon_state = icon_state_on w_class = w_class_on if(embedding) @@ -65,7 +65,7 @@ hitsound = initial(hitsound) throw_speed = initial(throw_speed) if(attack_verb_off.len) - attack_verb = attack_verb_off + attack_verb_continuous = attack_verb_off icon_state = initial(icon_state) w_class = initial(w_class) if(embedding) diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 874a31f6726..eb107d939c5 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -10,7 +10,8 @@ throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_SMALL - attack_verb = list("warned", "cautioned", "smashed") + attack_verb_continuous = list("warns", "cautions", "smashes") + attack_verb_simple = list("warn", "caution", "smash") /obj/item/choice_beacon name = "choice beacon" @@ -150,7 +151,8 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "skub" w_class = WEIGHT_CLASS_BULKY - attack_verb = list("skubbed") + attack_verb_continuous = list("skubs") + attack_verb_simple = list("skub") /obj/item/skub/suicide_act(mob/living/user) user.visible_message("[user] has declared themself as anti-skub! The skub tears them apart!") diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index e5bbc475c47..540e6bf33e2 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -10,7 +10,8 @@ throw_speed = 3 throw_range = 7 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") + attack_verb_continuous = list("mops", "bashes", "bludgeons", "whacks") + attack_verb_simple = list("mop", "bash", "bludgeon", "whack") resistance_flags = FLAMMABLE var/mopping = 0 var/mopcount = 0 diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 5a400f036ec..57fe19f9561 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -11,7 +11,8 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' force = 5 - attack_verb = list("bashed", "carried") + attack_verb_continuous = list("bashes", "carries") + attack_verb_simple = list("bash", "carry") w_class = WEIGHT_CLASS_BULKY throw_speed = 2 throw_range = 3 diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm index f7524168d2c..2ba33674e82 100644 --- a/code/game/objects/items/pitchfork.dm +++ b/code/game/objects/items/pitchfork.dm @@ -7,7 +7,8 @@ force = 7 throwforce = 15 w_class = WEIGHT_CLASS_BULKY - attack_verb = list("attacked", "impaled", "pierced") + attack_verb_continuous = list("attacks", "impales", "pierces") + attack_verb_simple = list("attack", "impale", "pierce") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED max_integrity = 200 diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 8b2fa120ca9..7559931c34b 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -3,7 +3,8 @@ desc = "This is the special coder plush, do not steal." icon = 'icons/obj/plushes.dmi' icon_state = "debug" - attack_verb = list("thumped", "whomped", "bumped") + attack_verb_continuous = list("thumps", "whomps", "bumps") + attack_verb_simple = list("thump", "whomp", "bump") w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE var/list/squeak_override //Weighted list; If you want your plush to have different squeak sounds use this @@ -382,14 +383,16 @@ desc = "An adorable stuffed toy that resembles a space carp." icon_state = "carpplush" inhand_icon_state = "carp_plushie" - attack_verb = list("bitten", "eaten", "fin slapped") + attack_verb_continuous = list("bites", "eats", "fin slaps") + attack_verb_simple = list("bite", "eat", "fin slap") squeak_override = list('sound/weapons/bite.ogg'=1) /obj/item/toy/plush/bubbleplush name = "\improper Bubblegum plushie" desc = "The friendly red demon that gives good miners gifts." icon_state = "bubbleplush" - attack_verb = list("rent") + attack_verb_continuous = list("rents") + attack_verb_simple = list("rent") squeak_override = list('sound/magic/demon_attack1.ogg'=1) /obj/item/toy/plush/ratplush @@ -498,7 +501,8 @@ desc = "An adorable stuffed toy that resembles a lizardperson." icon_state = "plushie_lizard" inhand_icon_state = "plushie_lizard" - attack_verb = list("clawed", "hissed", "tail slapped") + attack_verb_continuous = list("claws", "hisses", "tail slaps") + attack_verb_simple = list("claw", "hiss", "tail slap") squeak_override = list('sound/weapons/slash.ogg' = 1) /obj/item/toy/plush/snakeplushie @@ -506,7 +510,8 @@ desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing." icon_state = "plushie_snake" inhand_icon_state = "plushie_snake" - attack_verb = list("bitten", "hissed", "tail slapped") + attack_verb_continuous = list("bites", "hisses", "tail slaps") + attack_verb_simple = list("bite", "hiss", "tail slap") squeak_override = list('sound/weapons/bite.ogg' = 1) /obj/item/toy/plush/nukeplushie @@ -514,7 +519,8 @@ desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious." icon_state = "plushie_nuke" inhand_icon_state = "plushie_nuke" - attack_verb = list("shot", "nuked", "detonated") + attack_verb_continuous = list("shoots", "nukes", "detonates") + attack_verb_simple = list("shoot", "nuke", "detonate") squeak_override = list('sound/effects/hit_punch.ogg' = 1) /obj/item/toy/plush/slimeplushie @@ -522,7 +528,8 @@ desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack." icon_state = "plushie_slime" inhand_icon_state = "plushie_slime" - attack_verb = list("blorbled", "slimed", "absorbed") + attack_verb_continuous = list("blorbles", "slimes", "absorbs") + attack_verb_simple = list("blorble", "slime", "absorb") squeak_override = list('sound/effects/blobattack.ogg' = 1) gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy @@ -541,7 +548,8 @@ desc = "A cute toy that resembles an even cuter bee." icon_state = "plushie_h" inhand_icon_state = "plushie_h" - attack_verb = list("stung") + attack_verb_continuous = list("stings") + attack_verb_simple = list("sting") gender = FEMALE squeak_override = list('sound/voice/moth/scream_moth.ogg'=1) @@ -556,7 +564,8 @@ desc = "A plushie depicting an adorable mothperson. It's a huggable bug!" icon_state = "moffplush" inhand_icon_state = "moffplush" - attack_verb = list("fluttered", "flapped") + attack_verb_continuous = list("flutters", "flaps") + attack_verb_simple = list("flutter", "flap") squeak_override = list('sound/voice/moth/scream_moth.ogg'=1) ///Used to track how many people killed themselves with item/toy/plush/moth var/suicide_count = 0 @@ -583,5 +592,6 @@ desc = "A plushie depicting a peacekeeper cyborg. Only you can prevent human harm!" icon_state = "pkplush" inhand_icon_state = "pkplush" - attack_verb = list("hugged", "squeezed") + attack_verb_continuous = list("hugs", "squeezes") + attack_verb_simple = list("hug", "squeeze") squeak_override = list('sound/weapons/thudswoosh.ogg'=1) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 65a38bb98e2..73ad10867e5 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -7,7 +7,8 @@ desc = "A gas-powered cannon that can fire any object loaded into it." w_class = WEIGHT_CLASS_BULKY force = 8 //Very heavy - attack_verb = list("bludgeoned", "smashed", "beaten") + attack_verb_continuous = list("bludgeons", "smashes", "beats") + attack_verb_simple = list("bludgeon", "smash", "beat") icon = 'icons/obj/pneumaticCannon.dmi' icon_state = "pneumaticCannon" inhand_icon_state = "bulldog" diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index ab7452c92f2..3a427b6dc07 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -6,7 +6,8 @@ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' flags_1 = CONDUCT_1 - attack_verb = list("whacked", "fisted", "power-punched") + attack_verb_continuous = list("whacks", "fists", "power-punches") + attack_verb_simple = list("whack", "fist", "power-punch") force = 20 throwforce = 10 throw_range = 7 diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index d99d95b62ed..0148e6127fb 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -5,7 +5,8 @@ icon_state = "banner" inhand_icon_state = "banner" force = 8 - attack_verb = list("forcefully inspired", "violently encouraged", "relentlessly galvanized") + attack_verb_continuous = list("forcefully inspires", "violently encourages", "relentlessly galvanizes") + attack_verb_simple = list("forcefully inspire", "violently encourage", "relentlessly galvanize") lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi' var/inspiration_available = TRUE //If this banner can be used to inspire crew diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index a56829f433a..1ae7a49abc9 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -21,7 +21,8 @@ throw_range = 3 w_class = WEIGHT_CLASS_BULKY custom_materials = list(/datum/material/glass=7500, /datum/material/iron=1000) - attack_verb = list("shoved", "bashed") + attack_verb_continuous = list("shoves", "bashes") + attack_verb_simple = list("shove", "bash") var/cooldown = 0 //shield bash cooldown. based on world.time transparent = TRUE max_integrity = 75 @@ -192,7 +193,8 @@ lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' w_class = WEIGHT_CLASS_TINY - attack_verb = list("shoved", "bashed") + attack_verb_continuous = list("shoves", "bashes") + attack_verb_simple = list("shove", "bash") throw_range = 5 force = 3 throwforce = 3 diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 45bcb5ecfed..5941cbe7763 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -4,7 +4,8 @@ desc = "It's blank." force = 5 w_class = WEIGHT_CLASS_BULKY - attack_verb = list("bashed","smacked") + attack_verb_continuous = list("bashes", "smacks") + attack_verb_simple = list("bash", "smack") resistance_flags = FLAMMABLE var/label = "" diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index be175f78bd3..55271003197 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -14,7 +14,8 @@ armour_penetration = 10 custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075) hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "poked", "jabbed", "tore", "lacerated", "gored") + attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores") + attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore") sharpness = SHARP_EDGED // i know the whole point of spears is that they're pointy, but edged is more devastating at the moment so max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) @@ -133,7 +134,8 @@ /obj/item/spear/grey_tide name = "\improper Grey Tide" desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces." - attack_verb = list("gored") + attack_verb_continuous = list("gores") + attack_verb_simple = list("gore") force=15 /obj/item/spear/grey_tide/ComponentInitialize() diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index e88dd0bd93e..96dd8baee62 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -66,7 +66,8 @@ singular_name = "bluespace polycrystal" desc = "A stable polycrystal, made of fused-together bluespace crystals. You could probably break one off." custom_materials = list(/datum/material/bluespace=MINERAL_MATERIAL_AMOUNT) - attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed") + attack_verb_continuous = list("bluespace polybashes", "bluespace polybatters", "bluespace polybludgeons", "bluespace polythrashes", "bluespace polysmashes") + attack_verb_simple = list("bluespace polybash", "bluespace polybatter", "bluespace polybludgeon", "bluespace polythrash", "bluespace polysmash") novariants = TRUE grind_results = list(/datum/reagent/bluespace = 20) point_value = 30 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 053baeafc96..2c7758db401 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -20,7 +20,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ throw_range = 7 custom_materials = list(/datum/material/iron=1000) max_amount = 50 - attack_verb = list("hit", "bludgeoned", "whacked") + attack_verb_continuous = list("hits", "bludgeons", "whacks") + attack_verb_simple = list("hit", "bludgeon", "whack") hitsound = 'sound/weapons/gun/general/grenade_launch.ogg' embedding = list() novariants = TRUE diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 486f56c4061..66540bc87b0 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -248,7 +248,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' custom_materials = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT) - attack_verb = list("stabbed", "slashed", "sliced", "cut") + attack_verb_continuous = list("stabs", "slashes", "slices", "cuts") + attack_verb_simple = list("stab", "slash", "slice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' resistance_flags = ACID_PROOF armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100) diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 1ec59613752..67edd1c07b7 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -8,7 +8,8 @@ max_amount = 50 throw_speed = 1 throw_range = 3 - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes") + attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash") novariants = FALSE var/sheettype = null //this is used for girders in the creation of walls/false walls var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity. diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 26bdea43e1d..04ab24b0e8b 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -4,7 +4,8 @@ desc = "A floor tile, made out of glass. It produces light." icon_state = "tile_e" flags_1 = CONDUCT_1 - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes") + attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash") turf_type = /turf/open/floor/light var/state = 0 diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 5cbbb748f42..807b7895e45 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -8,7 +8,8 @@ lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' slot_flags = ITEM_SLOT_BELT - attack_verb = list("whipped", "lashed", "disciplined") + attack_verb_continuous = list("whips", "lashes", "disciplines") + attack_verb_simple = list("whip", "lash", "discipline") max_integrity = 300 equip_sound = 'sound/items/equip/toolbelt_equip.ogg' var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 19cb8a98da7..5fc22af8364 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -261,7 +261,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", hitsound = 'sound/weapons/sear.ogg' damtype = BURN name = "Syndicate Tome" - attack_verb = list("attacked", "burned", "blessed", "damned", "scorched") + attack_verb_continuous = list("attacks", "burns", "blesses", "damns", "scorches") + attack_verb_simple = list("attack", "burn", "bless", "damn", "scorch") var/uses = 1 /obj/item/storage/book/bible/syndicate/attack_self(mob/living/carbon/human/H) diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index bc08ec556e1..582564b9a01 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -10,7 +10,8 @@ throw_speed = 2 throw_range = 4 w_class = WEIGHT_CLASS_BULKY - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks") + attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack") resistance_flags = FLAMMABLE max_integrity = 150 var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New() diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 4ce9266be3e..c4df38c4486 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -128,7 +128,8 @@ throw_speed = 2 throw_range = 4 w_class = WEIGHT_CLASS_BULKY - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks") + attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack") /obj/item/storage/secure/briefcase/PopulateContents() new /obj/item/paper(src) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index f3ab4039ce0..b947ae93fda 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -12,7 +12,8 @@ throw_range = 7 w_class = WEIGHT_CLASS_BULKY custom_materials = list(/datum/material/iron = 500) - attack_verb = list("robusted") + attack_verb_continuous = list("robusts") + attack_verb_simple = list("robust") hitsound = 'sound/weapons/smash.ogg' drop_sound = 'sound/items/handling/toolbox_drop.ogg' pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 9471ae615cf..692101bdb00 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -9,7 +9,8 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' force = 10 - attack_verb = list("beaten") + attack_verb_continuous = list("beats") + attack_verb_simple = list("beat") w_class = WEIGHT_CLASS_NORMAL slot_flags = ITEM_SLOT_BELT diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 29561eb15d2..b1b59074752 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -15,7 +15,8 @@ drop_sound = 'sound/items/handling/crowbar_drop.ogg' pickup_sound = 'sound/items/handling/crowbar_pickup.ogg' - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks") + attack_verb_simple = list("attack", "bash", "batter", "bludgeon", "whack") tool_behaviour = TOOL_CROWBAR toolspeed = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index b306cd229aa..6b467476940 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -15,7 +15,8 @@ throw_speed = 3 throw_range = 5 custom_materials = list(/datum/material/iron=75) - attack_verb = list("stabbed") + attack_verb_continuous = list("stabs") + attack_verb_simple = list("stab") hitsound = 'sound/weapons/bladeslice.ogg' usesound = list('sound/items/screwdriver.ogg', 'sound/items/screwdriver2.ogg') tool_behaviour = TOOL_SCREWDRIVER @@ -102,7 +103,8 @@ throwforce = 8 throw_speed = 2 throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far - attack_verb = list("drilled", "screwed", "jabbed","whacked") + attack_verb_continuous = list("drills", "screws", "jabs", "whacks") + attack_verb_simple = list("drill", "screw", "jab", "whack") hitsound = 'sound/items/drill_hit.ogg' usesound = 'sound/items/drill_use.ogg' toolspeed = 0.7 diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 2a389aeafda..7117339d670 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -13,7 +13,8 @@ throw_range = 7 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=80) - attack_verb = list("pinched", "nipped") + attack_verb_continuous = list("pinches", "nips") + attack_verb_simple = list("pinch", "nip") hitsound = 'sound/items/wirecutter.ogg' usesound = 'sound/items/wirecutter.ogg' drop_sound = 'sound/items/handling/wirecutter_drop.ogg' diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index fa83b6fe628..c491479caa3 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -15,7 +15,8 @@ drop_sound = 'sound/items/handling/wrench_drop.ogg' pickup_sound = 'sound/items/handling/wrench_pickup.ogg' - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks") + attack_verb_simple = list("bash", "batter", "bludgeon", "whack") tool_behaviour = TOOL_WRENCH toolspeed = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) @@ -40,7 +41,8 @@ icon_state = "wrench_medical" force = 2 //MEDICAL throwforce = 4 - attack_verb = list("healed", "medicaled", "tapped", "poked", "analyzed") //"cobbyed" + attack_verb_continuous = list("heals", "medicals", "taps", "pokes", "analyzes") //"cobbyed" + attack_verb_simple = list("heal", "medical", "tap", "poke", "analyze") ///var to hold the name of the person who suicided var/suicider @@ -80,7 +82,8 @@ desc = "It's like a normal wrench but edgier. Can be found on the battlefield." icon_state = "wrench_combat" inhand_icon_state = "wrench_combat" - attack_verb = list("devastated", "brutalized", "committed a war crime against", "obliterated", "humiliated") + attack_verb_continuous = list("devastates", "brutalizes", "commits a war crime against", "obliterates", "humiliates") + attack_verb_simple = list("devastate", "brutalize", "commit a war crime against", "obliterate", "humiliate") tool_behaviour = null toolspeed = null var/on = FALSE diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 9c1681af3dc..6a53ebfe9c7 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -168,8 +168,8 @@ var/mob/M = loc SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "badass_antag", /datum/mood_event/badass_antag) . = ..() - - + + /obj/item/toy/balloon/arrest name = "arreyst balloon" desc = "A half inflated balloon about a boyband named Arreyst that was popular about ten years ago, famous for making fun of red jumpsuits as unfashionable." @@ -247,7 +247,8 @@ slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=10, /datum/material/glass=10) - attack_verb = list("struck", "pistol whipped", "hit", "bashed") + attack_verb_continuous = list("strikes", "pistol whips", "hits", "bashes") + attack_verb_simple = list("strike", "pistol whip", "hit", "bash") var/bullets = 7 /obj/item/toy/gun/examine(mob/user) @@ -323,7 +324,8 @@ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' var/active = 0 w_class = WEIGHT_CLASS_SMALL - attack_verb = list("attacked", "struck", "hit") + attack_verb_continuous = list("attacks", "strikes", "hits") + attack_verb_simple = list("attack", "strike", "hit") var/hacked = FALSE var/saber_color @@ -386,7 +388,8 @@ inhand_icon_state = "arm_blade" lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' - attack_verb = list("pricked", "absorbed", "gored") + attack_verb_continuous = list("pricks", "absorbs", "gores") + attack_verb_simple = list("prick", "absorb", "gore") w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE @@ -401,7 +404,8 @@ var/active = FALSE icon = 'icons/obj/items_and_weapons.dmi' hitsound = 'sound/weapons/smash.ogg' - attack_verb = list("robusted") + attack_verb_continuous = list("robusts") + attack_verb_simple = list("robust") /obj/item/toy/windup_toolbox/attack_self(mob/user) if(!active) @@ -447,7 +451,8 @@ throw_speed = 3 throw_range = 5 two_hand_force = 0 - attack_verb = list("attacked", "struck", "hit") + attack_verb_continuous = list("attacks", "strikes", "hits") + attack_verb_simple = list("attack", "strike", "hit") /obj/item/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 @@ -469,7 +474,8 @@ force = 5 throwforce = 5 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices") + attack_verb_simple = list("attack", "slash", "stab", "slice") hitsound = 'sound/weapons/bladeslice.ogg' /* @@ -646,7 +652,8 @@ var/card_throwforce = 0 var/card_throw_speed = 3 var/card_throw_range = 7 - var/list/card_attack_verb = list("attacked") + var/list/card_attack_verb_continuous = list("attacks") + var/list/card_attack_verb_simple = list("attack") /obj/item/toy/cards/suicide_act(mob/living/carbon/user) user.visible_message("[user] is slitting [user.p_their()] wrists with \the [src]! It looks like [user.p_they()] [user.p_have()] a crummy hand!") @@ -846,7 +853,8 @@ newobj.card_throwforce = sourceobj.card_throwforce newobj.card_throw_speed = sourceobj.card_throw_speed newobj.card_throw_range = sourceobj.card_throw_range - newobj.card_attack_verb = sourceobj.card_attack_verb + newobj.card_attack_verb_continuous = sourceobj.card_attack_verb_continuous + newobj.card_attack_verb_simple = sourceobj.card_attack_verb_simple newobj.resistance_flags = sourceobj.resistance_flags /** @@ -965,8 +973,10 @@ newobj.throw_speed = newobj.card_throw_speed newobj.card_throw_range = sourceobj.card_throw_range newobj.throw_range = newobj.card_throw_range - newobj.card_attack_verb = sourceobj.card_attack_verb - newobj.attack_verb = newobj.card_attack_verb + newobj.card_attack_verb_continuous = sourceobj.card_attack_verb_continuous + newobj.attack_verb_continuous = newobj.card_attack_verb_continuous + newobj.card_attack_verb_simple = sourceobj.card_attack_verb_simple + newobj.attack_verb_simple = newobj.card_attack_verb_simple /* || Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. || @@ -982,7 +992,8 @@ card_throwforce = 10 card_throw_speed = 3 card_throw_range = 7 - card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut") + card_attack_verb_continuous = list("attacks", "slices", "dices", "slashes", "cuts") + card_attack_verb_simple = list("attack", "slice", "dice", "slash", "cut") resistance_flags = NONE /* diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index b459f03c827..c7a0d5c10fa 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -9,7 +9,8 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 - attack_verb = list("banned") + attack_verb_continuous = list("bans") + attack_verb_simple = list("ban") max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) resistance_flags = FIRE_PROOF @@ -43,7 +44,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 1 w_class = WEIGHT_CLASS_NORMAL hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") /obj/item/sord/suicide_act(mob/user) user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \ @@ -63,7 +65,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 40 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") block_chance = 50 sharpness = SHARP_EDGED max_integrity = 200 @@ -85,7 +88,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 slot_flags = null block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY light_range = 3 - attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS + attack_verb_continuous = list("brutalizes", "eviscerates", "disembowels", "hacks", "carves", "cleaves") //ONLY THE MOST VISCERAL ATTACK VERBS + attack_verb_simple = list("brutalize", "eviscerate", "disembowel", "hack", "carve", "cleave") var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK @@ -217,7 +221,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 10 w_class = WEIGHT_CLASS_HUGE hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") block_chance = 50 sharpness = SHARP_EDGED max_integrity = 200 @@ -252,7 +257,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75) - attack_verb = list("hit", "bludgeoned", "whacked", "bonked") + attack_verb_continuous = list("hits", "bludgeons", "whacks", "bonks") + attack_verb_simple = list("hit", "bludgeon", "whack", "bonk") /obj/item/wirerod/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/shard)) @@ -322,7 +328,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 25 //kills regular carps in one hit force = 10 throw_range = 0 //throwing these invalidates the speargun - attack_verb = list("stabbed", "ripped", "gored", "impaled") + attack_verb_continuous = list("stabs", "rips", "gores", "impales") + attack_verb_simple = list("stab", "rip", "gore", "impale") embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit /obj/item/switchblade @@ -339,7 +346,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throw_range = 6 custom_materials = list(/datum/material/iron=12000) hitsound = 'sound/weapons/genhit.ogg' - attack_verb = list("stubbed", "poked") + attack_verb_continuous = list("stubs", "pokes") + attack_verb_simple = list("stub", "poke") resistance_flags = FIRE_PROOF var/extended = 0 @@ -351,7 +359,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 w_class = WEIGHT_CLASS_NORMAL throwforce = 23 icon_state = "switchblade_ext" - attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED else @@ -359,7 +368,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 w_class = WEIGHT_CLASS_SMALL throwforce = 5 icon_state = "switchblade" - attack_verb = list("stubbed", "poked") + attack_verb_continuous = list("stubs", "pokes") + attack_verb_simple = list("stub", "poke") hitsound = 'sound/weapons/genhit.ogg' sharpness = SHARP_NONE @@ -377,7 +387,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throw_speed = 3 throw_range = 4 w_class = WEIGHT_CLASS_SMALL - attack_verb = list("called", "rang") + attack_verb_continuous = list("calls", "rings") + attack_verb_simple = list("call", "ring") hitsound = 'sound/weapons/ring.ogg' /obj/item/phone/suicide_act(mob/user) @@ -399,7 +410,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 5 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=50) - attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") + attack_verb_continuous = list("bludgeons", "whacks", "disciplines", "thrashes") + attack_verb_simple = list("bludgeon", "whack", "discipline", "thrash") /obj/item/staff name = "wizard staff" @@ -414,7 +426,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throw_range = 5 w_class = WEIGHT_CLASS_SMALL armour_penetration = 100 - attack_verb = list("bludgeoned", "whacked", "disciplined") + attack_verb_continuous = list("bludgeons", "whacks", "disciplines") + attack_verb_simple = list("bludgeon", "whack", "discipline") resistance_flags = FLAMMABLE /obj/item/staff/broom @@ -467,7 +480,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throw_range = 0 throw_speed = 0 sharpness = SHARP_EDGED - attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") + attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") + attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1 @@ -497,7 +511,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 10 throw_speed = 5 throw_range = 2 - attack_verb = list("busted") + attack_verb_continuous = list("busts") + attack_verb_simple = list("bust") var/impressiveness = 45 /obj/item/statuebust/Initialize() @@ -519,7 +534,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 1 // why are you throwing a club do you even weapon throw_speed = 1 throw_range = 1 - attack_verb = list("clubbed", "bludgeoned") + attack_verb_continuous = list("clubs", "bludgeons") + attack_verb_simple = list("club", "bludgeon") /obj/item/melee/chainofcommand/tailwhip name = "liz o' nine tails" @@ -542,7 +558,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 12 throwforce = 4 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("smacked", "whacked", "slammed", "smashed") + attack_verb_continuous = list("smacks", "whacks", "slams", "smashes") + attack_verb_simple = list("smack", "whack", "slam", "smash") ///The vehicle counterpart for the board var/board_item_type = /obj/vehicle/ridden/scooter/skateboard @@ -585,7 +602,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 10 wound_bonus = -10 throwforce = 12 - attack_verb = list("beat", "smacked") + attack_verb_continuous = list("beats", "smacks") + attack_verb_simple = list("beat", "smack") custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5) w_class = WEIGHT_CLASS_HUGE var/homerun_ready = 0 @@ -654,7 +672,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' force = 1 throwforce = 1 - attack_verb = list("swatted", "smacked") + attack_verb_continuous = list("swats", "smacks") + attack_verb_simple = list("swat", "smack") hitsound = 'sound/effects/snap.ogg' w_class = WEIGHT_CLASS_SMALL //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. @@ -690,7 +709,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 0 throwforce = 0 item_flags = DROPDEL | ABSTRACT | HAND_ITEM - attack_verb = list("bopped") + attack_verb_continuous = list("bops") + attack_verb_simple = list("bop") /obj/item/circlegame/Initialize() . = ..() @@ -790,7 +810,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 0 throwforce = 0 item_flags = DROPDEL | ABSTRACT | HAND_ITEM - attack_verb = list("slapped") + attack_verb_continuous = list("slaps") + attack_verb_simple = list("slap") hitsound = 'sound/effects/snap.ogg' /obj/item/slapper/attack(mob/M, mob/living/carbon/human/user) @@ -839,7 +860,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 5 throwforce = 5 hitsound = "swing_hit" - attack_verb = list("whacked", "thwacked", "walloped", "socked") + attack_verb_continuous = list("whacks", "thwacks", "wallops", "socks") + attack_verb_simple = list("whack", "thwack", "wallop", "sock") icon = 'icons/obj/items_and_weapons.dmi' icon_state = "gohei" inhand_icon_state = "gohei" @@ -859,7 +881,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 20 throw_speed = 4 sharpness = SHARP_EDGED - attack_verb = list("cut", "sliced", "diced") + attack_verb_continuous = list("cuts", "slices", "dices") + attack_verb_simple = list("cut", "slice", "dice") w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 290660e08d1..0955519f688 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -160,7 +160,8 @@ throw_range = 0 throw_speed = 0 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") sharpness = SHARP_EDGED wound_bonus = -60 bare_wound_bonus = 20 diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index a7b164460ed..e8a14f55905 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -46,7 +46,8 @@ wound_bonus = -80 bare_wound_bonus = 30 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend") /obj/item/melee/cultblade/Initialize() . = ..() @@ -93,7 +94,8 @@ throw_range = 3 sharpness = SHARP_EDGED light_color = COLOR_RED - attack_verb = list("cleaved", "slashed", "tore", "lacerated", "hacked", "ripped", "diced", "carved") + attack_verb_continuous = list("cleaves", "slashes", "tears", "lacerates", "hacks", "rips", "dices", "carves") + attack_verb_simple = list("cleave", "slash", "tear", "lacerate", "hack", "rip", "dice", "carve") icon_state = "cultbastard" inhand_icon_state = "cultbastard" hitsound = 'sound/weapons/bladeslice.ogg' @@ -626,7 +628,8 @@ throw_speed = 2 armour_penetration = 30 block_chance = 30 - attack_verb = list("attacked", "impaled", "stabbed", "tore", "lacerated", "gored") + attack_verb_continuous = list("attacks", "impales", "stabs", "tears", "lacerates", "gores") + attack_verb_simple = list("attack", "impale", "stab", "tear", "lacerate", "gore") sharpness = SHARP_EDGED hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act @@ -896,7 +899,8 @@ throw_speed = 1 throw_range = 4 w_class = WEIGHT_CLASS_BULKY - attack_verb = list("bumped", "prodded") + attack_verb_continuous = list("bumps", "prods") + attack_verb_simple = list("bump", "prod") hitsound = 'sound/weapons/smash.ogg' var/illusions = 2 diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index e99b6558504..a15097096e0 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -123,8 +123,8 @@ var/weakness = check_weakness(I, user) apply_damage(I.force * weakness, I.damtype, def_zone) var/message_verb = "" - if(I.attack_verb && length(I.attack_verb)) - message_verb = "[pick(I.attack_verb)]" + if(length(I.attack_verb_continuous)) + message_verb = "[pick(I.attack_verb_continuous)]" else if(I.force) message_verb = "attacked" diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index fba5de445a1..ab79948c994 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -46,7 +46,8 @@ force = 17 throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend") /obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user) if(!IS_HERETIC(user)) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 912a8b6f331..4c48646969e 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -86,7 +86,8 @@ force = 10 throwforce = 10 throw_speed = 4 - attack_verb = list("sliced") + attack_verb_continuous = list("slices") + attack_verb_simple = list("slice") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED @@ -154,7 +155,8 @@ force = 10 throwforce = 20 throw_speed = 4 - attack_verb = list("sliced") + attack_verb_continuous = list("slices") + attack_verb_simple = list("slice") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED glass_colour_type = /datum/client_colour/glass_colour/lightgreen @@ -226,7 +228,8 @@ force = 10 throwforce = 10 throw_speed = 4 - attack_verb = list("sliced") + attack_verb_continuous = list("slices") + attack_verb_simple = list("slice") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED @@ -246,7 +249,8 @@ force = 10 throwforce = 10 throw_speed = 4 - attack_verb = list("sliced") + attack_verb_continuous = list("slices") + attack_verb_simple = list("slice") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED glass_colour_type = /datum/client_colour/glass_colour/orange diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 316d29cdc02..482e454c823 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -157,7 +157,8 @@ force = 10 throwforce = 10 throw_speed = 4 - attack_verb = list("sliced") + attack_verb_continuous = list("slices") + attack_verb_simple = list("slice") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index efb090c1490..20e557028f3 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -6,7 +6,8 @@ siemens_coefficient = 0.5 body_parts_covered = HANDS slot_flags = ITEM_SLOT_GLOVES - attack_verb = list("challenged") + attack_verb_continuous = list("challenges") + attack_verb_simple = list("challenge") var/transfer_prints = FALSE strip_delay = 20 equip_delay_other = 40 diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index bac1ba3225b..ec806f0e39f 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -290,7 +290,8 @@ throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_SMALL - attack_verb = list("warned", "cautioned", "smashed") + attack_verb_continuous = list("warns", "cautions", "smashes") + attack_verb_simple = list("warn", "caution", "smash") resistance_flags = NONE dynamic_hair_suffix = "" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0c6dbf2f5c0..5e5599c72f4 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -503,7 +503,8 @@ throw_range = 5 w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN - attack_verb = list("warned", "cautioned", "smashed") + attack_verb_continuous = list("warns", "cautions", "smashes") + attack_verb_simple = list("warn", "caution", "smash") armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) /obj/item/clothing/suit/changshan_red diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index ee6bd312474..33b886f4fc5 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -145,7 +145,8 @@ w_class = WEIGHT_CLASS_TINY inhand_icon_state = "beer" hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("stabbed", "slashed", "attacked") + attack_verb_continuous = list("stabs", "slashes", "attacks") + attack_verb_simple = list("stab", "slash", "attack") sharpness = SHARP_EDGED var/static/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index d84121c4cf3..312777c7043 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -204,7 +204,8 @@ bitesize = 3 w_class = WEIGHT_CLASS_NORMAL slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT - attack_verb = list("touche'd") + attack_verb_continuous = list("touche's") + attack_verb_simple = list("touche") tastes = list("bread" = 1) foodtype = GRAIN value = FOOD_FAST diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index b4cace10799..cb30aef130c 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -463,7 +463,8 @@ block_chance = 55 armour_penetration = 80 wound_bonus = -70 - attack_verb = list("slapped", "slathered") + attack_verb_continuous = list("slaps", "slathers") + attack_verb_simple = list("slap", "slather") w_class = WEIGHT_CLASS_BULKY tastes = list("cherry" = 1, "crepe" = 1) foodtype = GRAIN | FRUIT | SUGAR diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index aaf285dbb80..32a459f5225 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -45,14 +45,14 @@ D.card_throwforce = 0 D.card_throw_speed = 3 D.card_throw_range = 7 - D.card_attack_verb = list("attacked") + D.card_attack_verb_continuous = list("attacks") else D.card_hitsound = 'sound/weapons/bladeslice.ogg' D.card_force = 5 D.card_throwforce = 10 D.card_throw_speed = 3 D.card_throw_range = 7 - D.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut") + D.card_attack_verb_continuous = list("attacks", "slices", "dices", "slashes", "cuts") /obj/effect/holodeck_effect/sparks/activate(obj/machinery/computer/holodeck/HC) diff --git a/code/modules/hydroponics/grafts.dm b/code/modules/hydroponics/grafts.dm index 3af91b5ad3d..08849d5bdca 100644 --- a/code/modules/hydroponics/grafts.dm +++ b/code/modules/hydroponics/grafts.dm @@ -8,7 +8,8 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "graft_plant" worn_icon_state = "graft" - attack_verb = list("planted", "vegitized", "cropped", "reaped", "farmed") + attack_verb_continuous = list("plants", "vegitizes", "crops", "reaps", "farms") + attack_verb_simple = list("plant", "vegitize", "crop", "reap", "farm") ///The stored trait taken from the parent plant. Defaults to perenial growth. var/datum/plant_gene/trait/stored_trait ///Determines the appearance of the graft. Rudimentary right now so it just picks randomly. diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index beff7514794..1941c6d6a81 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -28,7 +28,8 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 2 throw_range = 3 - attack_verb = list("pomfed") + attack_verb_continuous = list("pomfs") + attack_verb_simple = list("pomf") var/cotton_type = /obj/item/stack/sheet/cotton var/cotton_name = "raw cotton" @@ -75,6 +76,7 @@ w_class = WEIGHT_CLASS_NORMAL throw_speed = 2 throw_range = 3 - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks") + attack_verb_simple = list("bash", "batter", "bludgeon", "whack") cotton_type = /obj/item/stack/sheet/cotton/durathread cotton_name = "raw durathread" diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 393348fa945..0c91c61b1a3 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -249,7 +249,8 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 1 throw_range = 3 - attack_verb = list("roasted", "scorched", "burned") + attack_verb_continuous = list("roasts", "scorches", "burns") + attack_verb_simple = list("roast", "scorch", "burn") grind_results = list(/datum/reagent/consumable/capsaicin = 0, /datum/reagent/consumable/condensedcapsaicin = 0) /obj/item/grown/novaflower/add_juice() diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 24d0b3017fd..79b39d8b6b7 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -46,7 +46,8 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 1 throw_range = 3 - attack_verb = list("stung") + attack_verb_continuous = list("stings") + attack_verb_simple = list("sting") /obj/item/reagent_containers/food/snacks/grown/nettle/suicide_act(mob/user) user.visible_message("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index 79df8aa75e8..acbfa088289 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -22,7 +22,8 @@ force = 4 throwforce = 8 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("stung", "pined") + attack_verb_continuous = list("stings", "pines") + attack_verb_simple = list("sting", "pine") throw_speed = 1 throw_range = 5 slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm index 374e7e58254..58878922163 100644 --- a/code/modules/hydroponics/grown/rainbow_bunch.dm +++ b/code/modules/hydroponics/grown/rainbow_bunch.dm @@ -30,7 +30,8 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 2 throw_range = 3 - attack_verb = list("pompfed") + attack_verb_continuous = list("pompfs") + attack_verb_simple = list("pompf") /obj/item/reagent_containers/food/snacks/grown/rainbow_flower/Initialize() . = ..() diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index c0756e90884..55fefef34e5 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -43,7 +43,8 @@ w_class = WEIGHT_CLASS_NORMAL throw_speed = 2 throw_range = 3 - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks") + attack_verb_simple = list("bash", "batter", "bludgeon", "whack") var/plank_type = /obj/item/stack/sheet/mineral/wood var/plank_name = "wooden planks" var/static/list/accepted = typecacheof(list(/obj/item/reagent_containers/food/snacks/grown/tobacco, diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 771ac0c505b..e3862e12cdc 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -81,7 +81,8 @@ throwforce = 7 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=50) - attack_verb = list("slashed", "sliced", "cut", "clawed") + attack_verb_continuous = list("slashes", "slices", "cuts", "claws") + attack_verb_simple = list("slash", "slice", "cut", "claw") hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/cultivator/suicide_act(mob/user) @@ -92,7 +93,8 @@ name = "rake" icon_state = "rake" w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("slashed", "sliced", "bashed", "clawed") + attack_verb_continuous = list("slashes", "slices", "bashes", "claws") + attack_verb_simple = list("slash", "slice", "bash", "claw") hitsound = null custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) flags_1 = NONE @@ -125,7 +127,8 @@ throw_speed = 3 throw_range = 4 custom_materials = list(/datum/material/iron = 15000) - attack_verb = list("chopped", "tore", "lacerated", "cut") + attack_verb_continuous = list("chops", "tears", "lacerates", "cuts") + attack_verb_simple = list("chop", "tear", "lacerate", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED @@ -158,7 +161,8 @@ flags_1 = CONDUCT_1 armour_penetration = 20 slot_flags = ITEM_SLOT_BACK - attack_verb = list("chopped", "sliced", "cut", "reaped") + attack_verb_continuous = list("chops", "slices", "cuts", "reaps") + attack_verb_simple = list("chop", "slice", "cut", "reap") hitsound = 'sound/weapons/bladeslice.ogg' var/swiping = FALSE @@ -205,7 +209,8 @@ w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT custom_materials = list(/datum/material/iron=4000) - attack_verb = list("slashed", "sliced", "cut", "clawed") + attack_verb_continuous = list("slashes", "slices", "cuts", "claws") + attack_verb_simple = list("slash", "slice", "cut", "claw") hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/geneshears @@ -223,7 +228,8 @@ slot_flags = ITEM_SLOT_BELT material_flags = MATERIAL_NO_EFFECTS custom_materials = list(/datum/material/iron=4000, /datum/material/uranium=1500, /datum/material/gold=500) - attack_verb = list("slashed", "sliced", "cut") + attack_verb_continuous = list("slashes", "slices", "cuts") + attack_verb_simple = list("slash", "slice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index c1415b1e254..df756968d0f 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -210,7 +210,8 @@ 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_continuous = list("bashes", "whacks", "educates") + attack_verb_simple = list("bash", "whack", "educate") resistance_flags = FLAMMABLE drop_sound = 'sound/items/handling/book_drop.ogg' pickup_sound = 'sound/items/handling/book_pickup.ogg' diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index d286eaac380..cfb9580a1a7 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -16,7 +16,8 @@ armour_penetration = 10 custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075) hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped") + attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps") + attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp") sharpness = SHARP_EDGED actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 2ceb85d7362..7a74f3a3c54 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -16,7 +16,8 @@ tool_behaviour = TOOL_MINING toolspeed = 1 usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg') - attack_verb = list("hit", "pierced", "sliced", "attacked") + attack_verb_continuous = list("hits", "pierces", "slices", "attacks") + attack_verb_simple = list("hit", "pierce", "slice", "attack") /obj/item/pickaxe/suicide_act(mob/living/user) user.visible_message("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") @@ -28,7 +29,8 @@ /obj/item/pickaxe/rusted name = "rusty pickaxe" desc = "A pickaxe that's been left to rust." - attack_verb = list("ineffectively hit") + attack_verb_continuous = list("ineffectively hits") + attack_verb_simple = list("ineffectively hit") force = 1 throwforce = 1 @@ -133,7 +135,8 @@ inhand_icon_state = "shovel" w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=50) - attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") + attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks") + attack_verb_simple = list("bash", "bludgeon", "thrash", "whack") sharpness = SHARP_EDGED /obj/item/shovel/Initialize() @@ -171,5 +174,6 @@ throwforce = 12 w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.7 - attack_verb = list("slashed", "impaled", "stabbed", "sliced") + attack_verb_continuous = list("slashes", "impales", "stabs", "slices") + attack_verb_simple = list("slash", "impale", "stab", "slice") sharpness = SHARP_EDGED diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 1951c8f764a..aa23c803c04 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -707,8 +707,8 @@ icon_state = "cleaving_saw" icon_state_on = "cleaving_saw_open" slot_flags = ITEM_SLOT_BELT - attack_verb_off = list("attacked", "sawed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") - attack_verb_on = list("cleaved", "swiped", "slashed", "chopped") + attack_verb_off = list("attacks", "saws", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_on = list("cleaves", "swipes", "slashes", "chops") hitsound = 'sound/weapons/bladeslice.ogg' hitsound_on = 'sound/weapons/bladeslice.ogg' w_class = WEIGHT_CLASS_BULKY @@ -823,7 +823,8 @@ force = 1 throwforce = 1 hitsound = 'sound/effects/ghost2.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend") var/summon_cooldown = 0 var/list/mob/dead/observer/spirits @@ -1140,7 +1141,8 @@ slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 15 - attack_verb = list("clubbed", "beat", "pummeled") + attack_verb_continuous = list("clubs", "beats", "pummels") + attack_verb_simple = list("club", "beat", "pummel") hitsound = 'sound/weapons/sonic_jackhammer.ogg' actions_types = list(/datum/action/item_action/vortex_recall, /datum/action/item_action/toggle_unfriendly_fire) var/cooldown_time = 20 //how long the cooldown between non-melee ranged attacks is diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index df64e0a9910..fa0f7a65550 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -8,7 +8,8 @@ zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_BRAIN organ_flags = ORGAN_VITAL - attack_verb = list("attacked", "slapped", "whacked") + attack_verb_continuous = list("attacks", "slaps", "whacks") + attack_verb_simple = list("attack", "slap", "whack") ///The brain's organ variables are significantly more different than the other organs, with half the decay rate for balance reasons, and twice the maxHealth decay_factor = STANDARD_ORGAN_DECAY / 2 //30 minutes of decaying to result in a fully damaged brain, since a fast decay rate would be unfun gameplay-wise diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 473415f8de8..2aa71321644 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -99,10 +99,9 @@ return TRUE //successful attack /mob/living/carbon/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart) - var/message_verb = "attacked" - if(length(I.attack_verb)) - message_verb = "[pick(I.attack_verb)]" - else if(!I.force) + var/message_verb_continuous = length(I.attack_verb_continuous) ? "[pick(I.attack_verb_continuous)]" : "attacks" + var/message_verb_simple = length(I.attack_verb_simple) ? "[pick(I.attack_verb_simple)]" : "attack" + if(!I.force) return var/extra_wound_details = "" @@ -119,15 +118,18 @@ var/message_hit_area = "" if(hit_area) message_hit_area = " in the [hit_area]" - var/attack_message = "[src] is [message_verb][message_hit_area] with [I][extra_wound_details]!" - var/attack_message_local = "You're [message_verb][message_hit_area] with [I][extra_wound_details]!" + var/attack_message_spectator = "[src] [message_verb_continuous][message_hit_area] with [I][extra_wound_details]!" + var/attack_message_victim = "You're [message_verb_continuous][message_hit_area] with [I][extra_wound_details]!" + var/attack_message_attacker = "You [message_verb_simple] [src][message_hit_area] with [I]!" if(user in viewers(src, null)) - attack_message = "[user] [message_verb] [src][message_hit_area] with [I][extra_wound_details]!" - attack_message_local = "[user] [message_verb] you[message_hit_area] with [I][extra_wound_details]!" + attack_message_spectator = "[user] [message_verb_continuous] [src][message_hit_area] with [I][extra_wound_details]!" + attack_message_victim = "[user] [message_verb_continuous] you[message_hit_area] with [I][extra_wound_details]!" if(user == src) - attack_message_local = "You [message_verb] yourself[message_hit_area] with [I][extra_wound_details]" - visible_message("[attack_message]",\ - "[attack_message_local]", null, COMBAT_MESSAGE_RANGE) + attack_message_victim = "You [message_verb_simple] yourself[message_hit_area] with [I][extra_wound_details]!" + visible_message("[attack_message_spectator]",\ + "[attack_message_victim]", null, COMBAT_MESSAGE_RANGE, user) + if(user != src) + to_chat(user, "[attack_message_attacker]") return TRUE diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index e21894eb0cc..99dd344788e 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -12,7 +12,8 @@ armour_penetration = 50 w_class = WEIGHT_CLASS_NORMAL hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT sharpness = SHARP_EDGED max_integrity = 200 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index df2acb52b74..6ff23ece78f 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -196,7 +196,8 @@ * (Alan) Edaggers */ /obj/item/pen/edagger - attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") //these won't show up if the pen is off + attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") //these won't show up if the pen is off + attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") sharpness = SHARP_EDGED var/on = FALSE diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index af22446fcfb..3db3bb8f6c2 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -10,7 +10,8 @@ throw_range = 7 custom_materials = list(/datum/material/iron=60) pressure_resistance = 2 - attack_verb = list("stamped") + attack_verb_continuous = list("stamps") + attack_verb_simple = list("stamp") /obj/item/stamp/suicide_act(mob/user) user.visible_message("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.") diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index b59830879fa..347a7f081f0 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -403,7 +403,8 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri custom_materials = list(/datum/material/iron=10, /datum/material/glass=5) flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT - attack_verb = list("whipped", "lashed", "disciplined", "flogged") + attack_verb_continuous = list("whips", "lashes", "disciplines", "flogs") + attack_verb_simple = list("whip", "lash", "discipline", "flog") singular_name = "cable piece" full_w_class = WEIGHT_CLASS_SMALL grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index c4450145fdd..da5ded778a1 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -197,7 +197,8 @@ By design, d1 is the smallest direction and d2 is the highest custom_materials = list(/datum/material/iron=10, /datum/material/glass=5) flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT - attack_verb = list("whipped", "lashed", "disciplined", "flogged") + attack_verb_continuous = list("whips", "lashes", "disciplines", "flogs") + attack_verb_simple = list("whip", "lash", "discipline", "flog") singular_name = "pipe cleaner piece" full_w_class = WEIGHT_CLASS_SMALL grind_results = list("copper" = 2) //2 copper per pipe_cleaner in the coil diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 72e5b5a566f..1ad591a0295 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -18,7 +18,8 @@ throw_range = 5 force = 5 item_flags = NEEDS_PERMIT - attack_verb = list("struck", "hit", "bashed") + attack_verb_continuous = list("strikes", "hits", "bashes") + attack_verb_simple = list("strike", "hit", "bash") var/fire_sound = 'sound/weapons/gun/pistol/shot.ogg' var/vary_fire_sound = TRUE diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 3475bc96b99..d19f3b534f2 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -254,7 +254,8 @@ weapon_weight = WEAPON_MEDIUM can_be_sawn_off = FALSE force = 16 //it has a hook on it - attack_verb = list("slashed", "hooked", "stabbed") + attack_verb_continuous = list("slashes", "hooks", "stabs") + attack_verb_simple = list("slash", "hook", "stab") hitsound = 'sound/weapons/bladeslice.ogg' //our hook gun! var/obj/item/gun/magic/hook/bounty/hook diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c08bd8e6afa..90e8e75c8e2 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -126,7 +126,8 @@ inhand_icon_state = "plasmacutter" ammo_type = list(/obj/item/ammo_casing/energy/plasma) flags_1 = CONDUCT_1 - attack_verb = list("attacked", "slashed", "cut", "sliced") + attack_verb_continuous = list("attacks", "slashes", "cuts", "slices") + attack_verb_simple = list("attack", "slash", "cut", "slice") force = 12 sharpness = SHARP_EDGED can_charge = FALSE diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 6b696af1f8f..e0fe135ddab 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -7,7 +7,8 @@ worn_icon_state = "pen" flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_TINY - attack_verb = list("poked") + attack_verb_continuous = list("pokes") + attack_verb_simple = list("poke") var/fail_message = "INVALID USER." var/selfdestruct = 0 // Explode when user check is failed. var/force_replace = 0 // Can forcefully replace other pins. diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm index 10a349fed2d..c4b5dbb3bf9 100644 --- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm +++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm @@ -33,19 +33,24 @@ Slimecrossing Weapons switch(damtype) if(BRUTE) hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("slashed","sliced","cut") + attack_verb_continuous = list("slashes", "slices", "cuts") + attack_verb_simple = list("slash", "slice", "cut") if(BURN) hitsound = 'sound/weapons/sear.ogg' - attack_verb = list("burned","singed","heated") + attack_verb_continuous = list("burns", "sings", "heats") + attack_verb_simple = list("burn", "sing", "heat") if(TOX) hitsound = 'sound/weapons/pierce.ogg' - attack_verb = list("poisoned","dosed","toxified") + attack_verb_continuous = list("poisons", "doses", "toxifies") + attack_verb_simple = list("poison", "dose", "toxify") if(OXY) hitsound = 'sound/effects/space_wind.ogg' - attack_verb = list("suffocated","winded","vacuumed") + attack_verb_continuous = list("suffocates", "winds", "vacuums") + attack_verb_simple = list("suffocate", "wind", "vacuum") if(CLONE) hitsound = 'sound/items/geiger/ext1.ogg' - attack_verb = list("irradiated","mutated","maligned") + attack_verb_continuous = list("irradiates", "mutates", "maligns") + attack_verb_simple = list("irradiate", "mutate", "malign") return ..() //Adamantine shield - Chilling Adamantine @@ -62,7 +67,8 @@ Slimecrossing Weapons force = 0 throw_range = 1 //How far do you think you're gonna throw a solid crystalline shield...? throw_speed = 2 - attack_verb = list("bashed","pounded","slammed") + attack_verb_continuous = list("bashes", "pounds", "slams") + attack_verb_simple = list("bash", "pound", "slam") item_flags = SLOWS_WHILE_IN_HAND /obj/item/shield/adamantineshield/ComponentInitialize() diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 3dea81eff1d..05698128a2d 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -60,7 +60,8 @@ be possessed by the devil? This arm appears to be possessed by no \ one though." icon_state = "default_human_l_arm" - attack_verb = list("slapped", "punched") + attack_verb_continuous = list("slaps", "punches") + attack_verb_simple = list("slap", "punch") max_damage = 50 max_stamina_damage = 50 body_zone = BODY_ZONE_L_ARM @@ -125,7 +126,8 @@ desc = "Over 87% of humans are right handed. That figure is much lower \ among humans missing their right arm." icon_state = "default_human_r_arm" - attack_verb = list("slapped", "punched") + attack_verb_continuous = list("slaps", "punches") + attack_verb_simple = list("slap", "punch") max_damage = 50 body_zone = BODY_ZONE_R_ARM body_part = ARM_RIGHT @@ -190,7 +192,8 @@ desc = "Some athletes prefer to tie their left shoelaces first for good \ luck. In this instance, it probably would not have helped." icon_state = "default_human_l_leg" - attack_verb = list("kicked", "stomped") + attack_verb_continuous = list("kicks", "stomps") + attack_verb_simple = list("kick", "stomp") max_damage = 50 body_zone = BODY_ZONE_L_LEG body_part = LEG_LEFT @@ -249,7 +252,8 @@ The hokey pokey has certainly changed a lot since space colonisation." // alternative spellings of 'pokey' are availible icon_state = "default_human_r_leg" - attack_verb = list("kicked", "stomped") + attack_verb_continuous = list("kicks", "stomps") + attack_verb_simple = list("kick", "stomp") max_damage = 50 body_zone = BODY_ZONE_R_LEG body_part = LEG_RIGHT diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 9d50faae898..9b89d09ea2e 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -13,7 +13,8 @@ /obj/item/bodypart/l_arm/robot name = "cyborg left arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb = list("slapped", "punched") + attack_verb_continuous = list("slaps", "punches") + attack_verb_simple = list("slap", "punch") inhand_icon_state = "buildpipe" icon = 'icons/mob/augmentation/augments.dmi' flags_1 = CONDUCT_1 @@ -34,7 +35,8 @@ /obj/item/bodypart/r_arm/robot name = "cyborg right arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb = list("slapped", "punched") + attack_verb_continuous = list("slaps", "punches") + attack_verb_simple = list("slap", "punch") inhand_icon_state = "buildpipe" icon = 'icons/mob/augmentation/augments.dmi' flags_1 = CONDUCT_1 @@ -55,7 +57,8 @@ /obj/item/bodypart/l_leg/robot name = "cyborg left leg" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb = list("kicked", "stomped") + attack_verb_continuous = list("kicks", "stomps") + attack_verb_simple = list("kick", "stomp") inhand_icon_state = "buildpipe" icon = 'icons/mob/augmentation/augments.dmi' flags_1 = CONDUCT_1 @@ -76,7 +79,8 @@ /obj/item/bodypart/r_leg/robot name = "cyborg right leg" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb = list("kicked", "stomped") + attack_verb_continuous = list("kicks", "stomps") + attack_verb_simple = list("kick", "stomp") inhand_icon_state = "buildpipe" icon = 'icons/mob/augmentation/augments.dmi' flags_1 = CONDUCT_1 diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 686cbc1fe9b..60face94e23 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -16,7 +16,8 @@ // Heart attack code is in code/modules/mob/living/carbon/human/life.dm var/beating = 1 var/icon_base = "heart" - attack_verb = list("beat", "thumped") + attack_verb_continuous = list("beats", "thumps") + attack_verb_simple = list("beat", "thump") var/beat = BEAT_NONE//is this mob having a heatbeat sound played? if so, which? var/failed = FALSE //to prevent constantly running failing code var/operated = FALSE //whether the heart's been operated on to fix some of its damages diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index db296c2abdf..5a80d940e1d 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -4,7 +4,8 @@ w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_STOMACH - attack_verb = list("gored", "squished", "slapped", "digested") + attack_verb_continuous = list("gores", "squishes", "slaps", "digests") + attack_verb_simple = list("gore", "squish", "slap", "digest") desc = "Onaka ga suite imasu." healing_factor = STANDARD_ORGAN_HEALING diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index b3a767199b8..6114bddd7df 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -4,7 +4,8 @@ icon_state = "tonguenormal" zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_TONGUE - attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued") + attack_verb_continuous = list("licks", "slobbers", "slaps", "frenches", "tongues") + attack_verb_simple = list("lick", "slobber", "slap", "french", "tongue") var/list/languages_possible var/say_mod = null var/taste_sensitivity = 15 // lower is more sensitive. @@ -211,7 +212,8 @@ desc = "Apparently skeletons alter the sounds they produce through oscillation of their teeth, hence their characteristic rattling." icon_state = "tonguebone" say_mod = "rattles" - attack_verb = list("bitten", "chattered", "chomped", "enamelled", "boned") + attack_verb_continuous = list("bites", "chatters", "chomps", "enamelles", "bones") + attack_verb_simple = list("bite", "chatter", "chomp", "enamel", "bone") taste_sensitivity = 101 // skeletons cannot taste anything modifies_speech = TRUE var/chattering = FALSE @@ -260,7 +262,8 @@ organ_flags = NONE icon_state = "tonguerobot" say_mod = "states" - attack_verb = list("beeped", "booped") + attack_verb_continuous = list("beeps", "boops") + attack_verb_simple = list("beep", "boop") modifies_speech = TRUE taste_sensitivity = 25 // not as good as an organic tongue @@ -289,7 +292,8 @@ desc = "A sophisticated ethereal organ, capable of synthesising speech via electrical discharge." icon_state = "electrotongue" say_mod = "crackles" - attack_verb = list("shocked", "jolted", "zapped") + attack_verb_continuous = list("shocks", "jolts", "zaps") + attack_verb_simple = list("shock", "jolt", "zap") taste_sensitivity = 101 // Not a tongue, they can't taste shit var/static/list/languages_possible_ethereal = typecacheof(list( /datum/language/common, diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 07ca2e7b4fd..b1addb190cd 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -30,7 +30,8 @@ flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_TINY - attack_verb = list("attacked", "pinched") + attack_verb_continuous = list("attacks", "pinches") + attack_verb_simple = list("attack", "pinch") tool_behaviour = TOOL_HEMOSTAT toolspeed = 1 @@ -51,7 +52,8 @@ flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_TINY - attack_verb = list("burnt") + attack_verb_continuous = list("burns") + attack_verb_simple = list("burn") tool_behaviour = TOOL_CAUTERY toolspeed = 1 @@ -73,7 +75,8 @@ item_flags = SURGICAL_TOOL | EYE_STAB force = 15 w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("drilled") + attack_verb_continuous = list("drills") + attack_verb_simple = list("drill") tool_behaviour = TOOL_DRILL toolspeed = 1 @@ -108,7 +111,8 @@ throw_speed = 3 throw_range = 5 custom_materials = list(/datum/material/iron=4000, /datum/material/glass=1000) - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED tool_behaviour = TOOL_SCALPEL @@ -145,7 +149,8 @@ throw_speed = 2 throw_range = 5 custom_materials = list(/datum/material/iron=1000) - attack_verb = list("attacked", "slashed", "sawed", "cut") + attack_verb_continuous = list("attacks", "slashes", "saws", "cuts") + attack_verb_simple = list("attack", "slash", "saw", "cut") sharpness = SHARP_EDGED tool_behaviour = TOOL_SAW toolspeed = 1 @@ -172,7 +177,8 @@ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' inhand_icon_state = "drapes" w_class = WEIGHT_CLASS_TINY - attack_verb = list("slapped") + attack_verb_continuous = list("slaps") + attack_verb_simple = list("slap") /obj/item/surgical_drapes/Initialize(mapload) . = ..() @@ -349,7 +355,8 @@ throw_speed = 2 throw_range = 5 custom_materials = list(/datum/material/iron=8000, /datum/material/titanium=6000) - attack_verb = list("sheared", "snipped") + attack_verb_continuous = list("shears", "snips") + attack_verb_simple = list("shear", "snip") sharpness = SHARP_EDGED custom_premium_price = 1800 @@ -415,6 +422,7 @@ flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL w_class = WEIGHT_CLASS_SMALL - attack_verb = list("corrected", "properly set") + attack_verb_continuous = list("corrects", "properly sets") + attack_verb_simple = list("correct", "properly set") tool_behaviour = TOOL_BONESET toolspeed = 1 diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm index 2ea557dba1b..8268f3732ba 100644 --- a/code/modules/vehicles/vehicle_key.dm +++ b/code/modules/vehicles/vehicle_key.dm @@ -68,6 +68,7 @@ inhand_icon_state = "chain" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - attack_verb = list("flogged", "whipped", "lashed", "disciplined") + attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines") + attack_verb_simple = list("flog", "whip", "lash", "discipline") hitsound = 'sound/weapons/whip.ogg' slot_flags = ITEM_SLOT_BELT