From d164819a4fc9608ee4efbefe740442d495c6ead1 Mon Sep 17 00:00:00 2001 From: Citinited Date: Sat, 11 Apr 2020 04:27:16 +0100 Subject: [PATCH] Plasma cutters now work as intended on reinforced walls (#13235) --- code/game/turfs/simulated/walls_reinforced.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 502803bc7d3..a3e9c9ae0f2 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -43,7 +43,7 @@ update_icon() to_chat(user, "You press firmly on the cover, dislodging it.") return - else if(RWALL_SUPPORT_RODS && istype(I, /obj/item/gun/energy/plasmacutter)) + else if(d_state == RWALL_SUPPORT_RODS && istype(I, /obj/item/gun/energy/plasmacutter)) to_chat(user, "You begin slicing through the support rods...") if(I.use_tool(src, user, 70, volume = I.tool_volume) && d_state == RWALL_SUPPORT_RODS) d_state = RWALL_SHEATH @@ -132,11 +132,11 @@ to_chat(user, "You pry off the cover.") if(RWALL_SHEATH) to_chat(user, "You struggle to pry off the outer sheath...") - if(!I.use_tool(src, user, 100, volume = I.tool_volume) || d_state != RWALL_SHEATH) + if(!I.use_tool(src, user, 100, volume = I.tool_volume)) return - to_chat(user, "You pry off the outer sheath.") - dismantle_wall() - return + if(dismantle_wall()) + to_chat(user, "You pry off the outer sheath.") + if(RWALL_BOLTS) to_chat(user, "You start to pry the cover back into place...") playsound(src, I.usesound, 100, 1) @@ -199,6 +199,9 @@ to_chat(user, "You tighten the bolts anchoring the support rods.") update_icon() +/turf/simulated/wall/r_wall/try_decon(obj/item/I, mob/user, params) //Plasma cutter only works in the deconstruction steps! + return FALSE + /turf/simulated/wall/r_wall/try_destroy(obj/item/I, mob/user, params) if(istype(I, /obj/item/pickaxe/drill/diamonddrill)) to_chat(user, "You begin to drill though the wall...")