Skip to content

Commit

Permalink
[MIRROR] Catwalks pass interactions to turfs (#3097)
Browse files Browse the repository at this point in the history
Co-authored-by: SierraKomodo <[email protected]>
  • Loading branch information
SierraHelper and SierraKomodo authored Jan 16, 2025
1 parent f7614a6 commit 47ac164
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion code/game/objects/structures/catwalk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 47ac164

Please sign in to comment.