From 19c718ac7805ed592c82765e9a869b01465abc4a Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:36:51 -0400 Subject: [PATCH] Tweak floor tile replacement and add missing catwalk sprite (#21607) * Cat. * Cat. --- code/game/turfs/simulated/floor.dm | 2 +- .../game/turfs/simulated/floor/transparent.dm | 6 ++++++ icons/turf/floors/catwalk_floor.dmi | Bin 5685 -> 5752 bytes 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index f877a8c0375..72750b2ff69 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama if(..()) return TRUE - if(intact && istype(C, /obj/item/stack/tile)) + if((intact || transparent_floor) && istype(C, /obj/item/stack/tile)) try_replace_tile(C, user, params) return TRUE diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm index cb761b04f98..2803985e333 100644 --- a/code/game/turfs/simulated/floor/transparent.dm +++ b/code/game/turfs/simulated/floor/transparent.dm @@ -121,6 +121,12 @@ /turf/simulated/floor/transparent/glass/can_lay_cable() return FALSE // this turf isn't "intact" but you also can't lay cable on it +/turf/simulated/floor/transparent/glass/try_replace_tile(obj/item/stack/tile/T, mob/user, params) + var/obj/item/thing = user.get_inactive_hand() + if(!thing || !prying_tool_list.Find(thing.tool_behaviour)) + return + to_chat(user, "You need to hold two sheets of metal to dismantle \the [src]!") + /turf/simulated/floor/transparent/glass/reinforced name = "reinforced glass floor" desc = "Jump on it, it can cope. Promise..." diff --git a/icons/turf/floors/catwalk_floor.dmi b/icons/turf/floors/catwalk_floor.dmi index 75b0b64564b2909b9fcfeca24b5bebc6a5a14504..d97948b6a123734b5d314a5a4b929cc98613d08e 100644 GIT binary patch literal 5752 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