From 8847bcce7d74d4b3ec4a2acfab3b66e2e1ce9c73 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:24:19 -0700
Subject: [PATCH] Merge pull request #13195 from Detective-Google/hotfix
makes glass floors actually deconstructable
---
code/game/turfs/openspace/transparent.dm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/code/game/turfs/openspace/transparent.dm b/code/game/turfs/openspace/transparent.dm
index 78ce82025..8efc60a15 100644
--- a/code/game/turfs/openspace/transparent.dm
+++ b/code/game/turfs/openspace/transparent.dm
@@ -57,6 +57,7 @@
icon = 'icons/turf/floors/glass.dmi'
icon_state = "floor_glass"
smooth = SMOOTH_MORE
+ var/floor_tile = /obj/item/stack/sheet/glass
canSmoothWith = list(/turf/open/transparent/glass, /turf/open/transparent/glass/reinforced)
footstep = FOOTSTEP_PLATING
barefootstep = FOOTSTEP_HARD_BAREFOOT
@@ -67,7 +68,28 @@
icon_state = "" //Prevent the normal icon from appearing behind the smooth overlays
return ..()
+/turf/open/transparent/glass/wrench_act(mob/living/user, obj/item/I)
+ to_chat(user, "You begin removing glass...")
+ if(I.use_tool(src, user, 30, volume=80))
+ if(!istype(src, /turf/open/transparent/glass))
+ return TRUE
+ if(floor_tile)
+ new floor_tile(src, 2)
+ ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+ return TRUE
+
/turf/open/transparent/glass/reinforced
name = "Reinforced glass floor"
desc = "Do jump on it, it can take it."
- icon = 'icons/turf/floors/reinf_glass.dmi'
\ No newline at end of file
+ icon = 'icons/turf/floors/reinf_glass.dmi'
+ floor_tile = /obj/item/stack/sheet/rglass
+
+/turf/open/transparent/glass/reinforced/wrench_act(mob/living/user, obj/item/I)
+ to_chat(user, "You begin removing reinforced glass...")
+ if(I.use_tool(src, user, 30, volume=80))
+ if(!istype(src, /turf/open/transparent/glass/reinforced))
+ return TRUE
+ if(floor_tile)
+ new floor_tile(src, 2)
+ ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+ return TRUE