From debba87ec279e9b5008ed96a8470251be28f5749 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 18 Jun 2020 14:48:12 -0400 Subject: [PATCH] fixes "dante torn the changeling with the sword" (#51688) --- code/game/objects/items/chainsaw.dm | 2 +- code/game/objects/items/dualsaber.dm | 2 +- code/game/objects/items/fireaxe.dm | 2 +- code/game/objects/items/holy_weapons.dm | 14 +++++++------- code/game/objects/items/kitchen.dm | 6 +++--- code/game/objects/items/melee/energy.dm | 2 +- code/game/objects/items/melee/misc.dm | 2 +- code/game/objects/items/melee/transforming.dm | 4 ++-- code/game/objects/items/spear.dm | 2 +- code/game/objects/items/weaponry.dm | 10 +++++----- .../antagonists/changeling/powers/mutations.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 6 +++--- .../antagonists/eldritch_cult/eldritch_items.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/mining/lavaland/necropolis_chests.dm | 4 ++-- code/modules/ninja/energy_katana.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/surgery/tools.dm | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 2a4511989d6..6c597000545 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -14,7 +14,7 @@ throw_speed = 2 throw_range = 4 custom_materials = list(/datum/material/iron=13000) - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = "swing_hit" sharpness = IS_SHARP actions_types = list(/datum/action/item_action/startchainsaw) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 1b5d6d5d300..ca0109d15cb 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -18,7 +18,7 @@ armour_penetration = 35 var/saber_color = "green" light_color = "#00ff00"//green - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "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/fireaxe.dm b/code/game/objects/items/fireaxe.dm index b0ecff19839..792568bc9ec 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -11,7 +11,7 @@ throwforce = 15 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK - attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") + attack_verb = list("attacked", "chopped", "cleaved", "tore", "lacerated", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP max_integrity = 200 diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index b58fdf37e0c..c682f41e7cf 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -318,7 +318,7 @@ block_chance = 30 sharpness = IS_SHARP hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "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 +343,7 @@ name = "sacred chainsaw sword" desc = "Suffer not a heretic to live." slot_flags = ITEM_SLOT_BELT - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1.5 //slower than a real saw @@ -406,7 +406,7 @@ force = 4.13 throwforce = 1 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") /obj/item/nullrod/scythe icon_state = "scythe1" @@ -501,7 +501,7 @@ chaplain_spawnable = FALSE force = 30 slot_flags = ITEM_SLOT_BELT - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 0.5 //faster than normal saw @@ -527,7 +527,7 @@ w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT sharpness = IS_SHARP - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 2 //slower than a real saw @@ -545,7 +545,7 @@ desc = "Used for absolutely hilarious sacrifices." hitsound = 'sound/items/bikehorn.ogg' sharpness = IS_SHARP - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") /obj/item/nullrod/pride_hammer icon_state = "pride" @@ -664,7 +664,7 @@ sharpness = IS_SHARP slot_flags = null hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") item_flags = SLOWS_WHILE_IN_HAND /obj/item/nullrod/tribal_knife/Initialize(mapload) diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 87fceeff6f2..94c69415658 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -83,7 +83,7 @@ throw_speed = 3 throw_range = 6 custom_materials = list(/datum/material/iron=12000) - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") sharpness = IS_SHARP_ACCURATE armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) item_flags = EYE_STAB @@ -167,7 +167,7 @@ force = 15 throwforce = 10 custom_materials = list(/datum/material/iron=18000) - attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") w_class = WEIGHT_CLASS_NORMAL custom_price = 600 @@ -187,7 +187,7 @@ 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", "torn", "ripped", "cut") + attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "cut") bayonet = TRUE /obj/item/kitchen/knife/combat/survival diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index d9bf9ee255b..da3ea4930be 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", "torn", "cut") + attack_verb_off = list("attacked", "chopped", "cleaved", "tore", "lacerated", "cut") attack_verb_on = list() light_color = "#40ceff" diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 6e6ae48f8e0..7846706c9ea 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -43,7 +43,7 @@ force = 20 throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") sharpness = IS_SHARP /obj/item/melee/synthetic_arm_blade/Initialize() diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index 15feb3e78a6..bfed019f671 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", "torn", "ripped", "diced", "cut") - var/list/attack_verb_off = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + 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") 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 diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 4e25c4e931d..fb452d20af2 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -14,7 +14,7 @@ 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", "torn", "gored") + attack_verb = list("attacked", "poked", "jabbed", "tore", "lacerated", "gored") sharpness = IS_SHARP max_integrity = 200 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/weaponry.dm b/code/game/objects/items/weaponry.dm index fd92c3643aa..e13f3ba1fc8 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -43,7 +43,7 @@ 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", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "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 +63,7 @@ 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", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") block_chance = 50 sharpness = IS_SHARP max_integrity = 200 @@ -217,7 +217,7 @@ 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", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") block_chance = 50 sharpness = IS_SHARP max_integrity = 200 @@ -351,7 +351,7 @@ 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", "torn", "ripped", "diced", "cut") + attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP else @@ -467,7 +467,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throw_range = 0 throw_speed = 0 sharpness = IS_SHARP - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1 diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 59d82af85fe..93a8dec8d6c 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -160,7 +160,7 @@ throw_range = 0 throw_speed = 0 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") sharpness = IS_SHARP 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 5d36564cb2e..af7a7493e28 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -46,7 +46,7 @@ wound_bonus = -80 bare_wound_bonus = 30 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended") /obj/item/melee/cultblade/Initialize() . = ..() @@ -93,7 +93,7 @@ throw_range = 3 sharpness = IS_SHARP light_color = "#ff0000" - attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved") + attack_verb = list("cleaved", "slashed", "tore", "lacerated", "hacked", "ripped", "diced", "carved") icon_state = "cultbastard" inhand_icon_state = "cultbastard" hitsound = 'sound/weapons/bladeslice.ogg' @@ -626,7 +626,7 @@ throw_speed = 2 armour_penetration = 30 block_chance = 30 - attack_verb = list("attacked", "impaled", "stabbed", "torn", "gored") + attack_verb = list("attacked", "impaled", "stabbed", "tore", "lacerated", "gored") sharpness = IS_SHARP hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index 74aab436ed8..fd830bb508e 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -44,7 +44,7 @@ force = 17 throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended") /obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user) if(!IS_HERETIC(user)) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 2b642f38459..9d0d172f1e9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -109,7 +109,7 @@ throw_speed = 3 throw_range = 4 custom_materials = list(/datum/material/iron = 15000) - attack_verb = list("chopped", "torn", "cut") + attack_verb = list("chopped", "tore", "lacerated", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 3c3cab50d73..2cb615a12d4 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -708,7 +708,7 @@ icon_state = "cleaving_saw" icon_state_on = "cleaving_saw_open" slot_flags = ITEM_SLOT_BELT - attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb_off = list("attacked", "sawed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") attack_verb_on = list("cleaved", "swiped", "slashed", "chopped") hitsound = 'sound/weapons/bladeslice.ogg' hitsound_on = 'sound/weapons/bladeslice.ogg' @@ -824,7 +824,7 @@ force = 1 throwforce = 1 hitsound = 'sound/effects/ghost2.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended") var/summon_cooldown = 0 var/list/mob/dead/observer/spirits diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 082b7cfcaf5..467051cc767 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -12,7 +12,7 @@ armour_penetration = 50 w_class = WEIGHT_CLASS_NORMAL hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT sharpness = IS_SHARP max_integrity = 200 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 29d2547564e..4925bee1ef2 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -195,7 +195,7 @@ * (Alan) Edaggers */ /obj/item/pen/edagger - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these won't show up if the pen is off + attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") //these won't show up if the pen is off sharpness = IS_SHARP var/on = FALSE diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 611f4f8f1cb..1e749a40444 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -108,7 +108,7 @@ throw_speed = 3 throw_range = 5 custom_materials = list(/datum/material/iron=4000, /datum/material/glass=1000) - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP_ACCURATE tool_behaviour = TOOL_SCALPEL