diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
index d528e42a619..0d2555c7a02 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
@@ -13,6 +13,10 @@
icon_state = "dark"
},
/area/ruin/space/abandoned_engi_sat)
+"aR" = (
+/mob/living/simple_animal/hostile/carp/megacarp,
+/turf/template_noop,
+/area/template_noop)
"bi" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -239,6 +243,7 @@
/area/ruin/space/abandoned_engi_sat)
"hB" = (
/obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"hE" = (
@@ -567,7 +572,6 @@
"pX" = (
/obj/structure/closet{
icon_state = "eng_secure";
- opened = 1;
open_door_sprite = "eng_secure_door";
name = "engineer's locker"
},
@@ -577,6 +581,10 @@
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
/area/ruin/space/abandoned_engi_sat)
+"rn" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
"rr" = (
/obj/structure/lattice,
/turf/template_noop,
@@ -1079,6 +1087,11 @@
name = "floor"
},
/area/ruin/space/abandoned_engi_sat)
+"Ig" = (
+/obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/abandoned_engi_sat)
"Iz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/wall_rusted_always,
@@ -1204,6 +1217,10 @@
icon_state = "blue"
},
/area/ruin/space/abandoned_engi_sat)
+"OW" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plating,
+/area/ruin/space/abandoned_engi_sat)
"OZ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -1410,6 +1427,11 @@
/obj/structure/bed,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
+"Xq" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plating,
+/area/ruin/space/abandoned_engi_sat)
"XP" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -1550,13 +1572,13 @@ LP
"}
(2,1,1) = {"
LP
+rn
LP
LP
LP
LP
LP
-LP
-LP
+rn
LP
LP
LP
@@ -1586,9 +1608,9 @@ LP
LP
LP
LP
+rn
LP
-LP
-LP
+rn
LP
LP
LP
@@ -1780,7 +1802,7 @@ Iz
hE
LP
LP
-LP
+aR
LP
LP
LP
@@ -1974,7 +1996,7 @@ kt
eP
fA
XP
-et
+OW
et
Yz
CP
@@ -2040,7 +2062,7 @@ kZ
Tw
YE
jG
-XP
+Xq
XP
Ud
fA
@@ -2308,7 +2330,7 @@ oL
mW
NM
mW
-BR
+Ig
IC
IC
ao
@@ -2357,11 +2379,11 @@ LP
Gi
LP
LP
+rn
LP
LP
LP
-LP
-LP
+rn
LP
"}
(26,1,1) = {"
@@ -2427,7 +2449,7 @@ px
LP
LP
LP
-LP
+rn
LP
LP
LP
@@ -2486,7 +2508,7 @@ uQ
qu
LP
LP
-LP
+rn
LP
LP
LP
@@ -2523,7 +2545,7 @@ LP
LP
LP
LP
-LP
+rn
LP
LP
LP
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
index 4f6c41bba6f..15199fc7f43 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
@@ -8,6 +8,10 @@
"c" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
+"V" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
(1,1,1) = {"
a
@@ -83,7 +87,7 @@ a
a
a
a
-a
+V
a
a
a
@@ -158,7 +162,7 @@ c
a
a
a
-a
+V
a
a
a
@@ -220,10 +224,10 @@ a
a
a
a
+V
a
a
-a
-a
+V
a
a
a
@@ -254,7 +258,7 @@ a
(12,1,1) = {"
a
a
-a
+V
a
a
c
@@ -322,7 +326,7 @@ a
a
a
a
-a
+V
a
a
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
index cb17b72a684..10f67de650e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
@@ -11,6 +11,18 @@
"d" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
+"t" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"R" = (
+/obj/structure/spawner/mining/goliath,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"V" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
(1,1,1) = {"
a
@@ -105,7 +117,7 @@ a
a
a
b
-b
+t
b
c
c
@@ -367,7 +379,7 @@ b
(17,1,1) = {"
a
a
-a
+V
b
a
a
@@ -388,8 +400,8 @@ a
"}
(18,1,1) = {"
a
-a
-a
+V
+V
b
b
a
@@ -400,7 +412,7 @@ a
b
b
b
-b
+R
b
b
b
@@ -413,7 +425,7 @@ a
a
a
a
-a
+V
a
a
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
index 6b24021c35a..869654dfc1b 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
@@ -19,6 +19,17 @@
/obj/item/pickaxe/diamond,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
+"q" = (
+/turf/simulated/mineral/random/low_chance,
+/area/ruin/space/unpowered)
+"v" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"N" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -79,7 +90,7 @@ b
d
d
c
-c
+q
d
d
d
@@ -101,8 +112,8 @@ c
d
d
c
-c
-d
+q
+q
d
d
b
@@ -115,17 +126,17 @@ b
b
c
c
+q
+q
c
c
c
c
c
c
-c
-c
-c
-d
-d
+q
+q
+q
d
c
a
@@ -137,16 +148,16 @@ a
b
c
c
-c
-c
-c
+q
+q
+q
c
c
c
b
c
c
-c
+q
c
c
b
@@ -192,7 +203,7 @@ b
b
c
c
-b
+v
b
b
"}
@@ -207,7 +218,7 @@ c
c
c
b
-b
+N
e
b
b
@@ -276,8 +287,8 @@ c
c
c
c
-c
-c
+q
+q
c
d
d
@@ -292,14 +303,14 @@ a
b
d
d
-c
-c
+q
+q
c
d
c
-c
-c
-c
+q
+q
+q
c
c
b
@@ -314,12 +325,12 @@ a
b
d
d
-c
-c
-c
-c
-c
-c
+q
+q
+q
+q
+q
+q
c
c
b
@@ -337,10 +348,10 @@ b
c
c
c
-c
-c
-c
-c
+q
+q
+q
+q
c
c
c
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
index 8c13e137558..e4bef47fe5f 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
@@ -50,6 +50,9 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/space/unpowered)
+"Q" = (
+/turf/simulated/mineral/random/low_chance,
+/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -122,7 +125,7 @@ a
a
b
c
-c
+Q
b
d
d
@@ -132,9 +135,9 @@ a
a
b
b
+Q
b
-b
-b
+Q
a
a
b
@@ -154,9 +157,9 @@ a
a
a
a
-b
-b
-b
+Q
+Q
+Q
a
a
a
@@ -166,8 +169,8 @@ a
a
a
b
-b
-b
+Q
+Q
b
b
d
@@ -189,7 +192,7 @@ a
a
b
c
-b
+Q
b
b
d
@@ -211,7 +214,7 @@ a
a
b
b
-b
+Q
b
b
d
@@ -233,8 +236,8 @@ a
a
a
b
-b
-b
+Q
+Q
b
b
b
@@ -388,9 +391,9 @@ a
a
a
b
-b
-b
-b
+Q
+Q
+Q
b
b
b
@@ -408,9 +411,9 @@ a
a
a
a
-b
-b
-b
+Q
+Q
+Q
b
b
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
index 7e5a5134d23..313a25539d5 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
@@ -11,6 +11,25 @@
"d" = (
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
+"f" = (
+/obj/structure/spawner/mining/goliath,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"A" = (
+/turf/simulated/mineral/random/low_chance,
+/area/ruin/space/unpowered)
+"S" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
+"U" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"Y" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -157,7 +176,7 @@ a
a
a
a
-a
+S
a
a
a
@@ -230,9 +249,9 @@ a
c
c
c
-b
-b
-b
+A
+A
+A
b
b
b
@@ -258,7 +277,7 @@ d
b
b
b
-b
+A
b
b
b
@@ -274,8 +293,8 @@ c
c
c
b
-b
-b
+A
+A
b
b
b
@@ -298,9 +317,9 @@ d
d
b
b
-b
-b
-b
+A
+A
+A
b
b
b
@@ -312,8 +331,8 @@ a
a
a
c
-c
-c
+A
+A
c
b
b
@@ -340,8 +359,8 @@ b
c
c
c
-c
-b
+A
+A
b
b
b
@@ -354,7 +373,7 @@ a
a
b
c
-c
+A
c
b
b
@@ -369,7 +388,7 @@ b
a
a
a
-a
+S
a
a
a
@@ -380,10 +399,10 @@ b
b
b
c
-c
-c
-c
-b
+A
+A
+A
+A
b
c
c
@@ -396,8 +415,8 @@ a
a
b
b
-b
-b
+A
+A
b
d
d
@@ -437,8 +456,8 @@ a
a
b
b
-b
-b
+A
+A
b
c
d
@@ -479,7 +498,7 @@ a
a
b
b
-b
+A
b
b
d
@@ -520,8 +539,8 @@ a
a
a
b
-b
-b
+A
+A
b
d
d
@@ -562,7 +581,7 @@ a
a
a
b
-b
+A
b
c
d
@@ -591,7 +610,7 @@ d
d
c
d
-d
+U
d
b
b
@@ -679,7 +698,7 @@ d
d
b
b
-b
+A
b
a
a
@@ -721,7 +740,7 @@ d
d
b
b
-b
+A
b
b
a
@@ -762,8 +781,8 @@ d
d
b
b
-b
-b
+A
+A
c
c
a
@@ -805,7 +824,7 @@ b
b
c
c
-b
+A
c
c
a
@@ -815,7 +834,7 @@ a
c
c
d
-d
+U
d
a
a
@@ -840,14 +859,14 @@ b
b
b
d
-d
+f
d
b
b
b
c
c
-b
+A
c
c
a
@@ -889,7 +908,7 @@ b
b
b
b
-b
+A
c
c
a
@@ -1263,11 +1282,11 @@ a
a
a
a
+S
a
a
a
-a
-a
+S
a
a
a
@@ -1337,14 +1356,14 @@ d
d
d
b
-b
-b
-b
-b
+A
+A
+A
+A
b
b
a
-a
+S
a
a
a
@@ -1361,7 +1380,7 @@ a
a
a
a
-a
+S
a
a
a
@@ -1382,8 +1401,8 @@ b
b
b
b
-b
-b
+A
+A
c
a
a
@@ -1406,7 +1425,7 @@ a
a
a
a
-a
+S
a
a
a
@@ -1506,7 +1525,7 @@ b
b
d
d
-d
+Y
d
b
b
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
index 525a0d85a8a..a24f340b2ae 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
@@ -199,6 +199,10 @@
icon_state = "dark"
},
/area/ruin/space/tcommsat)
+"lq" = (
+/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/tcommsat)
"my" = (
/obj/structure/window/reinforced{
dir = 4
@@ -239,6 +243,7 @@
"oh" = (
/obj/structure/table,
/obj/item/taperecorder,
+/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"ok" = (
@@ -1978,7 +1983,7 @@ YW
hg
Wc
jv
-Wc
+lq
Wc
Wc
Wc
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
index 2a6c21b9737..26391479a50 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
@@ -81,6 +81,9 @@
},
/turf/simulated/floor/plasteel/airless,
/area/ruin/space/unpowered)
+"v" = (
+/turf/simulated/mineral/random/high_chance/clown,
+/area/ruin/space/unpowered)
"x" = (
/obj/effect/mob_spawn/human/corpse/clown,
/turf/simulated/floor/plasteel/airless,
@@ -204,6 +207,16 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
+"U" = (
+/turf/simulated/mineral/random/low_chance,
+/area/ruin/space/unpowered)
+"Y" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/space/unpowered)
+"Z" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -254,8 +267,8 @@ a
a
a
m
-m
-m
+v
+v
m
m
m
@@ -277,8 +290,8 @@ a
a
a
m
-m
-m
+v
+v
m
m
m
@@ -299,10 +312,10 @@ a
a
a
a
-m
-m
-m
-m
+v
+v
+v
+v
m
m
m
@@ -321,13 +334,13 @@ a
a
a
a
-m
-m
-m
-m
-m
-m
-m
+v
+U
+U
+U
+U
+U
+Y
m
m
m
@@ -342,14 +355,14 @@ a
a
a
a
-m
-m
-m
-m
-m
-m
-m
-m
+v
+v
+v
+U
+U
+U
+U
+U
m
m
m
@@ -364,16 +377,16 @@ a
a
a
n
+v
m
m
m
-m
-m
-m
-m
-m
-m
-m
+U
+U
+U
+U
+Y
+Y
m
m
m
@@ -392,9 +405,9 @@ m
m
m
m
-m
-m
-m
+Y
+U
+U
m
m
m
@@ -413,14 +426,14 @@ m
m
m
m
-m
-m
-m
+Y
+Y
+Y
m
m
m
n
-n
+Z
a
a
a
@@ -435,10 +448,10 @@ m
m
m
m
+Y
m
-m
-m
-m
+Y
+Y
m
m
n
@@ -528,8 +541,8 @@ m
m
m
m
-m
-m
+v
+v
m
m
m
@@ -550,10 +563,10 @@ m
J
b
m
-m
-m
-m
-m
+v
+v
+v
+v
m
m
"}
@@ -573,8 +586,8 @@ k
b
m
m
-m
-m
+v
+v
n
m
m
@@ -595,8 +608,8 @@ K
b
b
m
-m
-m
+v
+v
n
m
m
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
index 67ff96e0ad2..4fabbe1c4c7 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
@@ -21,6 +21,10 @@
/obj/structure/grille/broken,
/turf/space,
/area/space)
+"f" = (
+/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space,
+/turf/space,
+/area/space)
"g" = (
/obj/structure/disposalpipe/broken{
dir = 4
@@ -144,6 +148,11 @@
"V" = (
/turf/simulated/wall,
/area/space)
+"W" = (
+/obj/structure/lattice,
+/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space,
+/turf/space,
+/area/space)
"X" = (
/turf/space,
/area/space)
@@ -295,7 +304,7 @@ X
X
y
E
-X
+f
E
Y
X
@@ -383,7 +392,7 @@ X
X
I
v
-v
+W
X
v
t
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm
index 97bf2280955..60b4f345c70 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm
@@ -118,9 +118,7 @@
/area/space)
"H" = (
/obj/structure/table,
-/obj/item/shard{
- icon_state = "medium"
- },
+/obj/item/salvage/ruin/brick,
/turf/simulated/floor/plasteel/airless,
/area/space)
"I" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm
index 303bc7dc35d..fd3877912ac 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm
@@ -134,6 +134,10 @@
/obj/structure/girder/displaced,
/turf/space,
/area/template_noop)
+"Q" = (
+/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space,
+/turf/space,
+/area/template_noop)
"S" = (
/obj/structure/lattice,
/turf/space,
@@ -429,7 +433,7 @@ A
A
B
O
-A
+Q
B
A
M
@@ -475,7 +479,7 @@ z
H
A
A
-A
+Q
S
A
q
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index 2338e405ac2..c0071384ce9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -731,6 +731,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
+/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"bQ" = (
@@ -763,6 +764,7 @@
/area/ruin/space/unpowered)
"bV" = (
/obj/structure/chair/office/dark,
+/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"bW" = (
@@ -827,12 +829,64 @@
"ce" = (
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
+"cZ" = (
+/obj/effect/decal/remains/robot,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"iZ" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/space/unpowered)
+"kM" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
"mL" = (
/obj/machinery/tcomms/relay/ruskie{
network_id = "STORAGE-RELAY"
},
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
+"pv" = (
+/obj/machinery/porta_turret/syndicate,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"qn" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"rb" = (
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/unpowered)
+"yU" = (
+/obj/structure/spawner/mining/goliath,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"zk" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/ruin/space/unpowered)
+"KB" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"Pm" = (
+/obj/effect/mine/explosive,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"SX" = (
+/obj/structure/flora/ash/rock/style_random,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"To" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/unpowered)
(1,1,1) = {"
aa
@@ -1132,17 +1186,17 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -1203,8 +1257,8 @@ ab
ab
ab
ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -1273,6 +1327,7 @@ ab
ab
ab
ab
+iZ
ab
ab
ab
@@ -1282,11 +1337,10 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -1351,17 +1405,17 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -1408,6 +1462,19 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
ab
ab
ab
@@ -1417,22 +1484,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -1476,6 +1530,17 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ab
+ce
+ce
+ab
+ab
+ab
+ab
+iZ
ab
ab
ab
@@ -1490,18 +1555,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -1544,6 +1598,13 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -1573,14 +1634,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -1612,14 +1666,14 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+SX
+SX
+ce
+ce
+ce
ab
ab
ab
@@ -1680,6 +1734,17 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+SX
+ce
+ce
+ce
+qn
+ce
+ce
ab
ab
ab
@@ -1691,6 +1756,12 @@ ab
ab
ab
ab
+ce
+ce
+kM
+ab
+ce
+ce
ab
ab
ab
@@ -1702,24 +1773,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -1746,6 +1800,43 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+qn
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -1754,44 +1845,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -1815,46 +1869,46 @@ ab
ab
ab
ab
+ce
+ce
+yU
+ce
+SX
+ce
+ce
+ce
+ab
+ce
+ce
+ce
ab
ab
ab
+ce
+ce
+ce
+ce
+qn
+ce
+ce
+ce
+ce
+SX
+ce
+ce
+ce
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+qn
+ce
+SX
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -1876,64 +1930,64 @@ ab
ab
ab
ab
+iZ
+iZ
+ab
+iZ
+iZ
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+SX
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
ab
+iZ
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
aa
@@ -1946,55 +2000,55 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ce
+ce
+ce
ab
ab
ab
ab
+ce
+ce
+ce
+yU
+ce
+ce
+SX
+ce
+ce
+ce
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+SX
+SX
+ce
+ce
ab
ab
ab
@@ -2015,6 +2069,36 @@ ab
ab
ab
ab
+iZ
+iZ
+ab
+ab
+ab
+ab
+ce
+ce
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -2022,49 +2106,19 @@ ab
ab
ab
ab
+ce
ab
+ce
+ce
+kM
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+SX
+ce
+ce
+ce
ab
ab
ab
@@ -2083,6 +2137,36 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -2092,54 +2176,24 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -2150,6 +2204,38 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
+iZ
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -2166,45 +2252,13 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -2223,6 +2277,32 @@ ab
ab
ab
ab
+iZ
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ab
+ce
ab
ab
ab
@@ -2245,35 +2325,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -2306,6 +2360,25 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ab
+ab
+ab
+ab
+iZ
+ab
+iZ
+iZ
ab
ab
ab
@@ -2321,28 +2394,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+cZ
ab
ab
ab
@@ -2372,6 +2426,27 @@ ab
ab
ab
ab
+kM
+ce
+ce
+SX
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -2389,29 +2464,8 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ce
ce
ce
@@ -2440,6 +2494,17 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
+SX
+ce
+ce
+ab
+ab
+iZ
+iZ
ab
ab
ab
@@ -2448,19 +2513,8 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ac
@@ -2482,7 +2536,7 @@ ce
ce
ce
ce
-ce
+Pm
ce
ce
ce
@@ -2496,6 +2550,7 @@ ab
ab
ab
ab
+iZ
ab
ab
ab
@@ -2508,6 +2563,17 @@ ab
ab
ab
ab
+ce
+ab
+ab
+ce
+ce
+qn
+ce
+ab
+ab
+iZ
+iZ
ab
ab
ab
@@ -2515,19 +2581,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -2548,12 +2602,12 @@ ca
ac
ce
ce
+Pm
ce
ce
ce
ce
-ce
-ce
+cZ
ce
ce
ab
@@ -2563,33 +2617,33 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ce
+ab
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -2615,11 +2669,11 @@ bZ
ca
ca
ac
+pv
ce
ce
ce
-ce
-ce
+cZ
ce
ce
ce
@@ -2633,33 +2687,33 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ce
+ce
+ce
+ce
+ab
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -2689,11 +2743,11 @@ ce
ce
ce
ce
+Pm
ce
ce
ce
-ce
-ce
+Pm
ce
ce
"}
@@ -2701,35 +2755,35 @@ ce
ab
ab
ab
+iZ
+iZ
+iZ
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ce
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -2755,11 +2809,11 @@ ca
cd
ce
ce
+Pm
+ce
+ce
ce
ce
-ab
-ab
-ab
ce
ce
ce
@@ -2770,28 +2824,28 @@ ce
ab
ab
ab
+iZ
+iZ
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+yU
+ce
+qn
+ce
+ce
+ce
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -2826,9 +2880,9 @@ ce
ce
ce
ce
-ab
-ab
-ab
+ce
+ce
+ce
ab
ce
ce
@@ -2839,28 +2893,28 @@ ce
ab
ab
ab
+iZ
ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
ab
ab
ab
@@ -2895,8 +2949,8 @@ ce
ce
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -2908,6 +2962,28 @@ ce
ab
ab
ab
+iZ
+iZ
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+SX
+SX
+ce
+ce
+ab
+ce
+ab
+ab
+ab
+ab
+ce
ab
ab
ab
@@ -2915,29 +2991,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -2964,8 +3018,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -2984,29 +3038,29 @@ ab
ab
ab
ab
+ce
+ce
+ce
+SX
+SX
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ce
+ce
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -3033,8 +3087,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3054,28 +3108,28 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ab
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ce
+ce
+ce
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -3102,8 +3156,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3126,6 +3180,9 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
@@ -3133,18 +3190,15 @@ ab
ab
ab
ab
+ce
+ce
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -3171,8 +3225,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3204,15 +3258,15 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -3240,8 +3294,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3273,15 +3327,15 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -3310,8 +3364,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3341,11 +3395,11 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
-ab
-ab
-ab
-ab
+ce
ab
ab
ab
@@ -3361,26 +3415,26 @@ ar
ar
bc
ar
-ar
+rb
bm
ac
ar
bE
-bE
+zk
bB
ac
ab
ab
ab
+iZ
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3409,11 +3463,11 @@ ab
ab
ab
ab
+ce
ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -3427,7 +3481,7 @@ ab
ac
aA
ar
-ar
+To
au
ar
ar
@@ -3441,14 +3495,14 @@ ac
ab
ab
ab
+iZ
+iZ
ab
ab
ab
ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3471,18 +3525,18 @@ ab
ab
ab
ab
+iZ
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -3509,15 +3563,15 @@ ar
ac
ab
ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3535,6 +3589,11 @@ ab
ab
ab
ab
+iZ
+iZ
+ab
+ab
+iZ
ab
ab
ab
@@ -3542,16 +3601,11 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -3578,15 +3632,15 @@ bT
ac
ab
ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3605,6 +3659,10 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -3612,15 +3670,11 @@ ab
ab
ab
ab
+ce
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -3647,15 +3701,15 @@ ac
ac
ab
ab
+iZ
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3673,6 +3727,10 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -3680,16 +3738,12 @@ ab
ab
ab
ab
+ce
+ce
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -3722,8 +3776,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3742,6 +3796,8 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
ab
@@ -3749,16 +3805,14 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3791,8 +3845,8 @@ ab
ab
ab
ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3812,6 +3866,7 @@ ab
ab
ab
ab
+iZ
ab
ab
ab
@@ -3819,16 +3874,15 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3859,9 +3913,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -3880,24 +3934,24 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
ab
ab
ab
ab
+ce
+ce
+SX
+ce
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -3912,7 +3966,7 @@ aF
aF
aF
ar
-ar
+To
ac
bp
ar
@@ -3927,9 +3981,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -3957,17 +4011,17 @@ ab
ab
ab
ab
+ce
+SX
+SX
+ce
+ce
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -3991,19 +4045,19 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
aa
@@ -4025,18 +4079,18 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+qn
+ce
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -4057,22 +4111,22 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
ab
ab
aa
@@ -4094,19 +4148,19 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -4126,22 +4180,22 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
aa
@@ -4163,20 +4217,20 @@ ab
ab
ab
ab
+ce
+ce
+ce
+yU
+ce
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -4195,15 +4249,15 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -4232,6 +4286,21 @@ ab
ab
ab
ab
+ce
+qn
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -4248,31 +4317,16 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -4301,6 +4355,22 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -4323,25 +4393,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -4364,6 +4418,37 @@ ab
ab
ab
ab
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
ab
ab
ab
@@ -4376,40 +4461,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
ab
ab
ab
@@ -4434,6 +4488,38 @@ ab
ab
ab
ab
+iZ
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+SX
+SX
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -4444,48 +4530,16 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -4502,6 +4556,18 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
ab
ab
ab
@@ -4511,50 +4577,38 @@ ab
ab
ab
ab
+ce
+SX
+ce
+ce
+ce
+ce
ab
ab
ab
ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
+ce
+ce
+ce
+SX
+SX
+SX
+ce
ab
ab
ab
ab
+iZ
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -4571,6 +4625,18 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
ab
ab
ab
@@ -4581,50 +4647,38 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -4641,6 +4695,17 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
ab
ab
ab
@@ -4648,51 +4713,40 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+qn
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -4711,6 +4765,32 @@ ab
ab
ab
ab
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+SX
+ce
+ce
+ce
ab
ab
ab
@@ -4719,48 +4799,22 @@ ab
ab
ab
ab
+KB
+ce
+ce
+ce
+SX
+ce
+ce
+ce
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -4780,6 +4834,32 @@ ab
ab
ab
ab
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+SX
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -4788,49 +4868,23 @@ ab
ab
ab
ab
+ce
+ce
+SX
+SX
+SX
+ce
+ce
+ce
+ce
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -4854,44 +4908,44 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+SX
+SX
+ce
+ce
+ce
ab
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -4921,46 +4975,46 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
ab
ab
+ce
+ce
+ce
+KB
+ce
+ce
+SX
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+qn
+ce
+ce
ab
ab
ab
@@ -4988,48 +5042,48 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+KB
ab
ab
ab
@@ -5056,6 +5110,13 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
+ab
+ce
+ce
ab
ab
ab
@@ -5064,40 +5125,33 @@ ab
ab
ab
ab
+ce
+ce
+ce
+qn
+ce
+ce
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5125,6 +5179,27 @@ ab
ab
ab
ab
+ce
+ab
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
+ab
+ab
+ce
+ce
+ce
+qn
+ce
+ce
ab
ab
ab
@@ -5132,31 +5207,10 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5194,6 +5248,27 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5202,29 +5277,8 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -5263,6 +5317,26 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
+ab
+ab
+ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5272,28 +5346,8 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ce
+ce
ab
ab
ab
@@ -5332,6 +5386,19 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -5347,6 +5414,9 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
@@ -5359,23 +5429,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -5411,6 +5465,8 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
ab
@@ -5427,6 +5483,9 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
@@ -5439,15 +5498,10 @@ ab
ab
ab
ab
+iZ
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -5481,6 +5535,10 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -5492,6 +5550,10 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5503,19 +5565,11 @@ ab
ab
ab
ab
+iZ
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -5564,6 +5618,10 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5576,14 +5634,10 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -5611,6 +5665,9 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
@@ -5629,6 +5686,9 @@ ab
ab
ab
ab
+ce
+ce
+ce
ab
ab
ab
@@ -5643,16 +5703,10 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -5679,6 +5733,12 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5693,6 +5753,10 @@ ab
ab
ab
ab
+ce
+ce
+ab
+ce
ab
ab
ab
@@ -5707,20 +5771,10 @@ ab
ab
ab
ab
+iZ
+iZ
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -5741,6 +5795,36 @@ aa
ab
ab
ab
+iZ
+iZ
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5759,37 +5843,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -5809,6 +5863,45 @@ aa
ab
ab
ab
+iZ
+iZ
+iZ
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+KB
+ce
+qn
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ab
+ce
+ce
+ce
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+iZ
ab
ab
ab
@@ -5819,46 +5912,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -5879,6 +5933,34 @@ ab
ab
ab
ab
+iZ
+iZ
+ab
+ab
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
+ce
ab
ab
ab
@@ -5887,37 +5969,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
ab
ab
ab
@@ -5946,6 +6000,33 @@ aa
aa
ab
ab
+iZ
+iZ
+ab
+iZ
+ab
+ab
+ab
+ab
+ce
+ce
+SX
+SX
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ce
+ce
+ce
+ce
+ce
+KB
+ce
+ce
ab
ab
ab
@@ -5957,38 +6038,11 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -6023,6 +6077,16 @@ ab
ab
ab
ab
+ce
+ce
+ce
+ce
+ce
+ce
+ab
+ab
+ce
+ce
ab
ab
ab
@@ -6043,22 +6107,12 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -6122,12 +6176,12 @@ ab
ab
ab
ab
+iZ
+iZ
ab
ab
-ab
-ab
-ab
-ab
+iZ
+iZ
ab
ab
ab
@@ -6241,10 +6295,10 @@ ab
ab
ab
ab
+iZ
+iZ
ab
-ab
-ab
-ab
+iZ
ab
ab
ab
@@ -6296,24 +6350,24 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+ab
+ab
+iZ
+iZ
+iZ
ab
ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -6367,6 +6421,11 @@ ab
ab
ab
ab
+iZ
+iZ
+iZ
+iZ
+iZ
ab
ab
ab
@@ -6376,12 +6435,7 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
+iZ
ab
ab
ab
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm
index 5d159c28d40..65aa7ffc7b5 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm
@@ -73,6 +73,25 @@
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/obj/effect/decal/remains/xeno,
+/mob/living/simple_animal/hostile/alien,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"F" = (
+/obj/structure/alien/weeds/node,
+/mob/living/simple_animal/hostile/alien/maid,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"G" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/mob/living/simple_animal/hostile/alien,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"S" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/decal/remains/human,
+/mob/living/simple_animal/hostile/alien,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
@@ -680,7 +699,7 @@ b
b
k
f
-i
+G
f
c
m
@@ -810,7 +829,7 @@ c
f
c
f
-j
+S
f
c
f
@@ -1015,7 +1034,7 @@ b
c
i
f
-h
+F
f
f
c
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
index b2789d61eca..d3c8d514d03 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
@@ -34,21 +34,9 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/powered)
-"h" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/ruin/space/powered)
"i" = (
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
-"j" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/ruin/space/powered)
"k" = (
/obj/structure/window/reinforced,
/turf/template_noop,
@@ -65,6 +53,7 @@
dir = 4
},
/obj/effect/decal/remains/human,
+/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"n" = (
@@ -78,6 +67,7 @@
/obj/item/trash/plate{
pixel_x = -10
},
+/obj/item/food/snacks/burger/ghost,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"o" = (
@@ -85,6 +75,7 @@
dir = 8
},
/obj/effect/decal/remains/human,
+/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"p" = (
@@ -94,13 +85,11 @@
/turf/template_noop,
/area/space/nearstation)
"q" = (
-/obj/machinery/light/small{
- dir = 8
- },
+/obj/structure/cult/functional/pylon,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"r" = (
-/obj/machinery/light/small,
+/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
@@ -840,7 +829,7 @@ i
i
i
i
-q
+i
f
a
a
@@ -877,12 +866,12 @@ a
a
a
f
-h
-i
-i
+i
+q
i
i
i
+q
i
f
a
@@ -924,7 +913,7 @@ i
i
m
i
-i
+r
i
g
b
@@ -1004,7 +993,7 @@ d
d
g
i
-i
+r
i
o
i
@@ -1046,12 +1035,12 @@ a
a
f
i
+q
i
i
i
+q
i
-i
-r
f
a
a
@@ -1088,7 +1077,7 @@ a
a
a
f
-j
+i
i
i
i
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm
index edb61980dc5..ce096c1198b 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm
@@ -12,6 +12,49 @@
/obj/structure/lattice,
/turf/template_noop,
/area/space/nearstation)
+"h" = (
+/obj/item/grenade/jaunter_grenade,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"l" = (
+/obj/structure/lattice,
+/mob/living/simple_animal/hostile/carp/megacarp,
+/turf/template_noop,
+/area/space/nearstation)
+"m" = (
+/obj/item/salvage/ruin/tablet,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"n" = (
+/obj/structure/lattice,
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/space/nearstation)
+"s" = (
+/mob/living/simple_animal/hostile/carp/megacarp,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"w" = (
+/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon,
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"x" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
+"F" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"O" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
+"X" = (
+/obj/item/survivalcapsule/luxury,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -109,7 +152,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -239,7 +282,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -257,7 +300,7 @@ d
b
b
b
-b
+X
b
c
a
@@ -298,8 +341,8 @@ a
d
d
d
-b
-b
+h
+F
b
c
a
@@ -328,7 +371,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -358,7 +401,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -479,7 +522,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -535,7 +578,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -609,7 +652,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -639,7 +682,7 @@ a
a
a
a
-a
+x
a
a
"}
@@ -658,7 +701,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -703,7 +746,7 @@ a
a
a
d
-d
+n
b
b
c
@@ -750,7 +793,7 @@ b
b
c
b
-b
+m
b
d
a
@@ -788,11 +831,11 @@ d
d
b
b
-b
+F
b
c
b
-b
+F
b
d
a
@@ -827,7 +870,7 @@ a
d
d
b
-d
+l
b
c
c
@@ -860,7 +903,7 @@ a
a
a
a
-a
+x
a
a
d
@@ -913,9 +956,9 @@ d
d
d
b
+F
b
-b
-b
+O
b
b
d
@@ -928,7 +971,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -947,7 +990,7 @@ a
a
b
b
-b
+O
b
b
b
@@ -955,7 +998,7 @@ d
d
d
b
-b
+m
b
b
d
@@ -988,11 +1031,11 @@ a
a
b
b
-b
+O
b
c
b
-b
+m
d
d
d
@@ -1000,7 +1043,7 @@ d
b
b
b
-d
+n
d
b
d
@@ -1076,11 +1119,11 @@ c
c
c
c
-b
+s
b
d
d
-b
+w
d
d
d
@@ -1168,14 +1211,14 @@ d
b
b
b
+O
b
-b
-b
+O
b
b
d
a
-a
+x
a
a
a
@@ -1201,14 +1244,14 @@ b
b
b
b
-b
+F
b
d
d
d
d
b
-b
+F
b
b
b
@@ -1249,9 +1292,9 @@ d
d
d
b
-b
-b
-b
+s
+F
+m
b
c
b
@@ -1265,7 +1308,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -1283,7 +1326,7 @@ a
a
a
a
-d
+n
d
d
d
@@ -1339,7 +1382,7 @@ c
b
c
b
-b
+F
b
a
a
@@ -1361,14 +1404,14 @@ a
a
a
a
+x
a
a
a
a
a
a
-a
-a
+x
a
d
d
@@ -1415,9 +1458,9 @@ a
a
d
d
+n
d
-d
-d
+n
b
b
b
@@ -1449,7 +1492,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -1517,7 +1560,7 @@ a
a
a
a
-a
+x
a
a
a
@@ -1540,6 +1583,7 @@ a
a
a
a
+x
a
a
a
@@ -1552,8 +1596,7 @@ a
a
a
a
-a
-a
+x
a
a
a
@@ -1691,5 +1734,5 @@ a
a
a
a
-a
+x
"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
index 2f1cae246aa..4481ccfa867 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
@@ -89,6 +89,14 @@
/obj/structure/girder,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
+"K" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"Z" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
(1,1,1) = {"
a
@@ -281,7 +289,7 @@ a
a
a
a
-a
+Z
a
a
a
@@ -313,7 +321,7 @@ c
a
a
a
-a
+Z
a
a
a
@@ -572,7 +580,7 @@ c
c
c
c
-c
+K
c
c
c
@@ -627,7 +635,7 @@ a
a
a
a
-a
+Z
a
a
a
@@ -897,7 +905,7 @@ a
a
a
a
-a
+Z
a
a
a
@@ -968,7 +976,7 @@ b
b
b
c
-c
+K
c
a
"}
@@ -1040,7 +1048,7 @@ h
h
f
c
-c
+K
c
c
b
@@ -1236,7 +1244,7 @@ b
b
b
a
-a
+Z
a
b
b
@@ -1338,7 +1346,7 @@ a
a
a
a
-a
+Z
a
a
a
@@ -1439,7 +1447,7 @@ a
a
a
a
-a
+Z
a
a
a
@@ -1542,7 +1550,7 @@ a
a
a
a
-a
+Z
a
a
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
index 96be2fc177c..a5e6e2a6520 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -34,6 +34,9 @@
/mob/living/simple_animal/cockroach,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
+"ez" = (
+/turf/simulated/mineral/random/high_chance/clown,
+/area/ruin/space/unpowered)
"fi" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/under/suit/charcoal,
@@ -48,6 +51,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
+"gx" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
"hG" = (
/obj/structure/kitchenspike,
/turf/simulated/floor/plasteel,
@@ -168,6 +175,10 @@
/obj/item/gun/projectile/revolver/russian,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
+"yq" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
"yY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -202,6 +213,9 @@
/obj/effect/decal/cleanable/insectguts,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
+"Dt" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/space/unpowered)
"Gx" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel,
@@ -216,6 +230,10 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
+"KW" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
"Li" = (
/obj/structure/door_assembly,
/obj/structure/barricade/wooden/crude,
@@ -394,7 +412,7 @@ TT
TT
TT
TT
-TT
+yq
TT
TT
TT
@@ -409,7 +427,7 @@ VS
VS
TT
TT
-TT
+yq
TT
"}
(3,1,1) = {"
@@ -446,8 +464,8 @@ TT
TT
TT
TT
-VS
-VS
+Dt
+Dt
VS
TT
TT
@@ -461,7 +479,7 @@ TT
TT
TT
TT
-TT
+yq
TT
TT
TT
@@ -524,7 +542,7 @@ TT
TT
TT
TT
-TT
+yq
TT
TT
TT
@@ -577,7 +595,7 @@ TT
TT
TT
TT
-VS
+Dt
TT
"}
(7,1,1) = {"
@@ -651,23 +669,23 @@ TT
TT
VS
VS
-VS
-TT
-TT
+Dt
TT
TT
TT
TT
TT
TT
+yq
TT
+yq
TT
TT
"}
(9,1,1) = {"
TT
TT
-TT
+yq
TT
TT
TT
@@ -693,7 +711,7 @@ TT
TT
VS
VS
-VS
+Dt
TT
TT
TT
@@ -715,10 +733,10 @@ TT
TT
TT
Qx
+Dt
+Dt
Qx
-Qx
-Qx
-Qx
+Dt
Qx
Qx
Qx
@@ -745,7 +763,7 @@ TT
TT
TT
TT
-TT
+yq
TT
"}
(11,1,1) = {"
@@ -776,7 +794,7 @@ TT
TT
TT
TT
-VS
+Dt
VS
VS
VS
@@ -804,10 +822,10 @@ Qx
Qx
Qx
Qx
+Dt
Qx
Qx
-Qx
-Qx
+Dt
Qx
Qx
WA
@@ -842,15 +860,15 @@ TT
Qx
Qx
Qx
+Dt
+Dt
Qx
Qx
+Dt
Qx
Qx
-Qx
-Qx
-Qx
-Qx
-Qx
+Dt
+Dt
Qx
Qx
Qx
@@ -936,8 +954,8 @@ Se
Pq
Se
Qx
-Qx
-Qx
+Dt
+Dt
Qx
Qx
WA
@@ -967,8 +985,8 @@ TT
TT
Qx
Qx
-Qx
-Qx
+Dt
+Dt
Qx
Pq
aN
@@ -978,7 +996,7 @@ vg
kb
Pq
LZ
-Qx
+Dt
Qx
Qx
Qx
@@ -1009,7 +1027,7 @@ TT
TT
TT
Qx
-Qx
+Dt
Qx
Qx
Se
@@ -1064,7 +1082,7 @@ Se
vE
KU
Se
-Qx
+Dt
Qx
Qx
WA
@@ -1106,7 +1124,7 @@ Se
zN
xs
Qx
-Qx
+Dt
Qx
Qx
Qx
@@ -1129,14 +1147,14 @@ TT
(20,1,1) = {"
TT
TT
-TT
+yq
TT
TT
TT
TT
Qx
Qx
-Qx
+Dt
Qx
Se
ph
@@ -1178,7 +1196,7 @@ TT
TT
Qx
Qx
-Qx
+Dt
Qx
Qx
ZP
@@ -1195,7 +1213,7 @@ Qx
Qx
Qx
WA
-WA
+KW
WA
WA
WA
@@ -1233,8 +1251,8 @@ vE
kO
Se
Qx
-Qx
-Qx
+Dt
+Dt
Qx
WA
WA
@@ -1247,8 +1265,8 @@ WA
WA
WA
Qx
-Qx
-Qx
+Dt
+Dt
Qx
TT
"}
@@ -1285,7 +1303,7 @@ WA
WA
WA
WA
-WA
+gx
WA
WA
Qx
@@ -1372,8 +1390,8 @@ WA
WA
Qx
Qx
-Qx
-Qx
+Dt
+Dt
Qx
Qx
Qx
@@ -1390,8 +1408,8 @@ TT
Qx
Qx
Qx
-Qx
-Qx
+Dt
+Dt
Gx
zN
zN
@@ -1415,7 +1433,7 @@ Qx
Qx
Qx
Qx
-Qx
+Dt
Qx
Qx
Qx
@@ -1433,7 +1451,7 @@ TT
Qx
Qx
Qx
-Qx
+Dt
Qx
zN
Wy
@@ -1445,8 +1463,8 @@ Se
Qx
Qx
Qx
-Qx
-Qx
+ez
+ez
Qx
Qx
Qx
@@ -1484,12 +1502,12 @@ Se
nb
zN
Qx
+Dt
Qx
Qx
-Qx
-Qx
-Qx
-Qx
+Dt
+Dt
+ez
Qx
Se
fi
@@ -1501,7 +1519,7 @@ Qx
Qx
Qx
Qx
-Qx
+Dt
Qx
"}
(29,1,1) = {"
@@ -1526,12 +1544,12 @@ Se
Se
Pq
Qx
+Dt
+ez
Qx
Qx
-Qx
-Qx
-Qx
-Qx
+Dt
+ez
Qx
Pq
zN
@@ -1543,7 +1561,7 @@ Pq
Qx
Qx
Qx
-Qx
+Dt
Qx
"}
(30,1,1) = {"
@@ -1563,17 +1581,17 @@ Qx
Qx
Qx
Qx
+Dt
+Dt
Qx
Qx
Qx
+Dt
Qx
Qx
+ez
Qx
-Qx
-Qx
-Qx
-Qx
-Qx
+ez
Qx
Se
vE
@@ -1610,12 +1628,12 @@ Qx
Qx
Qx
Qx
+Dt
+ez
Qx
Qx
-Qx
-Qx
-Qx
-Qx
+Dt
+ez
Qx
Pq
sd
@@ -1625,7 +1643,7 @@ rc
vE
Se
Qx
-Qx
+Dt
Qx
Qx
Qx
@@ -1652,12 +1670,12 @@ Qx
Qx
Qx
Qx
+Dt
Qx
Qx
-Qx
-Qx
-Qx
-Qx
+Dt
+Dt
+ez
Qx
Se
Qx
@@ -1666,8 +1684,8 @@ Pq
Se
Pq
Se
-Qx
-Qx
+Dt
+Dt
Qx
Qx
TT
@@ -1677,8 +1695,8 @@ TT
TT
VS
VS
-VS
-VS
+Dt
+Dt
TT
TT
TT
@@ -1697,8 +1715,8 @@ Qx
Qx
Qx
Qx
-Qx
-Qx
+ez
+ez
Qx
Qx
Qx
@@ -1718,8 +1736,8 @@ TT
TT
TT
TT
-VS
-VS
+Dt
+Dt
VS
TT
TT
@@ -1733,6 +1751,7 @@ Qx
Qx
Qx
Qx
+Dt
Qx
Qx
Qx
@@ -1746,9 +1765,8 @@ Qx
Qx
Qx
Qx
-Qx
-Qx
-Qx
+Dt
+Dt
Qx
Qx
Qx
@@ -1778,16 +1796,16 @@ Qx
Qx
Qx
Qx
+Dt
Qx
Qx
Qx
+Dt
Qx
Qx
Qx
-Qx
-Qx
-Qx
-Qx
+Dt
+Dt
Qx
Qx
Qx
@@ -1827,7 +1845,7 @@ Qx
Qx
Qx
Qx
-Qx
+Dt
Qx
Qx
Qx
@@ -1895,7 +1913,7 @@ TT
TT
TT
TT
-TT
+yq
TT
TT
TT
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
index 8858774e866..717a32bcac8 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
@@ -512,6 +512,7 @@
/area/ruin/space/djstation)
"bp" = (
/obj/structure/chair/office/light,
+/mob/living/simple_animal/hostile/russian/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/djstation)
"bq" = (
@@ -794,6 +795,15 @@
},
/turf/template_noop,
/area/ruin/space/djstation)
+"yr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/salvage/ruin/russian,
+/turf/simulated/floor/plating,
+/area/ruin/space/djstation)
+"Zp" = (
+/obj/item/salvage/ruin/russian,
+/turf/simulated/floor/plating,
+/area/ruin/space/djstation)
(1,1,1) = {"
aa
@@ -1106,8 +1116,8 @@ ae
aa
aa
am
-at
-av
+yr
+Zp
aF
av
aM
@@ -1226,7 +1236,7 @@ ae
ad
aa
am
-av
+Zp
aB
at
aJ
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
index 6e07362ccb4..afceaf98c25 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
@@ -108,6 +108,7 @@
/area/ruin/space/methlab)
"v" = (
/obj/structure/chair,
+/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plating,
/area/ruin/space/methlab)
"w" = (
@@ -123,6 +124,9 @@
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plating,
/area/ruin/space/methlab)
+"K" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/space/methlab)
(1,1,1) = {"
a
@@ -162,9 +166,9 @@ a
a
b
b
-b
-b
-b
+K
+K
+K
b
b
b
@@ -229,8 +233,8 @@ e
j
p
t
-b
-b
+K
+K
b
b
b
@@ -240,12 +244,12 @@ a
a
b
b
-b
+K
f
m
b
-b
-b
+K
+K
b
b
a
@@ -255,8 +259,8 @@ a
(9,1,1) = {"
b
b
-b
-b
+K
+K
f
n
j
@@ -272,7 +276,7 @@ a
b
b
b
-b
+K
g
i
j
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm b/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm
index 8d3bac1752a..4decd99b3e0 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm
@@ -29,12 +29,21 @@
/area/ruin/space/unpowered)
"i" = (
/obj/machinery/door/airlock,
+/obj/structure/barricade/wooden/crude,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"j" = (
/obj/item/stack/cable_coil,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
+"p" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plating,
+/area/ruin/space/unpowered)
+"T" = (
+/obj/item/salvage/ruin/tablet,
+/turf/simulated/floor/plating,
+/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -161,7 +170,7 @@ a
c
c
e
-d
+T
d
g
e
@@ -182,7 +191,7 @@ d
d
d
d
-d
+p
d
d
c
@@ -230,9 +239,9 @@ c
c
d
e
+p
d
-d
-d
+T
g
d
e
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
index 89383c9e77c..808ea5fc36b 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -131,6 +131,11 @@
/obj/item/blank_tarot_card,
/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/space/powered)
+"R" = (
+/obj/structure/table/wood,
+/obj/item/salvage/ruin/tablet,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/ruin/space/powered)
(1,1,1) = {"
a
@@ -194,7 +199,7 @@ h
z
b
h
-n
+R
b
"}
(6,1,1) = {"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
index ce511619893..565716ca4b3 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -18,6 +18,9 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/ruin/space/syndicate_listening_station)
+"cB" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/space/syndicate_listening_station/asteroid)
"du" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -448,6 +451,10 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/syndicate_listening_station/asteroid)
+"Ie" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/syndicate_listening_station/asteroid)
"Km" = (
/obj/machinery/light/small{
dir = 1
@@ -832,10 +839,10 @@ Zw
Zw
Zw
yn
-yn
+cB
Zw
Zw
-yn
+cB
yn
yn
yn
@@ -846,8 +853,8 @@ Zw
Zw
yn
yn
-yn
-yn
+cB
+cB
yn
Zw
Zw
@@ -876,8 +883,8 @@ Zw
yn
yn
Zw
-yn
-yn
+cB
+cB
yn
Zw
yn
@@ -888,9 +895,9 @@ Zw
Zw
yn
yn
-yn
-yn
-yn
+cB
+cB
+cB
Zw
Zw
Zw
@@ -945,7 +952,7 @@ HZ
yn
yn
yn
-yn
+cB
yn
AT
AT
@@ -985,15 +992,15 @@ tk
HZ
yn
yn
-yn
+cB
yn
yn
yn
AT
AT
yn
-yn
-yn
+cB
+cB
yn
yn
yn
@@ -1026,9 +1033,9 @@ yn
yn
yn
yn
+cB
yn
-yn
-yn
+cB
yn
yn
yn
@@ -1066,6 +1073,8 @@ kJ
kE
kJ
yn
+cB
+cB
yn
yn
yn
@@ -1078,9 +1087,7 @@ yn
yn
yn
yn
-yn
-yn
-yn
+cB
yn
yn
yn
@@ -1118,14 +1125,14 @@ yn
yn
yn
yn
+cB
+yn
+cB
yn
yn
yn
-yn
-yn
-yn
-yn
-yn
+cB
+cB
Zw
Zw
Zw
@@ -1164,10 +1171,10 @@ yn
yn
yn
yn
-yn
-yn
-yn
-yn
+cB
+cB
+cB
+cB
Zw
Zw
Zw
@@ -1208,7 +1215,7 @@ yn
yn
yn
yn
-yn
+cB
yn
yn
Zw
@@ -1247,7 +1254,7 @@ kJ
kJ
yn
yn
-yn
+cB
yn
yn
yn
@@ -1377,7 +1384,7 @@ yn
yn
yn
AT
-AT
+Ie
AT
Zw
Zw
@@ -1543,7 +1550,7 @@ yn
yn
yn
AT
-AT
+Ie
AT
Zw
Zw
@@ -1660,9 +1667,9 @@ kJ
yn
yn
rK
-yn
-yn
-yn
+cB
+cB
+cB
yn
yn
yn
@@ -1703,9 +1710,9 @@ yn
yn
rK
yn
-yn
-yn
-yn
+cB
+cB
+cB
yn
yn
yn
@@ -1746,8 +1753,8 @@ yn
iL
yn
yn
-yn
-yn
+cB
+cB
yn
yn
AT
@@ -1788,7 +1795,7 @@ yn
Zw
yn
yn
-yn
+cB
Zw
yn
AT
@@ -1980,8 +1987,8 @@ Zw
Zw
yn
yn
-yn
-yn
+cB
+cB
Zw
Zw
yn
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
index 067579f3be8..c69993f78e3 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -1480,6 +1480,7 @@
icon_state = "2-4";
tag = ""
},
+/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -2398,6 +2399,48 @@
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Aft)
+"hE" = (
+/obj/effect/landmark/damageturf,
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/BMPship/Midship)
+"qM" = (
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "meatConvey2"
+ },
+/obj/item/salvage/ruin/pirate,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/BMPship/Midship)
+"uK" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/ruin/unpowered/BMPship/Midship)
+"uT" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/powered)
+"BC" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/ruin/unpowered/BMPship/Midship)
+"Ht" = (
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "meatConvey1"
+ },
+/obj/item/salvage/ruin/pirate,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/BMPship/Midship)
"IM" = (
/obj/structure/closet/crate/freezer,
/obj/item/food/snacks/meat,
@@ -2761,7 +2804,7 @@ aJ
aJ
aK
aK
-aK
+uT
aK
aK
aK
@@ -2813,9 +2856,9 @@ aJ
aK
aK
aK
-aK
-aK
-aK
+uT
+uT
+uT
aK
aK
aa
@@ -2867,7 +2910,7 @@ aK
aK
aK
aK
-aK
+uT
aK
aK
aa
@@ -3114,8 +3157,8 @@ aD
aK
aK
aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3165,8 +3208,8 @@ aD
aK
aK
aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3215,9 +3258,9 @@ fA
aD
aK
aK
-aK
-aK
-aK
+uT
+uT
+uT
aK
aK
aK
@@ -3266,8 +3309,8 @@ gs
aK
aK
aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3318,11 +3361,11 @@ gs
aK
aK
aK
+uT
+uT
aK
aK
-aK
-aK
-aK
+uT
aK
aK
aK
@@ -3368,12 +3411,12 @@ gs
bc
aK
aK
+uT
+uT
aK
aK
-aK
-aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3420,10 +3463,10 @@ aK
aK
aK
aK
+uT
aK
-aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3469,12 +3512,12 @@ gs
gs
aK
aK
-aK
-aK
-aK
-aK
-aK
-aK
+uT
+uT
+uT
+uT
+uT
+uT
aK
aK
aK
@@ -3522,9 +3565,9 @@ aK
aK
aK
aK
-aK
-aK
-aK
+uT
+uT
+uT
aK
aK
aK
@@ -3564,7 +3607,7 @@ eo
fn
dC
ca
-gb
+hE
bF
aK
aK
@@ -3573,13 +3616,13 @@ aK
aK
bc
aK
+uT
aK
aK
aK
aK
-aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3629,9 +3672,9 @@ aK
aK
aK
aK
-aK
-aK
-aK
+uT
+uT
+uT
aK
aK
aK
@@ -3682,8 +3725,8 @@ aK
aK
aK
aK
-aK
-aK
+uT
+uT
aK
aK
aK
@@ -3734,7 +3777,7 @@ aK
aK
aK
aK
-aK
+uT
aK
aK
aK
@@ -3862,7 +3905,7 @@ cr
cJ
ca
ca
-ca
+uK
ca
dg
ca
@@ -3915,7 +3958,7 @@ ca
ca
dT
ca
-dg
+BC
ca
ca
dT
@@ -4117,7 +4160,7 @@ ca
ca
ca
dC
-dU
+Ht
dC
dg
ca
@@ -4195,7 +4238,7 @@ aJ
aJ
aK
aK
-aK
+uT
aK
aa
"}
@@ -4224,7 +4267,7 @@ dC
dg
ca
dC
-fr
+qM
dC
ca
ca
@@ -4245,8 +4288,8 @@ aa
aa
aa
aK
-aK
-aK
+uT
+uT
aK
aa
"}
@@ -4297,7 +4340,7 @@ aa
aa
aa
aK
-aK
+uT
aa
aa
"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
index b38b995bef2..d90c6ba615b 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -340,6 +340,7 @@
/obj/effect/decal/cleanable/shreds{
pixel_y = -10
},
+/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plating/airless,
/area/ruin/space/mech_transport)
"xE" = (
@@ -383,6 +384,10 @@
/obj/effect/decal/remains/human,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/mech_transport)
+"zM" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/mineral/plastitanium/red/airless,
+/area/ruin/space/mech_transport)
"zP" = (
/obj/machinery/computer/nonfunctional{
dir = 8
@@ -524,6 +529,10 @@
pixel_x = -6
},
/obj/item/pen/multi/syndicate,
+/obj/item/salvage/ruin/nanotrasen{
+ pixel_y = 3;
+ pixel_x = 2
+ },
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/mech_transport)
"MA" = (
@@ -556,6 +565,7 @@
pixel_y = -32;
name = "secure supplies blast door control"
},
+/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/mech_transport)
"Nq" = (
@@ -713,6 +723,10 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/mech_transport)
+"Yq" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel/dark,
+/area/ruin/space/mech_transport)
"Zn" = (
/obj/machinery/light_switch{
dir = 4;
@@ -1269,7 +1283,7 @@ MI
vo
rK
bU
-bU
+Yq
bU
Af
vo
@@ -1333,7 +1347,7 @@ vo
vo
zX
bU
-bU
+Yq
bU
HK
vo
@@ -1484,7 +1498,7 @@ oo
vo
pJ
VS
-VS
+zM
VS
aW
aq
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
index 349e4181c28..6258e9c2b2b 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -4441,6 +4441,7 @@
},
/obj/effect/decal/cleanable/cobweb2,
/obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -4574,6 +4575,15 @@
dir = 8
},
/area/ruin/space/moonbase19)
+"oI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
+/turf/simulated/floor/plating,
+/area/ruin/space/moonbase19)
"oJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/tracks{
@@ -12664,6 +12674,7 @@
/obj/item/taperecorder{
pixel_x = -3
},
+/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -16449,7 +16460,7 @@ Gg
Gg
tv
lm
-Ic
+oI
cm
bP
NU
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index 6ba4f2256a0..4619d299098 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -2421,20 +2421,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/thetacorridor)
-"ge" = (
-/obj/structure/table,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
-/obj/machinery/power/apc/off_station/empty_charge/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "red"
- },
-/area/ruin/ancientstation/sec)
"gf" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -2497,6 +2483,7 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser,
/obj/item/stack/cable_coil,
+/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/rnd)
"gn" = (
@@ -3877,9 +3864,11 @@
/turf/simulated/floor/plating,
/area/ruin/ancientstation)
"jt" = (
-/obj/effect/spawner/random_spawners/wall_rusted_always,
-/turf/simulated/wall/r_wall,
-/area/ruin/ancientstation/proto)
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/salvage/ruin/nanotrasen,
+/turf/simulated/floor/plasteel,
+/area/ruin/ancientstation/comm)
"ju" = (
/obj/structure/cable{
d1 = 1;
@@ -4141,6 +4130,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel/white,
/area/ruin/ancientstation/proto)
"jZ" = (
@@ -4382,8 +4372,8 @@
/turf/simulated/floor/engine,
/area/ruin/ancientstation/atmo)
"kE" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/indestructible/riveted,
/area/ruin/ancientstation/proto)
"kF" = (
/obj/structure/transit_tube_pod{
@@ -4960,6 +4950,21 @@
/obj/machinery/power/tesla_coil,
/turf/simulated/floor/plating,
/area/ruin/ancientstation/thetacorridor)
+"Hr" = (
+/obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2";
+ pixel_y = 1
+ },
+/obj/machinery/power/apc/off_station/empty_charge/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
+/area/ruin/ancientstation/sec)
"Lu" = (
/obj/structure/transit_tube/horizontal{
dir = 4
@@ -6583,7 +6588,7 @@ aa
am
aM
aO
-aF
+jt
at
aS
dt
@@ -7169,7 +7174,7 @@ bC
bC
cG
dg
-ge
+Hr
eu
fX
eu
@@ -7952,13 +7957,13 @@ dj
dj
iS
jj
-jt
-jt
-jt
-jt
-jt
-jt
-jt
+kE
+kE
+kE
+kE
+kE
+kE
+kE
aa
aa
aa
@@ -8000,13 +8005,13 @@ ig
dj
ld
lg
-jt
+kE
jB
jS
-jt
+kE
kq
ky
-jt
+kE
aa
aa
aa
@@ -8048,13 +8053,13 @@ ig
dj
iU
jk
-jt
+kE
jC
jT
-jt
+kE
jT
jC
-jt
+kE
aa
aa
aa
@@ -8096,13 +8101,13 @@ ih
dj
iV
ji
-jt
+kE
jD
jU
ki
jU
jU
-jt
+kE
aa
aa
aa
@@ -8144,13 +8149,13 @@ gf
dj
ld
lg
-jt
+kE
cV
jV
jV
jV
kz
-jt
+kE
aa
aa
aa
@@ -8288,13 +8293,13 @@ dj
dj
iT
fq
-jt
+kE
cW
jV
jV
jV
kz
-jt
+kE
aa
aa
aa
@@ -8336,13 +8341,13 @@ ij
dj
lf
lh
-jt
+kE
jI
jW
kj
jW
jW
-jt
+kE
aa
aa
aa
@@ -8384,13 +8389,13 @@ ik
dj
iT
fq
-jt
+kE
jC
jX
-jt
+kE
jX
jC
-jt
+kE
aa
aa
aa
@@ -8432,13 +8437,13 @@ il
dj
ld
kS
-jt
+kE
jJ
jY
-jt
+kE
kt
kB
-jt
+kE
aa
aa
aa
@@ -8480,13 +8485,13 @@ dj
dj
iS
jn
-jt
-jt
-jt
-jt
-jt
-jt
-jt
+kE
+kE
+kE
+kE
+kE
+kE
+kE
aa
aa
aa
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
index da0e0f1d570..1f08f9eea57 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -1224,6 +1224,10 @@
},
/turf/template_noop,
/area/space/nearstation)
+"gL" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
"jQ" = (
/obj/structure/cable{
d2 = 8;
@@ -1239,6 +1243,11 @@
icon_state = "white"
},
/area/ruin/space/onehalf/dorms_med)
+"kV" = (
+/obj/item/stack/rods,
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/space/nearstation)
"xr" = (
/obj/structure/cable{
d2 = 8;
@@ -1436,7 +1445,7 @@ bw
bK
ak
aa
-cv
+kV
aa
aa
aa
@@ -1483,7 +1492,7 @@ aa
cx
aw
aa
-aa
+gL
cv
dg
aa
@@ -1502,7 +1511,7 @@ bw
bO
aj
aa
-aa
+gL
cE
cv
cR
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
index 68bca8457f6..88ca979c764 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -228,9 +228,9 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/space/nearstation)
"aZ" = (
-/obj/item/radio/beacon,
-/turf/simulated/floor/plasteel,
-/area/ruin/space/powered/bar)
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/space)
"ba" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 1
@@ -492,6 +492,12 @@
icon_state = "dark"
},
/area/ruin/space/powered/bar)
+"rC" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/ruin/space/powered/bar)
"rN" = (
/obj/machinery/atmospherics/portable/canister/air{
filled = 1
@@ -502,6 +508,7 @@
/obj/structure/chair/stool{
dir = 4
},
+/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered/bar)
"sq" = (
@@ -563,6 +570,10 @@
},
/turf/simulated/floor/plating/asteroid/ancient,
/area/ruin/space/powered)
+"wo" = (
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/simulated/floor/wood,
+/area/ruin/space/powered/bar)
"wy" = (
/obj/effect/landmark/damageturf,
/obj/structure/holosign/barrier/engineering,
@@ -581,6 +592,12 @@
icon_state = "dark"
},
/area/ruin/space/powered/bar)
+"xZ" = (
+/obj/item/radio/beacon,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/ruin/space/powered/bar)
"yC" = (
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
@@ -644,6 +661,7 @@
/obj/structure/chair/stool{
dir = 8
},
+/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered/bar)
"Cx" = (
@@ -890,6 +908,10 @@
/obj/structure/falsewall,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/powered/bar)
+"Rc" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/space/nearstation)
"RL" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -1323,7 +1345,7 @@ ad
ad
ad
ad
-ad
+aZ
ad
ad
ad
@@ -1480,7 +1502,7 @@ br
br
br
br
-ad
+aZ
ad
ad
ad
@@ -1530,7 +1552,7 @@ au
bo
br
br
-br
+Rc
br
ad
ad
@@ -1584,7 +1606,7 @@ br
br
br
br
-ad
+aZ
ad
ad
ad
@@ -1739,7 +1761,7 @@ ad
ad
ad
ad
-ad
+aZ
ad
ad
ad
@@ -2184,11 +2206,11 @@ am
aE
as
as
-as
+wo
aK
ap
aO
-aZ
+aO
aV
aO
yC
@@ -2351,7 +2373,7 @@ LU
lO
bg
bk
-bk
+rC
bk
bk
bk
@@ -2506,7 +2528,7 @@ Is
bf
am
bk
-bk
+xZ
qZ
bk
Ad
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
index 643d69228c3..8d633526eb9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
@@ -138,6 +138,10 @@
"sb" = (
/turf/template_noop,
/area/ruin/space/syndicate_druglab/asteroid)
+"st" = (
+/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot,
+/turf/simulated/floor/pod/dark,
+/area/ruin/space/syndicate_druglab)
"sD" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/queen_bee/bought,
@@ -686,8 +690,8 @@ sb
vZ
xF
vZ
-vZ
-vZ
+yI
+yI
vZ
vZ
vZ
@@ -720,9 +724,9 @@ sb
vZ
vZ
vZ
-vZ
-vZ
-vZ
+yI
+yI
+yI
vZ
vZ
xF
@@ -769,10 +773,10 @@ vZ
vZ
vZ
vZ
-vZ
-vZ
-vZ
-vZ
+yI
+yI
+yI
+yI
vZ
yI
vZ
@@ -803,12 +807,12 @@ Nr
Nr
Nr
vZ
-vZ
-vZ
-vZ
+yI
+yI
+yI
xF
-vZ
-vZ
+yI
+yI
yI
yI
sb
@@ -838,12 +842,12 @@ nP
dL
Nr
vZ
-vZ
-vZ
+yI
+yI
xF
xF
ue
-vZ
+yI
vZ
vZ
sb
@@ -873,7 +877,7 @@ tL
os
Nr
Nr
-vZ
+yI
xF
ue
xF
@@ -908,7 +912,7 @@ os
os
en
Nr
-vZ
+yI
xF
DG
qf
@@ -943,8 +947,8 @@ os
os
Ue
Nr
-vZ
-vZ
+yI
+yI
Gm
ue
xF
@@ -979,7 +983,7 @@ tL
Nr
Nr
vZ
-vZ
+yI
Wd
vZ
vZ
@@ -1087,7 +1091,7 @@ ym
te
vz
Nr
-vZ
+yI
xF
xF
xF
@@ -1109,7 +1113,7 @@ vZ
vZ
Nr
BD
-os
+st
os
gU
SG
@@ -1122,7 +1126,7 @@ gI
gI
Oy
Nr
-vZ
+yI
xF
QL
xF
@@ -1157,7 +1161,7 @@ gI
gI
Oy
Nr
-vZ
+yI
xF
xF
xF
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index 2e5a3f2bdb5..bed7091a823 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -7237,6 +7237,9 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/main)
+"OT" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/unpowered/syndicate_space_base/inner)
"OY" = (
/obj/machinery/light{
dir = 1
@@ -13200,7 +13203,7 @@ nv
Kh
Jo
Vl
-kE
+OT
kE
kE
kE
@@ -13272,8 +13275,8 @@ nv
Vl
Vl
Vl
-kE
-kE
+OT
+OT
kE
Ri
Ri
@@ -13343,8 +13346,8 @@ nv
nv
qT
Vl
-kE
-kE
+OT
+OT
Ri
kE
kE
@@ -13396,7 +13399,7 @@ LE
AD
Mf
kE
-kE
+OT
kE
Vl
Vl
@@ -13416,7 +13419,7 @@ nv
Vl
Vl
kE
-kE
+OT
kE
kE
kE
@@ -13468,7 +13471,7 @@ AD
kE
AD
kE
-kE
+OT
kE
kE
Vl
@@ -13489,7 +13492,7 @@ Vl
kE
kE
kE
-kE
+OT
kE
Ri
Ri
@@ -13612,7 +13615,7 @@ kE
AD
kE
kE
-kE
+OT
kE
kE
kE
@@ -13632,7 +13635,7 @@ Vl
kE
kE
kE
-kE
+OT
kE
Ri
Ri
@@ -13684,7 +13687,7 @@ kE
AD
Vs
kE
-kE
+OT
kE
kE
kE
@@ -13702,9 +13705,9 @@ Vl
Vl
kE
kE
+OT
kE
-kE
-kE
+OT
Ri
Ri
Ri
@@ -13756,11 +13759,11 @@ kE
kE
kE
kE
+OT
+OT
kE
-kE
-kE
-kE
-kE
+OT
+OT
kE
kE
Vl
@@ -13771,13 +13774,13 @@ Vl
Vl
Vl
kE
+OT
+kE
+OT
kE
kE
-kE
-kE
-kE
-kE
-kE
+OT
+OT
Ri
Ri
AV
@@ -13827,13 +13830,13 @@ kE
kE
kE
kE
+OT
+OT
+OT
+OT
kE
-kE
-kE
-kE
-kE
-kE
-kE
+OT
+OT
kE
kE
kE
@@ -13842,14 +13845,14 @@ Vl
Vl
kE
kE
+OT
+OT
kE
kE
kE
-kE
-kE
-kE
-kE
-kE
+OT
+OT
+OT
Ri
Ri
Ri
@@ -13899,6 +13902,8 @@ Ri
Ri
kE
Ri
+OT
+OT
kE
kE
kE
@@ -13910,15 +13915,13 @@ kE
kE
kE
kE
+OT
+OT
kE
kE
kE
kE
-kE
-kE
-kE
-kE
-kE
+OT
Ri
Ri
Ri
@@ -13979,9 +13982,9 @@ kE
kE
Ri
kE
-kE
-kE
-kE
+OT
+OT
+OT
kE
kE
kE
@@ -13990,7 +13993,7 @@ kE
kE
Ri
kE
-kE
+OT
Ri
Ri
Ri
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
index c8c725c60a6..20f47726645 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -640,7 +640,7 @@
/area/ruin/space/unpowered)
"xW" = (
/obj/structure/rack,
-/obj/item/clothing/under/syndicate,
+/obj/item/clothing/under/syndicate/silicon_cham,
/turf/simulated/floor/engine,
/area/ruin/space/unpowered)
"yU" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
index 5164e88c329..71c4bb2a8c7 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
@@ -1168,6 +1168,9 @@
},
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/syndicate_depot/core)
+"Te" = (
+/turf/simulated/mineral/random/high_chance,
+/area/syndicate_depot/outer)
(1,1,1) = {"
aa
@@ -1500,8 +1503,8 @@ ad
ad
ad
ad
-ad
-ad
+Te
+Te
ad
ad
ad
@@ -1542,7 +1545,7 @@ ac
ac
ad
ad
-ad
+Te
ad
af
af
@@ -1552,9 +1555,9 @@ ad
ad
ad
af
-ad
-ad
-ad
+Te
+Te
+Te
ad
ad
ad
@@ -1592,7 +1595,7 @@ ac
ac
ad
ad
-ad
+Te
af
am
aU
@@ -1643,7 +1646,7 @@ ac
ad
ad
ad
-ad
+Te
af
af
aV
@@ -1972,8 +1975,8 @@ cM
am
dc
af
-ad
-ad
+Te
+Te
ad
ac
ac
@@ -2023,8 +2026,8 @@ af
af
af
af
-ad
-ad
+Te
+Te
ad
ad
ac
@@ -2075,7 +2078,7 @@ af
af
af
af
-ad
+Te
ad
ad
ad
@@ -2126,7 +2129,7 @@ af
af
ap
af
-ad
+Te
ad
ad
ac
@@ -2303,7 +2306,7 @@ ad
ad
ad
ad
-ad
+Te
ad
ad
ad
@@ -2355,8 +2358,8 @@ ad
ad
am
af
-ad
-ad
+Te
+Te
ad
at
aQ
@@ -2401,12 +2404,12 @@ ac
ac
ac
ad
-ad
-ad
+Te
+Te
ad
an
af
-ad
+Te
ad
ad
at
@@ -2453,7 +2456,7 @@ ac
ad
ad
ac
-ad
+Te
ad
af
ap
@@ -2498,13 +2501,13 @@ aa
(27,1,1) = {"
ab
ac
-ad
+Te
ac
ac
ac
ac
ac
-ad
+Te
ad
af
af
@@ -2537,7 +2540,7 @@ af
af
af
ad
-ad
+Te
ad
ac
ac
@@ -2587,8 +2590,8 @@ at
af
ap
af
-ad
-ad
+Te
+Te
ad
ac
ac
@@ -2755,7 +2758,7 @@ aa
ac
ac
ac
-ad
+Te
ac
ac
ac
@@ -2842,7 +2845,7 @@ aD
at
af
af
-ad
+Te
ad
ad
ad
@@ -2893,7 +2896,7 @@ bv
at
af
af
-ad
+Te
ad
ac
ad
@@ -2944,7 +2947,7 @@ at
at
cM
af
-ad
+Te
ad
ac
ac
@@ -3221,7 +3224,7 @@ ad
ad
ad
ad
-ad
+Te
ad
ad
ad
@@ -3241,9 +3244,9 @@ ad
ad
ad
ad
-ad
-ad
-ad
+Te
+Te
+Te
ad
ad
ad
@@ -3269,10 +3272,10 @@ ac
ad
ad
ad
+Te
ad
ad
-ad
-ad
+Te
ad
ad
ad
@@ -3291,8 +3294,8 @@ ad
ad
bf
bf
-ad
-ad
+Te
+Te
ad
ad
ad
@@ -3320,10 +3323,10 @@ ad
ad
ad
ad
+Te
+Te
ad
-ad
-ad
-ad
+Te
ad
ad
ad
@@ -3371,13 +3374,13 @@ ac
ad
ad
ad
+Te
+Te
+Te
+Te
ad
ad
-ad
-ad
-ad
-ad
-ad
+Te
ad
ad
ad
@@ -3421,17 +3424,17 @@ ac
ad
ad
ad
+Te
+Te
+Te
+Te
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+Te
+Te
+Te
+Te
+Te
ad
bf
bm
@@ -3472,16 +3475,16 @@ ad
ad
ad
ad
+Te
+Te
+Te
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+Te
+Te
+Te
+Te
ad
ad
bf
@@ -3524,13 +3527,13 @@ ad
ad
ad
ad
+Te
ad
ad
ad
-ad
-ad
-ad
-ad
+Te
+Te
+Te
ad
ad
ad
@@ -3580,7 +3583,7 @@ ad
ad
ad
ad
-ad
+Te
ad
ad
ad
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
index fb0523287cb..7ae763de091 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -57,10 +57,11 @@
/obj/structure/chair{
dir = 8
},
+/mob/living/simple_animal/hostile/syndicate/melee/autogib,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"o" = (
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret/syndicate/exterior,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"p" = (
@@ -131,6 +132,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
+/obj/item/salvage/loot/syndicate,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"B" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index ff85ca336a4..5e2914e76a8 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -279,6 +279,7 @@
/obj/structure/chair/comfy/red{
dir = 1
},
+/mob/living/simple_animal/hostile/russian/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/bridge)
"aN" = (
@@ -736,9 +737,8 @@
},
/area/ruin/space/derelict/arrival)
"bU" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
+/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -894,8 +894,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"cp" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -2337,6 +2336,7 @@
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
name = "Human remains"
},
+/mob/living/simple_animal/hostile/russian/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fF" = (
@@ -3111,6 +3111,7 @@
/area/ruin/space/derelict/hallway/primary)
"hC" = (
/obj/structure/chair/stool,
+/mob/living/simple_animal/hostile/russian,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/hallway/primary)
"hD" = (
@@ -4192,7 +4193,7 @@
/turf/simulated/floor/engine/vacuum,
/area/ruin/space/derelict/hallway/primary)
"ko" = (
-/obj/item/stack/ore/iron,
+/obj/item/stack/ore/uranium,
/turf/simulated/floor/plating/airless,
/area/ruin/space/derelict/hallway/primary)
"kp" = (
@@ -4382,6 +4383,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/russian,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"kF" = (
@@ -7549,6 +7551,20 @@
},
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/ruin/space/derelict/arrival)
+"vm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/flag/ussp,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "red"
+ },
+/area/ruin/space/derelict/arrival)
+"Ci" = (
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/simulated/floor/plasteel/airless{
+ icon_state = "white"
+ },
+/area/ruin/space/derelict/arrival)
"Ef" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/barsign{
@@ -7575,9 +7591,22 @@
},
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/ruin/space/derelict/crew_quarters)
+"PR" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel/airless{
+ icon_state = "white"
+ },
+/area/ruin/space/derelict/arrival)
"QN" = (
/turf/simulated/wall/mineral/titanium/nodecon/nosmooth,
/area/ruin/space/derelict/arrival)
+"Sv" = (
+/obj/item/flag/ussp,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
+/area/ruin/space/derelict/arrival)
"Ud" = (
/obj/effect/spawner/airlock{
req_access_txt = 0
@@ -7595,6 +7624,24 @@
icon_state = "wood-broken"
},
/area/ruin/space/derelict/crew_quarters)
+"XQ" = (
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/mob/living/simple_animal/hostile/russian,
+/turf/simulated/floor/plasteel/dark,
+/area/ruin/space/derelict/crew_quarters)
+"Yi" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/simulated/floor/plasteel/airless{
+ icon_state = "white"
+ },
+/area/ruin/space/derelict/arrival)
(1,1,1) = {"
ac
@@ -8664,7 +8711,7 @@ mS
nk
mU
nG
-mS
+PR
mS
oF
oS
@@ -8754,7 +8801,7 @@ iy
mJ
mT
mT
-mT
+Yi
nH
mS
nG
@@ -9685,7 +9732,7 @@ ac
aW
aW
pI
-mS
+Ci
mS
nl
oF
@@ -9780,7 +9827,7 @@ pJ
pS
qa
mS
-mS
+Ci
qC
mU
qY
@@ -10978,7 +11025,7 @@ ac
ac
aW
sv
-qt
+Sv
ka
rq
rq
@@ -11316,7 +11363,7 @@ eg
ac
ac
ac
-ih
+hq
ii
ii
ii
@@ -11346,7 +11393,7 @@ ac
ac
aW
bn
-qv
+vm
hY
ru
ru
@@ -13528,9 +13575,9 @@ Ef
in
iK
je
-je
+XQ
kC
-je
+XQ
je
lX
ms
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
index 12d6318b4d5..dd40e6e0cda 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
@@ -170,6 +170,23 @@
icon_state = "floorgrime"
},
/area/ruin/space/derelict/teleporter)
+"I" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
+"M" = (
+/mob/living/simple_animal/hostile/carp/megacarp,
+/turf/template_noop,
+/area/template_noop)
+"R" = (
+/obj/item/salvage/ruin/russian,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/derelict/teleporter)
+"U" = (
+/obj/structure/lattice,
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/space/nearstation)
(1,1,1) = {"
a
@@ -242,7 +259,7 @@ g
a
"}
(6,1,1) = {"
-a
+I
a
a
a
@@ -266,17 +283,17 @@ l
m
m
y
-f
+R
g
"}
(8,1,1) = {"
a
-a
+M
a
b
f
h
-f
+R
m
r
f
@@ -369,7 +386,7 @@ a
"}
(15,1,1) = {"
a
-a
+I
a
b
b
@@ -426,7 +443,7 @@ a
(19,1,1) = {"
a
b
-b
+U
b
b
b
@@ -449,7 +466,7 @@ a
a
a
a
-a
+I
"}
(21,1,1) = {"
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm b/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm
index 28328faafbf..98520005345 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm
@@ -16,6 +16,10 @@
},
/turf/template_noop,
/area/template_noop)
+"k" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
"q" = (
/obj/structure/safe/floor,
/obj/item/golden_record,
@@ -42,7 +46,7 @@ c
S
S
S
-S
+k
"}
(2,1,1) = {"
S
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm b/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
index 1d5d0a0d041..96555361ed9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
@@ -14,6 +14,32 @@
},
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered/no_grav/way_home)
+"g" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered/no_grav/way_home)
+"n" = (
+/turf/simulated/mineral/random/high_chance/clown,
+/area/ruin/space/unpowered/no_grav/way_home)
+"s" = (
+/mob/living/simple_animal/hostile/carp/megacarp,
+/turf/template_noop,
+/area/template_noop)
+"z" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered/no_grav/way_home)
+"O" = (
+/obj/item/salvage/ruin/tablet,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered/no_grav/way_home)
+"P" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
+"R" = (
+/turf/simulated/mineral/random/high_chance,
+/area/ruin/space/unpowered/no_grav/way_home)
(1,1,1) = {"
a
@@ -75,7 +101,7 @@ a
a
a
a
-a
+P
a
a
"}
@@ -104,8 +130,8 @@ a
a
a
a
-b
-b
+R
+R
a
a
a
@@ -136,9 +162,9 @@ a
a
a
a
-b
-b
-b
+R
+R
+R
a
a
a
@@ -169,10 +195,10 @@ a
a
a
a
-b
-a
+R
a
a
+P
a
"}
(6,1,1) = {"
@@ -234,7 +260,7 @@ a
a
a
a
-a
+P
a
a
a
@@ -252,7 +278,7 @@ a
a
b
b
-b
+R
b
b
b
@@ -282,10 +308,10 @@ a
a
a
b
-b
-b
-b
-b
+R
+R
+R
+R
b
b
a
@@ -315,13 +341,13 @@ b
b
b
b
-b
-b
+R
+R
b
b
a
a
-a
+P
a
a
a
@@ -348,7 +374,7 @@ b
b
b
b
-b
+R
b
c
a
@@ -356,7 +382,7 @@ a
a
a
a
-a
+s
a
a
a
@@ -376,8 +402,8 @@ b
b
b
b
-b
-b
+R
+R
b
b
b
@@ -407,8 +433,8 @@ a
b
b
b
-b
-b
+R
+R
b
b
b
@@ -423,7 +449,7 @@ a
a
a
a
-a
+P
a
a
a
@@ -438,15 +464,15 @@ a
b
b
b
-b
-b
+R
+R
b
b
b
b
b
c
-c
+g
c
c
c
@@ -469,10 +495,10 @@ a
b
b
b
+R
+R
b
-b
-b
-b
+R
b
b
c
@@ -507,7 +533,7 @@ b
b
b
c
-c
+O
c
a
a
@@ -546,7 +572,7 @@ a
a
c
c
-c
+O
c
c
c
@@ -583,7 +609,7 @@ c
b
b
b
-b
+n
b
b
a
@@ -612,11 +638,11 @@ a
a
c
c
-c
-b
-b
-b
+z
b
+R
+n
+n
b
a
a
@@ -647,8 +673,8 @@ c
c
c
b
-b
-b
+n
+n
b
b
a
@@ -680,8 +706,8 @@ a
c
b
b
-b
-b
+n
+n
b
a
a
@@ -777,8 +803,8 @@ a
a
a
a
-b
-b
+R
+R
a
a
a
@@ -817,7 +843,7 @@ a
"}
(26,1,1) = {"
a
-a
+P
a
a
a
@@ -850,7 +876,7 @@ a
(27,1,1) = {"
a
a
-a
+P
a
a
a
@@ -882,7 +908,7 @@ a
(28,1,1) = {"
a
a
-a
+P
a
a
a
@@ -913,8 +939,8 @@ a
"}
(29,1,1) = {"
a
-a
-a
+P
+P
a
a
a
@@ -944,7 +970,7 @@ a
a
"}
(30,1,1) = {"
-a
+s
a
a
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
index bd0783a1299..4e36b053638 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
@@ -121,7 +121,7 @@
/area/shuttle/abandoned)
"qK" = (
/obj/structure/table/reinforced,
-/obj/item/gun/energy/laser/retro,
+/obj/item/whiteship_port_generator,
/turf/simulated/floor/mineral/plastitanium,
/area/shuttle/abandoned)
"ri" = (
@@ -214,6 +214,13 @@
},
/turf/simulated/floor/plating,
/area/shuttle/abandoned)
+"xz" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/mineral/plastitanium,
+/area/shuttle/abandoned)
"ys" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -269,6 +276,7 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/item/salvage/ruin/pirate,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"Ct" = (
@@ -400,6 +408,11 @@
},
/turf/simulated/floor/mineral/plastitanium,
/area/shuttle/abandoned)
+"YH" = (
+/obj/structure/table/wood/poker,
+/obj/item/gun/energy/laser/retro,
+/turf/simulated/floor/wood,
+/area/shuttle/abandoned)
(1,1,1) = {"
zM
@@ -435,8 +448,8 @@ zM
zM
zO
Gs
-SS
-SS
+xz
+xz
qK
zO
zM
@@ -545,7 +558,7 @@ zO
zO
Pe
sK
-sK
+YH
zO
vB
vB
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
index 8434558c253..81116fa3bdf 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
@@ -165,13 +165,6 @@
/obj/item/book/manual/hydroponics_pod_people,
/turf/simulated/floor/wood,
/area/ruin/space/unpowered)
-"aF" = (
-/obj/structure/table/wood,
-/obj/item/blank_tarot_card,
-/turf/simulated/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/ruin/space/unpowered)
"aG" = (
/obj/structure/table/wood,
/obj/item/candle/eternal,
@@ -220,8 +213,15 @@
/turf/simulated/floor/wood,
/area/ruin/space/unpowered)
"aO" = (
-/obj/item/storage/bag/books,
+/obj/item/storage/bag/books{
+ pixel_y = 4;
+ pixel_x = 1
+ },
/obj/structure/table/wood,
+/obj/item/salvage/ruin/tablet{
+ pixel_x = -5;
+ pixel_y = 4
+ },
/turf/simulated/floor/wood,
/area/ruin/space/unpowered)
"aP" = (
@@ -510,6 +510,13 @@
/obj/structure/table,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
+"YM" = (
+/obj/structure/table/wood,
+/obj/item/blank_tarot_card,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/ruin/space/unpowered)
(1,1,1) = {"
aa
@@ -748,7 +755,7 @@ ah
an
av
aC
-aF
+YM
aC
aO
aC
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
index 83d5f5fefa8..d48f3703ebe 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
@@ -146,6 +146,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
+/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -182,6 +183,7 @@
/obj/structure/chair/comfy/corp{
dir = 8
},
+/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/wreck_cargoship)
"hO" = (
@@ -466,6 +468,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/mob/living/simple_animal/parrot,
/turf/simulated/floor/plasteel{
icon_state = "titanium";
dir = 4
@@ -593,6 +596,7 @@
},
/area/ruin/space/wreck_cargoship)
"vq" = (
+/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
@@ -908,6 +912,7 @@
/area/ruin/space/wreck_cargoship)
"Ll" = (
/obj/effect/decal/cleanable/blood/old,
+/obj/item/salvage/ruin/pirate,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
@@ -1054,6 +1059,14 @@
icon_state = "black"
},
/area/ruin/space/wreck_cargoship)
+"RM" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/pirate,
+/turf/simulated/floor/plasteel{
+ icon_state = "titanium";
+ dir = 4
+ },
+/area/ruin/space/wreck_cargoship)
"RZ" = (
/obj/structure/rack,
/mob/living/simple_animal/bot/secbot/griefsky/toy,
@@ -1185,6 +1198,10 @@
icon_state = "caution"
},
/area/ruin/space/wreck_cargoship)
+"Vo" = (
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/simulated/floor/plating,
+/area/ruin/space/wreck_cargoship)
"Vs" = (
/turf/simulated/floor/plating,
/area/ruin/space/wreck_cargoship)
@@ -1503,7 +1520,7 @@ ea
qg
gE
Yz
-Vs
+Vo
Sj
gE
qg
@@ -1735,7 +1752,7 @@ NI
NM
cT
NM
-NM
+RM
qY
NM
xX
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index 3bae9832cf0..743bb7b3058 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -6851,7 +6851,7 @@
/area/admin)
"xf" = (
/obj/machinery/computer/security{
- network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
+ network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -9095,7 +9095,7 @@
"Gs" = (
/obj/machinery/computer/security{
dir = 4;
- network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
+ network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
},
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_x = -32
@@ -10217,7 +10217,7 @@
"Kd" = (
/obj/machinery/computer/security{
dir = 1;
- network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
+ network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel/dark,
/area/centcom/control)
@@ -10492,7 +10492,7 @@
"Lb" = (
/obj/machinery/computer/security{
dir = 1;
- network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
+ network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
@@ -14305,7 +14305,7 @@
"Yu" = (
/obj/machinery/computer/security{
dir = 1;
- network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
+ network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/wood,
/area/centcom/control)
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 22b5f8bf7f8..dec972b08ad 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -13858,8 +13858,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aSA" = (
-/turf/simulated/wall/r_wall,
-/area/station/service/expedition)
+/obj/effect/landmark/start/blueshield,
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"aSC" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -14093,15 +14097,14 @@
/turf/simulated/wall,
/area/station/hallway/secondary/garden)
"aTv" = (
-/obj/structure/rack,
/obj/effect/turf_decal/delivery/blue/hollow,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"aTw" = (
/obj/structure/cable{
d1 = 1;
@@ -14111,24 +14114,20 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aTx" = (
-/obj/structure/rack,
/obj/effect/turf_decal/delivery/blue/hollow,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/remains/xeno,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"aTy" = (
-/obj/machinery/light{
- dir = 1
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"aTz" = (
/obj/structure/cable{
d1 = 1;
@@ -14583,10 +14582,11 @@
/turf/simulated/wall/r_wall,
/area/station/command/vault)
"aUF" = (
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"aUG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14605,7 +14605,7 @@
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"aUI" = (
/obj/structure/window/reinforced{
dir = 1
@@ -16577,24 +16577,18 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bam" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"ban" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/landmark/start/explorer,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bao" = (
/obj/machinery/status_display{
layer = 4;
@@ -18213,17 +18207,11 @@
},
/area/station/public/dorms)
"bfe" = (
-/obj/machinery/camera{
- c_tag = "Expedition";
- dir = 4
- },
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/obj/item/storage/fancy/donut_box,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bfi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18806,20 +18794,20 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
"bgK" = (
-/obj/structure/chair/stool{
- dir = 8
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bgL" = (
+/mob/living/simple_animal/cockroach,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bgM" = (
/obj/structure/table/glass,
/obj/item/hatchet,
@@ -19150,34 +19138,33 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/office)
"bhG" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 4
- },
-/obj/machinery/light_switch{
- name = "north bump";
- pixel_y = 24
- },
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bhH" = (
/obj/machinery/status_display{
layer = 4;
pixel_x = -32
},
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bhI" = (
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bhK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -19237,13 +19224,13 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/obj/machinery/recharge_station,
/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/ore_box,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bhQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -19565,11 +19552,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
"biH" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -20251,15 +20233,11 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bku" = (
-/obj/effect/spawner/window/reinforced/polarized/grilled{
- id = "NT"
- },
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/station/command/office/ntrep)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"bkv" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -20534,18 +20512,14 @@
},
/area/station/service/hydroponics)
"blf" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/directional/west,
-/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/ore_box,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"blg" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -20888,13 +20862,13 @@
name = "east bump";
pixel_x = 24
},
-/obj/structure/closet/secure_closet/personal,
/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/ore_box,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bmm" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -21106,11 +21080,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bmO" = (
@@ -22560,10 +22529,9 @@
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"bqF" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
+/obj/structure/bookcase/sop,
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"bqG" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
@@ -24143,14 +24111,18 @@
/turf/simulated/wall,
/area/station/public/locker)
"bvr" = (
-/obj/machinery/computer/secure_data{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/requests_console{
+ department = "Expedition";
+ departmentType = 2;
+ pixel_x = -30;
dir = 4
},
-/obj/structure/sign/poster/random{
- pixel_x = -32
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
},
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"bvs" = (
/turf/simulated/wall,
/area/station/public/toilet/lockerroom)
@@ -25284,14 +25256,11 @@
/turf/simulated/floor/carpet,
/area/station/command/office/captain)
"bAb" = (
-/obj/structure/chair/comfy/black{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"bAe" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel,
@@ -25523,22 +25492,11 @@
},
/area/station/science/rnd)
"bBf" = (
-/obj/machinery/door_control{
- id = "ntrepofficedoor";
- name = "Office Door";
- normaldoorcontrol = 1;
- pixel_x = 6;
- pixel_y = -24;
- req_access_txt = "73"
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
},
-/obj/machinery/button/windowtint{
- dir = 1;
- id = "NT";
- pixel_x = -8;
- pixel_y = -24
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"bBg" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera{
@@ -27793,23 +27751,12 @@
},
/area/station/medical/reception)
"bJC" = (
-/obj/structure/table,
-/obj/item/radio{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_y = 6
- },
-/obj/item/radio,
+/obj/structure/rack,
+/obj/item/poster/random_contraband,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"bJE" = (
/obj/machinery/light{
dir = 8
@@ -27980,12 +27927,8 @@
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/south)
"bKs" = (
-/obj/structure/chair/office/dark{
- dir = 1
- },
-/obj/effect/landmark/start/nanotrasen_rep,
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"bKt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/effect/spawner/window/reinforced/tinted,
@@ -28786,10 +28729,8 @@
},
/area/station/hallway/secondary/exit)
"bNx" = (
+/obj/machinery/alarm/directional/south,
/obj/machinery/light,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "browncorner"
@@ -29406,8 +29347,12 @@
name = "south bump";
pixel_y = -28
},
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/structure/closet/secure_closet/explorer,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bPK" = (
/obj/structure/chair/stool{
dir = 1
@@ -30402,9 +30347,20 @@
},
/area/station/science/robotics)
"bTk" = (
-/obj/machinery/economy/vending/cigarette,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/sw)
+/obj/machinery/button/windowtint{
+ id = "BS";
+ pixel_y = -24;
+ dir = 1;
+ pixel_x = 4
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24;
+ pixel_x = -4
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"bTq" = (
/obj/machinery/light/small{
dir = 1
@@ -30544,7 +30500,6 @@
dir = 1
},
/obj/structure/table,
-/obj/item/hand_tele,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"bTR" = (
@@ -31336,15 +31291,19 @@
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"bXk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/obj/structure/disposalpipe/segment/corner{
- dir = 8
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -31693,9 +31652,14 @@
},
/area/station/medical/cryo)
"bYD" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"bYG" = (
@@ -32094,35 +32058,60 @@
},
/area/station/medical/reception)
"cao" = (
-/obj/machinery/power/apc/directional/west,
-/obj/item/kirbyplants,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+ d2 = 4;
+ icon_state = "0-4"
},
-/obj/machinery/light{
- dir = 1
+/obj/machinery/light_switch{
+ name = "north bump";
+ pixel_y = 24
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/obj/machinery/power/apc/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cap" = (
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"caq" = (
-/obj/item/flag/nt,
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
-"cat" = (
-/obj/structure/bookcase/sop,
-/obj/machinery/light{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
+"cat" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cau" = (
/obj/structure/table,
/obj/item/mmi,
@@ -32524,10 +32513,15 @@
},
/area/station/medical/medbay)
"cbR" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cbT" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -32864,8 +32858,9 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/bookcase/sop,
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"ccW" = (
/obj/structure/cable{
d1 = 1;
@@ -33008,22 +33003,15 @@
},
/area/station/science/robotics)
"cdE" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32
},
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"cdF" = (
/obj/machinery/computer/operating{
name = "Robotics Operating Computer";
@@ -33092,18 +33080,17 @@
},
/area/station/science/hallway)
"cdQ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/light_switch{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/newscaster{
dir = 4;
name = "west bump";
- pixel_x = -24
+ pixel_x = -28
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cdS" = (
/obj/structure/cable{
d2 = 2;
@@ -33372,7 +33359,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"ceQ" = (
/obj/structure/disposalpipe/junction{
dir = 1
@@ -33400,20 +33387,21 @@
},
/area/station/supply/miningdock)
"cfd" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "AI Satellite Atmospherics";
+ dir = 4;
+ network = list("SS13","MiniSat")
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cfe" = (
/turf/simulated/floor/plating{
desc = "
There is some old writing on this floor. You are barely able to read out a few lines from a tangled scribble.
In a chamber a great mirror lies, cut away it solemn cries. Travel bold as thou might, piercing vastness as a kite.
HONK!
";
@@ -33435,20 +33423,16 @@
codes_txt = "patrol;next_patrol=AIW";
location = "QM"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
@@ -33460,39 +33444,12 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"cfj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "browncorner"
- },
-/area/station/hallway/primary/central/sw)
-"cfm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
@@ -33505,9 +33462,6 @@
},
/area/station/hallway/primary/aft/north)
"cfq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -33539,9 +33493,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -33555,20 +33506,22 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"cfu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"cfv" = (
@@ -33786,8 +33739,8 @@
},
/obj/structure/cable{
d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
@@ -34193,12 +34146,9 @@
},
/area/station/medical/medbay3)
"chH" = (
-/obj/structure/closet/cabinet,
-/obj/item/reagent_containers/drinks/bottle/whiskey,
-/obj/item/reagent_containers/drinks/drinkingglass,
-/obj/item/reagent_containers/drinks/drinkingglass,
+/obj/structure/closet/secure_closet/ntrep,
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"chI" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Biohazard_medi";
@@ -34380,7 +34330,7 @@
dir = 1
},
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"ciC" = (
/obj/machinery/alarm/directional/south,
/obj/effect/landmark/spawner/xeno,
@@ -34419,16 +34369,11 @@
},
/area/station/medical/medbay)
"ciG" = (
-/obj/structure/table/wood,
-/obj/item/ashtray/glass{
- pixel_x = -4;
- pixel_y = -4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/turf/simulated/floor/wood,
+/area/station/command/office/ntrep)
"ciH" = (
/obj/machinery/computer/crew,
/turf/simulated/floor/wood,
@@ -34457,7 +34402,7 @@
},
/obj/item/kirbyplants,
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"ciM" = (
/obj/machinery/camera{
c_tag = "Central Primary Hallway South-West";
@@ -34862,20 +34807,26 @@
/turf/simulated/wall,
/area/station/medical/medbay3)
"ckt" = (
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/obj/structure/table/wood,
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"ckv" = (
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"ckw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"ckx" = (
-/obj/machinery/keycard_auth{
- pixel_x = -24
+/obj/machinery/economy/vending/exploredrobe,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"ckB" = (
/obj/machinery/light{
dir = 8
@@ -34950,10 +34901,13 @@
},
/area/station/medical/virology)
"ckG" = (
-/obj/structure/chair/comfy/black,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"ckL" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -35231,7 +35185,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"clO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/public/glass{
@@ -35537,8 +35491,9 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"cmQ" = (
/obj/structure/rack,
/obj/item/extinguisher,
@@ -35671,10 +35626,21 @@
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
- pixel_y = -24
+ pixel_y = -24;
+ pixel_x = -5
+ },
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/obj/effect/landmark/start/nanotrasen_rep,
+/obj/machinery/button/windowtint{
+ id = "NTR";
+ pixel_y = -24;
+ dir = 1;
+ pixel_x = 4
},
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"cnv" = (
/obj/item/seeds/berry,
/turf/simulated/floor/wood{
@@ -35844,9 +35810,13 @@
},
/area/station/medical/patients_rooms1)
"cnX" = (
-/obj/structure/closet/secure_closet/ntrep,
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/structure/closet/secure_closet/explorer,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cnY" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -35927,21 +35897,35 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/sw)
"con" = (
/obj/effect/spawner/random_spawners/blood_often,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"coo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/obj/structure/table/wood,
+/obj/machinery/photocopier/faxmachine/longrange{
+ department = "NT Representative's Office";
+ pixel_y = 4
+ },
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"cop" = (
-/obj/item/flag/nt,
/obj/machinery/alarm/directional/east,
+/obj/structure/table/wood,
+/obj/item/paper_bin/nanotrasen,
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"cot" = (
/obj/structure/table,
/obj/item/clothing/glasses/hud/health,
@@ -35964,9 +35948,13 @@
},
/area/station/maintenance/asmaint2)
"coH" = (
-/obj/machinery/photocopier,
-/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/obj/structure/dispenser/oxygen,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"coK" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -35996,22 +35984,8 @@
},
/area/station/supply/miningdock)
"coT" = (
-/obj/machinery/door_control{
- id = "blueshieldofficedoor";
- name = "Office Door";
- normaldoorcontrol = 1;
- pixel_x = 6;
- pixel_y = -24;
- req_access_txt = "67"
- },
-/obj/machinery/button/windowtint{
- dir = 1;
- id = "BS";
- pixel_x = -8;
- pixel_y = -24;
- req_access_txt = "67"
- },
-/turf/simulated/floor/wood,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/wall,
/area/station/command/office/blueshield)
"coU" = (
/obj/machinery/camera{
@@ -36022,8 +35996,15 @@
name = "south bump";
pixel_y = -28
},
+/obj/machinery/door/window/classic/normal{
+ dir = 8;
+ name = "Glass Door"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/command/ntrep{
+ dir = 8
+ },
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"coV" = (
/obj/structure/cable{
d1 = 1;
@@ -36035,18 +36016,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"coW" = (
-/obj/machinery/requests_console{
- announcementConsole = 1;
- department = "Blueshield";
- departmentType = 5;
- pixel_y = -30
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
"coZ" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -36431,12 +36400,12 @@
},
/area/station/supply/miningdock)
"cqB" = (
-/obj/machinery/camera{
- c_tag = "NT Representative's Office";
- dir = 8
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"cqG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/wardrobe/miner,
@@ -36446,21 +36415,24 @@
},
/area/station/supply/miningdock)
"cqI" = (
-/obj/structure/chair/office/dark{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/landmark/start/blueshield,
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/south)
"cqJ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/obj/structure/chair/comfy/black,
+/turf/simulated/floor/carpet/royalblack,
+/area/station/command/office/ntrep)
"cqK" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
@@ -37829,12 +37801,13 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"cvm" = (
-/obj/item/clothing/gloves/color/rainbow,
-/obj/item/clothing/shoes/rainbow,
-/obj/item/clothing/under/color/rainbow,
-/obj/item/clothing/head/soft/rainbow,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cvp" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/apmaint)
@@ -40001,21 +39974,6 @@
},
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
-"cCp" = (
-/obj/machinery/firealarm{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/obj/machinery/requests_console{
- announcementConsole = 1;
- department = "NT Representative";
- departmentType = 5;
- pixel_y = 30
- },
-/obj/machinery/photocopier,
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
"cCq" = (
/turf/simulated/floor/engine,
/area/station/maintenance/incinerator)
@@ -40469,15 +40427,16 @@
},
/area/station/public/construction)
"cDS" = (
-/obj/item/paper/blueshield,
+/obj/machinery/alarm/directional/east,
/obj/structure/table/wood,
-/obj/item/pen/blue,
-/obj/item/lighter/zippo/blue{
- pixel_x = 7;
- pixel_y = 4
+/obj/item/paper_bin{
+ pixel_y = 4;
+ pixel_x = -5
},
-/obj/machinery/keycard_auth{
- pixel_x = -24
+/obj/item/folder/blue,
+/obj/item/book/manual/wiki/sop_command,
+/obj/machinery/light{
+ dir = 4
},
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
@@ -40961,9 +40920,13 @@
},
/area/station/science/misc_lab)
"cFM" = (
-/obj/structure/filingcabinet,
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/structure/closet/secure_closet/explorer,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cFP" = (
/obj/structure/rack{
dir = 8;
@@ -41261,43 +41224,32 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"cGV" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
-/obj/structure/closet/secure_closet/personal,
/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/ore_box,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"cGX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/effect/landmark/start/explorer,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"cGY" = (
/obj/structure/chair{
dir = 8
@@ -41324,15 +41276,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
+/mob/living/simple_animal/mouse/gray,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"cHb" = (
/obj/machinery/status_display{
layer = 4;
@@ -41497,23 +41445,17 @@
},
/area/station/turret_protected/ai_upload)
"cHB" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"cHC" = (
-/obj/structure/table/wood,
-/obj/machinery/photocopier/faxmachine/longrange{
- department = "NT Representative's Office"
+/obj/machinery/mineral/equipment_vendor/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "brown"
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"cHD" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
@@ -42594,8 +42536,11 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"cLE" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
-/turf/simulated/wall,
+/obj/structure/table/wood,
+/obj/item/paper/ntrep,
+/obj/item/stamp/rep,
+/obj/item/folder,
+/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"cLF" = (
/obj/structure/cable{
@@ -44302,11 +44247,11 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/portsolar)
"cRB" = (
-/obj/machinery/firealarm{
- dir = 8;
- name = "west bump";
- pixel_x = -24
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
},
+/obj/machinery/power/apc/directional/east,
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
"cRC" = (
@@ -46394,7 +46339,7 @@
dir = 4;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"cYO" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -46418,15 +46363,10 @@
"cYS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"cYT" = (
/obj/machinery/atmospherics/trinary/tvalve/digital/flipped,
/turf/simulated/floor/plasteel,
@@ -46444,17 +46384,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/visible,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"cZa" = (
-/obj/machinery/requests_console{
- department = "Expedition";
- departmentType = 2;
- pixel_x = 30
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkbluecorners"
- },
-/area/station/service/expedition)
"cZb" = (
/obj/machinery/atmospherics/binary/pump{
dir = 4;
@@ -48156,15 +48085,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"dfg" = (
-/obj/structure/table/wood,
-/obj/item/folder/blue{
- pixel_x = 4;
- pixel_y = 6
- },
-/obj/item/paper_bin,
-/obj/item/book/manual/wiki/sop_command,
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/blueshield)
+/obj/machinery/photocopier,
+/turf/simulated/floor/wood,
+/area/station/command/office/ntrep)
"dfh" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/portable/scrubber,
@@ -51069,6 +50992,7 @@
pixel_x = 24;
pixel_y = -5
},
+/obj/item/hand_tele,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -57197,31 +57121,30 @@
id_tag = "blueshieldofficedoor"
},
/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/command/blueshield,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/polarized{
- id = "BS"
+ id = "NTR"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/mapping_helpers/airlock/access/all/command/blueshield,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
+/obj/effect/mapping_helpers/airlock/access/all/command/ntrep,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"fMM" = (
/obj/structure/flora/grass/jungle,
/turf/simulated/floor/grass,
@@ -58686,10 +58609,10 @@
},
/area/station/public/toilet/unisex)
"gyA" = (
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"gyG" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -59278,6 +59201,12 @@
/obj/structure/lattice,
/turf/space,
/area/space/nearstation)
+"gNX" = (
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkblue"
+ },
+/area/station/maintenance/fpmaint)
"gOd" = (
/obj/structure/chair{
dir = 1
@@ -61168,6 +61097,15 @@
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/station/command/bridge)
+"hJe" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/item/paper/blueshield,
+/obj/item/lighter/zippo/blue,
+/turf/simulated/floor/carpet/blue,
+/area/station/command/office/blueshield)
"hJj" = (
/obj/machinery/computer/security/mining,
/turf/simulated/floor/plasteel{
@@ -65225,6 +65163,10 @@
icon_state = "red"
},
/area/station/legal/courtroom)
+"jNe" = (
+/obj/item/flag/nt,
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"jNu" = (
/obj/machinery/door_control{
id = "teleshutter";
@@ -66594,22 +66536,14 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
"kwE" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"kwG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/spawner/nukedisc_respawn,
@@ -66926,6 +66860,14 @@
icon_state = "wood-broken7"
},
/area/station/maintenance/asmaint)
+"kEs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"kEt" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -67076,14 +67018,14 @@
/area/station/science/storage)
"kHO" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
- id = "BS"
+ id = "NTR"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"kHT" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -67417,6 +67359,7 @@
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"kPo" = (
@@ -67773,6 +67716,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
+"kYq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/maintenance/fpmaint)
"kYB" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -67808,6 +67758,23 @@
icon_state = "white"
},
/area/station/science/robotics)
+"kZX" = (
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
+ },
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"laa" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -71479,6 +71446,13 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"mNf" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"mNq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/window/reinforced/normal{
@@ -71939,20 +71913,16 @@
},
/area/station/medical/medbay2)
"mZU" = (
-/obj/machinery/door/window{
- name = "Desk Door";
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/command/blueshield{
- dir = 4
- },
/obj/machinery/newscaster/security_unit{
dir = 1;
name = "south bump";
pixel_y = -28
},
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/wood,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"nab" = (
/obj/machinery/door/airlock/security/glass,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -72379,8 +72349,11 @@
/area/station/turret_protected/aisat/interior)
"nrD" = (
/obj/machinery/alarm/directional/west,
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"nrS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -75223,13 +75196,12 @@
},
/area/station/science/misc_lab)
"oFK" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin/nanotrasen,
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+ dir = 8
},
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"oGf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/economy/vending/sovietsoda,
@@ -75604,6 +75576,16 @@
icon_state = "whitepurple"
},
/area/station/science/xenobiology)
+"oLT" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "BS"
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/command/office/blueshield)
"oMz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -77527,6 +77509,18 @@
icon_state = "red"
},
/area/station/security/permabrig)
+"pNd" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/carpet/blue,
+/area/station/command/office/blueshield)
"pNj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -77550,19 +77544,14 @@
/turf/simulated/floor/plasteel,
/area/station/command/office/ce)
"pNz" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- pixel_x = -5;
- pixel_y = 12
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/obj/item/clipboard{
- pixel_x = -2
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "browncorner"
},
-/obj/item/folder,
-/obj/item/pen/multi/fountain,
-/obj/item/stamp/rep,
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"pNL" = (
/obj/machinery/power/apc/directional/west,
/obj/structure/cable{
@@ -78128,42 +78117,16 @@
},
/area/station/public/toilet/unisex)
"qcM" = (
-/obj/machinery/door/airlock/command/glass{
- id_tag = "ntrepofficedoor";
- name = "NT Representative's Office"
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "BS"
},
-/obj/effect/mapping_helpers/airlock/access/all/command/ntrep,
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- d1 = 4;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/obj/effect/mapping_helpers/airlock/polarized{
- id = "NT"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/ntrep,
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/turf/simulated/floor/plating,
+/area/station/command/office/blueshield)
"qcN" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -79090,13 +79053,14 @@
/turf/simulated/floor/carpet/green,
/area/station/command/bridge)
"qvo" = (
-/obj/structure/closet/secure_closet/personal,
/obj/effect/turf_decal/delivery/hollow,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/ore_box,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbluecorners"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"qvO" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -80284,9 +80248,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 1
},
/obj/structure/cable{
d1 = 4;
@@ -80405,6 +80368,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"qZX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/requests_console{
+ department = "Expedition";
+ departmentType = 2;
+ pixel_x = 30
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkbluecorners"
+ },
+/area/station/maintenance/fpmaint)
"rac" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -80996,11 +80971,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"rmK" = (
-/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"rmT" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 1
@@ -81287,14 +81261,14 @@
"rvo" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/window/reinforced/polarized/grilled{
- id = "BS"
+ id = "NTR"
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/command/office/blueshield)
+/area/station/command/office/ntrep)
"rvD" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -81838,6 +81812,11 @@
icon_state = "brown"
},
/area/station/supply/miningdock)
+"rJJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel,
+/area/station/supply/lobby)
"rJZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -82429,6 +82408,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
+"rZr" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"rZE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -82489,6 +82478,34 @@
},
/turf/simulated/floor/engine/plasma,
/area/station/engineering/atmos)
+"sco" = (
+/obj/machinery/door/airlock/command/glass{
+ id_tag = "blueshieldofficedoor"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/command/blueshield,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "BS"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"scq" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -82667,6 +82684,10 @@
icon_state = "white"
},
/area/station/medical/virology)
+"shN" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/sw)
"siq" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "MiniSat Maintenance"
@@ -82810,14 +82831,15 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"smS" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random_spawners/cobweb_right_rare,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/light/small{
- dir = 1
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "Blueshield";
+ departmentType = 5;
+ name = "Blueshield Requests Console";
+ pixel_y = -30
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
+/turf/simulated/wall,
+/area/station/command/office/blueshield)
"smW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -83659,6 +83681,26 @@
},
/turf/simulated/floor/plasteel,
/area/station/command/bridge)
+"sJe" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "NT Representative";
+ departmentType = 5;
+ pixel_y = 30
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"sJu" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -84968,6 +85010,12 @@
/obj/structure/weightmachine/stacklifter,
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
+"tvi" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/blue,
+/area/station/command/office/blueshield)
"tvr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -86966,15 +87014,11 @@
},
/area/station/science/xenobiology)
"uro" = (
-/obj/machinery/door/window{
- dir = 1;
- name = "Desk Door"
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "browncorner"
},
-/obj/effect/mapping_helpers/airlock/windoor/access/any/command/ntrep{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/ntrep)
+/area/station/supply/expedition)
"ury" = (
/obj/structure/cable{
d1 = 1;
@@ -87267,19 +87311,9 @@
/turf/simulated/floor/plating,
/area/station/science/xenobiology)
"uAa" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/carpet/royalblack,
-/area/station/command/office/ntrep)
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"uAo" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -90395,11 +90429,10 @@
},
/area/station/public/dorms)
"wgt" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/spawner/random_spawners/cobweb_right_rare,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
+/obj/structure/table/wood,
+/obj/item/ashtray/glass,
+/turf/simulated/floor/carpet/blue,
+/area/station/command/office/blueshield)
"wgA" = (
/obj/effect/landmark/burnturf,
/obj/effect/decal/cleanable/dirt,
@@ -90840,12 +90873,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"wrU" = (
-/obj/effect/spawner/window/reinforced/polarized/grilled{
- id = "NT"
- },
-/obj/structure/cable,
-/turf/simulated/floor/plating,
-/area/station/command/office/ntrep)
+/turf/simulated/wall,
+/area/station/supply/expedition)
"wrY" = (
/obj/structure/chair{
dir = 8
@@ -92043,14 +92072,6 @@
icon_state = "whitepurplecorner"
},
/area/station/science/hallway)
-"xaf" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
-/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
- },
-/area/station/service/expedition)
"xag" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -92194,6 +92215,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
+"xcV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/windoor/access/all/command/blueshield,
+/obj/machinery/door/window/classic/normal,
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"xde" = (
/obj/machinery/mech_bay_recharge_port{
dir = 1
@@ -92686,6 +92717,14 @@
icon_state = "whitepurple"
},
/area/station/science/explab)
+"xpJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+ c_tag = "Blueshield's Office";
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/blueshield)
"xpW" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -92765,7 +92804,7 @@
/turf/simulated/floor/grass/jungle/no_creep,
/area/station/command/bridge)
"xqL" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/structure/sign/poster/official/nanotrasen_logo,
/turf/simulated/wall,
/area/station/command/office/blueshield)
"xrj" = (
@@ -92839,6 +92878,19 @@
},
/turf/simulated/floor/plating,
/area/station/command/bridge)
+"xty" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "NT Representative";
+ departmentType = 5;
+ pixel_y = -30;
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/ntrep)
"xtZ" = (
/mob/living/simple_animal/pet/penguin/baby,
/turf/simulated/floor/carpet,
@@ -93335,14 +93387,13 @@
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"xHw" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Expedition Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/eva,
+/obj/structure/barricade/wooden/crude,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/maintenance/fpmaint)
"xHy" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -117943,14 +117994,14 @@ bDX
bDX
rwR
bzJ
-cgW
-cgW
-cgW
-cgW
-cgW
-cgW
-cgW
-cgW
+wrU
+wrU
+wrU
+wrU
+wrU
+wrU
+wrU
+wrU
cog
nNh
coP
@@ -118200,16 +118251,16 @@ bUU
bUU
hLL
bsY
-cgW
+wrU
cao
cdQ
cfd
nrD
ckx
cHC
-cgW
-cgW
-cgW
+wrU
+wrU
+wrU
cha
cam
ckM
@@ -118454,19 +118505,19 @@ kOU
bzF
fTS
bzF
-bzF
+rJJ
bXk
bYD
-cgW
+kZX
cap
-ckw
+bku
cHB
-ckw
-ckw
+cHB
+kEs
pNz
bvr
cnX
-cgW
+wrU
xfv
uvc
uId
@@ -118681,12 +118732,12 @@ aMA
bac
aSu
aSu
-aSA
-aSA
-aSA
-aSA
-aSA
-aSA
+aSu
+aSu
+aSu
+aSu
+aSu
+aSu
gIc
dmx
bkg
@@ -118714,16 +118765,16 @@ bUV
bVL
bXj
fIS
-cgW
+wrU
caq
-ckw
+uAa
uAa
gyA
ckG
oFK
bKs
bBf
-cgW
+wrU
nIY
cqs
egi
@@ -118935,15 +118986,15 @@ aMY
aPi
aRr
aMA
-aSA
-aSA
+aSu
+aSu
bhG
bfe
bhH
blf
cGV
cYN
-aSA
+aSu
djO
bmC
bks
@@ -118971,16 +119022,16 @@ bUX
tum
bVt
bWU
-cgW
+wrU
cat
cbR
cdE
-ckv
+cvm
cqB
uro
-ckw
+bKs
bPH
-cgW
+wrU
eGZ
jWV
cqs
@@ -119192,15 +119243,15 @@ uJq
aPw
aVE
aQj
-aSA
+aSu
aTv
aTx
bgK
bhI
bam
cGT
-aUF
-aSA
+rmK
+aSu
bgP
yhp
bkq
@@ -119228,16 +119279,16 @@ bUW
bPW
jPF
jPF
-cgW
-cgW
-bku
-qcM
wrU
-cgW
-cgW
-cCp
+wrU
+wrU
+wrU
+wrU
+wrU
+coH
+sJe
cFM
-cgW
+wrU
xQB
cgQ
rgs
@@ -119449,15 +119500,15 @@ aMY
aPi
aRr
aQl
-aSA
+aSu
aTy
-aUH
-aUF
+aTy
+kYq
aUF
aUF
cGZ
rmK
-aSA
+aSu
qZp
yhp
gsf
@@ -119488,13 +119539,13 @@ bOw
bYO
bOw
bOw
-cfj
bOw
-bTk
-cgW
-cgW
-cgW
-cLE
+bOw
+wrU
+wrU
+wrU
+wrU
+wrU
xyI
coL
sPF
@@ -119708,9 +119759,9 @@ ffD
aPi
xHw
aUH
-aUH
+bfe
bgL
-bhI
+gNX
ban
cGX
cYS
@@ -119748,8 +119799,8 @@ ajO
cfh
bNx
cgQ
-cgQ
-tGO
+coL
+coL
ezn
tIs
reC
@@ -119963,15 +120014,15 @@ aRP
aEl
ffD
biE
-aSA
-aSA
+aSu
+aSu
bJC
-xaf
+aUH
bhP
bmk
qvo
-cZa
-aSA
+qZX
+aSu
djW
yhp
bgS
@@ -120221,14 +120272,14 @@ aEl
aRr
aQl
aPi
-aSA
-aSA
-aSA
-aSA
-aSA
-aSA
-aSA
-aSA
+aSu
+aSu
+aSu
+aSu
+aSu
+aSu
+aSu
+aSu
djV
bmW
bkv
@@ -120259,14 +120310,14 @@ bSi
bSi
bSi
bTy
-cfm
+cok
cfi
-cgQ
+cgS
smS
-coL
-lNb
-lNb
-cwl
+cgS
+coT
+coT
+cgS
lNb
cyg
gYs
@@ -120516,14 +120567,14 @@ hwK
hwK
bSi
cdT
-cfm
+cok
nKN
-cgQ
-gYs
-tGO
-cqs
-lNb
-coL
+cgS
+jNe
+clR
+xcV
+xpJ
+cgS
nBs
hyx
cgQ
@@ -120775,12 +120826,12 @@ bSi
cdS
cfs
bTy
-cgQ
-cvm
-cgQ
+oLT
+ciH
+tvi
wgt
-coL
-coL
+bTk
+cgS
lNb
lNb
cgQ
@@ -121031,12 +121082,12 @@ mun
bSi
cdV
cfu
-bTy
-cgS
-cgS
-cgS
-cgS
-cgS
+cfj
+sco
+rZr
+pNd
+hJe
+aSA
xqL
tGO
lNb
@@ -121287,13 +121338,13 @@ iLY
bZc
bSi
cdU
-cfm
-bTy
-cgS
-ciD
+cok
+shN
+qcM
+mNf
cRB
cDS
-coH
+ciD
cgS
csw
coL
@@ -121547,10 +121598,10 @@ cdJ
cfT
cdJ
cgS
-ciH
-cqI
-ckt
-coT
+cgS
+cgS
+cgS
+cgS
cgS
lNb
ybL
@@ -121803,12 +121854,12 @@ bSi
cdX
rME
ciM
-cgS
+cgW
bqF
ciG
dfg
mZU
-cgS
+cgW
coL
lNb
cgQ
@@ -122060,12 +122111,12 @@ sMZ
cdZ
rME
cdN
-cgS
+cgW
ccL
bAb
-ckt
-clR
-cgS
+ckw
+ckv
+cgW
lNb
qov
cgQ
@@ -122319,10 +122370,10 @@ qVN
wuu
rvo
ciB
-cok
+bAb
ckt
coU
-cgS
+cgW
cvf
clr
cgQ
@@ -122573,13 +122624,13 @@ izs
doo
cfv
cgi
-cev
+cqI
fMD
clL
cmM
coo
-coW
-cgS
+xty
+cgW
cqs
csE
cgQ
@@ -122832,11 +122883,11 @@ cfv
cgj
cdN
kHO
-clR
+ckv
cqJ
-ckt
+cLE
cnu
-cgS
+cgW
cqs
csE
cgQ
@@ -123088,12 +123139,12 @@ nEK
cfv
cgh
bsr
-cgS
+cgW
ciK
ceP
cop
chH
-cgS
+cgW
csE
cqs
gYs
@@ -123345,12 +123396,12 @@ cdN
cfv
cgj
qbm
-cgS
-cgS
-cgS
-cgS
-cgS
-cgS
+cgW
+cgW
+cgW
+cgW
+cgW
+cgW
xLy
xLy
cgQ
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 6d9352005e5..ef2e647a875 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -2486,6 +2486,13 @@
/obj/machinery/ai_status_display,
/turf/simulated/wall/r_wall,
/area/station/turret_protected/aisat/interior)
+"apu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/fore2)
"apw" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
@@ -2745,41 +2752,37 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
"ard" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/syndicatebomb/training,
-/obj/machinery/light,
-/turf/simulated/floor/plasteel,
-/area/station/security/defusal)
+/area/station/security/permabrig)
"arh" = (
-/obj/item/disk/nuclear/training{
- pixel_y = -2;
- pixel_x = -7
+/obj/item/vending_refill/cola,
+/obj/item/multitool,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/grouped_spawner{
+ group_id = "tunnelbats";
+ max_per_spawner = 1;
+ name = "bat spawner";
+ path_to_spawn = /mob/living/simple_animal/hostile/scarybat;
+ total_amount = 20
},
-/obj/structure/table/reinforced,
-/obj/item/paper/nuclear_guide_spacing{
- pixel_x = 10;
- pixel_y = 7
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/obj/item/paper/nuclear_guide_defusing{
- pixel_x = 9;
- pixel_y = 4
+/area/station/maintenance/fore2)
+"ark" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/obj/item/disk/nuclear/training{
- pixel_x = -5
- },
-/obj/item/paper/nuclear_guide_operating{
- pixel_x = 8;
- pixel_y = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "redcorner"
- },
-/area/station/security/defusal)
+/area/station/maintenance/fore2)
+"arl" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"arm" = (
/obj/machinery/door/airlock/maintenance{
name = "Fore Asteroid Maintenance Access"
@@ -3827,6 +3830,7 @@
"axJ" = (
/obj/structure/table,
/obj/item/folder/blue,
+/obj/item/hand_tele,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -5825,13 +5829,6 @@
"aMC" = (
/turf/simulated/mineral/ancient,
/area/station/medical/break_room)
-"aME" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/security/permabrig)
"aMJ" = (
/obj/machinery/firealarm{
dir = 1;
@@ -8087,9 +8084,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aYU" = (
@@ -9027,22 +9021,6 @@
icon_state = "dark"
},
/area/station/ai_monitored/storage/eva)
-"bdA" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/ai_monitored/storage/eva)
"bdB" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
@@ -9153,11 +9131,6 @@
/obj/effect/mapping_helpers/airlock/access/any/command/eva,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -9313,11 +9286,6 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -9603,11 +9571,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -9760,7 +9723,6 @@
/area/station/command/office/cmo)
"bhm" = (
/obj/structure/table,
-/obj/item/hand_tele,
/obj/item/radio/beacon,
/obj/item/radio/intercom{
pixel_x = -28;
@@ -11255,7 +11217,7 @@
/obj/machinery/door/airlock/engineering/glass{
name = "Laser Room"
},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -11263,7 +11225,6 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -12065,21 +12026,19 @@
pixel_x = -3;
pixel_y = -2
},
-/turf/simulated/floor/plasteel,
-/area/station/security/range)
-"bsP" = (
-/obj/item/radio/intercom{
- pixel_y = -28;
- name = "custom placement"
- },
-/obj/structure/table/reinforced,
+/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/clothing/glasses/sunglasses,
-/obj/item/storage/box/flashbangs{
- pixel_x = -16
+/turf/simulated/floor/plasteel,
+/area/station/security/range)
+"bsP" = (
+/obj/machinery/syndicatebomb/training,
+/obj/structure/closet/bombclosetsecurity,
+/obj/item/radio/intercom{
+ pixel_y = -28;
+ name = "custom placement"
},
/turf/simulated/floor/plasteel,
/area/station/security/range)
@@ -13631,15 +13590,6 @@
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/south)
-"bzs" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/effect/landmark/start/explorer,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"bzv" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
@@ -22750,6 +22700,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/security/lobby)
+"cth" = (
+/obj/effect/landmark/start/explorer,
+/obj/machinery/firealarm{
+ pixel_y = 24;
+ name = "north bump"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"ctk" = (
/obj/machinery/light/small{
dir = 8
@@ -23133,14 +23094,6 @@
icon_state = "darkbrown"
},
/area/station/supply/office)
-"cvm" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/fingerless,
-/obj/item/clothing/head/soft/cargo,
-/turf/simulated/floor/plasteel{
- icon_state = "darkbrown"
- },
-/area/station/supply/office)
"cvp" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -25509,16 +25462,6 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central/west)
-"cJn" = (
-/obj/structure/table,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"cJo" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
@@ -25813,16 +25756,13 @@
/turf/simulated/floor/wood,
/area/station/legal/magistrate)
"cKZ" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/item/radio/intercom{
- name = "custom placement";
- pixel_y = 28
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/obj/machinery/camera{
- c_tag = "Defusal Workshop"
- },
-/turf/simulated/floor/plasteel,
-/area/station/security/defusal)
+/area/station/maintenance/fore2)
"cLa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -28703,11 +28643,10 @@
},
/area/station/supply/office)
"cXf" = (
-/obj/structure/grille/broken,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/area/station/maintenance/fsmaint)
+/area/station/supply/expedition)
"cXi" = (
/turf/simulated/floor/engine{
slowdown = -0.3
@@ -29006,23 +28945,6 @@
icon_state = "darkyellow"
},
/area/station/engineering/atmos)
-"cZi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "redcorner"
- },
-/area/station/security/defusal)
"cZr" = (
/obj/structure/chair{
dir = 8
@@ -29394,11 +29316,13 @@
/area/station/security/prison/cell_block/A)
"ddl" = (
/obj/effect/spawner/window/reinforced/grilled,
-/obj/machinery/door/firedoor,
/obj/structure/cable/orange{
+ d1 = 1;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "1-4"
},
+/obj/structure/cable/orange,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"ddn" = (
@@ -30644,6 +30568,13 @@
},
/turf/space,
/area/station/hallway/spacebridge/cargocom)
+"dky" = (
+/obj/effect/landmark/start/explorer,
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"dkC" = (
/obj/machinery/light/small,
/obj/structure/closet/firecloset/full,
@@ -30720,9 +30651,16 @@
},
/area/station/medical/medbay)
"dlb" = (
-/obj/effect/spawner/random_spawners/wall_rusted_always,
-/turf/simulated/wall,
-/area/mine/unexplored/cere/cargo)
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -24;
+ name = "west bump"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"dld" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -33168,10 +33106,9 @@
/obj/machinery/door/airlock/engineering/glass{
name = "Laser Room"
},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -33496,6 +33433,13 @@
icon_state = "white"
},
/area/station/medical/cloning)
+"dAo" = (
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"dAs" = (
/obj/item/radio/intercom{
pixel_y = 28;
@@ -33975,17 +33919,6 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central/east)
-"dEa" = (
-/obj/machinery/light_switch{
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/alarm/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
- },
-/area/station/security/defusal)
"dEi" = (
/obj/structure/table/wood,
/obj/item/ammo_box/shotgun/beanbag,
@@ -34850,24 +34783,6 @@
icon_state = "bluered"
},
/area/station/hallway/secondary/entry/west)
-"dQG" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Defusal Workshop"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/machinery/door/firedoor,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "red"
- },
-/area/station/security/defusal)
"dQR" = (
/obj/machinery/door/airlock/maintenance{
name = "Aft Asteroid Maintenance"
@@ -35013,6 +34928,17 @@
},
/turf/simulated/floor/wood,
/area/station/service/theatre)
+"dSO" = (
+/obj/machinery/newscaster{
+ pixel_y = -28;
+ name = "south bump";
+ dir = 1
+ },
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"dSV" = (
/obj/structure/cable{
d1 = 1;
@@ -35269,10 +35195,12 @@
},
/area/station/hallway/primary/aft/west)
"dXo" = (
-/obj/machinery/light/small{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"dXD" = (
@@ -36769,6 +36697,15 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"eAn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/firecloset,
+/obj/item/crowbar/red,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"eAu" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/recharge_station,
@@ -37573,6 +37510,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"eNn" = (
+/obj/machinery/door/airlock/welded,
+/obj/structure/barricade/wooden/crude,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"eNC" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -41527,33 +41469,6 @@
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/apmaint)
-"gmV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/structure/table/reinforced,
-/obj/item/clothing/head/welding{
- pixel_x = 12;
- pixel_y = 6
- },
-/obj/item/multitool{
- pixel_x = -4;
- pixel_y = 6
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -3;
- pixel_y = -2
- },
-/turf/simulated/floor/plasteel,
-/area/station/security/defusal)
-"gmZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"gnu" = (
/turf/simulated/mineral/ancient,
/area/station/maintenance/disposal/west)
@@ -41692,6 +41607,13 @@
icon_state = "wood-broken7"
},
/area/station/maintenance/asmaint)
+"gqh" = (
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"gqH" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -42901,21 +42823,6 @@
icon_state = "whitebluecorner"
},
/area/station/medical/surgery/secondary)
-"gLb" = (
-/obj/item/vending_refill/cola,
-/obj/item/multitool,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/grouped_spawner{
- group_id = "tunnelbats";
- max_per_spawner = 1;
- name = "bat spawner";
- path_to_spawn = /mob/living/simple_animal/hostile/scarybat;
- total_amount = 20
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/security/permabrig)
"gLj" = (
/obj/structure/table/wood,
/obj/effect/spawner/lootdrop/maintenance/eight,
@@ -42962,6 +42869,14 @@
/obj/machinery/economy/vending/coffee,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/south)
+"gLG" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/fingerless,
+/obj/item/clothing/head/soft/cargo,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/supply/office)
"gLH" = (
/turf/simulated/mineral/ancient,
/area/station/legal/courtroom)
@@ -43922,15 +43837,6 @@
icon_state = "red"
},
/area/station/security/storage)
-"hcm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset,
-/obj/item/crowbar/red,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/security/permabrig)
"hco" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -44518,14 +44424,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior/secondary)
-"hnL" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/firealarm{
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel,
-/area/station/security/defusal)
"hoa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -44546,28 +44444,6 @@
icon_state = "dark"
},
/area/station/command/bridge)
-"hou" = (
-/obj/structure/table,
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"hoF" = (
/obj/structure/disposalpipe/segment/corner,
/turf/simulated/mineral/ancient,
@@ -46167,6 +46043,12 @@
icon_state = "darkred"
},
/area/station/security/warden)
+"hOh" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/fsmaint)
"hOn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm{
@@ -47328,6 +47210,16 @@
icon_state = "purple"
},
/area/station/hallway/primary/aft/west)
+"ifA" = (
+/obj/structure/closet,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/poster/syndicate_recruitment,
+/obj/item/poster/syndicate_recruitment,
+/obj/item/poster/syndicate_recruitment,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"ifS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating{
@@ -49354,21 +49246,6 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/aft/west)
-"iMh" = (
-/obj/structure/table,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -24;
- name = "west bump"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"iMq" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -50843,12 +50720,12 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/west)
"jjh" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/orange{
- d1 = 4;
+ d1 = 2;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "2-8"
},
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"jjp" = (
@@ -51157,6 +51034,14 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
+"jpi" = (
+/obj/machinery/economy/vending/exploredrobe,
+/obj/machinery/alarm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"jpk" = (
/obj/machinery/status_display{
layer = 4
@@ -51545,8 +51430,12 @@
},
/area/station/engineering/atmos)
"juo" = (
-/turf/simulated/wall/r_wall,
-/area/station/service/expedition)
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"juy" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -52873,6 +52762,12 @@
icon_state = "browncorner"
},
/area/station/hallway/primary/fore/east)
+"jNT" = (
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"jNX" = (
/turf/simulated/floor/plating/asteroid/ancient,
/area/mine/unexplored/cere/civilian)
@@ -53344,12 +53239,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/west)
-"jVI" = (
-/obj/effect/landmark/start/explorer,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"jVQ" = (
/turf/simulated/mineral/ancient,
/area/station/medical/medbay)
@@ -53984,6 +53873,20 @@
temperature = 80
},
/area/station/science/xenobiology)
+"khV" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/station/security/brig)
"kic" = (
/obj/structure/closet/wardrobe/grey,
/turf/simulated/floor/mineral/titanium/blue,
@@ -55093,10 +54996,10 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
"kyi" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"kyo" = (
@@ -55284,15 +55187,6 @@
icon_state = "cafeteria"
},
/area/station/science/hallway)
-"kCa" = (
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/ai_monitored/storage/eva)
"kCe" = (
/obj/machinery/atmospherics/binary/volume_pump/on{
dir = 1;
@@ -56768,13 +56662,9 @@
/turf/simulated/floor/plasteel,
/area/station/science/storage)
"kZV" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"kZW" = (
/obj/structure/flora/junglebush,
/turf/simulated/floor/grass/jungle,
@@ -58072,11 +57962,6 @@
"lrd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -59144,6 +59029,17 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/black,
/area/station/command/bridge)
+"lGH" = (
+/obj/machinery/camera{
+ c_tag = "Research Toxins Test Chamber South";
+ dir = 1;
+ network = list("Toxins","Research","SS13")
+ },
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"lHa" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
@@ -59629,15 +59525,6 @@
icon_state = "cafeteria"
},
/area/station/service/kitchen)
-"lQa" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/machinery/door/firedoor,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/plating,
-/area/station/security/permabrig)
"lQy" = (
/obj/machinery/optable,
/obj/machinery/light{
@@ -59675,9 +59562,6 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central/east)
-"lQV" = (
-/turf/simulated/mineral/ancient/outer,
-/area/station/service/expedition)
"lQY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -59816,22 +59700,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"lSo" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/ai_monitored/storage/eva)
"lSt" = (
/obj/structure/window/reinforced{
dir = 4
@@ -60928,14 +60796,6 @@
icon_state = "dark"
},
/area/station/science/robotics)
-"mmn" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"mmx" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -61067,6 +60927,11 @@
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/external/southwest)
+"moQ" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"moY" = (
/obj/structure/closet/secure_closet/medical3,
/obj/machinery/light,
@@ -61916,6 +61781,13 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/north)
+"mDA" = (
+/obj/machinery/light,
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"mDB" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -62629,6 +62501,15 @@
},
/turf/simulated/floor/plating,
/area/station/security/brig)
+"mSf" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/station/security/permabrig)
"mSh" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -62923,12 +62804,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"mVr" = (
-/obj/machinery/nuclearbomb/training,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
+/obj/item/clothing/shoes/orange,
+/obj/item/clothing/under/color/orange/prison,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/area/station/security/defusal)
+/area/station/maintenance/fore2)
"mVs" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8;
@@ -63369,16 +63251,6 @@
/obj/structure/sign/securearea,
/turf/simulated/wall,
/area/station/engineering/tech_storage)
-"nde" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "floorgrime"
- },
-/area/station/security/permabrig)
"ndl" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "rd"
@@ -65142,6 +65014,17 @@
},
/turf/simulated/floor/carpet,
/area/station/security/detective)
+"nHB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/fsmaint)
"nHK" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -65443,6 +65326,12 @@
icon_state = "darkyellow"
},
/area/station/engineering/break_room)
+"nNa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/wall,
+/area/station/supply/office)
"nNd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light/small{
@@ -65474,11 +65363,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/east)
-"nNB" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/security/permabrig)
"nNF" = (
/obj/machinery/door/airlock/maintenance{
name = "Service SMES Access"
@@ -65514,10 +65398,6 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/port/north)
-"nOr" = (
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plating,
-/area/station/security/permabrig)
"nOu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -65793,16 +65673,6 @@
"nTa" = (
/turf/simulated/mineral/ancient,
/area/station/hallway/primary/central/east)
-"nTo" = (
-/obj/machinery/requests_console{
- department = "Expedition";
- departmentType = 2;
- pixel_x = 30
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"nTJ" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -68295,26 +68165,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
-"oKk" = (
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/ai_monitored/storage/eva)
"oKm" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -68747,7 +68597,7 @@
},
/area/station/maintenance/gambling_den)
"oQn" = (
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -68755,13 +68605,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"oQs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -68977,6 +68827,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/launch)
+"oTU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"oTV" = (
/obj/structure/cable{
d1 = 2;
@@ -69090,9 +68952,6 @@
icon_state = "whiteblue"
},
/area/station/medical/cloning)
-"oVI" = (
-/turf/simulated/mineral/ancient,
-/area/station/service/expedition)
"oVZ" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -69591,6 +69450,17 @@
icon_state = "dark"
},
/area/station/service/library)
+"pdF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/office)
"ped" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -69647,9 +69517,6 @@
icon_state = "dark"
},
/area/station/turret_protected/ai)
-"peU" = (
-/turf/simulated/wall/r_wall,
-/area/station/security/defusal)
"pfe" = (
/obj/structure/chair/wood{
dir = 1
@@ -71367,6 +71234,13 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
+"pGk" = (
+/obj/machinery/mineral/equipment_vendor/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"pGv" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -72655,6 +72529,16 @@
icon_state = "whitepurple"
},
/area/station/science/genetics)
+"pZX" = (
+/obj/effect/landmark/start/explorer,
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"qad" = (
/obj/machinery/door/airlock/glass{
id_tag = "Cryogenics";
@@ -72911,22 +72795,6 @@
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/north)
-"qdT" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"qef" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
@@ -74337,6 +74205,13 @@
/obj/item/clothing/glasses/meson,
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
+"qzq" = (
+/obj/structure/dispenser/oxygen,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"qzy" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall,
@@ -75273,6 +75148,18 @@
icon_state = "whiteblue"
},
/area/station/medical/storage/secondary)
+"qNc" = (
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"qNe" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -75441,11 +75328,8 @@
},
/area/station/hallway/secondary/entry/north)
"qQc" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/fsmaint)
+/turf/simulated/wall,
+/area/station/supply/expedition)
"qQw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -76156,6 +76040,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prisonlockers)
+"rgQ" = (
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"rhg" = (
/obj/structure/disposalpipe/junction/reversed{
dir = 1
@@ -77454,30 +77350,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/locker)
-"rGv" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/security/brig)
"rGw" = (
/obj/structure/disposalpipe/segment/corner,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -80965,15 +80837,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port/south)
-"sMx" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"sME" = (
/obj/machinery/light{
dir = 8
@@ -81537,6 +81400,18 @@
/obj/structure/chair/stool,
/turf/simulated/floor/wood,
/area/station/maintenance/gambling_den)
+"sVg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/office)
"sVn" = (
/obj/machinery/light{
dir = 8
@@ -83731,18 +83606,16 @@
/area/station/maintenance/port)
"tFL" = (
/obj/effect/spawner/window/reinforced/grilled,
-/obj/machinery/door/firedoor,
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/orange{
- d1 = 1;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "0-8"
},
-/obj/structure/cable/orange,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"tFY" = (
@@ -84330,12 +84203,6 @@
},
/turf/simulated/wall,
/area/station/maintenance/electrical_shop)
-"tTc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"tTm" = (
/obj/machinery/quantumpad/cere/service_cargo,
/obj/structure/sign/directions/cargo{
@@ -85012,9 +84879,6 @@
icon_state = "4-8"
},
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"ucV" = (
@@ -85730,12 +85594,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/station/service/library)
-"uot" = (
-/obj/structure/closet/secure_closet/personal,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"uoB" = (
/obj/machinery/alarm/directional/north,
/obj/machinery/economy/vending/coffee,
@@ -86390,13 +86248,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port/south)
-"uyj" = (
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"uyl" = (
/turf/simulated/wall/r_wall,
/area/station/science/test_chamber)
@@ -88991,6 +88842,22 @@
icon_state = "darkpurple"
},
/area/station/public/quantum/science)
+"vmZ" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkbrownfull"
+ },
+/area/station/supply/expedition)
"vng" = (
/turf/simulated/wall,
/area/station/command/office/rd)
@@ -89939,6 +89806,18 @@
/obj/structure/disposalpipe/segment/corner,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port2)
+"vzY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/stripes/end,
+/obj/machinery/power/apc/directional/north,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/supply/expedition)
"vAg" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -90508,10 +90387,14 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"vId" = (
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"vIi" = (
/obj/structure/cable{
d1 = 1;
@@ -91784,14 +91667,6 @@
icon_state = "darkyellow"
},
/area/station/engineering/control)
-"weh" = (
-/obj/item/clothing/shoes/orange,
-/obj/item/clothing/under/color/orange/prison,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/security/permabrig)
"weN" = (
/obj/structure/cable{
d1 = 4;
@@ -92176,13 +92051,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/west)
-"wiU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/security/permabrig)
"wiV" = (
/obj/structure/mirror{
pixel_x = -28
@@ -93666,18 +93534,6 @@
icon_state = "neutral"
},
/area/station/public/storage/tools)
-"wBp" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/directional/north,
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
"wBr" = (
/obj/machinery/computer/monitor{
dir = 1
@@ -94447,6 +94303,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
+"wNm" = (
+/obj/item/gun/projectile/automatic/toy/pistol,
+/obj/structure/rack,
+/obj/item/toy/sword,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"wNA" = (
/obj/structure/table,
/obj/item/storage/box/syringes,
@@ -95446,7 +95308,7 @@
id = "engsm";
name = "Radiation Shutters Control";
pixel_y = 24;
- req_access_txt = "32"
+ req_access_txt = "10"
},
/obj/machinery/camera{
c_tag = "SM South";
@@ -95955,6 +95817,18 @@
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/hallway/primary/port/north)
+"xnp" = (
+/obj/effect/landmark/start/explorer,
+/obj/machinery/requests_console{
+ department = "Expedition";
+ pixel_x = -30;
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"xnz" = (
/obj/structure/flora/ausbushes/ywflowers,
/mob/living/simple_animal/cow/betsy,
@@ -96214,6 +96088,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
+"xsd" = (
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "darkbrown"
+ },
+/area/station/supply/expedition)
"xsS" = (
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -98758,7 +98639,6 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/structure/closet/bombclosetsecurity,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -119072,7 +118952,7 @@ rHj
cDb
rHj
aQL
-nde
+aQL
tFL
rNK
rNK
@@ -119330,10 +119210,10 @@ gLk
cVR
amO
myY
-lQa
+tFL
rNK
rNK
-lPn
+khV
yfX
fOj
awv
@@ -119587,11 +119467,11 @@ dpC
rHj
adc
rHj
-peU
-peU
-peU
-peU
-wGz
+mSf
+rNK
+rNK
+lPn
+yfX
uaJ
awB
uqz
@@ -119844,12 +119724,12 @@ rHj
rHj
vNP
sFU
-peU
-dEa
-cZi
-dQG
-dsy
-rGv
+afd
+afd
+afd
+afd
+wGz
+uaJ
dtr
uqz
aLp
@@ -120101,10 +119981,10 @@ rHj
cgX
tkn
dqz
-peU
-hnL
+tkn
+rHj
ard
-peU
+afd
daG
sVX
daG
@@ -120354,13 +120234,13 @@ aTz
afd
aTz
aTz
+rHj
+aTz
+aTz
afd
afd
-aME
-mYJ
-peU
cKZ
-gmV
+mYJ
fqh
eBm
krP
@@ -120611,11 +120491,11 @@ afd
afd
aTz
aTz
+aTz
+aTz
+aTz
afd
-tkn
-weh
-gLb
-peU
+vXM
mVr
arh
fqh
@@ -120868,13 +120748,13 @@ abW
abW
afd
aTz
+aTz
+aTz
+aTz
afd
-hcm
-nNB
-adc
-peU
-peU
-peU
+eAn
+moQ
+ark
fqh
xax
pZs
@@ -121123,15 +121003,15 @@ rNK
cRv
abW
abW
-afd
-aTz
-afd
-vNP
-wiU
-nOr
+abW
afd
aTz
aTz
+aTz
+afd
+vrQ
+apu
+arl
asu
atc
eZh
@@ -121380,15 +121260,15 @@ rNK
cRv
cRv
cRv
+abW
afd
aTz
aTz
+aTz
+aTz
afd
afd
aTz
-afd
-aTz
-aTz
fqh
bOR
gyQ
@@ -137379,7 +137259,7 @@ aXD
baS
bZk
bYS
-bdA
+lrd
lrd
bev
bfk
@@ -137636,7 +137516,7 @@ aXD
baS
xuC
qBL
-lSo
+bYQ
bdB
etP
vRj
@@ -137893,7 +137773,7 @@ aXD
baS
bZk
bYQ
-lSo
+bYQ
cGr
baS
cID
@@ -138150,12 +138030,12 @@ xbO
sUW
sUW
sUW
-oKk
+sUW
sUW
sUW
sUW
baS
-kCa
+sUW
sUW
dwz
nTa
@@ -138405,16 +138285,16 @@ aXD
xbO
xbO
aXR
-oVI
-mmn
-oQn
-sMx
-uot
-uot
-sMx
-vId
-iMh
-oVI
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
xbO
xbO
wJN
@@ -138662,16 +138542,16 @@ xbO
xbO
aXR
aXR
-juo
-wBp
-qdT
-tTc
-tTc
-tTc
-gmZ
-vId
-cJn
-oVI
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
xbO
xbO
jvP
@@ -138919,16 +138799,16 @@ xbO
xbO
xbO
aXR
-oVI
-uyj
-kZV
-jVI
-jVI
-jVI
-bzs
-nTo
-hou
-oVI
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
xbO
aXD
euP
@@ -139176,16 +139056,16 @@ rNK
xbO
xbO
xbO
-oVI
-oVI
-oVI
-oVI
-oVI
-oVI
-oVI
-oVI
-oVI
-lQV
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+aXR
+xbO
xbO
aXD
euP
@@ -150709,14 +150589,14 @@ cqm
any
aVM
hZJ
-hZJ
+pdF
kDN
any
any
any
any
fue
-any
+nNa
ucH
gaX
any
@@ -150966,13 +150846,13 @@ scI
any
aQC
hZJ
-hZJ
+pdF
aTs
any
-rWb
-rWb
-rWb
-aRx
+ifA
+kZV
+lMw
+eNn
kyi
aYT
vdj
@@ -151223,12 +151103,12 @@ scI
any
aQD
dKI
-dKI
+sVg
cIw
any
-rWb
-rWb
-rWb
+wNm
+yiW
+yiW
vpe
upy
sLD
@@ -151478,13 +151358,13 @@ uKL
mXt
scI
any
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
+qQc
+qQc
+vmZ
+qQc
+qQc
+qQc
+qQc
vpe
cUk
xaF
@@ -151735,13 +151615,13 @@ wtU
woa
hTh
cvi
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
+qQc
+pGk
+oTU
+dlb
+xnp
+xsd
+qQc
rWb
cXK
kJr
@@ -151991,14 +151871,14 @@ aCo
iss
tqv
gFv
-cvm
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
+gLG
+qQc
+juo
+rgQ
+cXf
+jNT
+lGH
+qQc
rWb
bwM
qOp
@@ -152249,16 +152129,16 @@ fQk
qsY
aOl
bue
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
-aRx
-aRx
-hqL
-xaF
+qQc
+jpi
+qNc
+vId
+dky
+mDA
+qQc
+vzY
+nHB
+oQn
yiW
aRx
cpC
@@ -152506,14 +152386,14 @@ aMn
hrx
krZ
aPO
-rWb
-rWb
-rWb
-rWb
-rWb
-rWb
qQc
-vpe
+cth
+pZX
+cXf
+cXf
+dSO
+qQc
+hOh
yiW
cZd
eUS
@@ -152763,13 +152643,13 @@ iss
lUU
cqo
cvp
-aRx
-aRx
-aRx
-rWb
-rWb
-rWb
-cXf
+qQc
+dAo
+gqh
+gqh
+gqh
+qzq
+qQc
dkW
alk
klx
@@ -153020,14 +152900,14 @@ uKL
any
txT
any
-aRx
-rWb
-rWb
-rWb
-rWb
-rWb
+qQc
+qQc
+qQc
+qQc
+qQc
+qQc
+qQc
alk
-bkW
cHS
leh
rPi
@@ -153283,7 +153163,7 @@ aYR
hKk
cey
eUS
-cHS
+bkW
dXo
qkJ
aRx
@@ -153541,7 +153421,7 @@ yiW
yiW
yiW
vdj
-dlb
+vdj
alc
alc
hFo
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 51d579a263d..911dd437d2d 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -37853,11 +37853,12 @@
/area/station/legal/courtroom)
"ccx" = (
/obj/structure/table/reinforced,
-/obj/machinery/power/apc/directional/south,
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/item/hand_tele,
+/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat)
"ccy" = (
@@ -40607,9 +40608,8 @@
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"ckB" = (
-/obj/machinery/power/apc/directional/north,
/obj/structure/table,
-/obj/item/hand_tele,
+/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
@@ -43845,8 +43845,12 @@
},
/area/station/hallway/primary/central)
"csV" = (
-/turf/simulated/wall/r_wall,
-/area/station/service/expedition)
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"csW" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -44207,36 +44211,39 @@
},
/area/station/hallway/primary/central)
"cuk" = (
-/obj/structure/table,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"cul" = (
-/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
-"cum" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/chair/office{
+ dir = 8
},
+/obj/machinery/power/apc/directional/north,
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
+"cum" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
- d1 = 2;
+ d1 = 1;
d2 = 8;
- icon_state = "2-8"
+ icon_state = "1-8"
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cun" = (
/obj/machinery/light{
dir = 8
@@ -44585,13 +44592,16 @@
},
/area/station/engineering/control)
"cuX" = (
-/obj/item/kirbyplants,
/obj/machinery/light_switch{
name = "north bump";
pixel_y = 24
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/effect/spawner/random_spawners/dirt_often,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cuY" = (
/obj/machinery/suit_storage_unit/engine/secure,
/obj/machinery/ai_status_display{
@@ -44834,54 +44844,34 @@
},
/area/station/hallway/primary/central)
"cvJ" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/rods{
- amount = 8
- },
/obj/structure/extinguisher_cabinet{
name = "east bump";
pixel_x = 30
},
-/obj/item/storage/toolbox/emergency,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cvK" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
},
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cvM" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cvQ" = (
/obj/machinery/status_display{
pixel_y = 32
},
-/obj/structure/table,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
+/obj/machinery/mineral/equipment_vendor/explorer,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cvT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44924,9 +44914,13 @@
},
/area/station/hallway/primary/starboard/south)
"cvY" = (
-/obj/structure/table,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/effect/spawner/random_spawners/dirt_often,
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"cvZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -45318,48 +45312,41 @@
},
/area/station/public/locker)
"cxe" = (
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/structure/musician/piano,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cxf" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cxh" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
+/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cxk" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"cxl" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"cxm" = (
/obj/machinery/camera{
c_tag = "Central Ring Hallway East";
@@ -45527,16 +45514,9 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
"cxJ" = (
-/obj/structure/table,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cxL" = (
/obj/structure/rack,
/obj/item/storage/belt/utility,
@@ -45779,15 +45759,14 @@
c_tag = "Expedition Access";
dir = 4
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -32
+ },
+/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cys" = (
/obj/machinery/hologram/holopad,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
@@ -45797,51 +45776,49 @@
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyt" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyu" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyv" = (
/turf/simulated/wall,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyw" = (
/obj/machinery/light{
dir = 8
},
-/obj/structure/chair/stool{
- dir = 1
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "browncorner"
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyx" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/obj/structure/chair{
+ dir = 4
},
+/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyy" = (
/obj/machinery/camera{
c_tag = "Expedition";
dir = 8
},
-/obj/structure/closet/secure_closet/personal,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cyz" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -45911,16 +45888,14 @@
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
"cyI" = (
-/obj/machinery/light{
- dir = 4
- },
/obj/item/radio/intercom{
name = "east bump";
pixel_x = 28
},
-/obj/structure/table,
+/obj/effect/spawner/random_spawners/dirt_often,
+/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cyJ" = (
/obj/structure/urinal{
pixel_y = 28
@@ -46454,56 +46429,25 @@
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
"czV" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/chair/stool/bar,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"czW" = (
-/obj/structure/closet/crate/internals,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/head/hardhat/orange{
- name = "protective hat";
- pixel_y = 8
+/obj/effect/spawner/random_spawners/dirt_often,
+/obj/machinery/requests_console{
+ department = "Expedition";
+ pixel_x = -30;
+ dir = 4
},
-/obj/item/clothing/head/hardhat/orange{
- name = "protective hat";
- pixel_y = 8
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "browncorner"
},
-/obj/item/clothing/head/hardhat/orange{
- name = "protective hat";
- pixel_y = 8
- },
-/obj/item/clothing/head/hardhat/orange{
- name = "protective hat";
- pixel_y = 8
- },
-/obj/item/clothing/head/hardhat/orange{
- name = "protective hat";
- pixel_y = 8
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"czY" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -46511,14 +46455,9 @@
},
/area/station/hallway/primary/central/south)
"cAb" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cAc" = (
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet/lockerroom)
@@ -47010,57 +46949,49 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"cBv" = (
-/obj/effect/landmark/start/explorer,
+/obj/structure/table/reinforced,
+/obj/item/pizzabox/firecracker,
+/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cBw" = (
-/obj/structure/table,
/obj/machinery/firealarm{
dir = 8;
name = "west bump";
pixel_x = -24
},
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cBy" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/chair/stool/bar,
+/obj/effect/landmark/start/explorer,
+/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cBC" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"cBD" = (
/obj/machinery/hologram/holopad,
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -47068,7 +46999,7 @@
dir = 10
},
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cBE" = (
/turf/simulated/floor/plating,
/area/station/public/toilet/lockerroom)
@@ -47464,22 +47395,29 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"cCV" = (
-/obj/structure/table,
-/obj/machinery/recharger,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cCW" = (
-/obj/structure/table,
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
pixel_y = -24
},
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cCX" = (
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/machinery/economy/vending/exploredrobe,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"cCY" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -47501,10 +47439,8 @@
},
/area/station/hallway/primary/starboard/south)
"cDa" = (
-/obj/machinery/recharge_station,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cDb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
@@ -47529,7 +47465,7 @@
dir = 1
},
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"cDd" = (
/obj/effect/landmark/lightsout,
/turf/simulated/floor/plasteel{
@@ -47541,9 +47477,12 @@
/turf/simulated/wall,
/area/station/public/toilet/lockerroom)
"cDf" = (
-/obj/structure/closet/secure_closet/personal,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"cDg" = (
/obj/structure/cable{
d1 = 1;
@@ -58955,8 +58894,10 @@
"dte" = (
/obj/item/kirbyplants,
/obj/machinery/alarm/directional/south,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"dto" = (
/obj/structure/sign/science{
icon_state = "xenobio2"
@@ -67399,8 +67340,10 @@
"eXJ" = (
/obj/structure/dispenser/oxygen,
/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"eXP" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/bulletproof/sec,
@@ -68276,12 +68219,6 @@
icon_state = "redyellowfull"
},
/area/station/medical/break_room)
-"fyq" = (
-/obj/machinery/requests_console{
- department = "Expedition"
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
"fzd" = (
/obj/machinery/access_button{
autolink_id = "virolab_btn_int";
@@ -73244,33 +73181,15 @@
/area/station/maintenance/abandonedbar)
"iFr" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/effect/mapping_helpers/airlock/access/all/supply/expedition,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
+ },
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"iFv" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -79019,9 +78938,12 @@
name = "east bump";
pixel_x = 28
},
-/obj/structure/closet/secure_closet/personal,
-/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"miL" = (
/obj/structure/chair/comfy/black,
/obj/effect/landmark/start/head_of_security,
@@ -81215,18 +81137,12 @@
/turf/simulated/floor/grass,
/area/station/medical/medbay)
"nsD" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/structure/chair/stool/bar,
+/obj/effect/spawner/random_spawners/dirt_often,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
},
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"ntt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -83828,13 +83744,9 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"oVl" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"oVu" = (
/obj/structure/morgue,
/obj/machinery/light/small,
@@ -85196,20 +85108,14 @@
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"pLm" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"pLs" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel/white,
@@ -89916,11 +89822,6 @@
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
/area/station/maintenance/apmaint)
-"stt" = (
-/obj/structure/cable,
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/service/expedition)
"stv" = (
/obj/item/radio/intercom{
name = "north bump";
@@ -92713,7 +92614,7 @@
"uaS" = (
/obj/machinery/economy/vending/cigarette,
/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
+/turf/simulated/wall,
/area/station/hallway/primary/central)
"ubm" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -97491,13 +97392,11 @@
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block)
"wUm" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
},
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"wUq" = (
/obj/machinery/economy/vending/hydronutrients,
/obj/effect/turf_decal/delivery/hollow,
@@ -98225,14 +98124,14 @@
},
/area/station/hallway/primary/aft/south)
"xph" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/obj/effect/turf_decal/stripes/line,
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/drinks/cans/beer,
+/obj/item/reagent_containers/drinks/cans/beer,
+/obj/item/reagent_containers/drinks/cans/beer,
+/obj/item/reagent_containers/drinks/cans/beer,
+/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"xpq" = (
/obj/machinery/economy/vending/snack,
/turf/simulated/floor/plasteel{
@@ -98703,10 +98602,7 @@
/area/station/medical/virology)
"xFp" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
+/obj/effect/mapping_helpers/airlock/access/all/supply/expedition,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -98714,8 +98610,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
+ },
/turf/simulated/floor/plasteel,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"xFq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -141005,15 +140904,15 @@ aaa
bsv
tlB
bIX
-csV
-csV
+cyv
+cyv
oVl
-csV
-csV
-csV
-csV
-csV
-csV
+cyv
+cyv
+cyv
+cyv
+cyv
+cyv
cEY
ckv
cHK
@@ -141262,15 +141161,15 @@ cht
cht
ygv
bIX
-csV
+cyv
cxe
cvK
-fyq
+cyw
cyr
czW
cBw
cCV
-csV
+cyv
gaZ
ckv
cHK
@@ -141519,15 +141418,15 @@ cmX
cht
ygv
hQe
-csV
+cyv
cul
-cxh
-cCX
+cDa
+cDa
cyt
-cBv
+xph
cBv
cCW
-csV
+cyv
cEZ
ckv
cHK
@@ -141783,8 +141682,8 @@ cxf
cys
czV
cBy
-cCX
-xph
+nsD
+cyv
csW
qZt
ukK
@@ -142033,15 +141932,15 @@ cnA
cht
sor
bIX
-csV
+cyv
cuX
-cCX
+cyx
cxh
cyu
-cBv
+cDa
pLm
dte
-csV
+cyv
csW
ckv
cHK
@@ -142290,15 +142189,15 @@ cnB
coF
sHD
crO
-csV
+cyv
cvJ
cvY
cxJ
cyI
-cCX
-cBC
cDa
-csV
+cxk
+cDa
+cyv
rfw
ckv
cHK
@@ -142547,15 +142446,15 @@ cnB
coG
wat
bIX
-csV
-csV
-wUm
-nsD
cyv
-wUm
+cyv
+oVl
+oVl
+cyv
+oVl
iFr
-stt
-csV
+oVl
+cyv
jdr
dLT
njU
@@ -142805,14 +142704,14 @@ cht
sqO
bIX
uaS
-csV
+cyv
cxl
cuk
cyw
-cCX
+cuk
cBC
cCX
-csV
+cyv
csW
ckv
jfG
@@ -143062,14 +142961,14 @@ xmE
ygv
bIX
rVL
-csV
+cyv
cvQ
-cxk
-cyx
+cDa
+cDa
cAb
cBD
cDc
-csV
+cyv
csW
ckv
cHN
@@ -143319,14 +143218,14 @@ cht
ygv
bIX
nSv
-csV
+cyv
eXJ
-cCX
+wUm
cyy
mhU
cDf
-cDf
csV
+cyv
csW
ckv
cHN
@@ -143575,15 +143474,15 @@ cht
cht
vAP
bSz
-csV
-csV
-csV
-csV
-csV
-csV
-csV
-csV
-csV
+cyv
+cyv
+cyv
+cyv
+cyv
+cyv
+cyv
+cyv
+cyv
lXi
tIa
njo
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 1a88285f334..426773de555 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -7362,11 +7362,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/north)
"aKI" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
@@ -22460,6 +22455,7 @@
},
/obj/item/folder/blue,
/obj/item/pen/multi,
+/obj/item/hand_tele,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -25003,11 +24999,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -25751,6 +25742,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -25898,7 +25894,7 @@
/area/station/engineering/controlroom)
"bNh" = (
/turf/simulated/wall/r_wall,
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bNi" = (
/turf/simulated/wall,
/area/station/public/storage/emergency/port)
@@ -25908,11 +25904,12 @@
},
/area/station/medical/reception)
"bNl" = (
-/obj/machinery/economy/vending/coffee,
+/obj/structure/closet/secure_closet/explorer,
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ dir = 6;
+ icon_state = "darkyellow"
},
-/area/station/hallway/secondary/bridge)
+/area/station/supply/expedition)
"bNm" = (
/obj/machinery/status_display{
layer = 4;
@@ -25933,17 +25930,6 @@
icon_state = "arrival"
},
/area/station/hallway/secondary/entry/south)
-"bNo" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
"bNp" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -26048,23 +26034,12 @@
/turf/simulated/floor/carpet,
/area/station/command/bridge)
"bNU" = (
-/obj/machinery/door_control{
- id = "gateshutter";
- name = "Expedition Shutter Control";
- pixel_y = -26;
- req_access_txt = "62"
- },
-/obj/machinery/firealarm{
- dir = 8;
- name = "west bump";
- pixel_x = -24
- },
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkblue"
+ dir = 10;
+ icon_state = "darkyellow"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bNX" = (
/obj/structure/window/reinforced{
dir = 4
@@ -26392,16 +26367,22 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"bOY" = (
-/obj/machinery/newscaster{
- dir = 1;
- name = "south bump";
- pixel_y = -28
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "darkyellowfull"
},
-/area/station/hallway/secondary/bridge)
+/area/station/supply/expedition)
"bOZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -26542,7 +26523,6 @@
icon_state = "2-8"
},
/obj/item/radio/beacon,
-/obj/item/hand_tele,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"bPB" = (
@@ -26701,10 +26681,6 @@
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"bQm" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 4
- },
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -26712,11 +26688,12 @@
/obj/machinery/camera{
c_tag = "Expedition"
},
+/obj/machinery/mineral/equipment_vendor/explorer,
/turf/simulated/floor/plasteel{
dir = 9;
- icon_state = "darkblue"
+ icon_state = "darkyellow"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bQn" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
@@ -26755,11 +26732,16 @@
/turf/simulated/floor/engine/vacuum,
/area/station/maintenance/turbine)
"bQB" = (
-/obj/structure/closet/secure_closet/personal,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/machinery/firealarm{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
},
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ icon_state = "darkyellow";
+ dir = 8
+ },
+/area/station/supply/expedition)
"bQC" = (
/obj/structure/table,
/obj/machinery/kitchen_machine/microwave,
@@ -26773,13 +26755,11 @@
},
/area/station/service/kitchen)
"bQD" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ icon_state = "darkyellow";
+ dir = 1
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bQF" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -27133,15 +27113,12 @@
},
/area/station/hallway/primary/central/west)
"bRP" = (
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
- },
-/obj/effect/landmark/start/explorer,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bRQ" = (
/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/effect/turf_decal/stripes/line{
@@ -27273,40 +27250,23 @@
/turf/simulated/floor/engine/vacuum,
/area/station/maintenance/turbine)
"bSo" = (
-/obj/structure/table,
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/radio{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/machinery/requests_console{
- department = "Expedition";
- pixel_x = 30
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bSp" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/camera{
+ c_tag = "Research Test Lab North";
+ dir = 8;
+ network = list("RD","SS13");
+ pixel_y = -22
},
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkyellow"
+ },
+/area/station/supply/expedition)
"bSr" = (
/obj/machinery/light,
/obj/structure/extinguisher_cabinet{
@@ -27813,36 +27773,25 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"bTS" = (
-/obj/machinery/light{
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -32
+ },
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkyellow";
dir = 8
},
-/obj/structure/closet/secure_closet/personal,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bTU" = (
-/obj/machinery/light{
- dir = 4
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
-/obj/structure/table,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
-"bTV" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/landmark/burnturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/area/station/supply/expedition)
"bTW" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -28669,65 +28618,40 @@
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
"bWV" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/directional/west,
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/obj/item/storage/fancy/donut_box,
+/obj/structure/dispenser/oxygen,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkblue"
+ icon_state = "darkyellow";
+ dir = 8
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bWW" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
+/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"bWX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/hologram/holopad,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
-"bWY" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/light{
dir = 8
},
+/turf/simulated/floor/plasteel{
+ icon_state = "darkyellow";
+ dir = 8
+ },
+/area/station/supply/expedition)
+"bWY" = (
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkyellow"
+ },
+/area/station/supply/expedition)
+"bWZ" = (
+/obj/effect/spawner/random_spawners/dirt_maybe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
-"bWZ" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Expedition Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/area/station/supply/expedition)
"bXb" = (
/obj/machinery/plantgenes,
/obj/effect/turf_decal/stripes/line,
@@ -29184,16 +29108,16 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"bYp" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/requests_console{
+ department = "Expedition";
+ pixel_x = 30;
dir = 8
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkyellow"
+ },
+/area/station/supply/expedition)
"bYq" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -29471,32 +29395,22 @@
},
/area/station/maintenance/asmaint)
"bZz" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
-"bZD" = (
-/obj/machinery/light_switch{
- dir = 8;
- name = "east bump";
- pixel_x = 24
- },
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/effect/landmark/start/explorer,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+ dir = 5
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
+"bZD" = (
+/obj/machinery/light,
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkyellow"
+ },
+/area/station/supply/expedition)
"bZH" = (
/obj/structure/bookcase,
/turf/simulated/floor/wood,
@@ -29533,23 +29447,8 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"bZX" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
- name = "Expedition Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/service/expedition)
+/turf/simulated/wall,
+/area/station/supply/expedition)
"bZZ" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -29918,19 +29817,25 @@
/turf/simulated/floor/plasteel/dark/telecomms,
/area/station/science/server/coldroom)
"cbi" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
+/obj/machinery/light_switch{
+ name = "custom placement";
+ pixel_x = 6;
+ pixel_y = 24
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/south)
+/obj/machinery/power/apc/directional/west,
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "darkyellow"
+ },
+/area/station/supply/expedition)
"cbj" = (
/obj/structure/sign/securearea{
pixel_y = 32
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"cbl" = (
@@ -30241,24 +30146,24 @@
/turf/simulated/floor/engine/co2,
/area/station/engineering/atmos)
"ccl" = (
-/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "darkblue"
+ icon_state = "darkyellowcorners"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"ccm" = (
-/obj/machinery/alarm/directional/east,
-/obj/structure/table,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/obj/item/flashlight,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkblue"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ icon_state = "darkyellow";
+ dir = 1
+ },
+/area/station/supply/expedition)
"ccn" = (
/obj/structure/cable{
d1 = 4;
@@ -30562,12 +30467,14 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"cdB" = (
-/obj/effect/landmark/start/explorer,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkblue"
+/obj/effect/spawner/random_spawners/dirt_maybe,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
},
-/area/station/service/expedition)
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"cdC" = (
/obj/structure/sign/poster/official/ian,
/turf/simulated/wall,
@@ -31699,6 +31606,28 @@
/obj/effect/spawner/window,
/turf/simulated/floor/plating,
/area/station/medical/reception)
+"chF" = (
+/obj/structure/table,
+/obj/item/radio{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/item/radio{
+ pixel_y = 4;
+ pixel_x = -2
+ },
+/obj/item/radio{
+ pixel_x = -7;
+ pixel_y = 4
+ },
+/obj/item/radio{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/expedition)
"chH" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -38909,17 +38838,12 @@
},
/area/station/medical/paramedic)
"cJT" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkyellow"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/area/station/supply/expedition)
"cJU" = (
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
@@ -39564,11 +39488,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -40385,16 +40304,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cPD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"cPF" = (
@@ -50876,12 +50785,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"fXz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/se)
"fYb" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 10
@@ -57988,17 +57891,11 @@
/turf/simulated/floor/plasteel,
/area/station/security/processing)
"iSE" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
- dir = 2;
- id_tag = "gateshutter";
- name = "Expedition Access Shutter"
- },
-/obj/effect/turf_decal/caution/stand_clear,
+/obj/structure/closet/secure_closet/explorer,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ icon_state = "darkyellow"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"iSH" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
@@ -75855,11 +75752,10 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/east)
"qrT" = (
-/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ icon_state = "darkyellow"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"qse" = (
/obj/machinery/hologram/holopad,
/obj/effect/turf_decal/delivery/blue/hollow,
@@ -78992,21 +78888,20 @@
/area/station/medical/morgue)
"rFL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/light_switch{
dir = 8;
name = "east bump";
pixel_x = 24
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"rGd" = (
@@ -84140,21 +84035,12 @@
},
/area/station/medical/surgery/secondary)
"tST" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
+/obj/structure/closet/secure_closet/explorer,
+/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ icon_state = "darkyellow"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"tSX" = (
/obj/machinery/photocopier,
/obj/machinery/newscaster/security_unit{
@@ -84929,20 +84815,12 @@
},
/area/station/service/bar)
"uhY" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkyellow";
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/se)
+/area/station/supply/expedition)
"uiK" = (
/obj/item/radio/intercom{
name = "south bump";
@@ -87752,17 +87630,12 @@
/turf/simulated/floor/plasteel,
/area/station/security/main)
"vtR" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/machinery/door/poddoor/shutters{
- dir = 2;
- id_tag = "gateshutter";
- name = "Expedition Access Shutter"
- },
+/obj/machinery/economy/vending/exploredrobe,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ dir = 4;
+ icon_state = "darkyellow"
},
-/area/station/service/expedition)
+/area/station/supply/expedition)
"vtY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -89429,12 +89302,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"wkM" = (
-/obj/machinery/economy/vending/cola,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/hallway/secondary/bridge)
"wlo" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/lootdrop{
@@ -124053,7 +123920,7 @@ bNh
bNh
bNh
bNh
-bNh
+bZX
caN
jdP
bdb
@@ -124310,8 +124177,8 @@ bNh
bQm
bWV
bNU
-bNh
-cbi
+bZX
+cIA
ben
bqb
fXo
@@ -124559,16 +124426,16 @@ bHC
qgk
bJp
bLg
-wkM
-bNh
-bQB
+bZX
+cbi
+bWX
bQB
bTS
ccl
-bWW
+bSo
qrT
-iSE
-fXz
+bZX
+cPD
ixQ
eOI
bbg
@@ -124815,17 +124682,17 @@ bEm
bIy
qgk
bMG
-bLg
+bLq
bOY
-bNh
+ccm
+bRP
bRP
bZz
-bZz
cdB
-bWX
+bWZ
tST
-vtR
-fXz
+bZX
+cPD
sZY
eOI
dbb
@@ -125073,17 +124940,17 @@ bHH
qgk
bJB
bLg
-bNl
-bNh
+bZX
bQD
bSo
+chF
bTU
-ccm
-bWY
+bWZ
+bWZ
bZD
bZX
cPD
-uhY
+sZY
eOI
dbb
cmo
@@ -125330,15 +125197,15 @@ qgk
qgk
bJp
daF
-bNh
-bNh
-bNh
-bNh
-bNh
-bNh
+bZX
+uhY
+bWW
+bWW
bWZ
-bNh
-bNh
+bWZ
+bWZ
+iSE
+bZX
cbj
nJC
bhp
@@ -125586,16 +125453,16 @@ cdO
cPt
bHK
bJC
-bLq
-bNo
-clO
-bTV
+bLg
+bZX
+bWY
+cJT
bSp
cJT
-cdO
+vtR
bYp
-cPt
-bHK
+bNl
+bZX
aKI
cMh
cdE
@@ -125844,15 +125711,15 @@ bht
bht
bJD
bLr
-bht
-bht
-bht
-bht
-bht
-bht
-bht
-bht
-bht
+bZX
+bZX
+bZX
+bZX
+bZX
+bZX
+bZX
+bZX
+bZX
xki
jAV
bqR
diff --git a/code/controllers/subsystem/SSeconomy.dm b/code/controllers/subsystem/SSeconomy.dm
index 8e6e428e69b..a847892ba8c 100644
--- a/code/controllers/subsystem/SSeconomy.dm
+++ b/code/controllers/subsystem/SSeconomy.dm
@@ -56,6 +56,8 @@ SUBSYSTEM_DEF(economy)
var/credits_per_plasma = 10
/// credits gained per research design sold
var/credits_per_design = 20
+ /// points gained per salvage sold
+ var/credits_per_salvage = 100
/// credits gained per working mech sold
var/credits_per_mech = 100
/// credits gained for each secondary goal completed
diff --git a/code/controllers/subsystem/non_firing/SSmapping.dm b/code/controllers/subsystem/non_firing/SSmapping.dm
index 3823c267e71..cef6d19cb47 100644
--- a/code/controllers/subsystem/non_firing/SSmapping.dm
+++ b/code/controllers/subsystem/non_firing/SSmapping.dm
@@ -139,6 +139,59 @@ SUBSYSTEM_DEF(mapping)
if(HAS_TRAIT(SSstation, STATION_TRAIT_HANGOVER))
generate_themed_messes(list(/obj/effect/spawner/themed_mess/party))
+/datum/controller/subsystem/mapping/proc/seed_space_salvage(space_z_levels)
+ log_startup_progress("Seeding space salvage...")
+ var/space_salvage_timer = start_watch()
+ var/seeded_salvage_surfaces = list()
+ var/seeded_salvage_closets = list()
+
+ var/list/small_salvage_items = list(
+ /obj/item/salvage/ruin/brick,
+ /obj/item/salvage/ruin/nanotrasen,
+ /obj/item/salvage/ruin/carp,
+ /obj/item/salvage/ruin/tablet,
+ /obj/item/salvage/ruin/pirate,
+ /obj/item/salvage/ruin/russian
+ )
+
+ for(var/z_level in space_z_levels)
+ var/list/turf/z_level_turfs = block(locate(1, 1, z_level), locate(world.maxx, world.maxy, z_level))
+ for(var/z_level_turf in z_level_turfs)
+ var/turf/T = z_level_turf
+ var/area/A = get_area(T)
+ if(istype(A, /area/ruin/space))
+ // cardboard boxes are blacklisted otherwise deepstorage.dmm ends up hogging all the loot
+ var/list/closet_blacklist = list(/obj/structure/closet/cardboard, /obj/structure/closet/fireaxecabinet, /obj/structure/closet/walllocker/emerglocker, /obj/structure/closet/crate/can, /obj/structure/closet/body_bag, /obj/structure/closet/coffin)
+ for(var/obj/structure/closet/closet in T)
+ if(is_type_in_list(closet, closet_blacklist))
+ continue
+
+ seeded_salvage_closets |= closet
+ for(var/obj/structure/table/table in T)
+ if(locate(/obj/machinery) in T)
+ continue // Machinery on tables tend to take up all the visible space
+ seeded_salvage_surfaces |= table
+
+ var/max_salvage_attempts = rand(10, 15)
+ while(max_salvage_attempts > 0 && length(seeded_salvage_closets) > 0)
+ var/obj/structure/closet/C = pick_n_take(seeded_salvage_closets)
+ var/salvage_item_type = pick(small_salvage_items)
+ var/obj/salvage_item = new salvage_item_type(C)
+ salvage_item.pixel_x = rand(-5, 5)
+ salvage_item.pixel_y = rand(-5, 5)
+ max_salvage_attempts -= 1
+
+ max_salvage_attempts = rand(10, 15)
+ while(max_salvage_attempts > 0 && length(seeded_salvage_surfaces) > 0)
+ var/obj/T = pick_n_take(seeded_salvage_surfaces)
+ var/salvage_item_type = pick(small_salvage_items)
+ var/obj/salvage_item = new salvage_item_type(T.loc)
+ salvage_item.pixel_x = rand(-5, 5)
+ salvage_item.pixel_y = rand(-5, 5)
+ max_salvage_attempts -= 1
+
+ log_startup_progress("Successfully seeded space salvage in [stop_watch(space_salvage_timer)]s.")
+
// Do not confuse with seedRuins()
/datum/controller/subsystem/mapping/proc/handleRuins()
// load in extra levels of space ruins
@@ -156,8 +209,10 @@ SUBSYSTEM_DEF(mapping)
// Note that this budget is not split evenly accross all zlevels
log_startup_progress("Seeding ruins...")
var/seed_ruins_timer = start_watch()
- seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
+ var/space_z_levels = levels_by_trait(SPAWN_RUINS)
+ seedRuins(space_z_levels, rand(20, 30), /area/space, GLOB.space_ruins_templates)
log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+ seed_space_salvage(space_z_levels)
// Loads in the station
/datum/controller/subsystem/mapping/proc/loadStation()
diff --git a/code/datums/outfits/plasmamen_outfits.dm b/code/datums/outfits/plasmamen_outfits.dm
index 5fc1adec16b..4ba5e9665a3 100644
--- a/code/datums/outfits/plasmamen_outfits.dm
+++ b/code/datums/outfits/plasmamen_outfits.dm
@@ -70,6 +70,12 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/cargo
uniform = /obj/item/clothing/under/plasmaman/cargo
+/datum/outfit/plasmaman/expedition
+ name = "Plasmaman Expedition"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/expedition
+ uniform = /obj/item/clothing/under/plasmaman/expedition
+
/datum/outfit/plasmaman/mining
name = "Plasmaman Mining"
diff --git a/code/datums/ruins/space_ruins.dm b/code/datums/ruins/space_ruins.dm
index 89bf2625726..84cb4f5cfd3 100644
--- a/code/datums/ruins/space_ruins.dm
+++ b/code/datums/ruins/space_ruins.dm
@@ -82,6 +82,7 @@
name = "Derelict 3"
description = "These hulks were once part of a larger structure, where \
the three great \[REDACTED\] were forged."
+ allow_duplicates = FALSE
/datum/map_template/ruin/space/derelict4
id = "derelict4"
@@ -146,7 +147,8 @@
No tabs. No violence in the inside areas. That's it. Welcome to the \
Rampant Golem and Yellow Hound. Can I take your order?"
allow_duplicates = FALSE //it spawn ship docking, no more than one to avoid duplication in console.
- cost = 2
+ always_place = TRUE
+ cost = 0
/datum/map_template/ruin/space/turreted_outpost
id = "turreted-outpost"
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index 3a601fa24f9..4566d67b188 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -84,7 +84,7 @@
reference = "KPM"
item = /obj/item/borg/upgrade/modkit/indoors
cost = 25 //you need two for full damage, so total of 50 for maximum damage
- job = list("Shaft Miner")
+ job = list("Shaft Miner", "Explorer")
surplus = 0 // Requires a KA to even be used.
/datum/uplink_item/jobspecific/mining_charge_hacker
diff --git a/code/game/area/ss13_areas/service_areas.dm b/code/game/area/ss13_areas/service_areas.dm
index a32cfce0822..db6956a205c 100644
--- a/code/game/area/ss13_areas/service_areas.dm
+++ b/code/game/area/ss13_areas/service_areas.dm
@@ -59,9 +59,3 @@
name = "Hydroponics"
icon_state = "hydro"
sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/station/service/expedition
- name = "\improper Expedition room"
- icon_state = "expedition"
- ambientsounds = ENGINEERING_SOUNDS
- sound_environment = SOUND_AREA_STANDARD_STATION
diff --git a/code/game/area/ss13_areas/supply_areas.dm b/code/game/area/ss13_areas/supply_areas.dm
index 2344b78525e..0266aebe7ab 100644
--- a/code/game/area/ss13_areas/supply_areas.dm
+++ b/code/game/area/ss13_areas/supply_areas.dm
@@ -37,3 +37,9 @@
/area/station/supply/mechbay
name = "\improper Mech Bay"
icon_state = "yellow"
+
+/area/station/supply/expedition
+ name = "\improper Expedition Room"
+ icon_state = "expedition"
+ ambientsounds = list('sound/ambience/ambiexp.ogg')
+ sound_environment = SOUND_AREA_SMALL_ENCLOSED
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index daf72168235..f3e6ac5d09f 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -64,7 +64,7 @@
name = "a hand teleporter"
typepath = /obj/item/hand_tele
protected_jobs = list("Captain", "Research Director", "Chief Engineer")
- location_override = "Teleporter"
+ location_override = "the AI Satellite, or the Captain's Office"
/datum/theft_objective/defib
name = "the chief medical officer's advanced compact defibrillator"
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index b24597ec1fa..11034d97226 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -27,7 +27,9 @@
ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS,
ACCESS_SUPPLY_SHUTTLE,
- ACCESS_WEAPONS
+ ACCESS_WEAPONS,
+ ACCESS_TELEPORTER,
+ ACCESS_EXPEDITION
)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
outfit = /datum/outfit/job/qm
@@ -161,7 +163,45 @@
back = /obj/item/mod/control/pre_equipped/mining/asteroid
mask = /obj/item/clothing/mask/breath
+/datum/job/explorer
+ title = "Explorer"
+ flag = JOB_EXPLORER
+ department_flag = JOBCAT_SUPPORT
+ job_department_flags = DEP_FLAG_SUPPLY
+ total_positions = 4
+ spawn_positions = 4
+ supervisors = "the quartermaster"
+ department_head = list("Quartermaster")
+ selection_color = "#eeddbe"
+ access = list(
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_EXPEDITION,
+ ACCESS_EVA,
+ ACCESS_EXTERNAL_AIRLOCKS,
+ ACCESS_TELEPORTER,
+ ACCESS_CARGO,
+ ACCESS_CARGO_BAY,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_SUPPLY_SHUTTLE,
+ ACCESS_MINING_STATION
+ )
+ alt_titles = list("Salvage Technician", "Scavenger")
+ outfit = /datum/outfit/job/explorer
+/datum/outfit/job/explorer
+ name = "Explorer"
+ jobtype = /datum/job/explorer
+ l_ear = /obj/item/radio/headset/headset_cargo/expedition
+ head = /obj/item/clothing/head/soft/expedition
+ uniform = /obj/item/clothing/under/rank/cargo/expedition
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/jackboots
+ belt = /obj/item/storage/belt/utility/expedition
+ id = /obj/item/card/id/explorer
+ pda = /obj/item/pda/explorer
+ backpack = /obj/item/storage/backpack/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ box = /obj/item/storage/box/survival_mining
//Food
/datum/job/bartender
@@ -500,26 +540,3 @@
if(new_language.flags & (HIVEMIND|NOLIBRARIAN))
continue
H.add_language(la)
-
-/datum/job/explorer
- title = "Explorer"
- flag = JOB_EXPLORER
- department_flag = JOBCAT_SUPPORT
- total_positions = 4
- spawn_positions = 4
- supervisors = "the head of personnel"
- department_head = list("Head of Personnel")
- selection_color = "#dddddd"
- access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXPEDITION, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
- outfit = /datum/outfit/job/explorer
-
-/datum/outfit/job/explorer
- name = "Explorer"
- jobtype = /datum/job/explorer
- uniform = /obj/item/clothing/under/color/orange
- gloves = /obj/item/clothing/gloves/color/black
- shoes = /obj/item/clothing/shoes/workboots
- glasses = /obj/item/clothing/glasses/welding
- belt = /obj/item/storage/belt/utility
- l_pocket = /obj/item/gps
- id = /obj/item/card/id/explorer
diff --git a/code/game/jobs/job_globals.dm b/code/game/jobs/job_globals.dm
index b469381bbfe..eafaadcfaa1 100644
--- a/code/game/jobs/job_globals.dm
+++ b/code/game/jobs/job_globals.dm
@@ -65,14 +65,14 @@ GLOBAL_LIST_INIT(service_positions, list(
"Internal Affairs Agent",
"Chaplain",
"Clown",
- "Mime",
- "Explorer"
+ "Mime"
))
GLOBAL_LIST_INIT(supply_positions, list(
"Quartermaster",
"Cargo Technician",
- "Shaft Miner"
+ "Shaft Miner",
+ "Explorer"
))
/// Roles that include any semblence of security, mostly for jobbans
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 4ab93649c91..580373b5048 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -34,7 +34,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/job/ntspecops/solgovspecops,
/datum/job/assistant,
/datum/job/syndicateofficer,
- /datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
)
// Jobs that appear in the list, and you can prioritize, but not open/close slots for
var/list/blacklisted_partial = list(
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 5890c24d07f..af3b0d0eeda 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -277,6 +277,7 @@ to destroy them and players will be able to make replacements.
"EngiDrobe" = /obj/machinery/economy/vending/engidrobe,
"AtmosDrobe" = /obj/machinery/economy/vending/atmosdrobe,
"CargoDrobe" = /obj/machinery/economy/vending/cargodrobe,
+ "ExploreDrobe" = /obj/machinery/economy/vending/exploredrobe,
"ChefDrobe" = /obj/machinery/economy/vending/chefdrobe,
"BarDrobe" = /obj/machinery/economy/vending/bardrobe,
"HydroDrobe" = /obj/machinery/economy/vending/hydrodrobe,
@@ -1052,6 +1053,11 @@ to destroy them and players will be able to make replacements.
icon_state = "generic"
build_path = /obj/machinery/mineral/equipment_vendor/labor
+/obj/item/circuitboard/mining_equipment_vendor/explorer
+ board_name = "Explorer Equipment Vendor"
+ icon_state = "supply"
+ build_path = /obj/machinery/mineral/equipment_vendor/explorer
+
/obj/item/circuitboard/clawgame
board_name = "Claw Game"
icon_state = "generic"
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 0b34829a439..3e9ffe429bc 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -179,6 +179,11 @@
helmet_type = /obj/item/clothing/head/space/prisoner_gulag
mask_type = /obj/item/clothing/mask/breath
+/obj/machinery/suit_storage_unit/expedition
+ name = "explorer modsuit storage unit"
+ mask_type = /obj/item/clothing/mask/gas/explorer
+ suit_type = /obj/item/mod/control/pre_equipped/standard/explorer
+ req_access = list(ACCESS_EXPEDITION)
/obj/machinery/suit_storage_unit/cmo
name = "chief medical officer's suit storage unit"
mask_type = /obj/item/clothing/mask/breath
diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm
index da5178641b9..8fbed17d817 100644
--- a/code/game/machinery/tcomms/nttc.dm
+++ b/code/game/machinery/tcomms/nttc.dm
@@ -111,6 +111,9 @@
"Cargo Technician" = "supradio",
"Shaft Miner" = "supradio",
"Spelunker" = "supradio",
+ "Explorer" = "supradio",
+ "Salvage Technician" = "supradio",
+ "Scavenger" = "supradio",
// Service
"Bartender" = "srvradio",
"Beautician" = "srvradio",
diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm
index aabb66a71a3..f5be50a1995 100644
--- a/code/game/machinery/vendors/wardrobe_vendors.dm
+++ b/code/game/machinery/vendors/wardrobe_vendors.dm
@@ -562,7 +562,8 @@
/obj/item/clothing/shoes/workboots = 3)
contraband = list(/obj/item/toy/figure/crew/qm = 1,
- /obj/item/toy/figure/crew/cargotech = 1)
+ /obj/item/toy/figure/crew/cargotech = 1,
+ /obj/item/toy/figure/crew/miner = 1)
prices = list(/obj/item/clothing/under/rank/cargo/tech = 50,
/obj/item/clothing/under/rank/cargo/tech/skirt = 50,
@@ -580,6 +581,48 @@
refill_canister = /obj/item/vending_refill/cargodrobe
+/obj/machinery/economy/vending/exploredrobe
+ name = "\improper ExploreDrobe"
+ desc = "This vending machine dispense clothing for the expedition team, though wearing any of the contents in place of a space suit may not go well for you."
+ icon_state = "exploredrobe"
+ icon_lightmask = "base_drobe"
+ icon_panel = "drobe"
+ icon_broken = "base_drobe"
+ icon_off = "base_drobe"
+ category = VENDOR_TYPE_CLOTHING
+ ads_list = list("Not guaranteed to protect the user from space. We are not liable!")
+
+ vend_reply = "Thank you for using the ExploreDrobe!"
+ products = list(/obj/item/clothing/under/rank/cargo/expedition = 3,
+ /obj/item/clothing/under/rank/cargo/expedition/skirt = 3,
+ /obj/item/clothing/under/rank/cargo/expedition/overalls = 3,
+ /obj/item/clothing/head/soft/expedition = 3,
+ /obj/item/clothing/head/beret/expedition = 3,
+ /obj/item/clothing/suit/jacket/expeditionbomber = 3,
+ /obj/item/mod/skin_applier = 3,
+ /obj/item/clothing/gloves/color/black = 3,
+ /obj/item/clothing/accessory/armband/cargo = 3,
+ /obj/item/clothing/shoes/jackboots = 3,
+ /obj/item/clothing/mask/gas/explorer = 3,
+ /obj/item/storage/backpack/explorer = 2,
+ /obj/item/storage/backpack/satchel/explorer = 2)
+
+ contraband = list(/obj/item/toy/figure/crew/explorer = 1)
+
+ prices = list(/obj/item/clothing/under/rank/cargo/expedition = 50,
+ /obj/item/clothing/under/rank/cargo/expedition/skirt = 50,
+ /obj/item/clothing/under/rank/cargo/expedition/overalls = 50,
+ /obj/item/clothing/head/soft/expedition = 20,
+ /obj/item/clothing/head/beret/expedition = 20,
+ /obj/item/clothing/suit/jacket/expeditionbomber = 75,
+ /obj/item/clothing/gloves/color/black = 20,
+ /obj/item/clothing/accessory/armband/cargo = 20,
+ /obj/item/clothing/shoes/jackboots = 20,
+ /obj/item/storage/backpack/explorer = 50,
+ /obj/item/storage/backpack/satchel/explorer = 50)
+
+ refill_canister = /obj/item/vending_refill/exploredrobe
+
/obj/machinery/economy/vending/chefdrobe
name = "\improper ChefDrobe"
desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing."
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index 03639969e9b..0384d6a718c 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -253,11 +253,11 @@
/obj/item/toy/syndicateballoon = 1,
/obj/item/soap/syndie = 1,
/obj/item/clothing/under/syndicate = 1,
- /obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/mask/gas/syndicate = 1,
/obj/item/suppressor = 1,
/obj/item/coin/antagtoken/syndicate = 1,
- /obj/item/storage/box/syndie_kit/cutouts = 1)
+ /obj/item/storage/box/syndie_kit/space = 1,
+ /obj/item/clothing/shoes/magboots/syndie = 1)
/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin
name = "20pc stetchkin"
@@ -271,88 +271,72 @@
/obj/effect/spawner/random_spawners/syndicate/loot/level2
name = "rare loot"
- // Loot schema: space gear, basic armor, basic ammo (10mm, rcd), drugs, more dangerous/useful gimmick items, lower-value minerals
+ // Basic stealth, utility and environmental gear.
result = list(/datum/nothing = 27,
- /obj/item/storage/box/syndie_kit/space = 1,
/obj/item/mod/control/pre_equipped/traitor = 1,
- /obj/item/clothing/shoes/magboots/syndie = 1,
- /obj/item/clothing/suit/armor/vest/combat = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
- /obj/item/storage/pill_bottle/happy = 1,
- /obj/item/storage/pill_bottle/zoom = 1,
- /obj/item/storage/pill_bottle/random_drug_bottle = 2,
/obj/item/storage/backpack/duffel/syndie/med/surgery = 1,
/obj/item/clothing/shoes/chameleon/noslip = 1,
/obj/item/storage/belt/military = 1,
/obj/item/clothing/under/chameleon = 1,
/obj/item/storage/backpack/satchel_flat = 1,
- /obj/item/rcd = 1,
- /obj/item/rcd_ammo = 1,
/obj/item/stamp/chameleon = 1,
- /obj/item/flag/chameleon = 1,
/obj/item/lighter/zippo/gonzofist = 1,
- /obj/item/clothing/gloves/fingerless/rapid = 1,
- /obj/item/grenade/spawnergrenade/manhacks = 1,
- /obj/item/grenade/syndieminibomb = 1,
- /obj/item/storage/box/syndie_kit/throwing_weapons = 1,
- /obj/item/pen/edagger = 1,
/obj/item/stack/sheet/mineral/plasma{amount = 20} = 1,
/obj/item/stack/sheet/mineral/silver{amount = 20} = 1,
/obj/item/stack/sheet/mineral/gold{amount = 20} = 1,
+ /obj/item/stack/sheet/mineral/uranium{amount = 20} = 1,
/obj/item/mod/module/noslip = 1,
- /obj/item/mod/module/visor/night = 1)
+ /obj/item/mod/module/visor/night = 1,
+ /obj/item/clothing/gloves/color/black/thief = 1,
+ /obj/item/clothing/suit/storage/iaa/blackjacket/armored = 1,
+ /obj/item/clothing/suit/jacket/syndicatebomber = 1,
+ /obj/item/mod/module/holster/hidden = 1,
+ /obj/item/storage/firstaid/tactical = 1,
+ /obj/item/clothing/under/syndicate/silicon_cham = 1,
+ /obj/item/storage/box/syndie_kit/camera_bug = 1,
+ /obj/item/gun/projectile/automatic/toy/pistol/riot = 1,
+ /obj/item/flash/cameraflash = 1,
+ /obj/item/mod/module/chameleon = 1,
+ /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1)
/obj/effect/spawner/random_spawners/syndicate/loot/level3
name = "officer loot"
- // Loot schema: medkits, very useful devices (jammer, illegal upgrade, RCD), better quality ammo (AP, fire), basic weapons (pistol, empgrenade), high value ores (diamond, uranium)
+ // Primarily utility items with occasional low damage weaponry.
result = list(/datum/nothing = 25,
/obj/item/jammer = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1,
- /obj/item/gun/projectile/automatic/pistol = 1,
- /obj/item/stock_parts/cell/bluespace = 1,
- /obj/item/card/emag = 1,
/obj/item/encryptionkey/binary = 1,
/obj/item/pinpointer/advpinpointer = 1,
- /obj/item/borg/upgrade/vtec = 1,
/obj/item/borg/upgrade/syndicate = 1,
/obj/item/borg/upgrade/selfrepair = 1,
+ /obj/item/storage/box/syndie_kit/stechkin = 1,
/obj/item/stack/sheet/mineral/diamond{amount = 10} = 1,
/obj/item/stack/sheet/mineral/uranium{amount = 10} = 1,
/obj/item/clothing/shoes/magboots/elite = 1,
- /obj/item/grenade/empgrenade = 1,
- /obj/item/grenade/clown_grenade = 1,
- /obj/item/grenade/spawnergrenade/feral_cats = 1,
- /obj/item/ammo_box/magazine/m10mm/ap = 1,
- /obj/item/ammo_box/magazine/m10mm/fire = 1,
- /obj/item/ammo_box/magazine/m10mm/hp = 1,
- /obj/item/storage/box/syndie_kit/emp = 1,
- /obj/item/toy/plushie/carpplushie/dehy_carp = 1,
/obj/item/clothing/glasses/hud/security/chameleon = 1,
/obj/item/mod/module/visor/thermal = 1,
/obj/item/mod/module/stealth = 1,
- /obj/item/mod/module/power_kick = 1)
+ /obj/item/mod/module/power_kick = 1,
+ /obj/item/storage/box/syndidonkpockets = 1,
+ /obj/item/pen/edagger = 1,
+ /obj/item/door_remote/omni/access_tuner = 1,
+ /obj/item/clothing/glasses/thermal = 1)
/obj/effect/spawner/random_spawners/syndicate/loot/level4
name = "armory loot"
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
- // Loot schema: high-power weapons (m90, esword, ebow, revolver), devices that negate depot challenges (thermal glasses, chameleon device), explosives
- result = list(/obj/item/gun/projectile/automatic/c20r = 1,
- /obj/item/gun/projectile/automatic/m90 = 1,
- /obj/item/gun/projectile/automatic/sniper_rifle/syndicate = 1,
- /obj/item/melee/energy/sword/saber = 1,
- /obj/item/gun/energy/kinetic_accelerator/crossbow = 1,
- /obj/item/gun/projectile/revolver = 1,
- /obj/item/bio_chip_implanter/shock = 1,
- /obj/item/butcher_chainsaw = 1,
- /obj/item/bee_briefcase = 1,
- /obj/item/fireaxe/energized = 1,
- /obj/item/clothing/glasses/thermal = 1,
+ // Combat orientated items that could give the player an advantage if an antag messes with them.
+ result = list(/obj/item/melee/energy/sword/saber = 1,
+ /obj/item/autosurgeon/organ/syndicate/razorwire = 1,
/obj/item/chameleon = 1,
+ /obj/item/CQC_manual = 1,
/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
- /obj/item/grenade/plastic/c4/x4 = 1,
- /obj/item/mod/control/pre_equipped/traitor_elite = 1)// Adding this as it is something an explorer can use to explore space better, that isn't a high powered murder weapon.
+ /obj/item/clothing/gloves/fingerless/rapid = 1,
+ /obj/item/gun/medbeam = 1,
+ /obj/item/shield/energy = 1,
+ /obj/item/storage/box/syndie_kit/teleporter = 1,
+ /obj/item/weaponcrafting/gunkit/universal_gun_kit = 1)
// Layout-affecting spawns
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 518ec0bc614..1d56a6af5c3 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -289,6 +289,11 @@
desc = "Headset used by shaft miners."
icon_state = "mine_headset"
+/obj/item/radio/headset/headset_cargo/expedition
+ name = "expedition radio headset"
+ desc = "Headset used by space explorers."
+ icon_state = "mine_headset"
+
/obj/item/radio/headset/headset_service
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
diff --git a/code/game/objects/items/salvage.dm b/code/game/objects/items/salvage.dm
new file mode 100644
index 00000000000..c7f93048882
--- /dev/null
+++ b/code/game/objects/items/salvage.dm
@@ -0,0 +1,101 @@
+/obj/item/salvage
+ name = "salvage"
+ desc = "A tonne of salvage looted from bad mapping practices. Who spawned the base type? Report this on the github."
+ icon = 'icons/obj/sellable.dmi'
+ force = 5
+ throwforce = 5
+ throw_speed = 1
+ throw_range = 4
+ hitsound = 'sound/items/handling/salvagepickup.ogg'
+ pickup_sound = 'sound/items/handling/salvagepickup.ogg'
+ drop_sound = 'sound/items/handling/salvagedrop.ogg'
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/salvage/examine(mob/user)
+ . = ..()
+ . += "You can bring this back to Cargo to sell to Central Command onboard the 'NTV Arion' Supply shuttle."
+
+/// Ruin Salvage, misc loot gained from looking around ruins.
+
+/obj/item/salvage/ruin
+ desc = "A tonne of salvage recovered from an abandoned ruin. Who spawned the base type? Report this on the github."
+
+/obj/item/salvage/ruin/pirate
+ name = "rum keg"
+ desc = "A highly valued keg of aged space rum. Limited edition and sure to be a collector's item."
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "barrel"
+ color = "#7e5c00" // So that it's slightly different from normal kegs
+
+/obj/item/salvage/ruin/russian
+ name = "armaments cache"
+ desc = "A crate of old disused Belastrav ballistic firearms clearly long past their usability. This crate would make good scrap metal for shuttle construction."
+ icon_state = "weapon_crate"
+
+/obj/item/salvage/ruin/brick
+ name = "mysterious brick"
+ desc = "A peculier brick formed out of what appears to be plastic. This would make a fantastic collector's item."
+ icon_state = "lego_brick"
+ hitsound = 'sound/items/handling/taperecorder_drop.ogg'
+ pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
+ drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
+
+/obj/item/salvage/ruin/brick/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/caltrop, 5, 10) // 5 to 10 damage, hits like a truck
+
+/obj/item/salvage/ruin/nanotrasen
+ name = "lost research notes"
+ desc = "A collection of research notes penned by old Nanotrasen scientists from decades past, technology lost in time- until you found them. It is a mystery what technology Central Command will push if they could just get their hands on these notes."
+ icon_state = "research_doc"
+ hitsound = 'sound/items/handling/paper_pickup.ogg'
+ pickup_sound = 'sound/items/handling/paper_pickup.ogg'
+ drop_sound = 'sound/items/handling/paper_drop.ogg'
+
+/obj/item/salvage/ruin/nanotrasen/Initialize(mapload)
+ . = ..()
+ origin_tech = pick(list("combat=5", "materials=5", "engineering=5", "biotech=5", "power=5", "data=5"))
+/obj/item/salvage/ruin/carp
+ name = "carp scales"
+ desc = "A collection of scales shed from a corrupted space carp. Their culinary potential could mean untold riches for Nanotrasen."
+ icon_state = "dragon_scales"
+ hitsound = sound('sound/effects/hit_on_shattered_glass.ogg', 20)
+ pickup_sound = sound('sound/hallucinations/im_here2.ogg', 10)
+ drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
+
+/obj/item/salvage/ruin/tablet
+ name = "mysterious tablet"
+ desc = "A mysterious and old stone tablet. When you read the text on it, you start getting chills."
+ icon_state = "stone_tablet"
+ hitsound = sound('sound/effects/break_stone.ogg', 20)
+ pickup_sound = sound('sound/hallucinations/im_here2.ogg', 10)
+ drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
+
+/// Loot salvage, gained from fighting space simplemobs.
+
+/obj/item/salvage/loot
+ desc = "A tonne of salvage looted from a fallen foe. Who spawned the base type? Report this on the github."
+
+/obj/item/salvage/loot/pirate
+ name = "stolen jewellery"
+ desc = "A collection of stolen jewellery, fashioned from pilfered bluespace crystals and gems. Rumour has it, local pirates have been known to use these accessories to avoid capture."
+ icon_state = "pirate_treasure"
+ hitsound = 'sound/items/handling/taperecorder_drop.ogg'
+ pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
+ drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
+
+/obj/item/salvage/loot/russian
+ name = "siosp manual"
+ desc = "A small manual, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Central Command may wish to share this with their allies in the Trans-Solar Federation."
+ icon_state = "ussp_manual"
+ hitsound = 'sound/items/handling/paper_pickup.ogg'
+ pickup_sound = 'sound/items/handling/paper_pickup.ogg'
+ drop_sound = 'sound/items/handling/paper_drop.ogg'
+
+/obj/item/salvage/loot/syndicate
+ name = "syndicate intel"
+ desc = "A folder detailing Syndicate plans to infiltrate and sabotage operations in the Epsilon Eridani sector. Central Command may find use of this to aid them in counter-intelligence."
+ icon_state = "syndie_doc"
+ hitsound = 'sound/items/handling/paper_pickup.ogg'
+ pickup_sound = 'sound/items/handling/paper_pickup.ogg'
+ drop_sound = 'sound/items/handling/paper_drop.ogg'
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 683b0eac149..d7d0ea0e536 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1367,6 +1367,12 @@
icon_state = "cargotech"
toysay = "For Cargonia!"
+/obj/item/toy/figure/crew/explorer
+ name = "\improper Explorer action figure"
+ desc = "The oblivious explorer, from Space Life's SS12 figurine collection."
+ icon_state = "explorer"
+ toysay = "I f-foun-nd-d it-t in-n s-spac-ce!"
+
/obj/item/toy/figure/crew/ce
name = "\improper Chief Engineer action figure"
desc = "The expert Chief Engineer, from Space Life's SS12 figurine collection."
diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
index 0313f5ae46a..e047ea965b6 100644
--- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
@@ -254,9 +254,11 @@
/obj/item/melee/energy/sword/pirate
name = "energy cutlass"
desc = "Arrrr matey."
+ force_on = 20
icon_state = "cutlass0"
icon_state_on = "cutlass1"
light_color = LIGHT_COLOR_RED
+ origin_tech = "combat=3;magnets=4;syndicate=2"
/obj/item/melee/energy/blade
name = "energy blade"
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 4f9051aa39a..ea696589078 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -462,3 +462,28 @@
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/airlock_electronics, /obj/item/firelock_electronics, /obj/item/firealarm_electronics, /obj/item/apc_electronics, /obj/item/airalarm_electronics, /obj/item/camera_assembly, /obj/item/stock_parts/cell, /obj/item/circuitboard, /obj/item/stack/cable_coil)
resistance_flags = FLAMMABLE
+
+/*
+ * Treasure bag
+ */
+
+/obj/item/storage/bag/expedition
+ name = "treasure satchel"
+ desc = "A satchel for storing scavenged salvage. There be treasure."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "satchel" // placeholder
+ origin_tech = "engineering=2"
+ slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
+ w_class = WEIGHT_CLASS_NORMAL
+ storage_slots = 15
+ max_combined_w_class = 60
+ max_w_class = WEIGHT_CLASS_NORMAL
+ can_hold = list(/obj/item/salvage)
+
+/obj/item/storage/bag/expedition/robust
+ name = "robust treasure satchel"
+ desc = "We heard you liked booty so we put booty in your booty so ye could carry more booty."
+ storage_slots = 30
+ max_combined_w_class = 120
+ origin_tech = "materials=3;engineering=3"
+ icon_state = "satchel_bspace" // placeholder
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 0750631f1ba..f9276d10f9a 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -164,6 +164,21 @@
new /obj/item/stack/cable_coil(src, 30, COLOR_RED)
update_icon()
+/obj/item/storage/belt/utility/expedition
+ desc = "A belt for holding tools, but with style."
+ icon_state = "assaultbelt"
+ item_state = "assault"
+
+/obj/item/storage/belt/utility/expedition/populate_contents()
+ new /obj/item/screwdriver(src, "blue")
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool/hugetank(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/wirecutters(src)
+ new /obj/item/multitool(src)
+ new /obj/item/stack/cable_coil(src, 30, COLOR_BLUE)
+ update_icon()
+
/obj/item/storage/belt/medical
name = "medical belt"
desc = "Can hold various medical equipment."
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index a2578bc2cb5..4d585cef1d9 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -949,6 +949,17 @@
return
return ..()
+/obj/item/storage/box/relay_kit
+ name = "telecommunications relay kit"
+ desc = "Contains everything you need to set up your own telecommunications array!"
+
+/obj/item/storage/box/relay_kit/populate_contents()
+ new /obj/item/paper/tcommskey(src)
+ new /obj/item/stack/sheet/metal/(src, 5)
+ new /obj/item/circuitboard/tcomms/relay(src)
+ new /obj/item/stock_parts/manipulator(src)
+ new /obj/item/stock_parts/manipulator(src)
+ new /obj/item/stack/cable_coil(src, 7)
/obj/item/storage/box/centcomofficer
name = "officer kit"
diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm
index f648c022c23..47835a9a9c6 100644
--- a/code/game/objects/items/weapons/storage/garment.dm
+++ b/code/game/objects/items/weapons/storage/garment.dm
@@ -298,4 +298,15 @@
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/shoes/black(src)
+/obj/item/storage/bag/garment/explorer
+ name = "explorer's garment bag"
+ desc = "A bag for storing extra clothes and shoes. This one belongs to the explorer."
+/obj/item/storage/bag/garment/explorer/populate_contents()
+ new /obj/item/clothing/under/rank/cargo/expedition(src)
+ new /obj/item/clothing/under/rank/cargo/expedition/overalls(src)
+ new /obj/item/clothing/head/soft/expedition(src)
+ new /obj/item/clothing/head/beret/expedition(src)
+ new /obj/item/clothing/gloves/color/black(src)
+ new /obj/item/clothing/shoes/jackboots(src)
+ new /obj/item/clothing/mask/gas/explorer(src)
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index 02681064795..6995d3ad442 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -200,6 +200,10 @@
machine_name = "CargoDrobe"
icon_state = "refill_clothes"
+/obj/item/vending_refill/exploredrobe
+ machine_name = "ExploreDrobe"
+ icon_state = "refill_clothes"
+
/obj/item/vending_refill/chefdrobe
machine_name = "ChefDrobe"
icon_state = "refill_clothes"
diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm
index 2f2eec45cf9..6a437f9a735 100644
--- a/code/game/objects/mail.dm
+++ b/code/game/objects/mail.dm
@@ -107,10 +107,11 @@
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/stack/wrapping_paper,
/obj/item/toy/figure/crew/cargotech,
+ /obj/item/toy/figure/crew/explorer,
/obj/item/toy/figure/crew/qm,
/obj/item/toy/figure/crew/miner,
/obj/item/storage/box/scratch_cards)
- job_list = list("Quartermaster", "Cargo Technician", "Shaft Miner")
+ job_list = list("Quartermaster", "Cargo Technician", "Shaft Miner", "Explorer")
/obj/item/envelope/medical
icon_state = "mail_med"
@@ -211,7 +212,7 @@
/obj/item/toy/figure/owl,
/obj/item/toy/figure/griffin,
/obj/item/storage/box/scratch_cards)
- job_list = list("Assistant", "Explorer")
+ job_list = list("Assistant")
/*//////////////////////\/
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
index 1dcf525e29a..50298cb22db 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
@@ -13,6 +13,24 @@
new /obj/item/clothing/head/soft/cargo(src)
new /obj/item/storage/bag/mail(src)
+/obj/structure/closet/secure_closet/explorer
+ name = "explorer's locker"
+ req_access = list(ACCESS_EXPEDITION)
+ icon_state = "explorer"
+ open_door_sprite = "mining_door"
+
+/obj/structure/closet/secure_closet/explorer/populate_contents()
+ new /obj/item/radio/headset/headset_cargo/expedition(src)
+ new /obj/item/gun/energy/kinetic_accelerator/pistol(src)
+ new /obj/item/storage/firstaid/regular(src)
+ new /obj/item/clothing/accessory/holster(src)
+ new /obj/item/radio/beacon(src)
+ new /obj/item/storage/box/relay_kit(src)
+ new /obj/item/gps(src)
+ new /obj/item/storage/bag/ore(src)
+ new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
+ new /obj/item/storage/bag/expedition(src)
+
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm
index 998f1f3e5b4..d7922d10205 100644
--- a/code/modules/client/preference/character.dm
+++ b/code/modules/client/preference/character.dm
@@ -1188,15 +1188,17 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_EXPLORER)
- clothes_s = new /icon('icons/mob/clothing/under/color.dmi', "orange_s")
- clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "workboots"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/under/cargo.dmi', "expedition_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY)
has_gloves = TRUE
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/clothing/under/syndicate.dmi', "tactifool_s"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "explorerpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-explorer"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_medsci_high)
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index 18e88569691..7cb34bf437e 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -106,6 +106,11 @@
path = /obj/item/clothing/suit/jacket/miningbomber
allowed_roles = list("Quartermaster", "Shaft Miner")
+/datum/gear/suit/bomber/job/expedition
+ display_name = "Bomber jacket, expedition"
+ path = /obj/item/clothing/suit/jacket/expeditionbomber
+ allowed_roles = list("Quartermaster", "Explorer")
+
/datum/gear/suit/bomber/job/engi
display_name = "Bomber jacket, engineering"
path = /obj/item/clothing/suit/jacket/engibomber
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 9cb82ab6895..abc10ea7ce3 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -183,6 +183,11 @@
path = /obj/item/clothing/under/rank/cargo/tech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
+/datum/gear/uniform/skirt/job/expedition
+ display_name = "Skirt, expedition"
+ path = /obj/item/clothing/under/rank/cargo/expedition/skirt
+ allowed_roles = list("Quartermaster", "Explorer")
+
/datum/gear/uniform/skirt/job/qm
display_name = "Skirt, quartermaster"
path = /obj/item/clothing/under/rank/cargo/qm/skirt
diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm
index 01e350e4229..0cf008e5d5e 100644
--- a/code/modules/clothing/head/beret.dm
+++ b/code/modules/clothing/head/beret.dm
@@ -156,6 +156,19 @@
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
+/obj/item/clothing/head/beret/expedition
+ name = "expedition beret"
+ desc = "A brown beret with a blue Nanotrasen insignia emblazoned on it. Not much good for space protection, but stylish all the same."
+ icon_state = "beret_expedition"
+ item_color = "beret_expedition"
+ armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
+ strip_delay = 6 SECONDS
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
+ )
+
+
//Special Roles
/obj/item/clothing/head/beret/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's beret"
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 1a8586919f0..31afd6835b5 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -194,4 +194,3 @@
desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark as the coroner's humor."
icon_state = "surgcap_black"
dog_fashion = /datum/dog_fashion/head/surgery
-
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 976093af075..d8388767e59 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -117,6 +117,16 @@
"Grey" = 'icons/mob/clothing/species/grey/head/softcap.dmi'
)
+/obj/item/clothing/head/soft/expedition
+ name = "expedition cap"
+ desc = "It's a baseball hat in the brown and blue markings of the expedition team."
+ icon_state = "expeditionsoft"
+ item_color = "expedition"
+ armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi'
+ )
+
/obj/item/clothing/head/soft/janitorgrey
name = "grey janitor's cap"
desc = "It's a grey baseball hat with a purple custodial shield."
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 4519e320e1f..461f780e99d 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -187,6 +187,13 @@
item_state = "explorer_envirohelm"
visor_icon = "explorer_envisor"
+/obj/item/clothing/head/helmet/space/plasmaman/expedition
+ name = "expedition plasma envirosuit helmet"
+ desc = "A brown and blue helmet given to plasmaman explorers operating in Space.."
+ icon_state = "expedition_envirohelm"
+ item_state = "expedition_envirohelm"
+ armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150)
+
/obj/item/clothing/head/helmet/space/plasmaman/chaplain
name = "chaplain's plasma envirosuit helmet"
desc = "An envirohelmet specially designed for only the most pious of plasmamen."
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index 301c4c86314..0142f525753 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -305,10 +305,63 @@
icon_state = "carp_casual"
body_parts_covered = HEAD
cold_protection = HEAD
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags = BLOCKHAIR
flags_inv = HIDEEARS
+/obj/item/clothing/suit/hooded/carp_costume/dragon
+ name = "space carp poncho"
+ desc = "A poncho fashioned from the scales of a corrupted space carp, it still smells."
+ armor = list(MELEE = 30, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|HANDS|FEET
+ flags = STOPSPRESSUREDMAGE
+ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ hoodtype = /obj/item/clothing/head/hooded/carp_hood/dragon
+
+/obj/item/clothing/suit/hooded/carp_costume/dragon/equipped(mob/user, slot, initial)
+ . = ..()
+ if(slot == SLOT_HUD_OUTER_SUIT)
+ user.faction += "carp"
+ to_chat(user, "You feel a something gnash in the back of your mind- the carp are your friends, not your foe.")
+ playsound(loc, 'sound/weapons/bite.ogg', 35, TRUE)
+
+/obj/item/clothing/suit/hooded/carp_costume/dragon/dropped(mob/user)
+ . = ..()
+ if(user)
+ user.faction -= "carp"
+ to_chat(user, "A sudden calm fills the gnashing void of your mind- you're alone now.")
+
+/mob/living/carbon/human/Process_Spacemove(movement_dir = 0)
+ if(..())
+ return TRUE
+
+ if(istype(wear_suit, /obj/item/clothing/suit/hooded/carp_costume/dragon))
+ return TRUE
+ //Do we have a working jetpack?
+ var/obj/item/tank/jetpack/thrust
+ if(istype(back, /obj/item/tank/jetpack))
+ thrust = back
+ else if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit))
+ var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
+ thrust = C.jetpack
+ else if(ismodcontrol(back))
+ var/obj/item/mod/control/C = back
+ thrust = locate(/obj/item/mod/module/jetpack) in C
+ if(thrust)
+ if((movement_dir || thrust.stabilizers) && thrust.allow_thrust(0.01, src))
+ return TRUE
+ if(dna.species.spec_Process_Spacemove(src))
+ return TRUE
+ return FALSE
+
+/obj/item/clothing/head/hooded/carp_hood/dragon
+ name = "space carp hood"
+ desc = "Fashioned from the maw of a carp, this outfit makes you feel like a fish out of water."
+ armor = list(MELEE = 55, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
+ flags = STOPSPRESSUREDMAGE
+ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
+
/obj/item/clothing/suit/hooded/salmon_costume
name = "salmon suit"
desc = "A costume made from authentic salmon scales, it reeks!"
@@ -929,6 +982,13 @@
allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore)
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
+/obj/item/clothing/suit/jacket/expeditionbomber
+ name = "expedition bomber jacket"
+ desc = "A stylish jacket for station-side explorers. Won't do much to protect you from space."
+ icon_state = "bomberexpedition"
+ item_state = "bomberexpedition"
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/t_scanner/adv_mining_scanner, /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/gps)
+
/obj/item/clothing/suit/jacket/hydrobomber
name = "hydroponics bomber jacket"
desc = "A stylish choice for the workers of the hydroponics lab."
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
index 95830f86952..95e73e589d8 100644
--- a/code/modules/clothing/under/jobs/cargo.dm
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -77,3 +77,25 @@
icon_state = "explorer"
item_state = "explorer"
item_color = "explorer"
+
+/obj/item/clothing/under/rank/cargo/expedition
+ name = "expedition jumpsuit"
+ desc = "An armored brown jumpsuit with Nanotrasen markings for identification, and a black safety harness for their space suits."
+ armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
+ icon_state = "expedition"
+ item_state = "expedition"
+ item_color = "expedition"
+
+/obj/item/clothing/under/rank/cargo/expedition/skirt
+ name = "expedition jumpskirt"
+ desc = "An armoured brown jumpskirt with Nanotrasen markings for identification, and a black safety harness for their space suits."
+ icon_state = "expedition_skirt"
+ item_state = "expedition_skirt"
+ item_color = "expedition_skirt"
+
+/obj/item/clothing/under/rank/cargo/expedition/overalls
+ name = "expedition overalls"
+ desc = "A black set of overalls over a brown turtleneck, designed to protect the wearer from microscopic space debris. Does not protect against larger objects."
+ icon_state = "expedition_overalls"
+ item_state = "expedition_overalls"
+ item_color = "expedition_overalls"
diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
index 82b2ddf1f2e..b1be1bbd757 100644
--- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
@@ -5,6 +5,13 @@
item_state = "cargo_envirosuit"
item_color = "cargo_envirosuit"
+/obj/item/clothing/under/plasmaman/expedition
+ name = "expedition envirosuit"
+ desc = "An airtight brown and blue suit designed for operations in Space by plasmamen.."
+ icon_state = "expedition_envirosuit"
+ item_state = "expedition_envirosuit"
+ item_color = "expedition_envirosuit"
+
/obj/item/clothing/under/plasmaman/mining
name = "mining plasma envirosuit"
desc = "An airtight khaki suit designed for operations on Lavaland by plasmamen."
diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index 819125630bc..060f4a65261 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -40,7 +40,7 @@
/obj/effect/mapping_helpers/airlock/access/any/command/eva
access = ACCESS_EVA
-/obj/effect/mapping_helpers/airlock/access/any/command/expedition
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/access/any/command/hop
@@ -259,7 +259,7 @@
/obj/effect/mapping_helpers/airlock/access/all/command/eva
access = ACCESS_EVA
-/obj/effect/mapping_helpers/airlock/access/all/command/expedition
+/obj/effect/mapping_helpers/airlock/access/all/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/access/all/command/hop
diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm
index 015eebf685e..b9db5e37100 100644
--- a/code/modules/mapping/windoor_access_helpers.dm
+++ b/code/modules/mapping/windoor_access_helpers.dm
@@ -53,7 +53,7 @@
/obj/effect/mapping_helpers/airlock/windoor/access/any/command/eva
access = ACCESS_EVA
-/obj/effect/mapping_helpers/airlock/windoor/access/any/command/expedition
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/windoor/access/any/command/hop
@@ -262,7 +262,7 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/command/eva
access = ACCESS_EVA
-/obj/effect/mapping_helpers/airlock/windoor/access/all/command/expedition
+/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/windoor/access/all/command/hop
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index ba69109c473..3146e6f2a21 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -370,6 +370,103 @@
EQUIPMENT("Analyzer", /obj/item/analyzer, 50)
)
+/**********************Mining Equipment Vendor (Explorer)**************************/
+
+/obj/machinery/mineral/equipment_vendor/explorer
+ name = "explorer equipment vendor"
+ desc = "An equipment vendor for explorers, points collected at an ore redemption machine can be spent here."
+ icon_state = "explorer"
+
+/obj/machinery/mineral/equipment_vendor/explorer/Initialize(mapload)
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/mining_equipment_vendor/explorer(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stack/sheet/glass(null)
+ RefreshParts()
+
+/obj/machinery/mineral/equipment_vendor/explorer/Initialize(mapload)
+ . = ..()
+ prize_list = list()
+ prize_list["Equipment"] = list(
+ EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
+ EQUIPMENT("Tacticool Toolbelt", /obj/item/storage/belt/utility/expedition, 500),
+ EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 400),
+ EQUIPMENT("GPS", /obj/item/gps, 200),
+ EQUIPMENT("Treasure Satchel", /obj/item/storage/bag/expedition, 100),
+ EQUIPMENT ("Robust Treasure Satchel", /obj/item/storage/bag/expedition/robust, 300),
+ EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
+ EQUIPMENT("Telecommunications Relay Kit", /obj/item/storage/box/relay_kit, 500),
+ EQUIPMENT("Tracking Beacon", /obj/item/radio/beacon, 200),
+ )
+ prize_list["Modsuits"] = list(
+ EQUIPMENT("Standard MODsuit", /obj/item/mod/control/pre_equipped/standard/explorer, 1000),
+ EQUIPMENT("Advanced Jetpack Module", /obj/item/mod/module/jetpack/advanced, 2000),
+ EQUIPMENT("Night Vision Module", /obj/item/mod/module/visor/night, 1500),
+ EQUIPMENT("Clamp Module", /obj/item/mod/module/clamp, 500),
+ EQUIPMENT("GPS Module", /obj/item/mod/module/gps, 500),
+ EQUIPMENT("Mining MODsuit", /obj/item/mod/control/pre_equipped/mining/vendor, 3500),
+ EQUIPMENT("Asteroid MODsuit Skin", /obj/item/mod/skin_applier/asteroid, 1000),
+ )
+
+ prize_list["Consumables"] = list(
+ EQUIPMENT("First-Aid Kit", /obj/item/storage/firstaid/regular, 400),
+ EQUIPMENT("Advanced First-Aid Kit", /obj/item/storage/firstaid/adv, 600),
+ EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1000),
+ EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
+ EQUIPMENT("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
+ )
+
+ prize_list["Kinetic Accelerator"] = list(
+ EQUIPMENT("Kinetic Pistol", /obj/item/gun/energy/kinetic_accelerator/pistol, 750),
+ EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
+ EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
+ EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
+ EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
+ EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300),
+ EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000),
+ EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250),
+ EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
+ )
+
+ prize_list["Miscellaneous"] = list(
+ EQUIPMENT("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
+ EQUIPMENT("Toy Sword", /obj/item/toy/sword, 200),
+ EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
+ EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 300),
+ EQUIPMENT("Suspicious ID Sticker", /obj/item/id_decal/emag, 400),
+ EQUIPMENT("Syndicate Coin", /obj/item/coin/antagtoken/syndicate, 100),
+ EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000),
+ )
+
+/obj/machinery/mineral/equipment_vendor/explorer/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "explorer-open", "explorer", I))
+ return
+ if(panel_open)
+ if(istype(I, /obj/item/crowbar))
+ remove_id()
+ default_deconstruction_crowbar(user, I)
+ return TRUE
+ if(istype(I, /obj/item/mining_voucher))
+ if(!has_power())
+ return
+ redeem_voucher(I, user)
+ return
+ if(istype(I, /obj/item/card/id))
+ if(!has_power())
+ return
+ var/obj/item/card/id/C = user.get_active_hand()
+ if(istype(C) && !istype(inserted_id))
+ if(!user.drop_item())
+ return
+ C.forceMove(src)
+ inserted_id = C
+ ui_interact(user)
+ return
+ return ..()
+
/**********************Mining Equipment Datum**************************/
/datum/data/mining_equipment
@@ -416,4 +513,3 @@
#undef EQUIPMENT
-
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index bbbeff0d8b4..b9dcaa73e10 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -88,6 +88,9 @@
if("Cargo Technician", "Quartermaster")
O = new /datum/outfit/plasmaman/cargo
+ if("Explorer")
+ O = new /datum/outfit/plasmaman/expedition
+
if("Shaft Miner")
O = new /datum/outfit/plasmaman/mining
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 22e9ab52efa..3afe53239e3 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -41,6 +41,25 @@
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id
+/obj/effect/mob_spawn/human/corpse/syndicatequartermaster
+ name = "Syndicate Quartermaster"
+ mob_name = "Syndicate Quartermaster"
+ hair_style = "bald"
+ facial_hair_style = "shaved"
+ id_job = "Operative"
+ id_access_list = list(ACCESS_SYNDICATE)
+ outfit = /datum/outfit/syndicatequartermastercorpse
+
+/datum/outfit/syndicatequartermastercorpse
+ name = "Corpse of a Syndicate Quartermaster"
+ uniform = /obj/item/clothing/under/syndicate
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ l_ear = /obj/item/radio/headset
+ mask = /obj/item/clothing/mask/gas/syndicate
+ back = /obj/item/mod/control/pre_equipped/traitor_elite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen
+ id = /obj/item/card/id
/obj/effect/mob_spawn/human/corpse/clown/corpse
roundstart = TRUE
@@ -60,20 +79,19 @@
/datum/outfit/piratecorpse
name = "Corpse of a Pirate"
uniform = /obj/item/clothing/under/costume/pirate
+ suit = /obj/item/clothing/suit/space/eva
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/eyepatch
- head = /obj/item/clothing/head/bandana
-
+ head = /obj/item/clothing/head/helmet/space/eva
+ back = /obj/item/tank/jetpack/carbondioxide
/obj/effect/mob_spawn/human/corpse/pirate/ranged
name = "Pirate Gunner"
mob_name = "Pirate Gunner"
- outfit = /datum/outfit/piratecorpse/ranged
+ outfit = /datum/outfit/piratecorpse
/datum/outfit/piratecorpse/ranged
name = "Corpse of a Pirate Gunner"
- suit = /obj/item/clothing/suit/pirate_black
- head = /obj/item/clothing/head/pirate
/obj/effect/mob_spawn/human/corpse/russian
diff --git a/code/modules/mob/living/simple_animal/hostile/alien_types.dm b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
index 453bae0aee2..aacb7a71810 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien_types.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
@@ -35,6 +35,15 @@
death_sound = 'sound/voice/hiss6.ogg'
deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
footstep_type = FOOTSTEP_MOB_CLAW
+ loot = list(/obj/effect/decal/cleanable/blood/gibs/xeno/limb, /obj/effect/decal/cleanable/blood/gibs/xeno/core, /obj/effect/decal/cleanable/blood/xeno/splatter, /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/decal/cleanable/blood/gibs/xeno/down)
+
+/mob/living/simple_animal/hostile/alien/ListTargetsLazy()
+ return ListTargets()
+
+/mob/living/simple_animal/hostile/alien/Aggro()
+ . = ..()
+ if(target)
+ playsound(loc, 'sound/voice/hiss4.ogg', 70, TRUE)
/mob/living/simple_animal/hostile/alien/drone
name = "alien drone"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 9036a7298c6..ec3eeb697b6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -596,9 +596,9 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon
name = "space dragon"
- maxHealth = 250
- health = 250
- faction = list("neutral")
+ maxHealth = 1000
+ health = 1000
+ faction = list("carp")
desc = "A space carp turned dragon by vile magic. Has the same ferocity of a space carp, but also a much more enabling body."
icon = 'icons/mob/spacedragon.dmi'
icon_state = "spacedragon"
@@ -609,14 +609,18 @@ Difficulty: Medium
melee_damage_lower = 35
speed = 0
mouse_opacity = MOUSE_OPACITY_ICON
- loot = list()
+ move_to_delay = 3
+ rapid = 2
crusher_loot = list()
- butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
+ loot = list(/obj/effect/temp_visual/bsg_kaboom, /obj/effect/temp_visual/emp/cult, /obj/item/clothing/suit/hooded/carp_costume/dragon, /obj/item/gun/energy/kinetic_accelerator/experimental, /obj/effect/temp_visual/cult/portal)
+ butcher_results = list(/obj/item/stack/ore/diamond = 10, /obj/item/stack/sheet/bone = 30)
move_force = MOVE_FORCE_NORMAL
move_resist = MOVE_FORCE_NORMAL
pull_force = MOVE_FORCE_NORMAL
deathmessage = "screeches as its wings turn to dust and it collapses on the floor, life extinguished."
attack_action_types = list()
+ internal_gps = /obj/item/gps/internal/carp
+ death_sound = 'sound/creatures/spacedragondeath.ogg'
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon/Initialize(mapload)
var/datum/spell/aoe/repulse/spacedragon/repulse_action = new /datum/spell/aoe/repulse/spacedragon(src)
@@ -625,7 +629,7 @@ Difficulty: Medium
. = ..()
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon/proc/fire_stream(atom/at = target)
- playsound(get_turf(src),'sound/magic/fireball.ogg', 200, TRUE)
+ playsound(get_turf(src),'sound/magic/magic_missile.ogg', 200, TRUE)
SLEEP_CHECK_DEATH(0)
var/range = 20
var/list/turfs = list()
@@ -661,6 +665,12 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon/AltClickOn(atom/movable/A)
return
+/obj/item/gps/internal/carp
+ icon_state = null
+ gpstag = "Corrupted Signal"
+ desc = "Fish and chips."
+ invisibility = 100
+
#undef DRAKE_SWOOP_HEIGHT
#undef DRAKE_SWOOP_DIRECTION_CHANGE_RANGE
#undef SWOOP_DAMAGEABLE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index 9bfeb1725a2..932d718e908 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/asteroid/hivelord
name = "hivelord"
- desc = "A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original."
+ desc = "A levitating swarm of tiny creatures which act as a single individual. When threatened or hunting they rapidly replicate additional short-lived bodies."
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "Hivelord"
icon_living = "Hivelord"
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index 281167e5523..3e61c8e6a03 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -2,15 +2,16 @@
name = "Pirate"
desc = "Does what he wants cause a pirate is free."
icon = 'icons/mob/simple_human.dmi'
- icon_state = "piratemelee"
- icon_living = "piratemelee"
+ icon_state = "piratespace"
+ icon_living = "piratespace"
icon_dead = "piratemelee_dead" // Does not actually exist. del_on_death.
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
- speak_chance = 0
- turns_per_move = 5
+ speak_chance = 1
+ turns_per_move = 3
+ death_sound = 'sound/creatures/piratedeath.ogg'
response_help = "pushes the"
response_disarm = "shoves"
- response_harm = "hits the"
+ response_harm = "slashes"
speed = 0
maxHealth = 100
health = 100
@@ -20,28 +21,72 @@
melee_damage_lower = 30
melee_damage_upper = 30
attacktext = "slashes"
- attack_sound = 'sound/weapons/bladeslice.ogg'
+ attack_sound = 'sound/weapons/blade1.ogg'
+ minbodytemp = 0
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- unsuitable_atmos_damage = 15
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speak_emote = list("yarrs")
- loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
- /obj/item/melee/energy/sword/pirate)
+ loot = list(/obj/item/melee/energy/sword/pirate,
+ /obj/item/clothing/head/helmet/space/pirate,
+ /obj/effect/mob_spawn/human/corpse/pirate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
del_on_death = TRUE
faction = list("pirate")
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
+/mob/living/simple_animal/hostile/pirate/Initialize(mapload)
+ . = ..()
+ if(prob(50))
+ loot = list(/obj/item/clothing/head/helmet/space/pirate,
+ /obj/item/salvage/loot/pirate,
+ /obj/effect/mob_spawn/human/corpse/pirate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
+
+/mob/living/simple_animal/hostile/pirate/Process_Spacemove(movement_dir = 0)
+ return TRUE
+
+/mob/living/simple_animal/hostile/pirate/ListTargetsLazy()
+ return ListTargets()
+
+/mob/living/simple_animal/hostile/pirate/Aggro()
+ . = ..()
+ if(target)
+ playsound(loc, 'sound/creatures/pirateengage.ogg', 70, TRUE)
+
/mob/living/simple_animal/hostile/pirate/ranged
name = "Pirate Gunner"
- icon_state = "pirateranged"
- icon_living = "pirateranged"
+ icon_state = "piratespaceranged"
+ icon_living = "piratespaceranged"
icon_dead = "piratemelee_dead" // Does not actually exist. del_on_death.
projectilesound = 'sound/weapons/laser.ogg'
ranged = TRUE
rapid = 2
+ turns_per_move = 5
retreat_distance = 5
minimum_distance = 5
projectiletype = /obj/item/projectile/beam
- loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
- /obj/item/gun/energy/laser)
+ loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
+ /obj/item/gun/energy/laser,
+ /obj/item/clothing/head/helmet/space/pirate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
+
+/mob/living/simple_animal/hostile/pirate/ranged/Initialize(mapload)
+ . = ..()
+ if(prob(50))
+ loot = list(/obj/item/clothing/head/helmet/space/pirate,
+ /obj/item/salvage/loot/pirate,
+ /obj/effect/mob_spawn/human/corpse/pirate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index 02b6886b6ef..36d81092133 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -25,7 +25,8 @@
faction = list("russian")
status_flags = CANPUSH
loot = list(/obj/effect/mob_spawn/human/corpse/russian,
- /obj/item/kitchen/knife)
+ /obj/item/kitchen/knife,
+ /obj/item/salvage/loot/russian)
del_on_death = TRUE
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
@@ -42,5 +43,6 @@
/mob/living/simple_animal/hostile/russian/ranged/mosin
loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged,
- /obj/item/gun/projectile/shotgun/boltaction)
+ /obj/item/gun/projectile/shotgun/boltaction,
+ /obj/item/salvage/loot/russian)
casingtype = /obj/item/ammo_casing/a762
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
index 36ffb309a1d..b85c5b463ce 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
@@ -13,11 +13,11 @@
response_disarm = "shoves the"
response_harm = "hits the"
speed = 0
- maxHealth = 100
- health = 100
+ maxHealth = 150
+ health = 150
harm_intent_damage = 5
- melee_damage_lower = 10
- melee_damage_upper = 10
+ melee_damage_lower = 15
+ melee_damage_upper = 15
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
@@ -25,24 +25,43 @@
faction = list("syndicate")
check_friendly_fire = TRUE
status_flags = CANPUSH
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
del_on_death = TRUE
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
+ robust_searching = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/Initialize(mapload)
+ . = ..()
+ if(prob(50))
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
+ /obj/item/salvage/loot/syndicate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
+
+/mob/living/simple_animal/hostile/syndicate/Aggro()
+ . = ..()
+ if(target)
+ playsound(loc, 'sound/misc/for_the_syndicate.ogg', 70, TRUE)
///////////////Sword and shield////////////
/mob/living/simple_animal/hostile/syndicate/melee
- melee_damage_lower = 20
+ melee_damage_lower = 30
melee_damage_upper = 25
icon_state = "syndicate_sword"
icon_living = "syndicate_sword"
attacktext = "slashes"
- attack_sound = 'sound/weapons/bladeslice.ogg'
+ attack_sound = 'sound/weapons/blade1.ogg'
armour_penetration_percentage = 40
armour_penetration_flat = 10
status_flags = 0
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/melee/energy/sword/saber/red, /obj/item/shield/energy)
var/melee_block_chance = 20
var/ranged_block_chance = 35
@@ -61,7 +80,7 @@
return
adjustHealth(damage)
visible_message("[src] has been attacked with [O] by [user].")
- playsound(loc, O.hitsound, 25, 1, -1)
+ playsound(loc, O.hitsound, 25, TRUE, -1)
else
to_chat(usr, "This weapon is ineffective, it does no damage.")
visible_message("[user] gently taps [src] with [O].")
@@ -78,7 +97,12 @@
return 0
/mob/living/simple_animal/hostile/syndicate/melee/autogib
- loot = list()//no loot, its gonna delete and gib.
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
+ /obj/item/salvage/loot/syndicate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot
name = "Syndicate Operative"
@@ -124,7 +148,7 @@
if(!seen_enemy)
seen_enemy = TRUE
if(!ranged)
- playsound(loc, 'sound/weapons/saberon.ogg', 35, 1)
+ playsound(loc, 'sound/weapons/saberon.ogg', 35, TRUE)
if(alert_on_shield_breach)
if(length(depotarea.shield_list))
raise_alert("[name] reports that [target] is trying to breach the armory shield!")
@@ -186,7 +210,7 @@
scan_cycles++
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/AIShouldSleep(list/possible_targets)
- FindTarget(possible_targets, 1)
+ FindTarget(possible_targets, TRUE)
return FALSE
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/proc/raise_alert(reason)
@@ -195,6 +219,14 @@
say("Intruder!")
depotarea.increase_alert(reason)
+/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/drop_loot()
+ // If a depot syndicate dies after the depot has been destroyed, assume it
+ // was gibbed as part of the destruction and don't drop its loot.
+ if(istype(depotarea) && depotarea.destroyed)
+ return
+
+ return ..()
+
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/death()
if(!istype(depotarea))
return ..()
@@ -230,22 +262,20 @@
. = ..()
if(prob(50))
// 50% chance of switching to ranged variant.
- // Designed to counter players taking cover behind reinforced plasmasglass.
- // Does almost no danage in melee, but decent damage at range, and its shots go through glass.
- melee_damage_lower = 10
- melee_damage_upper = 10
+ melee_damage_lower = 30
+ melee_damage_upper = 25
attacktext = "punches"
- attack_sound = 'sound/weapons/punch1.ogg'
+ attack_sound = 'sound/weapons/cqchit1.ogg'
ranged = TRUE
rapid = 3
- retreat_distance = 3
+ retreat_distance = 5
minimum_distance = 3
melee_block_chance = 0
ranged_block_chance = 0
icon_state = "syndicate_pistol"
icon_living = "syndicate_pistol"
- projectiletype = /obj/item/projectile/beam/laser
- projectilesound = 'sound/weapons/laser.ogg'
+ projectiletype = /obj/item/projectile/bullet/armourpiercing
+ projectilesound = 'sound/weapons/gunshots/gunshot_pistol.ogg'
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory
name = "Syndicate Quartermaster"
@@ -257,6 +287,8 @@
health = 200
melee_block_chance = 40
alert_on_shield_breach = TRUE
+ death_sound = 'sound/mecha/mechmove03.ogg'
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatequartermaster, /obj/effect/decal/cleanable/blood/innards, /obj/effect/decal/cleanable/blood, /obj/effect/gibspawner/generic, /obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/Initialize(mapload)
. = ..()
@@ -267,14 +299,21 @@
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
ranged = TRUE
- retreat_distance = 3
- minimum_distance = 3
+ retreat_distance = 2
+ minimum_distance = 2
melee_block_chance = 0
ranged_block_chance = 0
icon_state = "syndicate_stormtrooper_shotgun"
icon_living = "syndicate_stormtrooper_shotgun"
+ speed = 2
projectiletype = /obj/item/projectile/bullet/sniper/penetrator // Ignores cover.
projectilesound = 'sound/weapons/gunshots/gunshot_sniper.ogg'
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatequartermaster,
+ /obj/item/salvage/loot/syndicate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
return INITIALIZE_HINT_LATELOAD
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/LateInitialize()
@@ -297,11 +336,17 @@
speed = 1
wander = FALSE
alert_on_spacing = FALSE
+ death_sound = 'sound/mecha/mechmove03.ogg'
+ loot = list() // Explodes, doesn't drop loot.
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space/Process_Spacemove(movement_dir = 0)
return TRUE
-
+/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space/death()
+ visible_message("[src] explodes!")
+ playsound(loc, 'sound/items/timer.ogg', 30, FALSE)
+ explosion(src, 0, 4, 4, flame_range = 2, adminlog = FALSE)
+ qdel(src)
/mob/living/simple_animal/hostile/syndicate/melee/space
name = "Syndicate Commando"
@@ -309,12 +354,26 @@
minbodytemp = 0
icon_state = "syndicate_space_sword"
icon_living = "syndicate_space_sword"
- speed = 1
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando, /obj/item/melee/energy/sword/saber/red, /obj/item/shield/energy)
+ speed = 1.5
+ death_sound = 'sound/mecha/mechmove03.ogg'
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
+ /obj/item/salvage/loot/syndicate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0)
return TRUE
+/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize(mapload)
+ . = ..()
+ if(prob(50))
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/ranged
ranged = TRUE
@@ -325,22 +384,41 @@
icon_living = "syndicate_smg"
projectilesound = 'sound/weapons/gunshots/gunshot.ogg'
casingtype = /obj/item/ammo_casing/c45
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/gun/projectile/automatic/c20r)
-
/mob/living/simple_animal/hostile/syndicate/ranged/space
icon_state = "syndicate_space_smg"
icon_living = "syndicate_space_smg"
name = "Syndicate Commando"
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
- speed = 1
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando, /obj/item/gun/projectile/automatic/c20r)
+ speed = 1.5
+ death_sound = 'sound/mecha/mechmove03.ogg'
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
+ /obj/item/salvage/loot/syndicate,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
+
+/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize(mapload)
+ . = ..()
+ if(prob(50))
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
+
/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(movement_dir = 0)
return TRUE
/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib
- loot = list()//gonna gibe, no loot.
+ loot = list(/obj/item/salvage/loot/syndicate,
+ /obj/effect/mob_spawn/human/corpse/syndicatecommando,
+ /obj/effect/decal/cleanable/blood/innards,
+ /obj/effect/decal/cleanable/blood,
+ /obj/effect/gibspawner/generic,
+ /obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/viscerator
name = "viscerator"
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index 370a5b29bce..d3a1ffa188e 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -45,6 +45,14 @@
/obj/item/mod/module/flashlight,
)
+/obj/item/mod/control/pre_equipped/standard/explorer
+ applied_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/jetpack
+ )
+
/obj/item/mod/control/pre_equipped/engineering
theme = /datum/mod_theme/engineering
applied_modules = list(
diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm
index 74f4f3a51ca..2c64ad4b98b 100644
--- a/code/modules/pda/messenger_plugins.dm
+++ b/code/modules/pda/messenger_plugins.dm
@@ -4,7 +4,6 @@
/datum/data/pda/messenger_plugin/proc/user_act(mob/user as mob, obj/item/pda/P)
return
-
/datum/data/pda/messenger_plugin/virus
name = "*Send Virus*"
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index 9d290e709cb..5bce65c3339 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -133,6 +133,9 @@
/obj/item/pda/shaftminer
icon_state = "pda-miner"
+/obj/item/pda/explorer
+ icon_state = "pda-exp"
+
/obj/item/pda/syndicate
default_cartridge = /obj/item/cartridge/syndicate/nuclear
icon_state = "pda-syndi"
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 4c2220793e6..70869766e3b 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -269,6 +269,18 @@
K.color = color
+/obj/item/gun/energy/kinetic_accelerator/pistol
+ name = "proto-kinetic pistol"
+ desc = "A lightweight mining tool, sacrificing upgrade capacity for convenience."
+ icon_state = "kineticgun_p"
+ item_state = "gun"
+ w_class = WEIGHT_CLASS_SMALL
+ max_mod_capacity = 65
+ can_bayonet = FALSE
+ can_flashlight = FALSE
+ can_holster = TRUE
+
+
//Modkits
/obj/item/borg/upgrade/modkit
name = "kinetic accelerator modification kit"
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index e75dc5db032..d1d5e984bf5 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -518,7 +518,7 @@
id = "ore_redemption"
req_tech = list("programming" = 2, "engineering" = 2, "plasmatech" = 3)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/ore_redemption
category = list ("Misc. Machinery")
@@ -528,17 +528,27 @@
id = "mining_equipment_vendor"
req_tech = list("engineering" = 3)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/mining_equipment_vendor
category = list ("Misc. Machinery")
+/datum/design/explorer_equipment_vendor
+ name = "Machine Design (Explorer Rewards Vendor Board)"
+ desc = "The circuit board for an Explorer Rewards Vendor."
+ id = "explorer_equipment_vendor"
+ req_tech = list("engineering" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/mining_equipment_vendor/explorer
+ category = list ("Misc. Machinery")
+
/datum/design/clawgame
name = "Machine Design (Claw Game Board)"
desc = "The circuit board for a Claw Game."
id = "clawgame"
req_tech = list("programming" = 1)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/clawgame
category = list ("Misc. Machinery")
@@ -548,7 +558,7 @@
id = "prize_counter"
req_tech = list("programming" = 2, "materials" = 2)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/prize_counter
category = list("Misc. Machinery")
@@ -558,7 +568,7 @@
id = "gameboard"
req_tech = list("programming" = 2)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/gameboard
category = list("Misc. Machinery")
@@ -568,7 +578,7 @@
id = "plantgenes"
req_tech = list("programming" = 4, "biotech" = 3)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/plantgenes
category = list("Hydroponics Machinery")
@@ -578,7 +588,7 @@
id = "slotmachine"
req_tech = list("programming" = 2)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/slot_machine
category = list("Misc. Machinery")
@@ -588,6 +598,6 @@
id = "bottlers"
req_tech = list("programming" = 2)
build_type = IMPRINTER
- materials = list(MAT_GLASS=1000)
+ materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/bottler
category = list("Misc. Machinery")
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 0e529da1d8b..76206d22cdf 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -808,6 +808,34 @@
if(istype(AM.loc, /obj/mecha/working))
return COMSIG_CARGO_SELL_SKIP
+/datum/economy/simple_seller/explorer_salvage
+ var/list/salvage_counts = list()
+
+/datum/economy/simple_seller/explorer_salvage/begin_sell(obj/docking_port/mobile/supply/S)
+ LAZYCLEARLIST(salvage_counts)
+
+/datum/economy/simple_seller/explorer_salvage/check_sell(obj/docking_port/mobile/supply/S, atom/movable/AM)
+ if(istype(AM, /obj/item/salvage))
+ return COMSIG_CARGO_SELL_NORMAL
+
+/datum/economy/simple_seller/explorer_salvage/sell_normal(obj/docking_port/mobile/supply/S, atom/movable/AM, datum/economy/cargo_shuttle_manifest/manifest)
+ if(!..())
+ return
+
+ salvage_counts[AM.name]++
+
+/datum/economy/simple_seller/explorer_salvage/end_sell(obj/docking_port/mobile/supply/S, datum/economy/cargo_shuttle_manifest/manifest)
+ if(!salvage_counts)
+ return
+ for(var/salvage_name in salvage_counts)
+ var/datum/economy/line_item/item = new
+ item.account = SSeconomy.cargo_account
+ var/count = salvage_counts[salvage_name]
+ item.credits = count * SSeconomy.credits_per_salvage
+ item.reason = "Received [count] haul(s) of [salvage_name]."
+ manifest.line_items += item
+ SSblackbox.record_feedback("nested tally", "cargo salvage sold", count, list(salvage_name, "count"))
+ SSblackbox.record_feedback("nested tally", "cargo salvage sold", item.credits, list(salvage_name, "credits"))
/datum/economy/cargo_shuttle_manifest
var/list/items_to_sell = list()
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index 66b1ef894d6..b0722805439 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -522,7 +522,8 @@
/datum/supply_packs/misc/vending/clothingvendor/cargo
name = "Cargo Clothing Vendors Crate"
cost = 50
- contains = list(/obj/item/vending_refill/cargodrobe)
+ contains = list(/obj/item/vending_refill/cargodrobe,
+ /obj/item/vending_refill/exploredrobe)
containername = "cargo clothing vendor crate"
///////////// Station Goals
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 855399da0d0..b501667f661 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi
index 90d95e4b408..70b98484b47 100644
Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ
diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi
index b810e9904b0..679d6da4602 100644
Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ
diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi
index 4466a4bb6b7..2103275d92c 100644
Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index d321eca14ed..a386bd8186c 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/cargo.dmi b/icons/mob/clothing/species/drask/under/cargo.dmi
index 382e2d6e825..79a977b93ac 100644
Binary files a/icons/mob/clothing/species/drask/under/cargo.dmi and b/icons/mob/clothing/species/drask/under/cargo.dmi differ
diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
index 2b2c0fd9991..541c0b645cd 100644
Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/cargo.dmi b/icons/mob/clothing/species/grey/under/cargo.dmi
index 4ed5cc61bd4..3c1dd10876b 100644
Binary files a/icons/mob/clothing/species/grey/under/cargo.dmi and b/icons/mob/clothing/species/grey/under/cargo.dmi differ
diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi
index e63c4014d0d..b13cac11f91 100644
Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/cargo.dmi b/icons/mob/clothing/species/kidan/under/cargo.dmi
index 5aea23d076a..de0bba7d66c 100644
Binary files a/icons/mob/clothing/species/kidan/under/cargo.dmi and b/icons/mob/clothing/species/kidan/under/cargo.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi
index 0c50caa58a4..25eb75c13e7 100644
Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi
index 4b7af92aacb..deb8d52fd46 100644
Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi
index 05f9b154718..f2544b868d1 100644
Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ
diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi
index fb576bdbe61..0f9259e2735 100644
Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 70f6748d3f0..71538568657 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/cargo.dmi b/icons/mob/clothing/species/vox/under/cargo.dmi
index 8771279567b..5d94ed9a428 100644
Binary files a/icons/mob/clothing/species/vox/under/cargo.dmi and b/icons/mob/clothing/species/vox/under/cargo.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 2d4bec4c9c6..4d0ccf481df 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi
index 6fcc309e9c4..37b367cfc68 100644
Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ
diff --git a/icons/mob/hud/job_assets.dmi b/icons/mob/hud/job_assets.dmi
index 38d6fa4f048..1a8f95de3cf 100644
Binary files a/icons/mob/hud/job_assets.dmi and b/icons/mob/hud/job_assets.dmi differ
diff --git a/icons/mob/hud/sechud.dmi b/icons/mob/hud/sechud.dmi
index 193e3b32345..c1fa305d1b2 100644
Binary files a/icons/mob/hud/sechud.dmi and b/icons/mob/hud/sechud.dmi differ
diff --git a/icons/mob/lavaland/lavaland_monsters.dmi b/icons/mob/lavaland/lavaland_monsters.dmi
index 5c89b0d2f82..4a46793e3f1 100644
Binary files a/icons/mob/lavaland/lavaland_monsters.dmi and b/icons/mob/lavaland/lavaland_monsters.dmi differ
diff --git a/icons/mob/spacedragon.dmi b/icons/mob/spacedragon.dmi
index 8dbd57613fd..e5ee23c64e0 100644
Binary files a/icons/mob/spacedragon.dmi and b/icons/mob/spacedragon.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 3818dd761e9..7f44f6a4f87 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 813f7735294..59622230cc4 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi
index 8f5af74a6df..35900a326ed 100644
Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ
diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi
index e013f42b353..1a518b64445 100644
Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi
index 504c6fa190f..17c37bedaf8 100644
Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi
index 830d26bab5b..be5bde4999a 100644
Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index e229ed6a2ff..f1781a9e17a 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi
index 0a2f2040688..7d4723fc3f1 100644
Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index f40e9ec0aea..74a9fe777ce 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi
index d6fc1afd716..935be58fe22 100644
Binary files a/icons/obj/machines/mining_machines.dmi and b/icons/obj/machines/mining_machines.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 89717abc742..612cf6c127d 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index af0cf5eb252..fa6f4ee1c14 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/sellable.dmi b/icons/obj/sellable.dmi
new file mode 100644
index 00000000000..8fca837209e
Binary files /dev/null and b/icons/obj/sellable.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index e21855df14a..0d4cb70893a 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 75a3237ae7c..12b2031f1d9 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/paradise.dme b/paradise.dme
index ae82570d648..fb060798f4f 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1021,6 +1021,7 @@
#include "code\game\objects\items\mixing_bowl.dm"
#include "code\game\objects\items\random_items.dm"
#include "code\game\objects\items\roulette.dm"
+#include "code\game\objects\items\salvage.dm"
#include "code\game\objects\items\scratch_card.dm"
#include "code\game\objects\items\shooting_range.dm"
#include "code\game\objects\items\sport.dm"
diff --git a/sound/ambience/ambiexp.ogg b/sound/ambience/ambiexp.ogg
new file mode 100644
index 00000000000..cf02aa18f6f
Binary files /dev/null and b/sound/ambience/ambiexp.ogg differ
diff --git a/sound/creatures/piratedeath.ogg b/sound/creatures/piratedeath.ogg
new file mode 100644
index 00000000000..c36a45a79ba
Binary files /dev/null and b/sound/creatures/piratedeath.ogg differ
diff --git a/sound/creatures/pirateengage.ogg b/sound/creatures/pirateengage.ogg
new file mode 100644
index 00000000000..5e6b3fa4f50
Binary files /dev/null and b/sound/creatures/pirateengage.ogg differ
diff --git a/sound/creatures/spacedragondeath.ogg b/sound/creatures/spacedragondeath.ogg
new file mode 100644
index 00000000000..08073e512ca
Binary files /dev/null and b/sound/creatures/spacedragondeath.ogg differ
diff --git a/sound/items/handling/salvagedrop.ogg b/sound/items/handling/salvagedrop.ogg
new file mode 100644
index 00000000000..1a018cf3777
Binary files /dev/null and b/sound/items/handling/salvagedrop.ogg differ
diff --git a/sound/items/handling/salvagepickup.ogg b/sound/items/handling/salvagepickup.ogg
new file mode 100644
index 00000000000..0e9a3d0ea92
Binary files /dev/null and b/sound/items/handling/salvagepickup.ogg differ
diff --git a/tools/UpdatePaths/Scripts/21565_common_access_helpers.txt b/tools/UpdatePaths/Scripts/21565_common_access_helpers.txt
index 9f60816638a..741dec96420 100644
--- a/tools/UpdatePaths/Scripts/21565_common_access_helpers.txt
+++ b/tools/UpdatePaths/Scripts/21565_common_access_helpers.txt
@@ -53,7 +53,7 @@
/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="57"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/command/hop
/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="58"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/security/hos
/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="61"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms
-/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="62"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/command/expedition
+/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="62"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/supply/expedition
/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="63"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/security/doors
/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="64"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/medical/psychology
/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="66"} : /obj/machinery/door/airlock/@SUBTYPES {@OLD;req_access_txt=@SKIP}, /obj/effect/mapping_helpers/airlock/access/all/medical/paramedic
diff --git a/tools/UpdatePaths/Scripts/21681_areas.txt b/tools/UpdatePaths/Scripts/21681_areas.txt
index 908a4a57909..3a340a8c733 100644
--- a/tools/UpdatePaths/Scripts/21681_areas.txt
+++ b/tools/UpdatePaths/Scripts/21681_areas.txt
@@ -162,7 +162,7 @@
/area/bridge/hall : /area/station/hallway/secondary/bridge{@OLD}
-/area/expedition : /area/station/service/expedition
+/area/expedition : /area/station/supply/expedition
/area/security/@SUBTYPES : /area/station/security/@SUBTYPES{@OLD}
/area/quartermaster/@SUBTYPES : /area/station/supply/@SUBTYPES{@OLD}