diff --git a/citadel.dme b/citadel.dme
index a0160f3e7a30..897ce810808c 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -5391,6 +5391,7 @@
#include "interface\menus\main.dm"
#include "maps\endeavour\endeavour-areas.dm"
#include "maps\endeavour\endeavour-overmap.dm"
+#include "maps\endeavour\endeavour-papers.dm"
#include "maps\endeavour\endeavour-sectors.dm"
#include "maps\endeavour\endeavour-shuttle-landmarks.dm"
#include "maps\endeavour\endeavour-turbolifts.dm"
diff --git a/maps/endeavour/endeavour-papers.dm b/maps/endeavour/endeavour-papers.dm
new file mode 100644
index 000000000000..1fc774f18094
--- /dev/null
+++ b/maps/endeavour/endeavour-papers.dm
@@ -0,0 +1,5 @@
+
+/obj/item/paper/pamphlet/substation
+ name = "Notice to NSV Endeavour Auxiliary Engineering Staff"
+ desc = "Some sort of technical information regarding this generator doohickey"
+ info = "Hello!
If you are reading this, you are attempting to activate the back up supply generators for an Endeavour Class vessel!
Please take note! Distribute the fuel among four or more generators, and be sure to leave them connected to each other via the breakers! This ships is divided into power zones, rather than departmental power subgrids. Powering the generators and leaving them connected to the secondary net will combine the power of all the generators and power the ship via this combined effort. If part of the ship is damaged, and you need to get power up to your section of the ship, *then* disconnect your area of interest.
Thank you for reading, and have a secure day!"
diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index e6103864e5df..322553f4f1f6 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -2610,6 +2610,12 @@
},
/turf/simulated/floor/carpet/purcarpet,
/area/exploration/meeting)
+"cag" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 1, Port Side"
+ },
+/turf/space/basic,
+/area/space)
"caS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/flora/pottedplant/orientaltree,
@@ -5070,6 +5076,21 @@
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"dSe" = (
+/obj/machinery/camera/network/command{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/beige/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 10
+ },
/turf/simulated/floor/tiled/dark,
/area/bridge/hallway)
"dSn" = (
@@ -5519,12 +5540,6 @@
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 10
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 10
- },
/turf/simulated/floor/tiled/dark,
/area/bridge/hallway)
"ejb" = (
@@ -7723,17 +7738,17 @@
/turf/simulated/floor/wood,
/area/library)
"fDY" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
},
-/obj/effect/floor_decal/corner/mauve/border{
- dir = 4
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
},
-/obj/structure/railing{
- dir = 8
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
},
-/turf/simulated/floor/tiled,
-/area/endeavour/exploration/hallway_fore)
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardafthall)
"fEx" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
@@ -7881,12 +7896,6 @@
/turf/simulated/floor/tiled,
/area/exploration/explorer_prep)
"fKd" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 8
- },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -8155,6 +8164,9 @@
/obj/machinery/door/firedoor/glass{
dir = 8
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled/dark,
/area/hallway/secondary/docking_hallway2)
"fRL" = (
@@ -9125,6 +9137,7 @@
/obj/machinery/light{
dir = 8
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/exploration)
"gDf" = (
@@ -12033,7 +12046,10 @@
/obj/machinery/camera/network/exploration{
dir = 4
},
-/turf/simulated/floor/tiled,
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/turf/simulated/open,
/area/endeavour/exploration/hallway_fore)
"iKk" = (
/obj/structure/cable{
@@ -13425,9 +13441,6 @@
/turf/simulated/floor/tiled,
/area/hallway/secondary/docking_hallway)
"jGM" = (
-/obj/machinery/light_switch{
- pixel_y = -23
- },
/obj/machinery/light_switch{
pixel_x = 27
},
@@ -14248,6 +14261,11 @@
/obj/spawner/window/reinforced/full,
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
+"khe" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/map_helper/access_helper/airlock/station/exploration/department,
+/turf/simulated/floor/tiled,
+/area/endeavour/exploration/hallway_fore)
"khl" = (
/obj/landmark/spawnpoint/job/lawyer,
/obj/structure/bed/chair/office/dark{
@@ -15474,6 +15492,7 @@
/obj/machinery/light{
dir = 8
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/command)
"kYZ" = (
@@ -15513,6 +15532,21 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"lbB" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/mauve/border{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/exploration/hallway_fore)
"lbH" = (
/obj/machinery/computer/ship/navigation{
dir = 1
@@ -16087,11 +16121,11 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d1portamidhall)
"lBc" = (
-/obj/machinery/power/breakerbox{
- RCon_tag = "MAIN - DECK 1 AFT"
+/obj/machinery/power/breakerbox/activated{
+ RCon_tag = "MAIN - DECK 1 FORE"
},
/turf/simulated/floor/plating,
-/area/maintenance/substation/civilian)
+/area/maintenance/substation/command)
"lBV" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -17496,10 +17530,7 @@
/obj/effect/floor_decal/corner/mauve/bordercorner{
dir = 8
},
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-j2"
- },
+/obj/structure/disposalpipe/junction,
/turf/simulated/floor/tiled,
/area/exploration)
"mDd" = (
@@ -18498,6 +18529,12 @@
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 8
+ },
/turf/simulated/floor/tiled/dark,
/area/bridge/hallway)
"nnq" = (
@@ -19013,7 +19050,7 @@
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"nFc" = (
-/obj/structure/loot_pile/maint,
+/obj/structure/loot_pile/maint/technical,
/turf/simulated/floor/plating,
/area/endeavour/hallway/d1fwdmaint)
"nFp" = (
@@ -20077,10 +20114,14 @@
/turf/simulated/floor/tiled,
/area/exploration/explorer_prep)
"ovE" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/map_helper/access_helper/airlock/station/exploration/department,
-/turf/simulated/floor/plating,
-/area/endeavour/exploration/hallway_fore)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
"owg" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -22279,6 +22320,18 @@
},
/turf/simulated/floor/tiled,
/area/hallway/secondary/docking_hallway2)
+"qgb" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1portforhall)
"qgv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -23644,6 +23697,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d1starboardforhall)
"rfr" = (
@@ -24311,7 +24367,6 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/structure/loot_pile/maint,
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"rFT" = (
@@ -25790,12 +25845,6 @@
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 8
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 8
- },
/turf/simulated/floor/tiled/dark,
/area/bridge/hallway)
"sSr" = (
@@ -26296,6 +26345,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d1starboardafthall)
+"tlw" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 1, Port Side"
+ },
+/turf/space,
+/area/space)
"tlI" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -27163,6 +27218,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/endeavour/hallway/d1aftmaint)
"tNd" = (
@@ -28380,7 +28438,8 @@
dir = 1
},
/obj/structure/disposalpipe/junction{
- dir = 8
+ dir = 4;
+ icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled,
/area/endeavour/exploration/hallway_aft)
@@ -30737,11 +30796,11 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d1starboardafthall)
"wmU" = (
-/obj/machinery/power/breakerbox{
- RCon_tag = "MAIN - DECK 1 FORE"
+/obj/machinery/power/breakerbox/activated{
+ RCon_tag = "MAIN - DECK 1 AFT"
},
/turf/simulated/floor/plating,
-/area/maintenance/substation/command)
+/area/maintenance/substation/civilian)
"wne" = (
/obj/item/pen/crayon/mime,
/obj/item/pen/crayon/marker/mime,
@@ -31198,6 +31257,7 @@
/obj/machinery/power/port_gen/pacman/mrs{
anchored = 1
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
"wAB" = (
@@ -32741,7 +32801,9 @@
/turf/simulated/floor/wood,
/area/hydroponics/garden)
"xJO" = (
-/obj/effect/shuttle_landmark/endeavour/deck4/excursion_space,
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 1, Starboard Side"
+ },
/turf/space/basic,
/area/space)
"xKz" = (
@@ -33149,7 +33211,7 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d1starboardamidhall)
"ybg" = (
-/obj/machinery/power/breakerbox{
+/obj/machinery/power/breakerbox/activated{
RCon_tag = "MAIN - DECK 1 AMIDSHIPS"
},
/turf/simulated/floor/plating,
@@ -41856,7 +41918,7 @@ xRj
xRj
xRj
xRj
-xRj
+cag
xRj
xRj
xRj
@@ -46191,7 +46253,7 @@ qTj
gPV
tHZ
aNK
-ojQ
+qgb
fnJ
oxV
piy
@@ -46203,7 +46265,7 @@ hkm
gkp
uru
piy
-axR
+fDY
oHo
riG
dZr
@@ -46552,9 +46614,9 @@ opm
opm
opm
opm
+opm
gtI
bxh
-bxh
iJn
khD
qfI
@@ -46609,7 +46671,7 @@ eYV
ojm
ilO
dJe
-sFF
+ovE
oyz
qTM
qTM
@@ -46746,10 +46808,10 @@ opm
opm
opm
opm
-ovE
+opm
+khe
iyz
-fDY
-oBL
+lbB
mZn
nPK
tfh
@@ -49498,7 +49560,7 @@ vDR
hWC
vRj
hVP
-aVW
+wmU
kPV
lxO
hnl
@@ -49689,7 +49751,7 @@ vHL
bdJ
eOe
djQ
-lBc
+aVW
pEr
mWe
cGJ
@@ -56794,7 +56856,7 @@ xRj
xRj
xRj
jNg
-jNg
+tlw
jNg
jNg
jNg
@@ -57237,7 +57299,7 @@ keD
oYa
maa
byt
-maa
+bFR
kfn
maa
dIE
@@ -58206,7 +58268,7 @@ oYa
unB
unB
maa
-maa
+bFR
byt
maa
maa
@@ -58484,7 +58546,7 @@ xRj
xRj
xRj
xRj
-xRj
+xJO
xRj
xRj
xRj
@@ -58793,7 +58855,7 @@ byt
uTr
maa
maa
-nFc
+maa
maa
maa
maa
@@ -58992,7 +59054,7 @@ maa
nFc
byt
byt
-nFc
+jkE
kfn
uTr
hYO
@@ -59179,7 +59241,7 @@ sIg
byt
maa
uTr
-maa
+hPx
byt
byt
byt
@@ -59781,7 +59843,7 @@ lmB
oVe
lCd
ghn
-meH
+lBc
aLV
uhY
jux
@@ -59972,7 +60034,7 @@ uwI
aLV
oZB
cdx
-wmU
+meH
aLV
pIq
uWI
@@ -65201,11 +65263,11 @@ gDf
tIO
fIr
gDf
-wDH
+dSe
fKd
nnp
eiM
-dSe
+mBp
sRV
jJL
hcK
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index eed974ef7168..4925eb492dd8 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -1463,6 +1463,9 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portamidhall)
"aVO" = (
@@ -2632,9 +2635,17 @@
/turf/simulated/floor/tiled/white,
/area/medical/surgeryprep)
"bHu" = (
-/obj/effect/shuttle_landmark/endeavour/deck3/port,
-/turf/space,
-/area/space)
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay3)
"bHz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -3418,6 +3429,24 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgeryprep)
+"caA" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardamidhall)
"cbh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4403,6 +4432,12 @@
"cEs" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/cockpit)
"cEy" = (
@@ -4730,6 +4765,18 @@
"cNW" = (
/turf/simulated/floor/reinforced,
/area/rnd/xenobiology)
+"cOc" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2afthall)
"cOu" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -6699,6 +6746,9 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portforhall)
"eam" = (
@@ -6902,6 +6952,18 @@
},
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portamidhall)
+"een" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portamidhall)
"eew" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloor{
@@ -8209,6 +8271,9 @@
/obj/effect/floor_decal/corner/lightorange/border{
dir = 9
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
"eUx" = (
@@ -8691,6 +8756,21 @@
/obj/structure/flora/pottedplant/orientaltree,
/turf/simulated/floor/tiled/dark,
/area/endeavour/hallway/d1starboardamidhall)
+"fiR" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/sleeper)
"fiT" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/navgold/border,
@@ -9230,7 +9310,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay4)
"fBT" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/research,
/obj/machinery/door/firedoor,
/obj/map_helper/access_helper/airlock/station/science/department,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10798,7 +10878,7 @@
dir = 1
},
/obj/machinery/portable_atmospherics/powered/scrubber,
-/turf/simulated/floor/airless/ceiling,
+/turf/simulated/floor/plating,
/area/endeavour/hallway/d2aftmaint)
"gwT" = (
/turf/simulated/floor/tiled/white,
@@ -10829,15 +10909,15 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/hallway/station/docks)
"gzw" = (
@@ -11592,8 +11672,8 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 4
+/obj/structure/disposalpipe/junction/flipped{
+ dir = 8
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
@@ -12662,7 +12742,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"hBp" = (
-/obj/machinery/power/breakerbox{
+/obj/machinery/power/breakerbox/activated{
RCon_tag = "MAIN - DECK 2 AMIDSHIPS"
},
/turf/simulated/floor/plating,
@@ -13055,7 +13135,7 @@
/turf/simulated/floor/plating,
/area/endeavour/hallway/d2fwdmaint)
"hMz" = (
-/obj/machinery/power/breakerbox{
+/obj/machinery/power/breakerbox/activated{
RCon_tag = "MAIN - DECK 2 FORE"
},
/turf/simulated/floor/plating,
@@ -14380,6 +14460,12 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"iBr" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 2, Port Side"
+ },
+/turf/space,
+/area/space)
"iBv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -14749,8 +14835,8 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay4)
"iPG" = (
-/obj/machinery/power/breakerbox{
- RCon_tag = "DECK 2 AFT MAIN"
+/obj/machinery/power/breakerbox/activated{
+ RCon_tag = "MAIN - DECK 2 AFT"
},
/turf/simulated/floor/plating,
/area/maintenance/substation/medical_science)
@@ -15338,6 +15424,9 @@
/area/rnd/reception_desk)
"jlP" = (
/obj/structure/dispenser/oxygen,
+/obj/machinery/camera/network/outside{
+ dir = 5
+ },
/turf/simulated/floor/tiled,
/area/medical/medbay_primary_storage)
"jlX" = (
@@ -16230,6 +16319,7 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/research)
"jPA" = (
@@ -17142,6 +17232,13 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/anomaly_lab)
+"kss" = (
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/secure_closet/medical3,
+/obj/item/soap/nanotrasen,
+/obj/item/storage/belt/medical,
+/turf/simulated/floor/tiled,
+/area/medical/medbay_primary_storage)
"ksB" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloorblack,
@@ -18207,6 +18304,13 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
+"kZb" = (
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/secure_closet/medical3,
+/obj/item/storage/belt/medical,
+/obj/item/soap/nanotrasen,
+/turf/simulated/floor/tiled,
+/area/medical/medbay_primary_storage)
"kZg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -19324,6 +19428,12 @@
/obj/machinery/artifact_scanpad,
/turf/simulated/floor/tiled/dark,
/area/rnd/anomaly_lab/containment_two)
+"lIj" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 2, Port Side"
+ },
+/turf/space/basic,
+/area/space)
"lIp" = (
/obj/machinery/camera/network/outside,
/turf/space/basic,
@@ -19531,6 +19641,27 @@
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/medical/patient_c)
+"lRS" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/beige/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay4)
"lRT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black,
/turf/simulated/floor/tiled,
@@ -19696,6 +19827,24 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled,
/area/rnd/storage)
+"lWH" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardforhall)
"lWJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20436,6 +20585,9 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 5
},
+/obj/machinery/station_map{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portamidhall)
"mxO" = (
@@ -20849,6 +21001,7 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/medical)
"mKe" = (
@@ -21141,6 +21294,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d1starboardafthall)
"mTN" = (
@@ -21972,6 +22128,18 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgeryprep)
+"nwH" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/machinery/station_map{
+ pixel_y = 32
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portamidhall)
"nwK" = (
/obj/effect/floor_decal/spline/fancy{
dir = 1
@@ -22366,6 +22534,27 @@
/obj/machinery/floodlight,
/turf/simulated/floor/plating,
/area/endeavour/hallway/d2fwdmaint)
+"nHZ" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/green/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/virology_aft_access)
"nIk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/borderfloorblack/corner{
@@ -22882,7 +23071,9 @@
/turf/simulated/floor/wood/sif/indoors,
/area/medical/reception)
"nWQ" = (
-/obj/effect/shuttle_landmark/endeavour/deck3/starboard,
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 2, Starboard Side"
+ },
/turf/space,
/area/space)
"nXe" = (
@@ -22943,6 +23134,21 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/station/stairs_two)
+"nZt" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portamidhall)
"nZC" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -23893,17 +24099,8 @@
/obj/machinery/station_map{
pixel_y = 32
},
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/corner/navblue/border{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portforhall)
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/hallway/d2portafthall)
"oGx" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -24133,6 +24330,9 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
+/obj/machinery/station_map{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portforhall)
"oLc" = (
@@ -24620,6 +24820,7 @@
/obj/machinery/light{
dir = 8
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/medical_science)
"oYE" = (
@@ -25306,7 +25507,7 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/floor/airless/ceiling,
+/turf/simulated/floor/plating,
/area/endeavour/hallway/d2aftmaint)
"pps" = (
/obj/machinery/computer/guestpass{
@@ -25674,10 +25875,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass/research{
- name = "Research Lounge";
- req_one_access = null
- },
+/obj/machinery/door/airlock/research,
/obj/map_helper/access_helper/airlock/station/science/department,
/turf/simulated/floor/tiled,
/area/rnd/breakroom)
@@ -27831,13 +28029,17 @@
/turf/simulated/floor/wood,
/area/medical/medbay4)
"qFD" = (
-/obj/structure/window/reinforced/tinted,
-/obj/machinery/shower{
- dir = 8
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
},
-/obj/structure/curtain/open/shower/medical,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/medical/medbay_primary_storage)
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/surgeryprep)
"qFO" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -28009,20 +28211,15 @@
/turf/simulated/floor/tiled/dark,
/area/assembly/robotics/surgery)
"qKR" = (
-/obj/structure/bed/chair/bay/shuttle{
- dir = 4
- },
-/obj/machinery/button/remote/blast_door{
- id = "emtblast";
- name = "emergency blast shields";
- pixel_y = 30
- },
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/cockpit)
"qLf" = (
@@ -29003,8 +29200,23 @@
/turf/simulated/floor/tiled/white,
/area/medical/virology_aft_access)
"rpi" = (
-/turf/simulated/floor/tiled/white,
-/area/medical/medbay_primary_storage)
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portforhall)
"rpj" = (
/turf/simulated/wall/prepainted,
/area/maintenance/substation/research)
@@ -29339,10 +29551,6 @@
/area/tether/station/public_meeting_room)
"ryO" = (
/obj/machinery/light,
-/obj/structure/closet/secure_closet/medical3,
-/obj/item/soap/nanotrasen,
-/obj/item/storage/belt/medical,
-/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled,
/area/medical/medbay_primary_storage)
"rzi" = (
@@ -30540,6 +30748,15 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/xenobiology)
+"soP" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/wood,
+/area/tether/station/public_meeting_room)
"soU" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -30724,7 +30941,7 @@
/obj/structure/catwalk,
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor,
-/turf/simulated/floor/airless/ceiling,
+/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
"svr" = (
/obj/effect/floor_decal/borderfloorwhite{
@@ -30824,15 +31041,11 @@
/obj/machinery/iv_drip,
/turf/simulated/floor/tiled,
/area/medical/surgery)
-"szh" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/airless/ceiling,
-/area/endeavour/hallway/d2aftmaint)
"szk" = (
-/obj/structure/closet/secure_closet/medical3,
+/obj/effect/floor_decal/industrial/outline/blue,
/obj/item/soap/nanotrasen,
+/obj/structure/closet/secure_closet/medical3,
/obj/item/storage/belt/medical,
-/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled,
/area/medical/medbay_primary_storage)
"szz" = (
@@ -31818,10 +32031,6 @@
},
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d1starboardamidhall)
-"teE" = (
-/obj/random/trash_pile,
-/turf/simulated/floor/airless/ceiling,
-/area/maintenance/fpmaint2)
"teL" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -32854,6 +33063,7 @@
/obj/machinery/door/airlock/glass/research{
name = "R&D Distribution Area"
},
+/obj/map_helper/access_helper/airlock/station/public,
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"tLU" = (
@@ -33813,6 +34023,9 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
+/obj/machinery/station_map{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2fwdhall)
"urC" = (
@@ -34085,10 +34298,6 @@
/obj/structure/flora/pottedplant/orientaltree,
/turf/simulated/floor/tiled/white,
/area/medical/medbay3)
-"uAu" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/airless/ceiling,
-/area/endeavour/hallway/d2aftmaint)
"uCm" = (
/obj/structure/cable/green{
icon_state = "0-4"
@@ -35666,15 +35875,17 @@
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portafthall)
"vFG" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
+/obj/machinery/button/remote/blast_door{
+ id = "emtblast";
+ name = "emergency blast shields";
+ pixel_y = 30
+ },
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/cockpit)
"vFO" = (
@@ -35879,6 +36090,13 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
+"vLZ" = (
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/item/storage/belt/medical,
+/obj/item/soap/nanotrasen,
+/obj/structure/closet/secure_closet/medical3,
+/turf/simulated/floor/tiled,
+/area/medical/medbay_primary_storage)
"vMh" = (
/obj/machinery/air_alarm{
pixel_y = 22
@@ -35976,6 +36194,7 @@
/obj/machinery/door/airlock/glass/research{
name = "R&D Distribution Area"
},
+/obj/map_helper/access_helper/airlock/station/public,
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"vQl" = (
@@ -36054,9 +36273,8 @@
/turf/simulated/floor/tiled,
/area/holodeck_control)
"vTa" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint/babyblue,
-/obj/machinery/vending/blood,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/medical/medbay_primary_storage)
"vTK" = (
@@ -36816,13 +37034,11 @@
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d2portforhall)
"wlZ" = (
-/obj/machinery/shower{
- dir = 4
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 2, Starboard Side"
},
-/obj/structure/window/reinforced/tinted,
-/obj/structure/curtain/open/shower/medical,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/medical/medbay_primary_storage)
+/turf/space/basic,
+/area/space)
"wme" = (
/obj/landmark/spawnpoint/job/pilot,
/turf/space/basic,
@@ -37234,6 +37450,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/medbreak)
"wwD" = (
@@ -38041,7 +38260,7 @@
/area/tether/surfacebase/shuttle_pad)
"wTM" = (
/obj/machinery/floodlight,
-/turf/simulated/floor/airless/ceiling,
+/turf/simulated/floor/plating,
/area/endeavour/hallway/d2aftmaint)
"wTS" = (
/obj/machinery/power/apc/west_mount,
@@ -38493,14 +38712,17 @@
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
"xhP" = (
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
/obj/machinery/computer/ship/sensors{
dir = 8
},
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/cockpit)
"xiN" = (
@@ -38658,18 +38880,6 @@
/obj/effect/floor_decal/corner/mauve/bordercorner,
/turf/simulated/floor/tiled,
/area/rnd/hallway)
-"xnE" = (
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/hallway/station/docks)
"xnM" = (
/obj/machinery/door/window/brigdoor/eastleft{
name = "Containment Pen";
@@ -40073,6 +40283,9 @@
/obj/effect/floor_decal/corner/navgold/border{
dir = 1
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d1starboardamidhall)
"yhw" = (
@@ -46338,7 +46551,7 @@ pNX
pNX
pNX
pNX
-gOV
+lRS
kBS
vcY
hgb
@@ -48080,7 +48293,7 @@ jbC
xDZ
dlw
oaU
-buM
+cOc
pdM
kxI
tQp
@@ -48926,7 +49139,7 @@ pRW
pRW
pRW
pRW
-pRW
+wlZ
pRW
mDp
mDp
@@ -49869,7 +50082,7 @@ mDp
mDp
mDp
mDp
-nWQ
+mDp
mDp
pRW
pRW
@@ -50976,7 +51189,7 @@ ohX
iwg
ohX
rkZ
-mSd
+oGt
uJM
mSd
uCx
@@ -51394,7 +51607,7 @@ oaZ
mZc
qpq
mmI
-oDK
+qFD
wHh
xKC
dqJ
@@ -51887,7 +52100,7 @@ mDp
mDp
pRW
pRW
-pRW
+lIj
pRW
pRW
pRW
@@ -52757,7 +52970,7 @@ bdJ
qSo
cyt
fwu
-vXJ
+bHu
tCz
aOx
ufT
@@ -54299,7 +54512,7 @@ iAl
jdx
hgX
juF
-wOk
+fiR
sCe
ggO
kgh
@@ -56224,7 +56437,7 @@ mIs
xsd
mHV
rxV
-kyR
+iPG
eEE
cHC
cBK
@@ -56415,7 +56628,7 @@ qIV
ePI
eEE
fPm
-iPG
+kyR
eEE
qPc
djp
@@ -57184,7 +57397,7 @@ gKZ
qog
aPb
dbo
-uza
+nwH
hBL
rVF
rBK
@@ -57378,7 +57591,7 @@ qog
qog
xec
dbo
-mYS
+nZt
bfx
oOa
jne
@@ -58389,7 +58602,7 @@ rFw
bNp
bNp
ujt
-szk
+ujt
xFH
xFH
xFH
@@ -58567,7 +58780,7 @@ kYY
kYY
kYY
uCH
-qan
+nHZ
lLU
nic
fNZ
@@ -58581,9 +58794,9 @@ bNp
wlg
kTz
bNp
-wlZ
+kZb
+ujt
ujt
-ryO
xFH
lmG
qBd
@@ -58775,9 +58988,9 @@ bNp
mnx
kTz
bNp
-rpi
+vLZ
ujt
-szk
+ryO
xFH
qBd
jRE
@@ -58969,9 +59182,9 @@ xFH
bxy
peZ
bNp
-qFD
-hQy
szk
+ujt
+ujt
vTa
pRW
pRW
@@ -59163,9 +59376,9 @@ xFH
kTz
kTz
xFH
-xFH
-xFH
-xFH
+kss
+hQy
+ujt
xFH
lIp
pRW
@@ -59357,10 +59570,10 @@ iro
svB
iro
aUR
-dYQ
-lmG
-qBd
-pRW
+xFH
+xFH
+xFH
+xFH
pRW
pRW
pRW
@@ -59551,9 +59764,9 @@ pkD
nMP
hGE
aUR
-jRE
+dYQ
+lmG
qBd
-jRE
pRW
pRW
pRW
@@ -59745,9 +59958,9 @@ nMP
nMP
sVo
aUR
-pRW
-pRW
-pRW
+jRE
+qBd
+jRE
pRW
pRW
pRW
@@ -60287,7 +60500,7 @@ eQu
liR
jBH
vez
-uza
+nwH
wil
wtZ
rBK
@@ -62421,7 +62634,7 @@ wNs
otK
jUa
uLo
-uza
+een
bCK
arL
rBK
@@ -62629,7 +62842,7 @@ uCq
uCq
xgg
jRu
-bFI
+caA
uOw
kdT
vCs
@@ -63009,7 +63222,7 @@ ffk
ezg
rBK
oDd
-uAu
+uSX
cHC
qQK
cHC
@@ -63398,7 +63611,7 @@ uMl
iBv
fDp
bHC
-szh
+qQK
oDd
oDd
oDd
@@ -63666,7 +63879,7 @@ mDp
mDp
mDp
mDp
-mDp
+nWQ
mDp
mDp
mDp
@@ -65932,7 +66145,7 @@ dhy
eXR
ybr
mbs
-xnE
+oFh
oku
oku
jYD
@@ -66424,7 +66637,7 @@ mDp
mDp
mDp
mDp
-bHu
+mDp
mDp
mDp
mDp
@@ -66510,7 +66723,7 @@ pIb
pUI
pUI
ifg
-aua
+lWH
vWh
oYE
mbs
@@ -66692,7 +66905,7 @@ jRK
jRK
wsu
wMp
-ppu
+rpi
mFT
kXE
iDS
@@ -67021,7 +67234,7 @@ pRW
pRW
pRW
pRW
-mDp
+iBr
mDp
mDp
pRW
@@ -67274,7 +67487,7 @@ jRK
jRK
jRK
mai
-oGt
+eYA
mFT
uXO
iDS
@@ -67674,7 +67887,7 @@ ruN
vJE
cCs
ifg
-aua
+lWH
sqA
oYE
mbs
@@ -68629,7 +68842,7 @@ sHP
wmt
gNW
dQO
-teE
+blQ
iDS
iDS
sUb
@@ -72510,7 +72723,7 @@ pRW
qBd
lmG
agO
-xAr
+soP
hGi
xWm
aiO
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index d2562092b8f3..7fc995e9ed81 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -697,7 +697,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"ayd" = (
/obj/machinery/door/firedoor,
@@ -1551,14 +1551,14 @@
/obj/structure/cable/orange{
icon_state = "4-8"
},
-/obj/spawner/window/reinforced/full,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/substation/cargo)
"aZU" = (
/obj/structure/cable/orange{
icon_state = "4-8"
},
-/obj/spawner/window/reinforced/full,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
"bax" = (
@@ -1759,7 +1759,7 @@
/obj/effect/floor_decal/corner/navgold/border{
dir = 4
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"bfE" = (
/obj/machinery/fire_alarm/west_mount{
@@ -2482,8 +2482,10 @@
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3portforhall)
"bBF" = (
-/obj/effect/shuttle_landmark/endeavour/deck2/port,
-/turf/space,
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 3, Starboard Side"
+ },
+/turf/space/basic,
/area/space)
"bBM" = (
/obj/machinery/fire_alarm/north_mount,
@@ -2682,7 +2684,7 @@
},
/obj/map_helper/access_helper/airlock/station/supply/cargo_bay,
/obj/machinery/door/airlock/glass/mining{
- name = "Magmatic Rift Leap Pad";
+ name = "Mailing Office";
req_one_access = null
},
/turf/simulated/floor/tiled/monodark,
@@ -2919,7 +2921,7 @@
/area/crew_quarters/sleep/Dorm_6)
"bTd" = (
/obj/machinery/door/airlock/glass/mining{
- name = "Magmatic Rift Leap Pad";
+ name = "Cargo Airlock";
req_one_access = null
},
/obj/machinery/door/firedoor,
@@ -3117,7 +3119,7 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 4
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"bYP" = (
/obj/structure/disposalpipe/segment{
@@ -3311,7 +3313,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/spawner/window/reinforced/full,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/endeavour/hallway/d3aftmaint)
"ciU" = (
@@ -3717,6 +3719,8 @@
/obj/machinery/status_display/supply_display{
pixel_x = -32
},
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/sif/fluffy,
/turf/simulated/floor/wood,
/area/quartermaster/qm)
"czc" = (
@@ -4077,9 +4081,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"cLp" = (
@@ -4998,11 +4999,17 @@
"dkO" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass/mining{
- name = "Magmatic Rift Leap Pad";
+ name = "Cargo Airlock";
req_one_access = null
},
/turf/simulated/floor/tiled/dark,
/area/quartermaster/foyer)
+"dkR" = (
+/obj/machinery/power/breakerbox/activated{
+ RCon_tag = "MAIN - DECK 3 AMIDSHIPS"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/substation/security)
"dld" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/brown/border,
@@ -6283,6 +6290,9 @@
name = "Powernet Sensor - Deck 3 Aft Subgrid";
name_tag = "Deck 3 Subgrid"
},
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/maintenance/substation/cargo)
"dYL" = (
@@ -6360,7 +6370,7 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 4
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"ecv" = (
/obj/structure/cable/green{
@@ -6588,6 +6598,12 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3portforhall)
"ejd" = (
@@ -7799,14 +7815,11 @@
/turf/simulated/floor/tiled/monotile,
/area/security/security_lockerroom)
"eTv" = (
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/structure/cable/green{
- icon_state = "2-4"
+ icon_state = "4-8"
},
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
@@ -7833,16 +7846,16 @@
dir = 1
},
/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 4
+ dir = 1
},
/obj/effect/floor_decal/corner/navblue/bordercorner2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d3portamidhall)
+/area/endeavour/hallway/d3portforhall)
"eVb" = (
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/bar/catwalk)
@@ -8550,6 +8563,9 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 9
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"fnF" = (
@@ -10222,6 +10238,7 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
"gqN" = (
@@ -10661,12 +10678,6 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/navblue/bordercorner2{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -11476,7 +11487,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/machinery/recharge_station,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"hmF" = (
@@ -11981,7 +11992,7 @@
pixel_x = -32
},
/turf/simulated/wall/r_wall/prepainted,
-/area/crew_quarters/sleep/Dorm_13)
+/area/crew_quarters/recreation_area)
"hGe" = (
/obj/machinery/door/airlock/glass{
desc = "A room dedicated for the repairs and recharging of adherent.";
@@ -13386,6 +13397,9 @@
name = "Powernet Sensor - Deck 3 Fore Subgrid";
name_tag = "Deck 3 Fore Subgrid"
},
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
"iFW" = (
@@ -14755,7 +14769,7 @@
/obj/effect/floor_decal/borderfloorblack{
dir = 4
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"jDL" = (
/obj/machinery/button/remote/blast_door{
@@ -14977,7 +14991,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"jMc" = (
@@ -15266,6 +15280,18 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
+"jXm" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d3starboardamidhall)
"jXM" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -15862,7 +15888,7 @@
dir = 8
},
/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_13)
+/area/crew_quarters/recreation_area)
"kuG" = (
/obj/landmark/spawnpoint/latejoin/station/cryogenics,
/obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -16684,7 +16710,7 @@
dir = 8
},
/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/sleep/Dorm_13)
+/area/crew_quarters/recreation_area)
"kZA" = (
/obj/effect/floor_decal/corner/green/full{
dir = 1
@@ -17403,6 +17429,24 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/fitness)
+"lzC" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/bordercorner2{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3starboardamidhall)
"lAm" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/brown/border,
@@ -17832,12 +17876,6 @@
/obj/structure/undies_wardrobe,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
-"lSK" = (
-/obj/machinery/power/breakerbox{
- RCon_tag = "MAIN - DECK 3 AMIDSHIPS"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/substation/security)
"lTj" = (
/turf/simulated/wall/r_wall/prepainted/civilian,
/area/endeavour/hallway/d3fwdmaint)
@@ -18224,6 +18262,21 @@
"mfy" = (
/turf/simulated/wall/r_wall/prepainted,
/area/crew_quarters/sleep/Dorm_12)
+"mfz" = (
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3starboardforhall)
"mgD" = (
/obj/effect/floor_decal/corner/black{
dir = 9
@@ -18760,7 +18813,7 @@
dir = 4
},
/obj/machinery/fire_alarm/east_mount,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"mwk" = (
/obj/item/banner/cargo,
@@ -18774,6 +18827,9 @@
dir = 2;
icon_state = "pipe-j2"
},
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"mwM" = (
@@ -18861,7 +18917,7 @@
/turf/simulated/floor/carpet,
/area/security/brig)
"mBj" = (
-/obj/machinery/power/breakerbox{
+/obj/machinery/power/breakerbox/activated{
RCon_tag = "MAIN - DECK 3 FORE"
},
/turf/simulated/floor/plating,
@@ -20094,10 +20150,13 @@
"nvp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction,
/obj/structure/cable/green{
- icon_state = "4-8"
+ icon_state = "2-4"
+ },
+/obj/structure/cable/green{
+ icon_state = "2-8"
},
-/obj/structure/disposalpipe/junction,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"nvw" = (
@@ -20874,9 +20933,7 @@
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3starboardforhall)
"nUf" = (
-/obj/structure/toilet{
- dir = 1
- },
+/obj/structure/toilet,
/obj/landmark{
name = "xeno_spawn";
pixel_x = -1
@@ -21103,6 +21160,21 @@
/obj/effect/floor_decal/corner_oldtile/white/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/kitchen)
+"obX" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portamidhall)
"och" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -21924,12 +21996,13 @@
/turf/simulated/floor/tiled/dark,
/area/security/tactical)
"oBe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d3portamidhall)
"oBE" = (
@@ -22890,6 +22963,9 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"pjF" = (
@@ -23328,10 +23404,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/security/hallway)
-"pwn" = (
-/obj/spawner/window/low_wall/full/firelocks/nogrille,
-/turf/simulated/floor/plating,
-/area/crew_quarters/sleep/Dorm_13)
"pwo" = (
/turf/simulated/wall/r_wall/prepainted/civilian,
/area/crew_quarters/game_room)
@@ -23712,7 +23784,7 @@
},
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/sleep/Dorm_13)
+/area/crew_quarters/recreation_area)
"pNn" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/light/small{
@@ -23900,7 +23972,7 @@
dir = 4
},
/obj/machinery/fire_alarm/east_mount,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"pSx" = (
/obj/structure/closet/secure_closet/security,
@@ -24345,6 +24417,7 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/security)
"qeX" = (
@@ -24990,7 +25063,6 @@
/obj/structure/disposalpipe/junction{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3portamidhall)
"qBU" = (
@@ -25206,7 +25278,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"qJB" = (
/turf/simulated/wall/prepainted/cargo,
@@ -25384,13 +25456,10 @@
/area/security/brig)
"qQD" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/multi_tile/glass{
- name = "Crew Quarters"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/machinery/door/airlock/multi_tile/glass{
+ name = "Crew Quarters"
},
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
@@ -26801,7 +26870,7 @@
dir = 4
},
/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_13)
+/area/crew_quarters/recreation_area)
"rPa" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/navblue/border,
@@ -27045,7 +27114,7 @@
/turf/simulated/wall/prepainted,
/area/maintenance/substation/cargo)
"rXl" = (
-/obj/machinery/power/breakerbox{
+/obj/machinery/power/breakerbox/activated{
RCon_tag = "MAIN - DECK 3 AFT"
},
/turf/simulated/floor/plating,
@@ -27727,7 +27796,7 @@
/obj/effect/floor_decal/corner/navgold/border{
dir = 4
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"ssY" = (
/obj/machinery/light/small{
@@ -27762,7 +27831,7 @@
/obj/structure/cable/orange{
icon_state = "4-8"
},
-/obj/spawner/window/reinforced/full,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/substation/security)
"suh" = (
@@ -28688,30 +28757,32 @@
"sWJ" = (
/turf/simulated/floor/tiled/monodark,
/area/prison/cell_block)
-"sXC" = (
-/obj/structure/cable/green,
-/obj/machinery/power/apc/south_mount,
-/turf/simulated/floor/wood,
-/area/quartermaster/office)
-"sXK" = (
-/obj/machinery/light{
- dir = 1
- },
+"sWT" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
},
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/navblue/bordercorner2{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
+"sXC" = (
+/obj/structure/cable/green,
+/obj/machinery/power/apc/south_mount,
+/turf/simulated/floor/wood,
+/area/quartermaster/office)
+"sXK" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d3portforhall)
"sYp" = (
@@ -29577,12 +29648,6 @@
/obj/effect/floor_decal/corner/navblue/border{
dir = 1
},
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/navblue/bordercorner2{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -29957,10 +30022,6 @@
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
/area/security/warden)
-"tQn" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
"tRb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30397,6 +30458,21 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3fwdhall)
+"ufF" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d3portforhall)
"ufL" = (
/obj/structure/bed/chair/shuttle,
/turf/simulated/floor/tiled/steel,
@@ -30572,6 +30648,9 @@
name = "Powernet Sensor - Deck 3 Amidships Subgrid";
name_tag = "Deck 3 Aft Subgrid"
},
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/maintenance/substation/security)
"ujb" = (
@@ -30591,6 +30670,7 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/cargo)
"ujB" = (
@@ -30728,6 +30808,18 @@
/obj/machinery/fire_alarm/east_mount,
/turf/simulated/floor/tiled/dark,
/area/endeavour/station/stairs_three)
+"unb" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navgold/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3starboardforhall)
"uny" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -31595,7 +31687,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/spawner/window/reinforced/full,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
"uPC" = (
@@ -32190,6 +32282,12 @@
"vkn" = (
/turf/simulated/wall/r_wall/prepainted/cargo,
/area/quartermaster/cargo_shelter_dock)
+"vkt" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 3, Port Side"
+ },
+/turf/space/basic,
+/area/space)
"vkR" = (
/obj/structure/catwalk,
/obj/machinery/light/small{
@@ -32957,6 +33055,12 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techmaint,
/area/quartermaster/warehouse)
+"vDG" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 3, Port Side"
+ },
+/turf/space,
+/area/space)
"vDN" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/cable/green{
@@ -34145,6 +34249,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/navblue/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/navblue/bordercorner2{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d3portamidhall)
"wpe" = (
@@ -35927,8 +36043,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
@@ -36176,8 +36291,6 @@
/turf/simulated/floor/crystal,
/area/endeavour/hallway/d3fwdhall)
"xJa" = (
-/obj/structure/dogbed,
-/mob/living/simple_mob/animal/sif/fluffy,
/obj/structure/cable/green{
icon_state = "1-4"
},
@@ -36185,6 +36298,10 @@
dir = 4;
pixel_x = -23
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/quartermaster/qm)
"xJv" = (
@@ -36331,7 +36448,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d3afthall)
"xMC" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -36615,17 +36732,12 @@
/turf/simulated/floor/tiled/old_cargo/red,
/area/security/security_processing)
"xXa" = (
-/obj/machinery/camera/network/civilian{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 8
},
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navblue/border,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portamidhall)
+/area/endeavour/hallway/d3portforhall)
"xXg" = (
/turf/simulated/wall/r_wall/prepainted,
/area/crew_quarters/game_room)
@@ -44347,7 +44459,7 @@ pRW
pRW
pRW
pRW
-pRW
+vkt
pRW
pRW
pRW
@@ -44886,7 +44998,7 @@ pRW
pRW
pRW
pRW
-pRW
+bBF
pRW
pRW
pRW
@@ -51199,7 +51311,7 @@ kSn
rvL
rvL
xhN
-txu
+ufF
ndp
sid
syH
@@ -55466,7 +55578,7 @@ kZu
pMS
kur
rOW
-pwn
+vaf
sTd
bBc
sid
@@ -56196,7 +56308,7 @@ mDp
mDp
mDp
mDp
-bBF
+mDp
mDp
mDp
mDp
@@ -56243,7 +56355,7 @@ rEX
mkn
jHr
pwq
-sTd
+eUA
bBc
sid
eqa
@@ -56430,16 +56542,16 @@ yab
jbC
lUu
ewu
-tQn
syZ
-lGM
+syZ
+syZ
eGx
eTv
cLn
qQD
sXK
-bBc
-sid
+xXa
+swv
eqa
mmq
mmq
@@ -56624,7 +56736,7 @@ fju
fju
lUu
ewu
-syZ
+lGM
qMP
hmk
jLP
@@ -56633,7 +56745,7 @@ mwA
sQO
oBe
qBQ
-xXa
+iIc
mMr
bWK
bWK
@@ -57019,7 +57131,7 @@ qbT
bzu
iPO
jiy
-eUA
+fqc
pAU
rPF
mMr
@@ -57407,7 +57519,7 @@ qbT
jUs
pPi
jiy
-tMK
+obX
nTO
pNH
mMr
@@ -57415,7 +57527,7 @@ lTw
cjw
mhY
nfG
-lSK
+dkR
mhY
jkU
nuP
@@ -57615,7 +57727,7 @@ bCC
stW
mhY
mhY
-osL
+lzC
gVA
fWt
qRW
@@ -57928,7 +58040,7 @@ mDp
mDp
mDp
mDp
-mDp
+vDG
mDp
mDp
mDp
@@ -60331,7 +60443,7 @@ efB
nif
oTx
daO
-eTx
+jXm
okL
pIT
vnQ
@@ -60593,7 +60705,7 @@ pRW
pRW
pRW
pRW
-pRW
+bBF
pRW
pRW
pRW
@@ -61287,7 +61399,7 @@ vRl
rBG
qdW
rBG
-tMK
+obX
nTO
goK
xID
@@ -62659,7 +62771,7 @@ qxb
xIo
uhW
qEf
-sih
+mfz
adZ
vWW
gSN
@@ -65181,7 +65293,7 @@ rpK
esO
tOV
orP
-gFU
+unb
adZ
poW
eVN
@@ -65555,7 +65667,7 @@ alQ
fSP
lTw
mMr
-qxm
+sWT
tAU
uIa
qcn
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index b6d717b24a46..b10228deb65b 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -108,6 +108,9 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"agJ" = (
@@ -433,6 +436,16 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos/workshop)
+"avj" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/brigdoor/eastright{
+ dir = 2;
+ req_access = null;
+ req_one_access = list(1,38)
+ },
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"avq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -776,13 +789,10 @@
},
/area/tcommsat/chamber)
"aKR" = (
-/obj/machinery/power/apc/north_mount,
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
/obj/machinery/light{
dir = 1
},
+/obj/machinery/suit_cycler/engineering,
/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
"aLa" = (
@@ -899,6 +909,9 @@
/obj/machinery/door/firedoor{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"aQR" = (
@@ -1057,11 +1070,7 @@
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4starboardamidhall)
"bdf" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/light,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4aftmaint)
"bdx" = (
/obj/machinery/light{
@@ -1445,6 +1454,21 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
+"bBM" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4starboardforhall)
"bCk" = (
/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_airlock)
@@ -1610,6 +1634,12 @@
/obj/effect/paint/sun,
/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
+"bKa" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "For Spacena Class Vessels"
+ },
+/turf/space/basic,
+/area/space)
"bKR" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -1709,6 +1739,24 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/endeavour/command/turrets)
+"bPS" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/camera/network/engineering,
+/obj/machinery/air_alarm/north_mount,
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/bordercorner2{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
"bQm" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -1860,13 +1908,20 @@
/turf/simulated/floor/tiled/monowhite,
/area/engineering/shield_gen)
"bWc" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/lightorange/border,
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
},
/turf/simulated/floor/tiled/steel_ridged,
-/area/endeavour/hallway/d4portafthall)
+/area/endeavour/hallway/d4starboardforhall)
"bXA" = (
/obj/machinery/camera/network/outside{
dir = 8
@@ -1880,6 +1935,12 @@
/obj/effect/floor_decal/corner/lightorange/border{
dir = 9
},
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4portafthall)
"bYC" = (
@@ -2002,6 +2063,18 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos/workshop)
+"chW" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
"cin" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -2066,6 +2139,16 @@
/obj/item/tank/emergency/oxygen/engi,
/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
+"cjZ" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
"ckg" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/lightorange/border,
@@ -2234,7 +2317,7 @@
dir = 5
},
/obj/machinery/computer/ship/navigation/telescreen{
- pixel_y = 27
+ pixel_y = 28
},
/turf/simulated/floor/tiled/techfloor,
/area/endeavour/command/turrets)
@@ -2360,16 +2443,14 @@
/area/engineering/atmos/workshop)
"cyd" = (
/obj/machinery/door/firedoor,
-/obj/effect/floor_decal/borderfloorblack{
- dir = 4
- },
-/obj/effect/floor_decal/corner/orange/border{
- dir = 4
+/obj/machinery/door/airlock/glass_external{
+ req_one_access = null
},
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/monofloor{
+ dir = 8
},
-/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4aftmaint)
"cyR" = (
/obj/machinery/door/airlock/maintenance{
@@ -2468,6 +2549,27 @@
/obj/item/circuitboard/machine/lathe/autolathe,
/turf/simulated/floor,
/area/storage/tech)
+"cFb" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "Checkpoint";
+ layer = 2.8;
+ name = "Security";
+ req_one_access = null
+ },
+/obj/map_helper/access_helper/airlock/station/security/general,
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
+"cFY" = (
+/obj/effect/paint/sun,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4portafthall)
"cGj" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -2517,13 +2619,14 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"cGP" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/item/radio/intercom/west_mount{
+ pixel_x = 28
},
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/monofloor{
+ dir = 8
},
-/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
"cGQ" = (
/obj/effect/floor_decal/corner/blue/diagonal,
@@ -2549,6 +2652,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4starboardafthall)
+"cIi" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass_external{
+ req_one_access = null
+ },
+/turf/simulated/floor/tiled/monofloor{
+ dir = 4
+ },
+/area/endeavour/hallway/d4aftmaint)
"cIU" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -2559,17 +2671,13 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portamidhall)
"cJh" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightorange/border{
- dir = 1
+/obj/machinery/light{
+ dir = 8
},
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/turf/simulated/floor/tiled/monofloor{
+ dir = 4
},
-/turf/simulated/floor/tiled/steel_ridged,
-/area/endeavour/hallway/d4portafthall)
+/area/endeavour/hallway/d4aftmaint)
"cJz" = (
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4porthall)
@@ -2602,12 +2710,6 @@
/obj/effect/floor_decal/corner/lightorange/bordercorner2{
dir = 4
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4portafthall)
"cLO" = (
@@ -2690,9 +2792,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload_foyer)
"cQM" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/space)
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/lightorange/border,
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4starboardhall)
"cQR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -3010,8 +3116,18 @@
},
/area/tcommsat/chamber)
"dpt" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightorange/bordercorner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightorange/bordercorner2{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
@@ -3148,6 +3264,15 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/substation)
+"dzG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"dAg" = (
/obj/effect/floor_decal/borderfloorblack/corner{
alpha = 255;
@@ -3171,16 +3296,8 @@
},
/area/tcommsat/chamber)
"dBH" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightorange/border{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/camera/network/engineering,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4portafthall)
"dBT" = (
@@ -3473,9 +3590,6 @@
/turf/simulated/floor/tiled/monotile,
/area/engineering/engineering_monitoring)
"dWT" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor{
dir = 8
},
@@ -3551,7 +3665,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/locker_room)
"ebQ" = (
-/obj/machinery/suit_cycler/engineering,
+/obj/machinery/suit_storage_unit/engineering,
/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
"ebZ" = (
@@ -4049,8 +4163,8 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/atmos/eva)
"eDe" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
@@ -4253,19 +4367,6 @@
/turf/simulated/floor/plating,
/area/engineering/atmos)
"eNP" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightorange/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloorblack/corner2{
- alpha = 255;
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightorange/bordercorner2{
- dir = 1
- },
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4portafthall)
@@ -4346,16 +4447,13 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos/workshop)
"eSP" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 4
- },
/obj/map_helper/access_helper/airlock/station/engineering/department,
/obj/machinery/door/firedoor{
dir = 8
},
+/obj/machinery/door/airlock/multi_tile/glass{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
"eTy" = (
@@ -4691,6 +4789,10 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4portforhall)
+"flc" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"flu" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -4763,6 +4865,9 @@
/obj/structure/cable/orange{
icon_state = "1-2"
},
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"fow" = (
@@ -4861,6 +4966,12 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
+"fxl" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/starboardnacelle)
"fxM" = (
/obj/effect/floor_decal/borderfloorblack/corner{
dir = 1
@@ -4895,6 +5006,18 @@
initial_gas_mix = "n2=100;TEMP=80"
},
/area/tcommsat/chamber)
+"fyX" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/structure/cable/orange{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
"fzb" = (
/turf/simulated/floor/tiled/white,
/area/engineering/shield_gen)
@@ -5031,6 +5154,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/engineering/engineering_monitoring)
+"fHL" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4aftmaint)
"fHR" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/obj/item/clothing/gloves/yellow,
@@ -5091,6 +5220,10 @@
},
/turf/simulated/floor/reinforced/airless,
/area/engineering/portnacelle)
+"fJK" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/portnacelle)
"fJV" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -5204,6 +5337,9 @@
dir = 8
},
/obj/map_helper/access_helper/airlock/station/engineering/department,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
"fSI" = (
@@ -5238,6 +5374,9 @@
},
/turf/simulated/floor/tiled/white,
/area/engineering/shield_gen)
+"fUW" = (
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4aftmaint)
"fVo" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 1
@@ -5390,6 +5529,15 @@
},
/turf/simulated/floor/tiled/monotile,
/area/engineering/engineering_monitoring)
+"gdC" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"ggr" = (
/obj/structure/bed/chair/comfy/beige{
dir = 8
@@ -6604,6 +6752,15 @@
/obj/machinery/atmospherics/pipe/simple/visible/blue,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
+"hxJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"hxV" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -6657,6 +6814,11 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4porthall)
+"hBu" = (
+/turf/simulated/floor/tiled/monofloor{
+ dir = 4
+ },
+/area/endeavour/hallway/d4aftmaint)
"hBH" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -6910,6 +7072,12 @@
},
/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
/area/engineering/atmos)
+"hMC" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 4, Starboard Side"
+ },
+/turf/space,
+/area/space)
"hMK" = (
/turf/simulated/floor/wood,
/area/crew_quarters/heads/chief)
@@ -7333,12 +7501,17 @@
/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
"imm" = (
-/obj/machinery/light/small{
+/obj/effect/floor_decal/borderfloorblack{
dir = 1
},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/space)
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portamidhall)
"imx" = (
/obj/structure/cable/cyan{
icon_state = "0-8"
@@ -7508,6 +7681,16 @@
},
/turf/simulated/floor/tiled,
/area/engineering/break_room)
+"ixk" = (
+/obj/effect/floor_decal/spline/fancy{
+ dir = 5
+ },
+/obj/item/paper/crumpled{
+ name = "Hastily crumpled schematics";
+ info = "Right - the equipment's all set and ready to go - as long as you can keep the ship in the drydock for another few days, we can get in, get out, and be gone before we're missed. Map's attached. Burn this if you think you're about to get pinched-"
+ },
+/turf/simulated/floor/carpet/oracarpet,
+/area/engineering/engineering_monitoring)
"ixG" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -8183,10 +8366,11 @@
/turf/simulated/floor/plating,
/area/engineering/atmos)
"jmD" = (
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/door/blast/regular{
+ name = "Pod Bay Inner Blast Door";
+ id = "podbayinnerhanger"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
"jnl" = (
/obj/effect/floor_decal/techfloor/orange,
@@ -8441,9 +8625,8 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4starboardhall)
"jyr" = (
-/obj/effect/shuttle_landmark/endeavour/deck1/starboard,
-/turf/space,
-/area/space)
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/engineering/portnacelle)
"jyT" = (
/obj/machinery/lathe/autolathe,
/turf/simulated/floor/tiled/techmaint,
@@ -8515,6 +8698,18 @@
},
/turf/simulated/wall/prepainted/engineering,
/area/endeavour/hallway/d4fwdmaint)
+"jBK" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
"jBO" = (
/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
@@ -9078,10 +9273,10 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"klx" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
+/obj/effect/floor_decal/steeldecal/steel_decals2{
+ dir = 8
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d4aftmaint)
"kmv" = (
/obj/effect/floor_decal/borderfloorblack,
@@ -9520,12 +9715,8 @@
/turf/simulated/floor,
/area/storage/tech)
"kLQ" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"kMd" = (
@@ -9700,8 +9891,11 @@
/turf/simulated/floor/tiled/monotile,
/area/engineering/engineering_monitoring)
"kWc" = (
-/obj/structure/cable/green{
- 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/reinforced,
/area/endeavour/hallway/d4aftmaint)
@@ -10068,6 +10262,18 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/starboardnacelle)
+"luB" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
"luJ" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 4
@@ -10581,18 +10787,12 @@
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/lightorange/border,
/obj/map_helper/access_helper/airlock/station/engineering/department,
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 4
- },
/obj/machinery/door/firedoor{
dir = 8
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/door/airlock/multi_tile/glass{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"maG" = (
@@ -11000,6 +11200,12 @@
/obj/machinery/atmospherics/pipe/simple/visible/black,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
+"mxW" = (
+/obj/machinery/drone_fabricator/matriarch{
+ fabricator_tag = "Engineering Matriarch"
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/engineering/drone_fabrication)
"myq" = (
/obj/structure/bed/double/padded,
/obj/item/bedsheet/cedouble,
@@ -11182,9 +11388,6 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"mFn" = (
@@ -11459,6 +11662,18 @@
},
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
+"mTb" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d4fwdhall)
"mTl" = (
/obj/effect/floor_decal/corner/lightorange/border{
dir = 4
@@ -11636,6 +11851,14 @@
},
/turf/simulated/floor/tiled/white,
/area/engineering/shield_gen)
+"niS" = (
+/obj/effect/paint/sun,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
"niT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12176,12 +12399,8 @@
/obj/effect/floor_decal/corner/lightorange/bordercorner2{
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-4"
},
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4portafthall)
@@ -12414,6 +12633,9 @@
/obj/effect/floor_decal/corner/lightorange/border{
dir = 5
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d4fwdhall)
"nRY" = (
@@ -12467,18 +12689,13 @@
/turf/simulated/floor/tiled/monotile,
/area/engineering/engineering_monitoring)
"nUo" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightorange/border{
- dir = 1
- },
-/obj/machinery/air_alarm/north_mount,
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/effect/paint/sun,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
-/turf/simulated/floor/tiled/steel_grid,
-/area/endeavour/hallway/d4portafthall)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
"nUM" = (
/obj/structure/sink{
pixel_y = 22
@@ -12738,9 +12955,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4portafthall)
"oma" = (
@@ -13388,6 +13602,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"pgh" = (
@@ -13405,6 +13622,9 @@
/obj/machinery/door/firedoor{
dir = 8
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = -32
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4porthall)
"pjV" = (
@@ -13765,6 +13985,12 @@
},
/turf/simulated/floor/plating,
/area/engineering/atmos)
+"pJi" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/portnacelle)
"pJw" = (
/obj/structure/table/hardwoodtable,
/obj/item/storage/box/snakesnackbox,
@@ -13831,8 +14057,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/engineering/engine_airlock)
"pNT" = (
-/obj/machinery/suit_storage_unit/engineering,
-/turf/simulated/floor/reinforced,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/endeavour/hallway/d4aftmaint)
"pOI" = (
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -13944,18 +14169,11 @@
/turf/simulated/floor/tiled/monowhite,
/area/engineering/drone_fabrication)
"pTX" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightorange/border{
- dir = 1
+/obj/effect/shuttle_landmark/automatic{
+ name = "For Tug class vessels "
},
-/obj/machinery/camera/network/engineering,
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel_ridged,
-/area/endeavour/hallway/d4portafthall)
+/turf/space,
+/area/space)
"pUe" = (
/obj/structure/catwalk,
/obj/machinery/light/small/emergency{
@@ -14042,6 +14260,20 @@
},
/turf/simulated/floor/tiled/white,
/area/engineering/shield_gen)
+"pYs" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portafthall)
"pZs" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -14053,6 +14285,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4starboardafthall)
+"qbg" = (
+/obj/machinery/air_alarm/east_mount,
+/obj/machinery/suit_storage_unit/engineering,
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"qbS" = (
/obj/structure/table/standard,
/obj/item/aiModule/asimov,
@@ -14169,6 +14406,25 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/red,
/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
/area/engineering/atmos/workshop)
+"qmd" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/bordercorner2{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
"qmW" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techmaint,
@@ -14565,6 +14821,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4porthall)
+"qNE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"qOR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -14904,7 +15165,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 8
},
-/obj/machinery/light/small,
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/portnacelle)
"rgn" = (
@@ -15008,8 +15268,8 @@
id = "podbayouterhanger";
name = "Pod Bay Outer Hanger Door";
pixel_y = 32;
- req_access = list(10);
- req_one_access = list(10)
+ req_access = list(19,10,2);
+ req_one_access = list(19,10,2)
},
/obj/machinery/light{
dir = 1
@@ -15171,16 +15431,10 @@
"rAt" = (
/obj/effect/floor_decal/borderfloorblack/corner,
/obj/effect/floor_decal/corner/lightorange/bordercorner,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/structure/cable/orange{
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
"rAC" = (
@@ -15327,10 +15581,7 @@
/turf/simulated/floor/tiled/white,
/area/engineering/engine_monitoring)
"rMc" = (
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/tiled,
/area/endeavour/hallway/d4aftmaint)
"rME" = (
/obj/machinery/camera/network/outside{
@@ -15602,6 +15853,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4starboardamidhall)
+"sbv" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4aftmaint)
"sdP" = (
/obj/machinery/atmospherics/portables_connector,
/obj/effect/floor_decal/industrial/outline/red,
@@ -15649,10 +15904,14 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
"sgN" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/monofloor{
+ dir = 8
},
-/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
"sgO" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -15679,8 +15938,11 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4porthall)
"shX" = (
-/obj/structure/cable/green{
- icon_state = "2-4"
+/obj/machinery/camera/network/outside{
+ dir = 1
+ },
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
@@ -15691,6 +15953,21 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering)
+"skk" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "Checkpoint";
+ layer = 2.8;
+ name = "Security";
+ req_one_access = null
+ },
+/obj/map_helper/access_helper/airlock/station/security/general,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4aftmaint)
"sky" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -15744,26 +16021,9 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4starboardafthall)
"sox" = (
-/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/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d4portafthall)
+/obj/structure/sign/nanotrasen,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/endeavour/hallway/d4aftmaint)
"spe" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -15936,6 +16196,9 @@
/obj/effect/floor_decal/corner/lightorange/border{
dir = 1
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/endeavour/hallway/d4fwdhall)
"sBU" = (
@@ -16089,9 +16352,8 @@
/turf/simulated/floor/tiled/dark,
/area/engineering/engine_gas)
"sIE" = (
-/obj/machinery/light,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 4
},
/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
@@ -16384,10 +16646,11 @@
/turf/simulated/floor/tiled/steel_dirty,
/area/engineering/atmos/workshop)
"tfb" = (
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green{
+ icon_state = "0-2"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
"tfL" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
@@ -16654,9 +16917,14 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos/workshop)
"tAQ" = (
-/obj/effect/shuttle_landmark/endeavour/deck1/port,
-/turf/space,
-/area/space)
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"tBv" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/spline/fancy{
@@ -16729,8 +16997,9 @@
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering)
"tFm" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
},
/turf/simulated/floor/reinforced,
/area/endeavour/hallway/d4aftmaint)
@@ -16963,6 +17232,7 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
+/obj/item/paper/pamphlet/substation,
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering)
"tSk" = (
@@ -17063,10 +17333,19 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4starboardamidhall)
-"tXA" = (
-/obj/machinery/light/small{
+"tWu" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
dir = 1
},
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4porthall)
+"tXA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 8
},
@@ -17079,6 +17358,12 @@
},
/turf/simulated/floor/plating,
/area/engineering/drone_fabrication)
+"tZd" = (
+/obj/effect/shuttle_landmark/automatic{
+ name = "Deck 4, Port Side"
+ },
+/turf/space/basic,
+/area/space)
"uai" = (
/obj/map_helper/access_helper/airlock/station/engineering/department,
/obj/structure/cable{
@@ -17119,6 +17404,12 @@
/obj/structure/cable/green{
icon_state = "0-2"
},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightorange/bordercorner2{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4portafthall)
"udV" = (
@@ -17302,6 +17593,10 @@
/obj/machinery/air_alarm/north_mount,
/turf/simulated/floor/tiled/monotile,
/area/endeavour/hallway/d4starboardhall)
+"uqH" = (
+/obj/machinery/computer/ship/navigation/telescreen,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai/foyer)
"uqT" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -17318,6 +17613,21 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload_foyer)
+"urR" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightorange/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4starboardamidhall)
"usD" = (
/obj/machinery/light/small{
dir = 4
@@ -17464,23 +17774,15 @@
/turf/simulated/floor/reinforced/nitrogen,
/area/engineering/atmos)
"uBe" = (
-/obj/machinery/door/firedoor,
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/effect/floor_decal/corner/orange/border{
- dir = 8
- },
-/obj/map_helper/access_helper/airlock/station/engineering/department,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/simulated/floor/tiled/steel,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
+"uBK" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/endeavour/hallway/d4porthall)
"uCd" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -17758,6 +18060,22 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/portnacelle)
+"uXJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/eastright{
+ req_access = null;
+ req_one_access = list(1,38);
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d4aftmaint)
"uYd" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/structure/disposalpipe/segment{
@@ -17766,10 +18084,13 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"uYj" = (
-/obj/structure/cable/green{
- icon_state = "1-8"
+/obj/machinery/camera/network/outside{
+ dir = 1
},
-/turf/simulated/floor/reinforced,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_ridged,
/area/endeavour/hallway/d4aftmaint)
"uYJ" = (
/obj/effect/floor_decal/borderfloorblack{
@@ -18005,7 +18326,6 @@
/obj/effect/floor_decal/corner/lightorange/border{
dir = 8
},
-/obj/map_helper/access_helper/airlock/station/engineering/department,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -19117,13 +19437,10 @@
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portforhall)
"wlC" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/camera/network/outside{
- dir = 1
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/plating,
/area/endeavour/hallway/d4aftmaint)
"wnt" = (
/obj/structure/cable{
@@ -19428,13 +19745,13 @@
/turf/simulated/floor/tiled/techmaint,
/area/rnd/robotics/smallcraft)
"wGc" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4aftmaint)
"wGk" = (
/obj/effect/floor_decal/industrial/warning{
@@ -19886,6 +20203,10 @@
/obj/structure/bed/chair/comfy/beige,
/turf/simulated/floor/wood,
/area/engineering/break_room)
+"xjr" = (
+/obj/machinery/computer/ship/navigation/telescreen,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload_foyer)
"xjs" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1
@@ -19974,8 +20295,16 @@
/obj/effect/floor_decal/corner/lightorange/border{
dir = 5
},
+/obj/machinery/button/remote/blast_door{
+ id = "podbayinnerhanger";
+ name = "Pod Bay Inner Hanger Door";
+ pixel_y = 32;
+ req_access = list(19,10,2);
+ req_one_access = list(19,10,2);
+ pixel_x = -1
+ },
/obj/structure/cable/orange{
- icon_state = "2-8"
+ icon_state = "2-4"
},
/turf/simulated/floor/tiled/steel_grid,
/area/endeavour/hallway/d4portafthall)
@@ -20114,6 +20443,29 @@
"xwk" = (
/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/drone_fabrication)
+"xwD" = (
+/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/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
+ },
+/obj/machinery/door/airlock/multi_tile/glass{
+ dir = 4
+ },
+/obj/map_helper/access_helper/airlock/station/engineering/department,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portafthall)
"xwH" = (
/obj/machinery/light{
dir = 4
@@ -20646,6 +20998,15 @@
/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/engineering/break_room)
+"xZC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/reinforced,
+/area/endeavour/hallway/d4aftmaint)
"yaf" = (
/turf/simulated/floor/reinforced/oxygen,
/area/engineering/atmos)
@@ -20711,9 +21072,11 @@
/obj/effect/floor_decal/corner/lightorange/bordercorner{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+ dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/endeavour/hallway/d4portafthall)
@@ -25668,7 +26031,7 @@ jNg
jNg
jNg
jNg
-jyr
+jNg
jNg
jNg
jNg
@@ -26188,9 +26551,9 @@ wEN
wEN
aXs
fCM
-lgz
-eIq
+pJi
eIq
+fJK
wEN
wEN
psc
@@ -26966,7 +27329,7 @@ jYW
ain
rga
eIq
-eIq
+fJK
vLd
kdA
lHH
@@ -27004,7 +27367,7 @@ iXz
hHV
jBO
cXp
-pWy
+fxl
pWy
tXA
uzl
@@ -28904,10 +29267,10 @@ wEN
wEN
wEN
wEN
-wEN
-wEN
-wEN
-wEN
+jyr
+jyr
+jyr
+jyr
iAM
xwJ
lgy
@@ -29090,21 +29453,21 @@ jNg
jNg
jNg
jNg
-jNg
+xRj
jNg
jNg
ikp
iYY
iYY
-ebQ
+jhP
jhP
pNT
+bdf
+fUW
pNT
-pNT
-ikp
-ihs
-xwJ
-mHH
+cjZ
+xwD
+gIr
nTU
nhY
wyk
@@ -29284,7 +29647,7 @@ jNg
jNg
jNg
jNg
-jNg
+xRj
jNg
jNg
ikp
@@ -29292,10 +29655,10 @@ wom
jhP
jhP
jhP
-jhP
-jhP
-peM
-ikp
+cFb
+fUW
+bdf
+pNT
iAM
xwJ
oSP
@@ -29478,19 +29841,19 @@ jNg
jNg
jNg
jNg
-jNg
+xRj
jNg
jNg
dYd
jhP
jhP
jhP
-jhP
-jhP
-jhP
wCh
-ikp
-kqk
+pNT
+bdf
+sbv
+pNT
+ihs
xwJ
mHH
nTU
@@ -29672,19 +30035,19 @@ jNg
jNg
jNg
jNg
-jNg
+xRj
jNg
jNg
dYd
jhP
-jhP
-jhP
-jhP
-jhP
-jhP
-jhP
-ikp
-iAM
+flc
+hxJ
+shX
+pNT
+fUW
+uYj
+pNT
+bPS
xwJ
kab
nTU
@@ -29866,20 +30229,20 @@ jNg
jNg
jNg
jNg
-jNg
+xRj
jNg
jNg
dYd
jhP
jhP
+kWc
jhP
-jhP
-jhP
-jhP
-jhP
-ikp
+avj
+bdf
+wGc
+skk
dBH
-xwJ
+pYs
mHH
nTU
cvQ
@@ -30053,25 +30416,25 @@ jNg
jNg
jNg
jNg
+pTX
jNg
jNg
jNg
jNg
jNg
jNg
-jNg
-jNg
+xRj
jNg
jNg
dYd
jhP
jhP
+kWc
jhP
-jhP
-jhP
-jhP
-jhP
-ikp
+pNT
+fUW
+fHL
+pNT
udi
jzg
kab
@@ -30254,19 +30617,19 @@ jNg
jNg
jNg
jNg
+xRj
jNg
-jNg
-jNg
+xRj
dYd
jhP
jhP
+kWc
jhP
-jhP
-jhP
-jhP
-jhP
-ikp
-ihs
+pNT
+uBe
+uXJ
+pNT
+qmd
xwJ
mHH
nTU
@@ -30444,22 +30807,22 @@ jNg
jNg
jNg
jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
jNg
jNg
dYd
jhP
jhP
+kWc
jhP
-jhP
-jhP
-jhP
-jhP
-bJi
+cIi
+cJh
+hBu
+cIi
eNP
gIB
xnV
@@ -30638,22 +31001,22 @@ jNg
jNg
jNg
jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
xRj
xRj
cuI
ikp
rpU
jhP
+kWc
jhP
-jhP
-jhP
+sox
rMc
klx
-uBe
+pNT
dpt
xwJ
mHH
@@ -30832,24 +31195,24 @@ jNg
jNg
jNg
jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
xRj
xRj
xRj
dYd
jhP
jhP
-jhP
-jhP
-shX
+tAQ
+qNE
+cyd
cGP
sgN
cyd
kLQ
-jzg
+pYs
oSP
nqa
eGc
@@ -31031,20 +31394,20 @@ jNg
jNg
jNg
xRj
-xRj
+bKa
xRj
dYd
jhP
jhP
-jhP
-jhP
kWc
-tFm
-tfb
-ksD
+wCh
+pNT
+pNT
+pNT
+pNT
cLC
-sox
-bWc
+xwJ
+mHH
nqa
pNL
jEy
@@ -31230,15 +31593,15 @@ xRj
dYd
jhP
jhP
+kWc
jhP
jhP
-kWc
-tFm
-eDe
-ikp
-cJh
+jhP
+peM
+pNT
+iAM
xwJ
-hLB
+kab
nqa
fZZ
xJp
@@ -31313,7 +31676,7 @@ xRj
xRj
xRj
jNg
-jNg
+hMC
jNg
jNg
jNg
@@ -31424,15 +31787,15 @@ xRj
dYd
jhP
jhP
+kWc
jhP
jhP
-kWc
-tFm
-bdf
-ikp
-nUo
+jhP
+wCh
+pNT
+kqk
xwJ
-cYd
+mHH
nqa
crO
gnX
@@ -31617,16 +31980,16 @@ xRj
xRj
dYd
jhP
+sIE
+kWc
jhP
jhP
jhP
-kWc
-tFm
-eDe
-ikp
-cJh
+sIE
+jmD
+iAM
xwJ
-hLB
+kab
nqa
crO
asr
@@ -31677,10 +32040,10 @@ jNg
jNg
jNg
jNg
-imm
-cQM
-jMU
-jMU
+xRj
+xRj
+xRj
+xRj
jNg
jNg
jNg
@@ -31770,7 +32133,7 @@ xRj
xRj
xRj
xRj
-xRj
+tZd
xRj
xRj
xRj
@@ -31811,16 +32174,16 @@ xRj
jNg
dYd
jhP
-jhP
-jhP
-jhP
-kWc
+xZC
+gdC
tFm
-wlC
-ikp
+tFm
+tFm
+dzG
+jmD
okY
xwJ
-cYd
+mHH
nqa
nqa
nqa
@@ -32005,14 +32368,14 @@ jNg
jNg
dYd
jhP
+eDe
jhP
jhP
jhP
-kWc
-tFm
-sIE
-ikp
-pTX
+jhP
+eDe
+jmD
+eDC
agu
mEZ
jnW
@@ -32199,13 +32562,13 @@ jNg
rME
ikp
aKR
-sgN
-sgN
-sgN
-uYj
-tFm
-eDe
-ikp
+ebQ
+ebQ
+qbg
+jhP
+jhP
+wCh
+pNT
xmz
fod
rAt
@@ -32400,7 +32763,7 @@ ikp
dWT
eSP
ikp
-gIr
+cFY
aQr
lZV
dpZ
@@ -32591,9 +32954,9 @@ uEt
uEt
rHl
uEt
-wGc
-jmD
-ikp
+uEt
+uEt
+niS
bXW
yeG
nGj
@@ -32785,10 +33148,10 @@ pLM
pLM
pLM
pLM
-coP
-jBO
+pLM
+pLM
fSH
-iAM
+fyX
hEI
bSj
vGs
@@ -32802,7 +33165,7 @@ hER
wNX
tWf
tWf
-tWf
+uBK
dOL
ieH
eOZ
@@ -32978,11 +33341,11 @@ bJi
jBO
jBO
jBO
-jBO
-jBO
-jBO
-ikp
-ihs
+tfb
+wlC
+wlC
+nUo
+luB
pfR
tmS
ppa
@@ -33370,7 +33733,7 @@ gMW
gMW
gMW
gMW
-ihs
+jBK
kiI
cYd
ppa
@@ -34155,7 +34518,7 @@ jZF
jZF
fSM
dpZ
-azJ
+tWu
atZ
pgh
wpR
@@ -34728,7 +35091,7 @@ hZm
irv
gMW
gMW
-iAM
+chW
kiI
qjJ
jQA
@@ -34747,7 +35110,7 @@ oCj
bHY
cQR
bHY
-inf
+ixk
lNQ
jlM
wpR
@@ -35917,7 +36280,7 @@ oJl
bAs
icI
xAC
-sSq
+cQM
xsV
dvY
rwJ
@@ -36277,7 +36640,7 @@ ylp
vLC
tDD
hmF
-tDD
+mxW
vLC
xwk
iAM
@@ -36483,7 +36846,7 @@ kuh
ryp
nqw
fJm
-azJ
+tWu
atZ
dlT
bAs
@@ -40751,7 +41114,7 @@ avD
wiw
pSY
xsV
-gzp
+imm
gDf
rqK
hHC
@@ -41541,7 +41904,7 @@ rgn
sNu
hHC
hHC
-aqU
+urR
kGS
uXi
xsV
@@ -43858,7 +44221,7 @@ qBz
xmZ
oAp
fIT
-ocO
+uqH
ocO
bny
fbf
@@ -44839,7 +45202,7 @@ uAo
rNG
xXo
xXo
-obt
+bBM
wqk
rbo
qBz
@@ -45931,7 +46294,7 @@ xRj
xRj
xRj
xRj
-xRj
+tZd
xRj
xRj
xRj
@@ -46186,7 +46549,7 @@ qBz
oOK
oAp
fIT
-bDO
+xjr
bDO
bDO
bDO
@@ -47023,7 +47386,7 @@ jNg
jNg
jNg
jNg
-jNg
+hMC
jNg
jNg
jNg
@@ -47117,7 +47480,7 @@ jNg
jNg
jNg
jNg
-tAQ
+jNg
jNg
jNg
jNg
@@ -48137,7 +48500,7 @@ meF
toK
tmr
tmr
-xNn
+bWc
wqk
hKp
qBz
@@ -51821,7 +52184,7 @@ sRd
tRY
fMI
knf
-ebZ
+mTb
ehr
vdH
qBz
diff --git a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
index c16757b54c69..0113b113667b 100644
--- a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
+++ b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
@@ -4401,7 +4401,6 @@
},
/obj/machinery/door/blast/regular{
density = 0;
- icon_state = "pdoor1";
id = "Runabout'";
name = "Teshari Runabout Airlock";
opacity = 0
@@ -17183,9 +17182,7 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/general)
"aTM" = (
-/obj/structure/cable/orange{
- dir = 2
- },
+/obj/structure/cable/orange,
/obj/machinery/power/terminal,
/turf/simulated/floor/tiled/monotechmaint,
/area/shuttle/tug)
@@ -19695,7 +19692,6 @@
"brN" = (
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/structure/window/reinforced/polarized{
- dir = 2;
id = "scoophead_office"
},
/turf/simulated/floor/plating,