From 9b33fa1cc1235f8a26477dfd821f9aa78f4ba777 Mon Sep 17 00:00:00 2001 From: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:18:10 -0500 Subject: [PATCH] grinder works on walls again --- code/game/turfs/closed/_closed.dm | 15 +++++++++++++++ code/modules/mining/equipment/angle_grinder.dm | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index 766d7e0e5a24..ea0c0d4ed4b1 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -269,6 +269,21 @@ return FALSE +/turf/closed/deconstruct_act(mob/living/user, obj/item/I) + var/act_duration = breakdown_duration + if(!I.tool_start_check(user, amount=0)) + return FALSE + to_chat(user, "You begin slicing through the outer plating...") + while(I.use_tool(src, user, act_duration, volume=100)) + if(iswallturf(src)) + to_chat(user, "You slice through some of the outer plating...") + if(!alter_integrity(-(I.wall_decon_damage),user,FALSE,TRUE)) + return TRUE + else + break + + return FALSE + /turf/closed/mech_melee_attack(obj/mecha/M) M.do_attack_animation(src) switch(M.damtype) diff --git a/code/modules/mining/equipment/angle_grinder.dm b/code/modules/mining/equipment/angle_grinder.dm index c1c480471d9d..290cf0d153d7 100644 --- a/code/modules/mining/equipment/angle_grinder.dm +++ b/code/modules/mining/equipment/angle_grinder.dm @@ -26,6 +26,7 @@ usesound = 'sound/weapons/anglegrinder.ogg' tool_behaviour = null // is set to TOOL_DECONSTRUCT once wielded toolspeed = 1 + wall_decon_damage = 200 usecost = 5 pack = /obj/item/gear_pack/anglegrinder var/startsound = 'sound/weapons/chainsawhit.ogg' @@ -74,7 +75,6 @@ SIGNAL_HANDLER tool_behaviour = TOOL_DECONSTRUCT - wall_decon_damage = 200 wielded = TRUE sharpness = IS_SHARP icon_state = "[initial(item_state)]-wield"