Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes multi-z stairs being invisible, shunts old stair sprites to the abyss in favor of the goon ones #22470

Closed
AMyriad wants to merge 5 commits into from
Closed

Fixes multi-z stairs being invisible, shunts old stair sprites to the abyss in favor of the goon ones #22470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d471859
fixa da stairs
AMyriad Jul 31, 2024
70430c3
true it was upside down
AMyriad Jul 31, 2024
71e5a3e
Merge remote-tracking branch 'upstream/master' into stairs-fix
AMyriad Aug 6, 2024
932638e
love dirs
AMyriad Aug 6, 2024
e63070e
gax fixes
AMyriad Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 124 additions & 11 deletions _maps/map_files/GaxStation/GaxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,6 +2373,7 @@
/obj/effect/turf_decal/trimline/red/corner{
dir = 4
},
/obj/effect/turf_decal/ramp_middle,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bfb" = (
Expand Down Expand Up @@ -5499,8 +5500,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"cES" = (
/obj/effect/turf_decal/ramp_middle{
dir = 4
},
/turf/open/floor/plasteel/stairs/goon/dark_stairs_wide{
dir = 8
dir = 4
},
/area/bridge)
"cEZ" = (
Expand Down Expand Up @@ -6113,6 +6117,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 1
},
/obj/effect/turf_decal/ramp_corner{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"cVa" = (
Expand Down Expand Up @@ -6167,6 +6174,9 @@
/obj/effect/turf_decal/trimline/secred/filled/corner/lower{
dir = 1
},
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"cWe" = (
Expand Down Expand Up @@ -7304,6 +7314,9 @@
/area/security/checkpoint/medical)
"dxA" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"dxH" = (
Expand Down Expand Up @@ -7515,6 +7528,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/science/research)
"dDw" = (
/obj/effect/turf_decal/trimline/white/filled/corner/lower{
dir = 1
},
/obj/effect/turf_decal/ramp_middle,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"dDx" = (
/obj/machinery/light/small{
dir = 8
Expand Down Expand Up @@ -13152,6 +13172,12 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 6
},
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/obj/effect/turf_decal/ramp_middle{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"gfu" = (
Expand Down Expand Up @@ -14466,6 +14492,15 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
"gMF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/turf_decal/ramp_middle,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"gMU" = (
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -14593,7 +14628,12 @@
/obj/effect/turf_decal/trimline/red/arrow_ccw{
dir = 4
},
/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone,
/obj/effect/turf_decal/ramp_middle{
dir = 1
},
/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{
dir = 1
},
/area/hallway/secondary/entry)
"gRV" = (
/obj/machinery/atmospherics/pipe/layer_manifold{
Expand Down Expand Up @@ -15203,6 +15243,9 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/effect/turf_decal/ramp_corner{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"hjs" = (
Expand Down Expand Up @@ -20374,6 +20417,9 @@
/obj/effect/turf_decal/trimline/secred/warning/lower{
dir = 4
},
/obj/effect/turf_decal/ramp_corner{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"jHj" = (
Expand Down Expand Up @@ -20996,7 +21042,12 @@
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/stairs/goon/stairs_middle,
/obj/effect/turf_decal/ramp_middle{
dir = 1
},
/turf/open/floor/plasteel/stairs/goon/stairs_middle{
dir = 1
},
/area/hallway/secondary/entry)
"jXr" = (
/obj/effect/spawner/structure/window/reinforced/shutter,
Expand Down Expand Up @@ -21140,6 +21191,9 @@
/obj/effect/turf_decal/trimline/white/filled/line/lower{
dir = 1
},
/obj/effect/turf_decal/ramp_corner{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"kbY" = (
Expand Down Expand Up @@ -24555,8 +24609,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"lMp" = (
/obj/effect/turf_decal/ramp_middle{
dir = 4
},
/turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{
dir = 8
dir = 4
},
/area/bridge)
"lMu" = (
Expand Down Expand Up @@ -24859,6 +24916,10 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"lSG" = (
/obj/effect/turf_decal/ramp_middle,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"lSI" = (
/obj/effect/decal/cleanable/glass,
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -24967,6 +25028,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/effect/turf_decal/ramp_middle,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"lVT" = (
Expand Down Expand Up @@ -27476,8 +27538,11 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/ramp_middle{
dir = 4
},
/turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{
dir = 8
dir = 4
},
/area/bridge)
"nlR" = (
Expand Down Expand Up @@ -28666,6 +28731,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{
dir = 4
},
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"nMW" = (
Expand Down Expand Up @@ -30635,6 +30703,9 @@
/obj/effect/turf_decal/trimline/secred/filled/corner/lower{
dir = 4
},
/obj/effect/turf_decal/ramp_corner{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"oRt" = (
Expand Down Expand Up @@ -31099,6 +31170,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 4
},
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"pgd" = (
Expand Down Expand Up @@ -34358,6 +34432,9 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower,
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"qJl" = (
Expand Down Expand Up @@ -34572,7 +34649,9 @@
/obj/effect/turf_decal/ramp_middle{
dir = 1
},
/turf/open/floor/plasteel/stairs/goon/stairs_middle,
/turf/open/floor/plasteel/stairs/goon/stairs_middle{
dir = 1
},
/area/hydroponics/garden)
"qQC" = (
/obj/machinery/navbeacon{
Expand Down Expand Up @@ -34691,6 +34770,9 @@
/turf/open/floor/plasteel,
/area/security/prison)
"qSn" = (
/obj/effect/turf_decal/ramp_middle{
dir = 1
},
/turf/open/floor/plasteel/stairs/goon/stairs_wide{
dir = 1
},
Expand Down Expand Up @@ -35174,6 +35256,10 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 5
},
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/obj/effect/turf_decal/ramp_middle,
/turf/open/floor/plasteel/dark,
/area/bridge)
"rdP" = (
Expand Down Expand Up @@ -37968,6 +38054,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 4
},
/obj/effect/turf_decal/ramp_corner{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"sup" = (
Expand Down Expand Up @@ -43461,6 +43550,9 @@
/obj/structure/railing,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
/obj/effect/turf_decal/ramp_corner{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"vgJ" = (
Expand Down Expand Up @@ -45515,6 +45607,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 1
},
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"wgK" = (
Expand Down Expand Up @@ -45596,7 +45691,7 @@
dir = 4
},
/turf/open/floor/plasteel/stairs/goon/stairs_alone{
dir = 8
dir = 4
},
/area/escapepodbay)
"wiA" = (
Expand Down Expand Up @@ -46050,6 +46145,9 @@
/obj/effect/turf_decal/trimline/red/arrow_ccw{
dir = 1
},
/obj/effect/turf_decal/ramp_middle{
dir = 4
},
/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{
dir = 4
},
Expand Down Expand Up @@ -47203,6 +47301,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
/obj/effect/turf_decal/ramp_middle,
/obj/effect/turf_decal/ramp_middle{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"wYp" = (
Expand Down Expand Up @@ -48159,6 +48261,9 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"xus" = (
/obj/effect/turf_decal/ramp_middle{
dir = 1
},
/turf/open/floor/plasteel/stairs/goon/stairs2_wide{
dir = 1
},
Expand Down Expand Up @@ -49395,6 +49500,14 @@
"xXn" = (
/turf/closed/wall/r_wall,
/area/security/detectives_office)
"xXs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/ramp_corner{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"xXt" = (
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -92575,7 +92688,7 @@ vvd
vmy
vvd
qSn
nPi
dDw
vvd
atx
pnP
Expand Down Expand Up @@ -92832,7 +92945,7 @@ qub
wcy
lzE
jWH
lzE
gMF
oAE
nVD
kMw
Expand Down Expand Up @@ -93089,7 +93202,7 @@ mPt
vvd
vvd
xus
vvd
lSG
rRY
atx
pnP
Expand Down Expand Up @@ -94890,7 +95003,7 @@ rrI
faQ
btB
wYh
aAR
xXs
aAR
blt
aAR
Expand Down
Loading