From 87e3c0b3740d2749749b86159bc54e1f8a1b9772 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Sat, 11 Jan 2025 19:57:13 +0000 Subject: [PATCH] [MIRROR] Catwalks pass interactions to turfs --- code/game/objects/structures/catwalk.dm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index 9b8aee7d392f9..9a2afcdaab515 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -75,6 +75,15 @@ qdel(src) +/obj/structure/catwalk/use_weapon(obj/item/weapon, mob/living/user, list/click_params) + var/parent = ..() + if (parent) + return TRUE + + var/turf/floor = get_turf(src) + return floor.use_weapon(weapon, user, click_params) + + /obj/structure/catwalk/use_tool(obj/item/tool, mob/user, list/click_params) // Crowbar - Toggle hatch if (isCrowbar(tool)) @@ -139,7 +148,12 @@ ) return TRUE - return ..() + var/parent = ..() + if (parent) + return TRUE + + var/turf/floor = get_turf(src) + return floor.use_tool(tool, user, click_params) /obj/structure/catwalk/refresh_neighbors()