Skip to content

Commit

Permalink
Merge pull request #898 from molnizz/cringe21
Browse files Browse the repository at this point in the history
Update: Fix price and maps
  • Loading branch information
MrCat15352 committed Aug 20, 2024
2 parents 37a96ac + a1b2d5d commit edd9983
Show file tree
Hide file tree
Showing 14 changed files with 245 additions and 131 deletions.
117 changes: 61 additions & 56 deletions _maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,13 @@
},
/area/ruin/space/has_grav/ancientstation)
"dG" = (
/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
},
/area/ruin/space/has_grav/ancientstation)
"dL" = (
/obj/effect/decal/cleanable/dirt,
Expand All @@ -500,7 +502,8 @@
dir = 4
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
/obj/machinery/door/poddoor/cannothit{
dir = 4;
id = "ancient"
},
/turf/open/floor/plasteel/patterned{
Expand Down Expand Up @@ -838,7 +841,8 @@
name = "Engineering";
dir = 8
},
/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
/obj/machinery/door/poddoor/cannothit{
dir = 4;
id = "ancient"
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -1915,13 +1919,6 @@
},
/turf/open/floor/plating,
/area/template_noop)
"pe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
id = "ancient"
},
/turf/open/space/basic,
/area/ruin/space/has_grav/ancientstation)
"pk" = (
/obj/structure/table,
/obj/effect/turf_decal/corner/transparent/blue/half,
Expand Down Expand Up @@ -1974,6 +1971,10 @@
},
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/poddoor/cannothit{
dir = 4;
id = "ancient"
},
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
},
Expand Down Expand Up @@ -2008,12 +2009,12 @@
/turf/open/floor/plasteel/patterned,
/area/ruin/space/has_grav/ancientstation/rnd)
"pO" = (
/obj/machinery/door/airlock/maintenance{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
dir = 8
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation)
"qa" = (
Expand Down Expand Up @@ -2751,13 +2752,6 @@
color = "#8a8a8a"
},
/area/ruin/space/has_grav/ancientstation/engi)
"wi" = (
/obj/machinery/door/airlock/engineering{
name = "Engineering";
dir = 8
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/engi)
"wp" = (
/obj/effect/turf_decal/industrial/warning/full,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
Expand Down Expand Up @@ -4023,6 +4017,19 @@
color = "#8a8a8a"
},
/area/ruin/space/has_grav/ancientstation/comm)
"GB" = (
/obj/machinery/door/airlock/command{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/poddoor/cannothit{
dir = 4;
id = "ancient"
},
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
},
/area/ruin/space/has_grav/ancientstation)
"GF" = (
/obj/effect/turf_decal/corner/transparent/blue{
dir = 4
Expand Down Expand Up @@ -4677,15 +4684,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/engi)
"Lm" = (
/obj/machinery/door/airlock/command{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
},
/area/ruin/space/has_grav/ancientstation)
"Lq" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
Expand Down Expand Up @@ -5246,6 +5244,10 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/poddoor/cannothit{
dir = 4;
id = "ancient"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/engi)
"Qo" = (
Expand Down Expand Up @@ -5375,13 +5377,6 @@
"Rj" = (
/turf/closed/wall,
/area/ruin/space/has_grav/ancientstation/hivebot)
"Rk" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/multi_tile/three_tile_hor{
id = "ancient"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/comm)
"Rl" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/assembly/flash,
Expand Down Expand Up @@ -5671,7 +5666,7 @@
/area/ruin/space/has_grav/ancientstation/engi)
"SR" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/multi_tile/two_tile_hor{
/obj/machinery/door/poddoor/cannothit{
id = "ancient"
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -5900,11 +5895,21 @@
/area/ruin/space/has_grav/ancientstation/betanorth)
"UZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
/obj/machinery/door/poddoor/cannothit{
dir = 4;
id = "ancient"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation)
/area/ruin/space/has_grav/ancientstation/sec)
"Va" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -9244,15 +9249,15 @@ LI
LI
LI
LI
WW
Lm
pe
LI
GB
LI
ws
qv
qv
qv
qv
wi
gC
Qj
gC
qv
Expand Down Expand Up @@ -9522,7 +9527,7 @@ tO
tO
tO
tO
ou
SR
Mj
Pt
Pt
Expand Down Expand Up @@ -9570,7 +9575,7 @@ tO
tO
tO
tO
Rk
SR
Pa
HN
Pt
Expand Down Expand Up @@ -9618,7 +9623,7 @@ tO
tO
tO
tO
ou
SR
FT
Qo
hs
Expand Down Expand Up @@ -9666,7 +9671,7 @@ tO
tO
tO
tO
ou
SR
CY
zl
BU
Expand Down Expand Up @@ -9762,7 +9767,7 @@ tO
tO
tO
tO
ou
SR
Az
GF
CZ
Expand Down Expand Up @@ -10012,25 +10017,25 @@ LI
LI
LI
LI
WW
Lm
UZ
LI
GB
LI
ld
Fs
Fs
Fs
Fs
pu
Cn
UZ
dQ
Fs
Fs
UR
Fs
ld
WW
Lm
UZ
LI
GB
LI
LI
LI
LI
Expand Down
Loading

0 comments on commit edd9983

Please sign in to comment.