From 85cbae9db3bac0083e92fe8dd79033d066f5f88f Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:30:25 -0400 Subject: [PATCH 1/2] increase crusher damage --- code/modules/mining/equipment/kinetic_crusher.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 05e81421ac4f..8ede75561f42 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -32,7 +32,7 @@ /obj/item/kinetic_crusher/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it - AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=15) + AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25) /obj/item/kinetic_crusher/examine(mob/living/user) . = ..() @@ -161,7 +161,7 @@ /obj/item/kinetic_crusher/old/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 60, 110) - AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25)//big choppa! + AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=30)//big choppa! /obj/item/kinetic_crusher/old/melee_attack_chain(mob/user, atom/target, params) ..() @@ -213,7 +213,7 @@ /obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 60, 150) - AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=10) + AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20) /// triggered on wield of two handed item /obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user) From 36a60eab1eec00c5d958425198f64eda34f1bcfc Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:35:14 -0400 Subject: [PATCH 2/2] Update kinetic_crusher.dm --- .../mining/equipment/kinetic_crusher.dm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 8ede75561f42..16fc0081db79 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -28,11 +28,13 @@ var/charge_time = 15 var/detonation_damage = 20 var/backstab_bonus = 10 + var/unwielded_force = 0 + var/wielded_force = 25 /obj/item/kinetic_crusher/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it - AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25) + AddComponent(/datum/component/two_handed, unwielded_force, wielded_force) /obj/item/kinetic_crusher/examine(mob/living/user) . = ..() @@ -153,16 +155,13 @@ detonation_damage = 10 slowdown = 0.5//hevy attack_verb = list("mashed", "flattened", "bisected", "eradicated","destroyed") + unwielded_force = 0 + wielded_force = 30 /obj/item/kinetic_crusher/old/examine(mob/user) . = ..() . += "This hunk of junk's so heavy that you can barely swing it! Though, that blade looks pretty sharp..." -/obj/item/kinetic_crusher/old/ComponentInitialize() - . = ..() - AddComponent(/datum/component/butchering, 60, 110) - AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=30)//big choppa! - /obj/item/kinetic_crusher/old/melee_attack_chain(mob/user, atom/target, params) ..() user.changeNext_move(CLICK_CD_MELEE * 2.0)//...slow swinga. @@ -203,18 +202,14 @@ detonation_damage = 35 backstab_bonus = 15 actions_types = list() - + unwielded_force = 0 + wielded_force = 22 /obj/item/kinetic_crusher/syndie_crusher/Initialize() . = ..() RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) -/obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize() - . = ..() - AddComponent(/datum/component/butchering, 60, 150) - AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20) - /// triggered on wield of two handed item /obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user) SIGNAL_HANDLER