From cd1389ae0faaf884517fbb33fa3c27e76810ba41 Mon Sep 17 00:00:00 2001 From: Linzolle Date: Tue, 2 Aug 2022 22:59:59 -0700 Subject: [PATCH] fix catwalks --- .../objects/items/stacks/tiles/tile_types.dm | 2 +- code/game/turfs/open/floor/catwalk_plating.dm | 22 +++++++++++------- icons/turf/floors/catwalk_plating.dmi | Bin 396 -> 484 bytes 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 728e5fd726..588e066a41 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -561,4 +561,4 @@ singular_name = "catwalk floor tile" desc = "Flooring that shows its contents underneath. Engineers love it!" icon_state = "catwalk_tile" - turf_type = /turf/open/floor/plating/catwalk_floor + turf_type = /turf/open/floor/catwalk_floor diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm index 76d22847c9..ac0f3b63de 100644 --- a/code/game/turfs/open/floor/catwalk_plating.dm +++ b/code/game/turfs/open/floor/catwalk_plating.dm @@ -5,7 +5,7 @@ * you can crowbar it to interact with the underneath stuff without destroying the tile... * unless you want to! */ -/turf/open/floor/plating/catwalk_floor +/turf/open/floor/catwalk_floor icon = 'icons/turf/floors/catwalk_plating.dmi' icon_state = "catwalk_below" floor_tile = /obj/item/stack/tile/catwalk @@ -16,29 +16,35 @@ barefootstep = FOOTSTEP_CATWALK clawfootstep = FOOTSTEP_CATWALK heavyfootstep = FOOTSTEP_CATWALK + intact = FALSE var/covered = TRUE -/turf/open/floor/plating/catwalk_floor/Initialize(mapload) +/turf/open/floor/catwalk_floor/Initialize(mapload) . = ..() layer = CATWALK_LAYER update_icon(UPDATE_OVERLAYS) -/turf/open/floor/plating/catwalk_floor/update_overlays() +/turf/open/floor/catwalk_floor/update_overlays() . = ..() - var/static/catwalk_overlay + var/static/image/catwalk_overlay if(isnull(catwalk_overlay)) - catwalk_overlay = iconstate2appearance(icon, "catwalk_above") + catwalk_overlay = new() + catwalk_overlay.icon = icon + catwalk_overlay.icon_state = "catwalk_above" + catwalk_overlay.plane = GAME_PLANE + catwalk_overlay.layer = CATWALK_LAYER + catwalk_overlay = catwalk_overlay.appearance if(covered) . += catwalk_overlay -/turf/open/floor/plating/catwalk_floor/screwdriver_act(mob/living/user, obj/item/tool) +/turf/open/floor/catwalk_floor/screwdriver_act(mob/living/user, obj/item/tool) . = ..() covered = !covered user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]") update_icon(UPDATE_OVERLAYS) -/turf/open/floor/plating/catwalk_floor/pry_tile(obj/item/crowbar, mob/user, silent) +/turf/open/floor/catwalk_floor/crowbar_act(mob/user, obj/item/I) if(covered) user.balloon_alert(user, "remove cover first!") return FALSE - . = ..() + return pry_tile(I, user) diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi index 24954e4a1750d3b11ff73bdcaf4b85fdae67ba5d..c9ad36653bbdef679308599ea8fcbbbe22670adf 100644 GIT binary patch delta 363 zcmV-x0hIoX1LOmc7e7D*0{{R3SVwH_0000OP)t-s0000nI6Fp7OH*81B_%8^Gd3wN zF&ZEu^8vZb1%CjmiqH zelB2N002rmJef8tXBV&E>;4-$N%@dC^>-n5bn~Pz>SV62U ze|&6rL8Z)8k`NenUAyWCfn@uYD{6vDq;N$Ef)kc$!2#G}H-8V51-$NM{-{q_h`9x| zS&5pERuJ0Fz;+At9+XeTP#!>#ClbIsKmwQtNMLl?=yDs|v*`$d)M>5LD7I%!O@O!e z{)E59bHb2yu1EntM6SN}D}KQO<^dAGAw0l>z;2>EfS^18+yFS%Y=YJ7+v)%S002ov JPDHLkV1h!-mzDqk delta 274 zcmV+t0qy?e1B?TZ7d#*Y0{{R3P_tvV0000LP)t-s0000}Tw59-A}upEDK9ZGI6Fp7 zOXqhD-2eap0d!JMQvg8b*k%9#0D6&DZ-2$5T3Nx>&jsul03P`(Te1V(Bme*apGibP zR5*=eNEAc?N$7kAu{0DQjLv5eOIAVvWuO8yK7*K%u`&Xg38V8F#FSl3oLx+ULqMdn zny{EMg8?%fsR0$3xum$cq=bclNH?GfW()~za0D{JIL#~>j(`f#_(Yg6Y6a8^rAs6= zIKpa0Xlht!s+%i_3>&n*7z$P-BO3|IIH-JJ)-y%`Gf>t;