From b13048f6368c41a37c24fce63eb4da3bfe61680b Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Mon, 17 Aug 2020 12:15:09 -0500 Subject: [PATCH 1/2] 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 78ce820257..8efc60a15b 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 From 0d3e95803cdf7b4eb30bbf8c046a8f45d5618d80 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 17 Aug 2020 18:24:23 -0500 Subject: [PATCH 2/2] Automatic changelog generation for PR #13195 [ci skip] --- html/changelogs/AutoChangeLog-pr-13195.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13195.yml diff --git a/html/changelogs/AutoChangeLog-pr-13195.yml b/html/changelogs/AutoChangeLog-pr-13195.yml new file mode 100644 index 0000000000..878b7bb3ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13195.yml @@ -0,0 +1,4 @@ +author: "Detective-Google" +delete-after: True +changes: + - bugfix: "you can actually remove glass floors now"