Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
181,950 changes: 181,950 additions & 0 deletions .merge_file_7hTbQH

Large diffs are not rendered by default.

143 changes: 103 additions & 40 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm

Large diffs are not rendered by default.

117 changes: 99 additions & 18 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,9 @@
"hZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cardboard,
/obj/structure/sign/security{
pixel_x = 32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"ia" = (
Expand Down Expand Up @@ -2001,6 +2004,12 @@
},
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"mP" = (
/obj/structure/sign/service/kitchen{
pixel_y = -32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"mQ" = (
/mob/living/simple_animal/hostile/spaceinfected/default/ranged,
/turf/simulated/floor/plasteel/dark,
Expand Down Expand Up @@ -2468,6 +2477,13 @@
},
/turf/simulated/floor/plasteel/white,
/area/ruin/space/deepstorage)
"qP" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/security{
pixel_y = -32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"qQ" = (
/obj/structure/closet/crate/can,
/obj/effect/spawner/random/maintenance,
Expand Down Expand Up @@ -2720,6 +2736,9 @@
/obj/structure/table/glass,
/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/tiles/department/security/corner,
/obj/structure/sign/medical/morgue{
pixel_x = -32
},
/turf/simulated/floor/plasteel/white,
/area/ruin/space/deepstorage)
"tb" = (
Expand Down Expand Up @@ -2924,6 +2943,13 @@
"uf" = (
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/deepstorage)
"uk" = (
/obj/effect/mapping_helpers/turfs/damage,
/obj/structure/sign/medical{
pixel_y = 32
},
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"un" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
Expand Down Expand Up @@ -3686,6 +3712,9 @@
/obj/effect/turf_decal/tiles/department/security/corner{
dir = 4
},
/obj/structure/sign/security/evidence{
pixel_x = 32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"Ao" = (
Expand Down Expand Up @@ -4229,7 +4258,7 @@
/obj/structure/railing/corner{
dir = 8
},
/obj/structure/sign/engineering{
/obj/structure/sign/engineering/power{
pixel_y = 32
},
/turf/simulated/floor/catwalk/airless,
Expand Down Expand Up @@ -4417,6 +4446,16 @@
/obj/item/defibrillator,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Fz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tiles/department/security/corner{
dir = 4
},
/obj/structure/sign/security/interrogation{
pixel_x = 32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"FC" = (
/obj/structure/railing{
dir = 8
Expand Down Expand Up @@ -4479,6 +4518,13 @@
},
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Gz" = (
/obj/effect/turf_decal/tiles/department/security/corner,
/obj/structure/sign/medical/virology{
pixel_x = -32
},
/turf/simulated/floor/plasteel/white,
/area/ruin/space/deepstorage)
"GA" = (
/obj/item/bedsheet,
/obj/effect/turf_decal/tiles/dark/side{
Expand Down Expand Up @@ -5001,9 +5047,6 @@
/area/ruin/space/deepstorage)
"Lh" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/greencross{
pixel_y = 32
},
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
Expand Down Expand Up @@ -5232,6 +5275,13 @@
/obj/structure/blob/normal/deepstorage,
/turf/simulated/floor/plasteel/white,
/area/ruin/space/deepstorage)
"Ny" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/public/restroom{
pixel_y = 32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"NN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/partial,
Expand Down Expand Up @@ -5363,6 +5413,10 @@
/obj/effect/turf_decal/tiles/dark/corner,
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"Pe" = (
/obj/structure/sign/public/reception,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/deepstorage)
"Pi" = (
/obj/structure/railing,
/turf/simulated/floor/plasteel/white,
Expand Down Expand Up @@ -5697,7 +5751,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"Ry" = (
/obj/structure/sign/custodian{
/obj/structure/sign/service/custodian{
pixel_x = 32
},
/mob/living/simple_animal/hostile/spaceinfected/default/ranged,
Expand Down Expand Up @@ -5881,6 +5935,10 @@
/obj/effect/turf_decal/tiles/dark/side,
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"Ty" = (
/obj/structure/sign/public/arrivals,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/deepstorage)
"TE" = (
/obj/effect/turf_decal/tiles/dark/corner{
dir = 1
Expand Down Expand Up @@ -6271,6 +6329,10 @@
},
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"WF" = (
/obj/structure/sign/service/botany,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/deepstorage)
"WG" = (
/obj/machinery/door/window,
/turf/simulated/floor/catwalk,
Expand Down Expand Up @@ -6307,6 +6369,16 @@
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"WL" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 1
},
/obj/structure/sign/service/kitchen{
pixel_x = -32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"WM" = (
/obj/structure/table/glass,
/obj/item/paper_bin{
Expand Down Expand Up @@ -6450,6 +6522,15 @@
},
/turf/simulated/floor/plasteel/white,
/area/ruin/space/deepstorage)
"XR" = (
/obj/effect/turf_decal/tiles/department/security/corner{
dir = 4
},
/obj/structure/sign/security/armory{
pixel_x = 32
},
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/deepstorage)
"XS" = (
/obj/structure/window/reinforced{
dir = 1
Expand Down Expand Up @@ -8056,7 +8137,7 @@ Zf
Sl
Bf
WH
Zf
Gz
Zf
Zf
Bf
Expand Down Expand Up @@ -9051,7 +9132,7 @@ QR
ht
eh
jB
eh
uk
dd
jB
sk
Expand Down Expand Up @@ -10442,11 +10523,11 @@ mu
bw
bw
jB
jB
Ty
av
Gl
Je
jB
Ty
jB
bw
bw
Expand Down Expand Up @@ -10756,7 +10837,7 @@ bl
QL
IN
wh
wh
mP
jB
AV
Aw
Expand Down Expand Up @@ -10825,7 +10906,7 @@ fk
Vv
Qi
or
jB
WF
wh
wh
jB
Expand Down Expand Up @@ -11048,7 +11129,7 @@ tq
Ut
bP
jB
Uk
WL
bP
cT
jB
Expand Down Expand Up @@ -11322,7 +11403,7 @@ SC
xZ
tu
jB
bP
Ny
bP
wh
jB
Expand Down Expand Up @@ -11435,12 +11516,12 @@ bU
bU
vL
nM
jB
Pe
bP
wh
dd
bP
bP
qP
jB
LT
aQ
Expand Down Expand Up @@ -11748,7 +11829,7 @@ tu
xZ
pL
jB
bP
Ny
wh
jB
Tb
Expand Down Expand Up @@ -12076,12 +12157,12 @@ Al
Ai
dt
Ai
Ai
Fz
GJ
FE
oB
Ai
GJ
XR
Ai
Ai
GJ
Expand Down
Loading