From 50d32e899fd9ca7f11e86150c75f3b7beaec672f Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Fri, 8 Dec 2023 01:59:40 +0000 Subject: [PATCH 1/2] Flag check --- code/game/turfs/walls/walls.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index 6ef0ffbdfec8..8c5859a7b523 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -149,6 +149,8 @@ /turf/closed/wall/get_examine_text(mob/user) . = ..() + if(flags_turf & TURF_ORGANIC) + return // Skip everything below. 'Organic' walls aren't deconstructable with tools. if(hull) .+= SPAN_WARNING("You don't think you have any tools able to even scratch this.") return //If it's indestructable, we don't want to give the wrong impression by saying "you can decon it with a welder" From 9e31dc457791ce6ad8f5220efafa57bb00ec78a0 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Fri, 8 Dec 2023 02:12:31 +0000 Subject: [PATCH 2/2] Whoops --- code/game/turfs/walls/walls.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index 8c5859a7b523..77143384e7e7 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -149,8 +149,6 @@ /turf/closed/wall/get_examine_text(mob/user) . = ..() - if(flags_turf & TURF_ORGANIC) - return // Skip everything below. 'Organic' walls aren't deconstructable with tools. if(hull) .+= SPAN_WARNING("You don't think you have any tools able to even scratch this.") return //If it's indestructable, we don't want to give the wrong impression by saying "you can decon it with a welder" @@ -172,6 +170,9 @@ if (acided_hole) . += SPAN_WARNING("There's a large hole in the wall that could've been caused by some sort of acid.") + if(flags_turf & TURF_ORGANIC) + return // Skip the part below. 'Organic' walls aren't deconstructable with tools. + switch(d_state) if(WALL_STATE_WELD) . += SPAN_INFO("The outer plating is intact. A blowtorch should slice it open.")