From d71cc35ecbc4cb2bf1255d23ea8b1569e87206db Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 7 Oct 2021 18:56:35 +0200 Subject: [PATCH] [MIRROR] fixes documentation and overlays on catwalks [MDB IGNORE] (#8655) * catwalks with fixed documentation and overlays (#61916) corrects documentation in layers.dm and catwalk_plating.dm. catwalks now correctly hide what's under them with the overlay. catwalk under plating now has a naked sprite instead of still showing the over-plating (which was confusing in game). also adds a built overlay example to that file. * fixes documentation and overlays on catwalks Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com> --- code/__DEFINES/layers.dm | 2 +- code/game/turfs/open/floor/catwalk_plating.dm | 11 ++++++++--- icons/turf/floors/catwalk_plating.dmi | Bin 396 -> 484 bytes 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 491d4b2293f..51e594cf2e7 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -44,7 +44,7 @@ #define GAS_FILTER_LAYER 2.48 #define GAS_PUMP_LAYER 2.49 #define LOW_OBJ_LAYER 2.5 -///catwalk overlay of /turf/open/floor/plating/plating_catwalk +///catwalk overlay of /turf/open/floor/plating/catwalk_floor #define CATWALK_LAYER 2.51 #define LOW_SIGIL_LAYER 2.52 #define SIGIL_LAYER 2.54 diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm index 063deb17f50..b445900522e 100644 --- a/code/game/turfs/open/floor/catwalk_plating.dm +++ b/code/game/turfs/open/floor/catwalk_plating.dm @@ -2,7 +2,7 @@ * ## catwalk flooring * * They show what's underneath their catwalk flooring (pipes and the like) - * you can crowbar it to interact with the underneath stuff without destroying the tile... + * you can screwdriver it to interact with the underneath stuff without destroying the tile... * unless you want to! */ /turf/open/floor/plating/catwalk_floor @@ -23,9 +23,14 @@ /turf/open/floor/plating/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 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;