diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index cf0dc948e474..c503c6d05f0c 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -5271,6 +5271,24 @@
icon_state = "darkredcorners"
},
/area/station/security/brig)
+"atD" = (
+/obj/structure/chair/comfy/brown,
+/obj/machinery/door/window/classic/normal{
+ name = "Glass Door"
+ },
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/obj/machinery/door_control{
+ id = "nct";
+ name = "Office Door";
+ normaldoorcontrol = 1;
+ pixel_x = -25;
+ req_access = list(80);
+ pixel_y = -1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreenfull"
+ },
+/area/station/procedure/trainer_office)
"atE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -12915,14 +12933,12 @@
/turf/simulated/wall,
/area/station/hallway/secondary/garden)
"aTv" = (
-/obj/effect/turf_decal/delivery/blue/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/machinery/economy/vending/traindrobe,
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ dir = 9;
+ icon_state = "darkgreen"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"aTw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -12930,20 +12946,15 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aTx" = (
-/obj/effect/turf_decal/delivery/blue/hollow,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/remains/xeno,
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ icon_state = "dark"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"aTy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ icon_state = "darkgreenfull"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"aTz" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -13373,11 +13384,8 @@
/turf/simulated/wall/r_wall,
/area/station/command/vault)
"aUF" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"aUG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13391,10 +13399,20 @@
},
/area/station/public/dorms)
"aUH" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer,
+/obj/machinery/door/window/reinforced/normal{
+ name = "NCT"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ dir = 4;
+ icon_state = "darkgreen"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"aUI" = (
/obj/structure/window/reinforced{
dir = 1
@@ -15235,17 +15253,24 @@
/area/station/public/storage/tools)
"bam" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
},
-/area/station/maintenance/fpmaint)
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"ban" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/effect/turf_decal/woodsiding{
+ dir = 4
},
-/area/station/maintenance/fpmaint)
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"bao" = (
/obj/machinery/status_display{
layer = 4;
@@ -16762,11 +16787,13 @@
},
/area/station/public/dorms)
"bfe" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/photocopier,
+/obj/structure/window/reinforced,
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ dir = 8;
+ icon_state = "darkgreen"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"bfi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -17302,20 +17329,15 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
"bgK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkbluecorners"
+/obj/structure/chair/comfy/brown,
+/obj/machinery/door/window/classic/normal{
+ name = "Glass Door"
},
-/area/station/maintenance/fpmaint)
-"bgL" = (
-/mob/living/simple_animal/cockroach,
+/obj/effect/landmark/start/nanotrasen_career_trainer,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkbluecorners"
+ icon_state = "darkgreenfull"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"bgM" = (
/obj/structure/table/glass,
/obj/item/hatchet,
@@ -17619,33 +17641,30 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/office)
"bhG" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/item/flag/nt,
+/obj/machinery/camera{
+ c_tag = "Career Trainer's Office"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ dir = 9;
+ icon_state = "darkgreen"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"bhH" = (
/obj/machinery/status_display{
layer = 4;
pixel_x = -32
},
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkblue"
- },
-/area/station/maintenance/fpmaint)
+/obj/structure/filingcabinet,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"bhI" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkblue"
+/obj/structure/table/wood,
+/obj/effect/turf_decal/woodsiding{
+ dir = 9
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"bhK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -17696,13 +17715,13 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/ore_box,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkblue"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"bhQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -17996,6 +18015,12 @@
"biH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "blue"
@@ -18909,14 +18934,8 @@
},
/area/station/service/hydroponics)
"blf" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/ore_box,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkbluecorners"
- },
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"blg" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -19231,13 +19250,13 @@
/area/station/service/kitchen)
"bmk" = (
/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/ore_box,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkbluecorners"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"bmm" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -19426,14 +19445,6 @@
},
/turf/simulated/floor/wood,
/area/station/service/bar)
-"bmN" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/nw)
"bmO" = (
/turf/simulated/floor/plasteel{
icon_state = "chapel"
@@ -20311,6 +20322,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bpn" = (
@@ -20684,6 +20696,7 @@
"bqq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "stairs-m"
},
@@ -21145,6 +21158,7 @@
"brJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"brK" = (
@@ -21951,6 +21965,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bun" = (
@@ -22592,6 +22607,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bwC" = (
@@ -23840,6 +23856,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bCu" = (
@@ -24164,14 +24181,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
-"bDO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/west)
"bDP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -24956,16 +24965,6 @@
/obj/structure/closet/crate/freezer,
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
-"bGZ" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/west)
"bHc" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -25691,12 +25690,28 @@
},
/area/station/medical/reception)
"bJC" = (
-/obj/structure/rack,
-/obj/item/poster/random_contraband,
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/button/windowtint{
+ id = "NCT";
+ pixel_x = 24;
+ dir = 8;
+ pixel_y = 5
+ },
+/obj/machinery/light_switch{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24;
+ pixel_y = -5
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkbluefull"
+ dir = 5;
+ icon_state = "darkgreen"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"bJE" = (
/obj/machinery/light{
dir = 8
@@ -26321,16 +26336,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
-"bMm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/west)
"bMn" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -26790,14 +26795,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
-"bNY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/west)
"bOd" = (
/obj/machinery/door/poddoor{
id_tag = "trash";
@@ -27336,6 +27333,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"bQo" = (
@@ -28507,6 +28505,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"bUW" = (
@@ -28517,6 +28518,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"bUX" = (
@@ -28526,6 +28530,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"bUY" = (
@@ -28535,6 +28542,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"bUZ" = (
@@ -28544,6 +28554,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "browncorner"
@@ -38203,32 +38216,36 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/effect/turf_decal/woodsiding{
+ dir = 10
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"cGV" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/ore_box,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkbluecorners"
+/obj/machinery/light{
+ dir = 8
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cGX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/effect/turf_decal/woodsiding{
+ dir = 6
},
-/area/station/maintenance/fpmaint)
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"cGY" = (
/obj/structure/chair{
dir = 8
@@ -38249,11 +38266,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/mob/living/simple_animal/mouse/gray,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/maintenance/fpmaint)
+/obj/effect/turf_decal/woodsiding,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"cHb" = (
/obj/machinery/status_display{
layer = 4;
@@ -42854,11 +42869,9 @@
/area/station/engineering/smes)
"cYN" = (
/obj/machinery/alarm/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkbluecorners"
- },
-/area/station/maintenance/fpmaint)
+/obj/item/kirbyplants,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cYO" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -42882,10 +42895,16 @@
"cYS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/maintenance/fpmaint)
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cYT" = (
/obj/machinery/atmospherics/trinary/tvalve/digital/flipped,
/turf/simulated/floor/plasteel,
@@ -45645,10 +45664,6 @@
/obj/machinery/camera{
c_tag = "Central Hallway North-West"
},
-/obj/structure/extinguisher_cabinet{
- name = "north bump";
- pixel_y = 30
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluecorner"
@@ -45663,6 +45678,10 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/extinguisher_cabinet{
+ name = "north bump";
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
@@ -50004,6 +50023,17 @@
icon_state = "bar"
},
/area/station/security/permabrig)
+"eum" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/west)
"euu" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 8
@@ -50340,6 +50370,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/main)
+"eDU" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"eDZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -54353,6 +54393,9 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
+"gHr" = (
+/turf/simulated/wall,
+/area/station/procedure/trainer_office)
"gHJ" = (
/obj/machinery/door/window/brigdoor{
dir = 1;
@@ -54627,11 +54670,12 @@
/turf/space,
/area/space/nearstation)
"gNX" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkblue"
+/obj/structure/table/wood,
+/obj/effect/turf_decal/woodsiding{
+ dir = 5
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"gOd" = (
/obj/structure/chair{
dir = 1
@@ -55314,6 +55358,22 @@
},
/turf/simulated/floor/grass/jungle/no_creep,
/area/station/command/bridge)
+"hdm" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/nw)
"hdr" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -57185,6 +57245,19 @@
/obj/machinery/power/apc/directional/north,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
+"igI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/west)
"igR" = (
/obj/machinery/door/airlock/public/glass,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -57505,14 +57578,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
-"ioq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/west)
"iot" = (
/obj/effect/decal/cleanable/ash,
/obj/effect/decal/cleanable/dirt,
@@ -59835,6 +59900,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
+"jAU" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"jCr" = (
/obj/structure/table,
/obj/item/storage/firstaid/adv{
@@ -59981,6 +60056,16 @@
/obj/structure/shelf/service,
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
+"jFW" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/woodsiding{
+ dir = 1
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"jGd" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -60897,6 +60982,12 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"kgz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/sw)
"khl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
@@ -61495,12 +61586,35 @@
"kwE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/door/airlock/command/glass{
+ name = "Trainer's Office";
+ id_tag = "nct"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "NCT"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"kwG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/spawner/nukedisc_respawn,
@@ -62612,12 +62726,20 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"kYq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_y = 4;
+ pixel_x = -5
+ },
+/obj/item/pen{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/structure/window/reinforced,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ icon_state = "darkgreenfull"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"kYB" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -66361,6 +66483,12 @@
icon_state = "whiteblue"
},
/area/station/medical/medbay2)
+"mUR" = (
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"mVd" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -67210,6 +67338,12 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
+"nxW" = (
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/lobby)
"nxX" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -73282,14 +73416,16 @@
/turf/simulated/floor/carpet/green,
/area/station/command/bridge)
"qvo" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/ore_box,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkbluecorners"
+/obj/machinery/light{
+ dir = 4
},
-/area/station/maintenance/fpmaint)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"qvO" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -74508,12 +74644,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"qZX" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkbluecorners"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"rac" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -75038,10 +75174,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"rmK" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/structure/chair/sofa/left{
+ dir = 1
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"rmT" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 1
@@ -75680,6 +75817,19 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint2)
+"rFd" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/west)
"rFe" = (
/obj/structure/chair/sofa/bench{
dir = 4
@@ -76309,6 +76459,12 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"rWJ" = (
+/obj/structure/chair/sofa/right{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"rWS" = (
/obj/machinery/camera{
c_tag = "Engineering Supermatter Port";
@@ -84406,6 +84562,17 @@
},
/turf/simulated/floor/plating,
/area/station/science/robotics)
+"wxi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/west)
"wxp" = (
/obj/machinery/alarm/directional/north,
/obj/machinery/light{
@@ -84991,11 +85158,32 @@
icon_state = "dark"
},
/area/station/aisat/service)
+"wNl" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/west)
"wNM" = (
/obj/structure/sign/vacuum/external,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/supply/storage)
+"wNQ" = (
+/obj/structure/closet,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"wNT" = (
/obj/structure/sign/bobross{
pixel_y = 32
@@ -86614,13 +86802,14 @@
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"xHw" = (
-/obj/structure/barricade/wooden/crude,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/airlock/maintenance{
+ name = "Trainer's Office Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"xHy" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -111601,7 +111790,7 @@ bNX
kOU
bzF
fTS
-bzF
+nxW
rJJ
bXk
bYD
@@ -111827,14 +112016,14 @@ aPi
nvO
aMA
bac
-aSu
-aSu
-aSu
-aSu
-aSu
-aSu
-aSu
-aSu
+gHr
+gHr
+gHr
+gHr
+gHr
+gHr
+gHr
+gHr
gIc
dmx
bkg
@@ -112083,15 +112272,15 @@ aMY
aPi
aRr
aMA
-aSu
-aSu
+gHr
+gHr
bhG
bfe
bhH
blf
cGV
cYN
-aSu
+gHr
djO
bmC
bks
@@ -112340,7 +112529,7 @@ uJq
aPw
aVE
aQj
-aSu
+gHr
aTv
aTx
bgK
@@ -112348,8 +112537,8 @@ bhI
bam
cGT
rmK
-aSu
-bgP
+gHr
+qZp
yhp
bkq
blQ
@@ -112597,16 +112786,16 @@ aMY
aPi
aRr
aQl
-aSu
-aTy
+gHr
+wNQ
aTy
kYq
-aUF
+jFW
aUF
cGZ
-rmK
-aSu
-qZp
+rWJ
+eDU
+bgP
yhp
gsf
dnN
@@ -112855,16 +113044,16 @@ lQx
ffD
aPi
xHw
-aUH
-bfe
-bgL
+mUR
+aTx
+atD
gNX
ban
cGX
cYS
kwE
biH
-bmN
+hdm
bpm
bqq
brJ
@@ -112874,18 +113063,18 @@ brJ
bwB
brJ
bCt
-bDO
-ioq
-bGZ
-ioq
-ioq
-ioq
-ioq
-bMm
-bNY
+wNl
+wxi
+rFd
+wxi
+wxi
+wxi
+wxi
+igI
+eum
bQn
-bST
-bST
+kgz
+kgz
bUY
bST
rSd
@@ -113111,15 +113300,15 @@ aRP
aEl
ffD
biE
-aSu
-aSu
+gHr
+gHr
bJC
aUH
bhP
bmk
qvo
qZX
-aSu
+jAU
djW
yhp
bgS
@@ -113369,14 +113558,14 @@ aEl
aRr
aQl
aPi
-aSu
-aSu
-aSu
-aSu
-aSu
-aSu
-aSu
-aSu
+gHr
+gHr
+gHr
+gHr
+gHr
+gHr
+gHr
+gHr
djV
bmW
bkv
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index b96d49be9950..41eb7da2369a 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -1236,6 +1236,13 @@
/obj/effect/spawner/random/dirt/frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"aji" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/machinery/alarm/directional/east,
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"ajq" = (
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1826,14 +1833,6 @@
/obj/machinery/ai_status_display,
/turf/simulated/wall/r_wall,
/area/station/aisat/service)
-"apl" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/station/security/brig)
"apx" = (
/obj/item/restraints/handcuffs/pinkcuffs,
/turf/simulated/floor/plating/asteroid/ancient,
@@ -2287,12 +2286,6 @@
/obj/structure/girder,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"atH" = (
-/obj/structure/closet/crate/freezer,
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange,
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"atI" = (
/obj/structure/disposalpipe/segment{
color = "#954535"
@@ -3907,6 +3900,17 @@
icon_state = "redcorner"
},
/area/station/security/prison/cell_block/a)
+"aJa" = (
+/obj/machinery/camera/autoname{
+ dir = 9
+ },
+/obj/machinery/door_control{
+ id = "pet_shop";
+ name = "Storefront Shutters";
+ pixel_x = 24
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"aJc" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -5290,6 +5294,20 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/east)
+"aWX" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable/orange{
+ icon_state = "0-2"
+ },
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "Secure Gate";
+ name = "Security Blast Door";
+ opacity = 0
+ },
+/turf/simulated/floor/plating,
+/area/station/security/prison/cell_block/a)
"aXa" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -6001,14 +6019,6 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain)
-"bco" = (
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/obj/item/flag/ian,
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"bcp" = (
/obj/machinery/door/airlock/maintenance{
name = "Port Asteroid Maintenance"
@@ -8271,10 +8281,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bqg" = (
-/obj/structure/table,
-/obj/item/instrument/harmonica,
-/turf/simulated/floor/plasteel,
-/area/station/security/permabrig)
+/turf/simulated/wall,
+/area/station/procedure/trainer_office)
"bqn" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -9468,6 +9476,29 @@
},
/turf/simulated/floor/plating,
/area/station/security/processing)
+"bwc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "bluecorner"
+ },
+/area/station/hallway/primary/fore/north)
"bwe" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -12835,6 +12866,16 @@
icon_state = "darkyellow"
},
/area/station/engineering/control)
+"bMm" = (
+/obj/structure/filingcabinet,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"bMv" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -16083,6 +16124,20 @@
/obj/effect/spawner/random/dirt/frequent,
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
+"cdZ" = (
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/obj/machinery/light_switch{
+ pixel_y = 24;
+ name = "north bump"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"ceb" = (
/obj/machinery/cryopod/robot,
/turf/simulated/floor/plasteel{
@@ -17982,6 +18037,12 @@
},
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/fore)
+"ctr" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/security/prison/cell_block/a)
"ctw" = (
/obj/structure/flora/tree/jungle,
/turf/simulated/floor/grass/jungle,
@@ -18788,6 +18849,14 @@
icon_state = "darkbrown"
},
/area/station/supply/office)
+"cAr" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/security/prison/cell_block/a)
"cAz" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/l3closet/scientist,
@@ -20603,6 +20672,9 @@
icon_state = "bar"
},
/area/station/service/theatre)
+"cOh" = (
+/turf/simulated/floor/plasteel,
+/area/station/security/prison/cell_block/a)
"cOo" = (
/obj/machinery/door/airlock/external/glass{
name = "Escape Pod Airlock"
@@ -23679,6 +23751,15 @@
"dgP" = (
/turf/simulated/floor/wood,
/area/station/maintenance/gambling_den)
+"dgU" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "redcorner"
+ },
+/area/station/security/prison/cell_block/a)
"dgW" = (
/obj/machinery/economy/vending/autodrobe{
desc = "A vending machine for costumes. The machine seems blessed by some higher power, allowing it to function without power. HONK!";
@@ -25010,27 +25091,6 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/fore/north)
-"duJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "blue"
- },
-/area/station/hallway/primary/fore/north)
"duL" = (
/obj/effect/turf_decal/stripes/corner,
/obj/structure/closet/wardrobe/pjs,
@@ -26905,6 +26965,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
+"dLS" = (
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/carpet/black,
+/area/station/command/office/captain)
"dLW" = (
/obj/structure/railing/corner{
dir = 1
@@ -27308,6 +27374,29 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/green,
/area/station/service/library)
+"dQW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "blue"
+ },
+/area/station/hallway/primary/fore/north)
"dQX" = (
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/unary/portables_connector{
@@ -27794,6 +27883,11 @@
icon_state = "cafeteria"
},
/area/station/service/kitchen)
+"dWr" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/security/prison/cell_block/a)
"dWD" = (
/turf/simulated/wall,
/area/station/hallway/primary/central/west)
@@ -28304,6 +28398,15 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/apmaint)
+"eeY" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters{
+ name = "Storefront Shutters";
+ id_tag = "pet_shop";
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/public/pet_store)
"efa" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
@@ -31036,6 +31139,27 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/a)
+"ePN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "bluecorner"
+ },
+/area/station/hallway/primary/fore/north)
"ePQ" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -31051,6 +31175,9 @@
icon_state = "darkblue"
},
/area/station/maintenance/disposal/northeast)
+"eQg" = (
+/turf/simulated/wall/r_wall,
+/area/station/procedure/trainer_office)
"eQs" = (
/turf/simulated/mineral/ancient,
/area/station/turret_protected/aisat/interior)
@@ -31877,6 +32004,21 @@
slowdown = -0.3
},
/area/station/hallway/spacebridge/servsci)
+"feB" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/alarm/directional/east,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"feG" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -32181,27 +32323,6 @@
icon_state = "dark"
},
/area/station/security/warden)
-"fiE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "bluecorner"
- },
-/area/station/hallway/primary/fore/north)
"fiJ" = (
/obj/structure/table/wood,
/obj/machinery/computer/med_data/laptop{
@@ -32675,6 +32796,19 @@
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
+"fqD" = (
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc/directional/north,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"fqM" = (
/obj/machinery/light/small{
dir = 1
@@ -32796,10 +32930,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/spacebridge/engmed)
-"fse" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/public/pet_store)
"fsf" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
@@ -34364,6 +34494,30 @@
icon_state = "cafeteria"
},
/area/station/science/hallway)
+"fOr" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Trainer's Office";
+ id_tag = "nct"
+ },
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "NCT"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/orange{
+ icon_state = "2-8"
+ },
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/procedure/trainer_office)
"fOt" = (
/obj/structure/sign/poster/contraband/clown{
pixel_y = 32
@@ -35588,15 +35742,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/fitness)
-"ghZ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"giA" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -35800,6 +35945,14 @@
icon_state = "redcorner"
},
/area/station/security/main)
+"gkA" = (
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/item/flag/ian,
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"gkD" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -36221,6 +36374,24 @@
/obj/effect/spawner/random/barrier/grille_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"gsu" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_y = 4;
+ pixel_x = -5
+ },
+/obj/item/pen{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"gsx" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -37116,6 +37287,10 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/starboard)
+"gFs" = (
+/obj/structure/closet/crate/freezer,
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"gFu" = (
/obj/effect/turf_decal/stripes/asteroid/end{
dir = 8
@@ -38441,6 +38616,16 @@
"gZI" = (
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
+"gZM" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_y = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/station/procedure/trainer_office)
"gZS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -40858,6 +41043,18 @@
icon_state = "cafeteria"
},
/area/station/science/hallway)
+"hGZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/cable/orange{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"hHb" = (
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/unary/portables_connector{
@@ -41770,14 +41967,6 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/apmaint)
-"hRc" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bucket,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"hRk" = (
/obj/structure/cable/orange{
icon_state = "1-2"
@@ -44465,20 +44654,6 @@
icon_state = "dark"
},
/area/station/command/teleporter)
-"iAK" = (
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "Secure Gate";
- name = "Security Blast Door";
- opacity = 0
- },
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/turf/simulated/floor/plating,
-/area/station/security/prison/cell_block/a)
"iAO" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -44604,6 +44779,15 @@
icon_state = "whitepurple"
},
/area/station/science/hallway)
+"iBK" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"iBP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -44843,14 +45027,6 @@
/mob/living/carbon/human/monkey,
/turf/simulated/floor/grass,
/area/station/science/genetics)
-"iFG" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/security/prison/cell_block/a)
"iFO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -45539,6 +45715,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"iNX" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Blueshield's Office";
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"iOd" = (
/obj/structure/railing{
dir = 6
@@ -46776,6 +46964,20 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/port)
+"jdL" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"jdN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -47455,15 +47657,6 @@
slowdown = -0.3
},
/area/station/hallway/spacebridge/engmed)
-"jmo" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Storefront Shutters";
- id_tag = "pet_shop";
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/public/pet_store)
"jmq" = (
/obj/structure/closet/firecloset/full,
/obj/effect/spawner/random/dirt/maybe,
@@ -48322,15 +48515,6 @@
},
/turf/simulated/wall,
/area/station/hallway/primary/central/east)
-"jvT" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "redcorner"
- },
-/area/station/security/prison/cell_block/a)
"jvX" = (
/obj/structure/closet/crate/trashcart{
desc = "A heavy, metal laundrycart with wheels.";
@@ -49204,7 +49388,7 @@
"jFG" = (
/obj/structure/closet/secure_closet/blueshield,
/obj/machinery/camera{
- c_tag = "Blueshield's Office";
+ c_tag = "Trainer's Office";
dir = 1
},
/turf/simulated/floor/wood,
@@ -49326,6 +49510,14 @@
/obj/machinery/economy/vending/autodrobe,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
+"jHr" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/glass/bucket,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"jHz" = (
/obj/machinery/firealarm/directional/east,
/obj/machinery/suit_storage_unit/blueshield/secure,
@@ -50099,6 +50291,13 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
+"jQT" = (
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass,
+/obj/structure/closet/crate/freezer,
+/obj/machinery/power/apc/directional/west,
+/obj/structure/cable/orange,
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"jQZ" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
@@ -55587,6 +55786,15 @@
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/wood,
/area/station/service/bar)
+"lmd" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "bs"
+ },
+/obj/structure/cable/orange{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"lme" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -56232,6 +56440,29 @@
},
/turf/space,
/area/station/engineering/solar/fore_port)
+"ltY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "blue"
+ },
+/area/station/hallway/primary/fore/north)
"lux" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating{
@@ -56291,6 +56522,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"lvm" = (
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "Secure Gate";
+ name = "Security Blast Door";
+ opacity = 0
+ },
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable/orange{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/security/prison/cell_block/a)
"lvw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -57465,17 +57710,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"lKF" = (
-/obj/machinery/camera/autoname{
- dir = 9
- },
-/obj/machinery/door_control{
- id = "pet_shop";
- name = "Storefront Shutters Control";
- pixel_x = 24
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"lKI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -64235,10 +64469,6 @@
},
/turf/space,
/area/space)
-"nxx" = (
-/obj/structure/closet/crate/freezer,
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"nxz" = (
/obj/machinery/light{
dir = 8
@@ -65515,6 +65745,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/southwest)
+"nPU" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Pet Shop"
+ },
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
+/area/station/public/pet_store)
"nPZ" = (
/obj/structure/disposalpipe/segment,
/obj/item/cigbutt,
@@ -65727,6 +65969,9 @@
slowdown = -0.3
},
/area/station/hallway/spacebridge/serveng)
+"nSI" = (
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"nSO" = (
/obj/structure/grille/broken,
/obj/effect/decal/cleanable/glass,
@@ -66099,9 +66344,6 @@
icon_state = "dark"
},
/area/station/turret_protected/ai)
-"nXW" = (
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"nXZ" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "bs"
@@ -67293,18 +67535,19 @@
},
/area/station/medical/virology)
"ooJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/orange{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
@@ -68565,6 +68808,23 @@
icon_state = "darkfull"
},
/area/station/supply/office)
+"oFY" = (
+/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/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/fore/north)
"oGk" = (
/obj/structure/disposalpipe/segment{
color = "#954535"
@@ -68663,6 +68923,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/north)
+"oIe" = (
+/obj/machinery/economy/vending/traindrobe,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"oIs" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes/cigpack_robust{
@@ -70993,18 +71260,6 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/port2)
-"pmi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"pmA" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -71592,6 +71847,21 @@
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/external/southeast)
+"ptU" = (
+/obj/machinery/door/window/classic/normal{
+ name = "Glass Door";
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"ptZ" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -72321,6 +72591,18 @@
icon_state = "bcircuit"
},
/area/station/turret_protected/ai)
+"pEh" = (
+/obj/structure/table/wood,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/storage/firstaid/aquatic_kit/full,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"pEi" = (
/obj/machinery/camera{
c_tag = "Research Asteroid Hallway 1";
@@ -72444,6 +72726,14 @@
/obj/structure/railing,
/turf/simulated/floor/plating/asteroid/ancient/airless,
/area/mine/unexplored/cere/ai)
+"pFe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"pFj" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -74253,13 +74543,6 @@
/obj/item/assembly/mousetrap/armed,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
-"qcC" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"qcE" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/effect/spawner/random/dirt/often,
@@ -75424,14 +75707,6 @@
icon_state = "darkredfull"
},
/area/station/security/permabrig)
-"qrB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"qrM" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -76501,6 +76776,15 @@
icon_state = "tranquillite"
},
/area/station/service/mime)
+"qGr" = (
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/station/procedure/trainer_office)
"qGC" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -77235,6 +77519,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"qPN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/cable/orange{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"qPO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -78412,6 +78708,11 @@
icon_state = "redcorner"
},
/area/station/maintenance/fpmaint)
+"rhO" = (
+/obj/structure/table,
+/obj/item/instrument/harmonica,
+/turf/simulated/floor/plasteel,
+/area/station/security/permabrig)
"ril" = (
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel,
@@ -79133,6 +79434,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/apmaint)
+"rtu" = (
+/obj/machinery/door/poddoor/shutters{
+ name = "Storefront Shutters";
+ id_tag = "pet_shop";
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plasteel,
+/area/station/public/pet_store)
"rtB" = (
/obj/machinery/door/airlock/public/glass{
name = "Garden"
@@ -80025,6 +80335,13 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/east)
+"rHd" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"rHj" = (
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -82568,6 +82885,24 @@
icon_state = "dark"
},
/area/station/engineering/gravitygenerator)
+"slY" = (
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/obj/machinery/door_control{
+ id = "nct";
+ name = "Office Door";
+ normaldoorcontrol = 1;
+ pixel_x = -25;
+ req_access = list(80);
+ pixel_y = -1
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"slZ" = (
/obj/machinery/economy/vending/cigarette,
/obj/machinery/camera{
@@ -83693,14 +84028,6 @@
icon_state = "redcorner"
},
/area/station/hallway/primary/fore/west)
-"sAJ" = (
-/obj/structure/table/wood,
-/obj/effect/spawner/random/toy/carp_plushie,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"sAQ" = (
/obj/machinery/light/small{
dir = 1
@@ -84217,6 +84544,10 @@
slowdown = -0.3
},
/area/station/hallway/spacebridge/comeng)
+"sGk" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/turf/simulated/floor/plating,
+/area/station/public/pet_store)
"sGr" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -84405,6 +84736,13 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port/north)
+"sJW" = (
+/obj/structure/closet,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"sJX" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "rd"
@@ -84445,11 +84783,6 @@
/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall,
/area/station/maintenance/apmaint)
-"sKs" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/security/prison/cell_block/a)
"sKz" = (
/obj/structure/rack,
/obj/item/painter{
@@ -85413,18 +85746,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"sVU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"sWc" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -86829,6 +87150,14 @@
icon_state = "bar"
},
/area/station/security/permabrig)
+"toj" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/spawner/random/toy/carp_plushie,
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"top" = (
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
@@ -87127,27 +87456,6 @@
},
/turf/simulated/floor/engine,
/area/station/medical/chemistry)
-"ttl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "blue"
- },
-/area/station/hallway/primary/fore/north)
"ttn" = (
/obj/effect/spawner/random/dirt/frequent,
/turf/simulated/floor/plasteel{
@@ -87186,27 +87494,6 @@
icon_state = "dark"
},
/area/station/security/execution)
-"ttT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "bluecorner"
- },
-/area/station/hallway/primary/fore/north)
"ttV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -88483,9 +88770,6 @@
icon_state = "cafeteria"
},
/area/station/medical/break_room)
-"tKF" = (
-/turf/simulated/floor/plasteel,
-/area/station/security/prison/cell_block/a)
"tKQ" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -88609,12 +88893,6 @@
icon_state = "darkgreenfull"
},
/area/station/service/hydroponics)
-"tMM" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/carpet/black,
-/area/station/command/office/captain)
"tNc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -90612,18 +90890,6 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
-"ukg" = (
-/obj/structure/table/wood,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/storage/firstaid/aquatic_kit/full,
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"ukj" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -96611,11 +96877,15 @@
},
/area/station/maintenance/fpmaint)
"vGW" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/structure/chair/comfy/brown{
+ dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/security/prison/cell_block/a)
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/station/procedure/trainer_office)
"vHe" = (
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 4;
@@ -96698,20 +96968,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
-"vIJ" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable/orange{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "Secure Gate";
- name = "Security Blast Door";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/station/security/prison/cell_block/a)
"vIQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -97989,13 +98245,6 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/starboard/south)
-"waL" = (
-/obj/machinery/light_switch{
- pixel_y = 24;
- name = "north bump"
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"waN" = (
/obj/machinery/door/airlock/maintenance{
name = "Hydroponics"
@@ -99699,6 +99948,14 @@
icon_state = "darkfull"
},
/area/station/public/quantum/cargo)
+"wvl" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable/orange{
+ icon_state = "0-4"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/station/security/brig)
"wvp" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -101185,6 +101442,14 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/aft/west)
+"wNY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"wOc" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -103443,6 +103708,13 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/rd)
+"xtv" = (
+/obj/machinery/light_switch{
+ pixel_y = 24;
+ name = "north bump"
+ },
+/turf/simulated/floor/wood,
+/area/station/public/pet_store)
"xtD" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -104036,18 +104308,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/processing)
-"xzT" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Pet Shop"
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/station/public/pet_store)
"xAk" = (
/obj/machinery/light{
dir = 1
@@ -106721,13 +106981,6 @@
icon_state = "darkfull"
},
/area/station/supply/storage)
-"yhn" = (
-/obj/machinery/alarm/directional/east,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/station/public/pet_store)
"yhw" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -124721,7 +124974,7 @@ cnJ
gmC
xla
bOp
-vIJ
+aWX
nEq
xla
jzO
@@ -124976,7 +125229,7 @@ qxe
lta
dpu
lZU
-sKs
+dWr
vTO
xMz
pmB
@@ -125232,8 +125485,8 @@ mqc
doc
oeK
dpu
-apl
-sKs
+wvl
+dWr
vTO
geV
nvO
@@ -125490,7 +125743,7 @@ daG
iBP
cnL
wrW
-iFG
+cAr
mrp
hgu
cbP
@@ -125713,7 +125966,7 @@ ciF
mDT
acw
ijf
-bqg
+rhO
aes
afY
aQL
@@ -127552,7 +127805,7 @@ txE
knF
kuV
mSn
-tKF
+cOh
bpT
fMx
kqd
@@ -128067,8 +128320,8 @@ fxM
gFP
rnL
xeU
-jvT
-vIJ
+dgU
+aWX
xrp
dPs
tyT
@@ -129091,9 +129344,9 @@ flL
wUX
wHW
tjy
-sKs
+dWr
aAV
-tKF
+cOh
bwv
dgZ
fMx
@@ -130122,7 +130375,7 @@ wmP
ozL
xla
mUN
-vGW
+ctr
vTt
xla
qLc
@@ -130379,7 +130632,7 @@ rlf
vWX
bVL
rnL
-tKF
+cOh
dgZ
peB
hII
@@ -130634,9 +130887,9 @@ wUX
vFV
iCq
hTP
-iAK
+lvm
pwT
-tKF
+cOh
hZU
fMx
vJL
@@ -138095,10 +138348,10 @@ vTH
sEC
ece
wBC
-xzT
-qrB
-sVU
-bco
+nPU
+pFe
+qPN
+gkA
eNW
dJc
cRv
@@ -138353,11 +138606,11 @@ rHK
dKw
nhG
dJc
-waL
-pmi
-ghZ
-atH
-fse
+xtv
+hGZ
+iBK
+jQT
+sGk
abE
abE
rNK
@@ -138609,12 +138862,12 @@ hiH
jlm
ugQ
oBw
-jmo
-nXW
-hRc
-nXW
-nxx
-fse
+eeY
+nSI
+jHr
+nSI
+gFs
+sGk
abE
rNK
rNK
@@ -138866,12 +139119,12 @@ qsv
jlm
ugQ
oBw
-jmo
-nXW
-sAJ
-nXW
-nXW
-fse
+rtu
+nSI
+toj
+nSI
+nSI
+sGk
abE
rNK
rNK
@@ -139120,15 +139373,15 @@ chb
vuY
vuY
vuY
-jlm
+oFY
ugQ
oBw
-jmo
-lKF
-ukg
-yhn
-qcC
-fse
+rtu
+aJa
+pEh
+aji
+rHd
+sGk
abE
rNK
rNK
@@ -139377,7 +139630,7 @@ koP
jMO
iwu
iwu
-ttT
+bwc
vQu
oBw
eNW
@@ -139634,16 +139887,16 @@ hgc
obC
gOi
duU
-ttl
+dQW
ugQ
oBw
-npV
-npV
-npV
-npV
-npV
-npV
-npV
+abW
+abW
+abW
+abW
+abW
+abW
+abW
cRv
rNK
rNK
@@ -139891,7 +140144,7 @@ oPo
obC
cof
iJf
-ttl
+dQW
ugQ
uzv
aKp
@@ -140148,7 +140401,7 @@ lrs
obC
mkx
gYx
-duJ
+ltY
lfg
gDa
lNu
@@ -140405,7 +140658,7 @@ dwG
tlx
uau
uau
-fiE
+ePN
grh
nhG
aKp
@@ -141409,7 +141662,7 @@ aEU
aVC
wVh
aCh
-tMM
+dLS
eTm
eYJ
xzb
@@ -142199,11 +142452,11 @@ mWm
sSz
xPy
wfN
-cMz
-npV
-npV
-npV
-npV
+eQg
+bqg
+bqg
+bqg
+bqg
vrW
dTd
dMB
@@ -142456,11 +142709,11 @@ wSb
xBD
cRT
wNf
-cMz
-abW
-abW
-abW
-npV
+eQg
+oIe
+bMm
+sJW
+bqg
rPB
tRn
cjE
@@ -142713,11 +142966,11 @@ biA
vVQ
cRT
qHg
-cMz
-abW
-abW
-abW
-aKp
+eQg
+cdZ
+vGW
+iNX
+bqg
rHS
lHB
daj
@@ -142970,11 +143223,11 @@ hgK
vHG
lak
bIl
-cMz
-abW
-abW
-abW
-npV
+eQg
+gsu
+gZM
+ptU
+bqg
eFt
fEK
gDZ
@@ -143227,11 +143480,11 @@ sqW
dIt
ctm
bIl
-cMz
-abW
-abW
-abW
-npV
+eQg
+slY
+qGr
+wNY
+lmd
cUk
dTI
tze
@@ -143484,11 +143737,11 @@ cMz
mOy
vfU
cMz
-cMz
-abW
-abW
-abW
-npV
+eQg
+fqD
+feB
+jdL
+fOr
ooJ
nTd
tze
@@ -143741,11 +143994,11 @@ ryJ
ghU
fPl
xSb
-pls
-pls
-pls
-pls
-cDp
+bqg
+bqg
+bqg
+bqg
+bqg
tLh
dWE
qyR
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 18a5e305e0af..3ce41306627c 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -20555,6 +20555,26 @@
icon_state = "red"
},
/area/station/security/storage)
+"bug" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "bluecorner"
+ },
+/area/station/hallway/primary/central/south)
"buh" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/door/firedoor,
@@ -36373,12 +36393,12 @@
},
/area/station/hallway/primary/central)
"csV" = (
-/obj/structure/closet/secure_closet/explorer,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "browncorner"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/area/station/supply/expedition)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"csW" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -36711,11 +36731,10 @@
},
/area/station/hallway/primary/central)
"cuk" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "browncorner"
- },
-/area/station/supply/expedition)
+/obj/machinery/alarm/directional/west,
+/obj/item/flag/nt,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cul" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -36725,6 +36744,7 @@
},
/obj/machinery/power/apc/directional/north,
/obj/effect/landmark/start/explorer,
+/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -36845,6 +36865,28 @@
icon_state = "neutralfull"
},
/area/station/public/locker)
+"cuB" = (
+/obj/machinery/hologram/holopad,
+/obj/machinery/door/window/classic/normal{
+ name = "Glass Door"
+ },
+/obj/structure/chair/comfy/brown,
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/door_control{
+ id = "nct";
+ name = "Office Door";
+ normaldoorcontrol = 1;
+ pixel_x = -25;
+ req_access = list(80);
+ pixel_y = -1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"cuC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -37276,17 +37318,14 @@
},
/area/station/hallway/primary/central)
"cvJ" = (
-/obj/structure/extinguisher_cabinet{
- name = "east bump";
- pixel_x = 30
- },
-/obj/machinery/suit_storage_unit/expedition,
+/obj/structure/dispenser/oxygen,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
},
/area/station/supply/expedition)
"cvK" = (
+/obj/structure/closet/secure_closet/explorer,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -37301,9 +37340,12 @@
/obj/machinery/status_display{
pixel_y = 32
},
-/obj/machinery/mineral/equipment_vendor/explorer,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/obj/structure/filingcabinet,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"cvT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -37343,14 +37385,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/starboard/south)
-"cvY" = (
-/obj/effect/spawner/random/dirt/often,
-/obj/machinery/suit_storage_unit/expedition,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "browncorner"
- },
-/area/station/supply/expedition)
"cvZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -37739,28 +37773,27 @@
icon_state = "neutralfull"
},
/area/station/supply/expedition)
-"cxh" = (
-/obj/effect/spawner/random/dirt/often,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"cxk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
+/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
},
/area/station/supply/expedition)
"cxl" = (
-/obj/machinery/recharge_station,
+/obj/machinery/power/apc/directional/north,
+/obj/item/kirbyplants,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "browncorner"
+ dir = 9;
+ icon_state = "darkgreen"
},
-/area/station/supply/expedition)
+/area/station/procedure/trainer_office)
"cxm" = (
/obj/machinery/camera{
c_tag = "Central Ring Hallway East";
@@ -38146,24 +38179,13 @@
icon_state = "darkblue"
},
/area/station/ai_monitored/storage/eva)
-"cyr" = (
-/obj/machinery/camera{
- c_tag = "Expedition Access";
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -32
- },
-/obj/effect/spawner/random/dirt/often,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"cys" = (
/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -38185,14 +38207,21 @@
/turf/simulated/wall,
/area/station/supply/expedition)
"cyw" = (
-/obj/machinery/light{
- dir = 8
+/obj/structure/window/reinforced,
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_y = 4;
+ pixel_x = -5
+ },
+/obj/item/pen{
+ pixel_x = 8;
+ pixel_y = 8
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "browncorner"
+ dir = 10;
+ icon_state = "darkgreen"
},
-/area/station/supply/expedition)
+/area/station/procedure/trainer_office)
"cyx" = (
/obj/structure/chair{
dir = 4
@@ -38202,15 +38231,26 @@
/area/station/supply/expedition)
"cyy" = (
/obj/machinery/camera{
- c_tag = "Expedition";
+ c_tag = "Career Trainer's Office";
dir = 8
},
-/obj/structure/closet/secure_closet/explorer,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer,
+/obj/machinery/door/window/reinforced/normal{
+ name = "NCT"
+ },
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "brown"
+ dir = 6;
+ icon_state = "darkgreen"
},
-/area/station/supply/expedition)
+/area/station/procedure/trainer_office)
"cyz" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -38276,15 +38316,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
-"cyI" = (
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
- },
-/obj/effect/spawner/random/dirt/often,
-/obj/machinery/suit_storage_unit/expedition,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"cyJ" = (
/obj/structure/urinal{
pixel_y = 28
@@ -38747,19 +38778,9 @@
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
"czV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/chair/stool/bar,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/expedition)
-"czW" = (
/obj/effect/spawner/random/dirt/often,
-/obj/machinery/requests_console/directional/west,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "browncorner"
+ icon_state = "neutralfull"
},
/area/station/supply/expedition)
"czY" = (
@@ -38769,9 +38790,9 @@
},
/area/station/hallway/primary/central/south)
"cAb" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/obj/structure/table/wood,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cAc" = (
/turf/simulated/floor/plasteel/freezer,
/area/station/public/toilet/lockerroom)
@@ -39241,54 +39262,41 @@
},
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
-"cBv" = (
-/obj/structure/table/reinforced,
-/obj/item/pizzabox/firecracker,
-/obj/effect/spawner/random/dirt/often,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"cBw" = (
/obj/machinery/firealarm/directional/west,
+/obj/structure/chair/stool/bar,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
/area/station/supply/expedition)
-"cBy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/structure/chair/stool/bar,
-/obj/effect/landmark/start/explorer,
-/obj/effect/spawner/random/dirt/often,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"cBC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/firealarm/directional/west,
+/obj/structure/chair/comfy/black{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "browncorner"
- },
-/area/station/supply/expedition)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cBD" = (
-/obj/machinery/hologram/holopad,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+ dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cBE" = (
/turf/simulated/floor/plating,
/area/station/public/toilet/lockerroom)
@@ -39653,6 +39661,8 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"cCV" = (
+/obj/structure/table/reinforced,
+/obj/item/pizzabox/firecracker,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
@@ -39664,18 +39674,20 @@
name = "south bump";
pixel_y = -24
},
-/obj/structure/table/reinforced,
+/obj/structure/chair/stool/bar,
+/obj/effect/landmark/start/explorer,
+/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
/area/station/supply/expedition)
"cCX" = (
-/obj/machinery/economy/vending/exploredrobe,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "browncorner"
+/obj/item/kirbyplants,
+/obj/machinery/light{
+ dir = 8
},
-/area/station/supply/expedition)
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cCY" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -39698,11 +39710,18 @@
/turf/simulated/floor/plasteel,
/area/station/supply/expedition)
"cDc" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cDd" = (
/obj/effect/landmark/lightsout,
/turf/simulated/floor/plasteel{
@@ -39714,12 +39733,16 @@
/turf/simulated/wall,
/area/station/public/toilet/lockerroom)
"cDf" = (
-/obj/structure/closet/secure_closet/explorer,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "brown"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/area/station/supply/expedition)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"cDg" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50477,8 +50500,9 @@
/turf/simulated/floor/plating,
/area/station/science/genetics)
"dte" = (
-/obj/item/kirbyplants,
/obj/machinery/alarm/directional/south,
+/obj/machinery/mineral/equipment_vendor/explorer,
+/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -56673,6 +56697,17 @@
icon_state = "yellow"
},
/area/station/engineering/transmission_laser)
+"eeT" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/procedure/trainer_office)
"eeX" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance,
@@ -58283,12 +58318,12 @@
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
"eXJ" = (
-/obj/structure/dispenser/oxygen,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/economy/vending/traindrobe,
/turf/simulated/floor/plasteel{
- icon_state = "browncorner"
+ dir = 5;
+ icon_state = "darkgreen"
},
-/area/station/supply/expedition)
+/area/station/procedure/trainer_office)
"eXP" = (
/obj/structure/closet/l3closet/security,
/obj/machinery/firealarm/directional/east,
@@ -59130,15 +59165,6 @@
icon_state = "redyellowfull"
},
/area/station/medical/break_room)
-"fys" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/drinks/bottle/beer,
-/obj/item/reagent_containers/drinks/bottle/beer,
-/obj/item/reagent_containers/drinks/bottle/beer,
-/obj/item/reagent_containers/drinks/bottle/beer,
-/obj/effect/spawner/random/dirt/often,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"fzd" = (
/obj/machinery/access_button{
autolink_id = "virolab_btn_int";
@@ -59342,6 +59368,19 @@
icon_state = "dark"
},
/area/station/security/armory/secure)
+"fFu" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/central/south)
"fFy" = (
/obj/machinery/camera{
dir = 6;
@@ -60191,6 +60230,14 @@
icon_state = "red"
},
/area/station/security/storage)
+"fZa" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/drinks/bottle/beer,
+/obj/item/reagent_containers/drinks/bottle/beer,
+/obj/item/reagent_containers/drinks/bottle/beer,
+/obj/item/reagent_containers/drinks/bottle/beer,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"fZc" = (
/obj/machinery/light{
dir = 1
@@ -60305,9 +60352,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/controlroom)
"gdm" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/structure/railing,
/turf/simulated/floor/engine,
/area/station/science/testrange)
@@ -64633,20 +64678,6 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/abandonedbar)
-"iFr" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/supply/expedition,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/door/airlock/mining{
- name = "Expedition Headquarters"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"iFv" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -67492,6 +67523,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/testrange)
+"kol" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/port)
"kot" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -67716,6 +67751,36 @@
icon_state = "dark"
},
/area/station/security/execution)
+"kwm" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Trainer's Office";
+ id_tag = "nct"
+ },
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"kxj" = (
/obj/structure/mirror{
pixel_y = 28
@@ -68556,6 +68621,20 @@
},
/turf/simulated/floor/carpet/black,
/area/station/service/chapel)
+"kWp" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/south)
"kWF" = (
/obj/machinery/light,
/turf/simulated/floor/engine,
@@ -70666,12 +70745,14 @@
name = "east bump";
pixel_x = 28
},
-/obj/structure/closet/secure_closet/explorer,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "brown"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/supply/expedition)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/station/procedure/trainer_office)
"miQ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -71905,6 +71986,14 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/command/bridge)
+"mSW" = (
+/obj/machinery/requests_console/directional/west,
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"mTd" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "xeno5";
@@ -72088,6 +72177,11 @@
icon_state = "dark"
},
/area/station/security/warden)
+"mWq" = (
+/obj/machinery/economy/vending/exploredrobe,
+/obj/effect/spawner/random/dirt/often,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"mWz" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -72954,13 +73048,6 @@
/obj/structure/sink/puddle,
/turf/simulated/floor/grass,
/area/station/medical/medbay)
-"nsD" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/spawner/random/dirt/often,
-/turf/simulated/floor/plasteel{
- icon_state = "brown"
- },
-/area/station/supply/expedition)
"ntt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -75174,6 +75261,16 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/hallway/primary/central)
+"oHi" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"oHk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/window,
@@ -76122,6 +76219,16 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/north)
+"pec" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"peB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -76250,6 +76357,11 @@
icon_state = "yellow"
},
/area/station/engineering/transmission_laser)
+"piL" = (
+/obj/machinery/suit_storage_unit/expedition,
+/obj/effect/spawner/random/dirt/often,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"pjk" = (
/turf/simulated/floor/engine,
/area/station/science/test_chamber)
@@ -76664,10 +76776,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/armory/secure)
-"pvo" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
"pvv" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/reinforced/normal,
@@ -77232,15 +77340,6 @@
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
-"pLm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
"pLq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -80865,6 +80964,10 @@
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/carpet/black,
/area/station/security/detective)
+"rIu" = (
+/obj/effect/landmark/start/explorer,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"rIE" = (
/obj/structure/table/wood,
/obj/item/storage/bible,
@@ -81092,6 +81195,18 @@
icon_state = "whiteyellowcorner"
},
/area/station/medical/medbay)
+"rPd" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/closet,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"rPH" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -83871,6 +83986,13 @@
/obj/structure/morgue,
/turf/simulated/floor/plasteel/dark,
/area/station/medical/morgue)
+"ten" = (
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "browncorner"
+ },
+/area/station/supply/expedition)
"tep" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -84069,6 +84191,18 @@
icon_state = "darkbluecorners"
},
/area/station/medical/morgue)
+"tlb" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -32
+ },
+/obj/structure/closet/secure_closet/explorer,
+/obj/machinery/camera{
+ c_tag = "Expedition Access";
+ dir = 4
+ },
+/obj/effect/spawner/random/dirt/often,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"tls" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
@@ -89304,6 +89438,12 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
+"vZf" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"vZx" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/closet/walllocker/emerglocker/east,
@@ -90221,6 +90361,9 @@
icon_state = "neutralfull"
},
/area/station/hallway/secondary/entry/east)
+"wwx" = (
+/turf/simulated/wall,
+/area/station/procedure/trainer_office)
"wwK" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable{
@@ -90820,6 +90963,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/science/storage)
+"wOM" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"wOW" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -90990,11 +91143,28 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/controlroom)
"wUm" = (
+/obj/machinery/button/windowtint{
+ id = "NCT";
+ pixel_x = 24;
+ dir = 8;
+ pixel_y = 5
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/light_switch{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24;
+ pixel_y = -5
+ },
/turf/simulated/floor/plasteel{
dir = 4;
- icon_state = "brown"
+ icon_state = "darkgreen"
},
-/area/station/supply/expedition)
+/area/station/procedure/trainer_office)
"wUq" = (
/obj/machinery/economy/vending/hydronutrients,
/obj/effect/turf_decal/delivery/hollow,
@@ -91814,6 +91984,15 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel/white,
/area/station/science/lobby)
+"xpZ" = (
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/machinery/suit_storage_unit/expedition,
+/obj/effect/spawner/random/dirt/often,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"xql" = (
/obj/machinery/light{
dir = 8
@@ -127466,7 +127645,7 @@ tik
xjh
mQi
rLQ
-pvo
+kol
drn
dhG
fBk
@@ -134907,9 +135086,9 @@ bIX
cyv
cxe
cvK
-cyw
-cyr
-czW
+oHi
+tlb
+mSW
cBw
cCV
cyv
@@ -135166,8 +135345,8 @@ cul
cDa
cDa
cyt
-fys
-cBv
+fZa
+cDa
cCW
cyv
cEZ
@@ -135424,8 +135603,8 @@ cvM
cxf
cys
czV
-cBy
-nsD
+rIu
+vZf
cyv
csW
qZt
@@ -135678,10 +135857,10 @@ bIX
cyv
cuX
cyx
-cxh
+cDa
cyu
cDa
-pLm
+cDa
dte
cyv
csW
@@ -135934,12 +136113,12 @@ sHD
crO
cyv
cvJ
-cvY
+ten
+piL
+xpZ
cxJ
-cyI
-cDa
cxk
-cDa
+mWq
cyv
rfw
ckv
@@ -136190,14 +136369,14 @@ coG
wat
bIX
cyv
-cyv
-oVl
-oVl
-cyv
-oVl
-iFr
-oVl
-cyv
+wwx
+wwx
+wwx
+wwx
+wwx
+wwx
+wwx
+wwx
jdr
dLT
njU
@@ -136447,14 +136626,14 @@ cht
sqO
bIX
uaS
-cyv
+wwx
cxl
-cuk
+rPd
cyw
cuk
cBC
cCX
-cyv
+wOM
csW
ckv
jfG
@@ -136704,17 +136883,17 @@ xmE
ygv
bIX
rVL
-cyv
+wwx
cvQ
-cDa
-cDa
+eeT
+cuB
cAb
cBD
cDc
-cyv
-csW
-ckv
-cHN
+kwm
+kWp
+fFu
+bug
ppu
cKW
nQF
@@ -136961,14 +137140,14 @@ cht
ygv
bIX
nSv
-cyv
+wwx
eXJ
wUm
cyy
mhU
cDf
csV
-cyv
+pec
csW
ckv
cHN
@@ -137217,15 +137396,15 @@ cht
cht
vAP
bSz
-cyv
-cyv
-cyv
-cyv
-cyv
-cyv
-cyv
-cyv
-cyv
+bsv
+wwx
+wwx
+wwx
+wwx
+wwx
+wwx
+wwx
+wwx
lXi
tIa
njo
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 11e9fb48594e..c9a562c8d80c 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -9633,6 +9633,16 @@
icon_state = "redyellowfull"
},
/area/station/maintenance/apmaint)
+"bSp" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"bSq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -10970,6 +10980,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
/area/station/maintenance/abandoned_office)
+"cfS" = (
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"cfV" = (
/obj/item/food/grown/harebell,
/turf/simulated/floor/grass,
@@ -11034,16 +11050,20 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cgE" = (
-/obj/structure/table,
-/obj/item/paper_bin/nanotrasen{
- pixel_y = -2
- },
/obj/machinery/camera{
c_tag = "Paper Supplies";
dir = 8
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/machinery/power/apc/important/directional/east,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/woodsiding{
+ dir = 4
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"cgK" = (
/obj/structure/rack{
dir = 1
@@ -11125,19 +11145,6 @@
icon_state = "darkgrey"
},
/area/station/security/permabrig)
-"chI" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler{
- pixel_y = 3;
- pixel_x = 2
- },
-/obj/item/hand_labeler,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
"chK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17683,6 +17690,13 @@
icon_state = "cult"
},
/area/station/service/chapel/office)
+"dzM" = (
+/obj/structure/filingcabinet,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"dzR" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -19151,18 +19165,24 @@
},
/area/station/science/lobby)
"dOH" = (
-/obj/structure/rack,
-/obj/item/folder/red{
- pixel_x = 8;
- pixel_y = 6
+/obj/structure/table/wood,
+/obj/effect/turf_decal/woodsiding{
+ dir = 10
},
-/obj/item/folder/blue{
- pixel_x = 4;
- pixel_y = 3
+/obj/item/flashlight/lamp/green{
+ pixel_y = 8;
+ pixel_x = 5
},
-/obj/item/folder,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/machinery/door_control{
+ id = "nct";
+ name = "Office Door";
+ normaldoorcontrol = 1;
+ req_access = list(80);
+ pixel_y = -2;
+ pixel_x = -7
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"dOQ" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -26680,17 +26700,6 @@
icon_state = "darkred"
},
/area/station/security/brig)
-"fop" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/corgisuit,
-/obj/item/clothing/head/corgi{
- pixel_y = 7
- },
-/obj/structure/sign/poster/official/love_ian{
- pixel_y = -32
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"fot" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -30327,6 +30336,23 @@
icon_state = "freezerfloor"
},
/area/station/security/brig)
+"fZt" = (
+/obj/machinery/button/windowtint{
+ id = "NCT";
+ pixel_y = 24;
+ pixel_x = 5
+ },
+/obj/machinery/light_switch{
+ pixel_y = 24;
+ name = "north bump";
+ pixel_x = -5
+ },
+/obj/structure/closet,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"fZK" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -32270,6 +32296,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/public/storage/office)
+"gsr" = (
+/obj/item/flag/ian,
+/turf/simulated/floor/wood,
+/area/station/maintenance/fpmaint)
"gsu" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
/obj/item/organ/internal/liver/nian,
@@ -33752,20 +33782,6 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/primary)
-"gHY" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
"gId" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -35787,15 +35803,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
-"hde" = (
-/obj/item/kitchen/sushimat{
- name = "Prayer Mat"
- },
-/obj/item/clothing/suit/ianshirt{
- desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in. This one in particular looks like it wasnt washed in months"
- },
-/turf/simulated/floor/wood,
-/area/station/maintenance/fpmaint)
"hdi" = (
/obj/structure/sign/poster/official/random{
pixel_x = -32
@@ -36966,6 +36973,14 @@
"hoM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "blue"
@@ -37891,6 +37906,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"hxK" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/corgisuit,
+/obj/item/clothing/head/corgi{
+ pixel_y = 7
+ },
+/turf/simulated/floor/wood,
+/area/station/maintenance/fpmaint)
"hxL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -37945,8 +37968,8 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"hye" = (
/obj/item/clothing/under/misc/swimsuit/blue,
/turf/simulated/floor/beach/away/sand,
@@ -39923,10 +39946,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint2)
-"hTO" = (
-/obj/item/flag/ian,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"hUe" = (
/obj/effect/spawner/random/blood/maybe,
/obj/structure/cable{
@@ -41747,6 +41766,15 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
+"imy" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "blue"
+ },
+/area/station/hallway/primary/fore/north)
"imB" = (
/obj/item/kirbyplants,
/turf/simulated/floor/plasteel,
@@ -44647,6 +44675,9 @@
/obj/structure/flora/grass/jungle,
/turf/simulated/floor/grass,
/area/station/public/dorms)
+"iPs" = (
+/turf/simulated/wall,
+/area/station/procedure/trainer_office)
"iPw" = (
/obj/structure/lattice/catwalk,
/obj/machinery/camera{
@@ -46624,6 +46655,23 @@
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/station/engineering/atmos/asteroid_maint)
+"jjE" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/fore/north)
"jjJ" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -48112,8 +48160,12 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/obj/effect/turf_decal/woodsiding,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"jzo" = (
/obj/machinery/turretid/stun{
control_area = "\improper AI Satellite Atmospherics";
@@ -49447,14 +49499,6 @@
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
-"jLq" = (
-/obj/structure/chair/office,
-/obj/item/restraints/handcuffs/cable/red,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/spawner/random/cobweb/right/rare,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"jLr" = (
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
@@ -50191,6 +50235,17 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/engineering/atmos/distribution)
+"jSa" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/chair/sofa/left,
+/obj/effect/turf_decal/woodsiding{
+ dir = 1
+ },
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"jSe" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -62561,13 +62616,15 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"muP" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/paper_bin{
- pixel_y = 15
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/effect/turf_decal/woodsiding{
+ dir = 6
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"muR" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -63730,6 +63787,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
+"mJo" = (
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/machinery/economy/vending/traindrobe,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"mJr" = (
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/sparsegrass,
@@ -64051,9 +64119,15 @@
/turf/simulated/wall/r_wall,
/area/station/science/toxins/mixing)
"mMY" = (
-/obj/effect/spawner/window/reinforced,
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
-/area/station/hallway/primary/fore/north)
+/area/station/procedure/trainer_office)
"mNe" = (
/obj/structure/table,
/obj/item/multitool,
@@ -64063,6 +64137,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
+"mNf" = (
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"mNs" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -71356,13 +71440,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
-"ofC" = (
-/obj/structure/closet,
-/obj/item/toy/plushie/girly_corgi,
-/obj/item/toy/plushie/robo_corgi,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"ofE" = (
/obj/machinery/alarm/directional/west,
/turf/simulated/floor/plasteel{
@@ -71403,6 +71480,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
+"ogi" = (
+/obj/structure/closet,
+/obj/effect/spawner/random/maintenance,
+/obj/item/toy/plushie/robo_corgi,
+/obj/item/toy/plushie/girly_corgi,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fpmaint)
"ogs" = (
/obj/structure/railing,
/obj/structure/flora/ausbushes/ywflowers,
@@ -76491,6 +76575,29 @@
icon_state = "bluecorner"
},
/area/station/hallway/primary/central/west)
+"pdn" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/fore/north)
"pdw" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
@@ -80886,18 +80993,16 @@
/turf/space,
/area/space/nearstation)
"pXA" = (
-/obj/item/kitchen/knife/shiv{
- pixel_y = 16;
- pixel_x = 7
+/obj/machinery/alarm/directional/west,
+/obj/machinery/photocopier,
+/obj/machinery/light{
+ dir = 8
},
-/obj/item/clothing/mask/gas,
-/obj/item/stock_parts/cell/high/empty{
- pixel_y = 12;
- pixel_x = -7
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "darkgreen"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
+/area/station/procedure/trainer_office)
"pXC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -86195,34 +86300,12 @@
},
/area/station/security/permabrig)
"rcg" = (
-/obj/structure/closet/crate,
-/obj/item/pen,
-/obj/item/pen{
- pixel_x = -8;
- pixel_y = 5
- },
-/obj/item/pen{
- pixel_x = 8;
- pixel_y = 5
- },
-/obj/item/pen/blue{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/pen/blue{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/pen/multi{
- pixel_x = -4;
- pixel_y = 5
- },
-/obj/item/pen/multi{
- pixel_x = -6
+/obj/structure/chair/sofa/right,
+/obj/effect/turf_decal/woodsiding{
+ dir = 1
},
-/obj/item/stack/wrapping_paper,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"rcm" = (
/obj/machinery/economy/vending/wallmed/directional/west,
/turf/simulated/floor/wood,
@@ -86483,16 +86566,6 @@
icon_state = "rampbottom"
},
/area/station/medical/medbay2)
-"reI" = (
-/obj/structure/table,
-/obj/item/stack/sheet/cardboard{
- amount = 10
- },
-/obj/item/dest_tagger{
- pixel_x = -4
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
"reR" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/crayons,
@@ -88348,16 +88421,18 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"rwZ" = (
-/obj/machinery/photocopier,
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{
+ dir = 8
},
-/obj/structure/sign/poster/official/random{
- pixel_y = 32
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/machinery/door/window/reinforced/normal{
+ name = "NCT";
+ dir = 8
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"rxd" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
@@ -90127,6 +90202,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/interrogation)
+"rNI" = (
+/obj/item/flag/nt,
+/obj/effect/turf_decal/woodsiding{
+ dir = 9
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"rNN" = (
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel{
@@ -90862,14 +90947,35 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"rUQ" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Paper Supplies"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/command/glass{
+ name = "Trainer's Office";
+ id_tag = "nct"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/area/station/procedure/trainer_office)
"rUU" = (
/obj/structure/sign/poster/official/random{
pixel_y = -32
@@ -99421,7 +99527,9 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"tDQ" = (
-/obj/effect/spawner/random/maintenance,
+/obj/structure/sign/poster/official/love_ian{
+ pixel_y = -32
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"tDY" = (
@@ -101258,8 +101366,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"tXh" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plating,
@@ -102414,13 +102528,6 @@
},
/turf/simulated/floor/wood,
/area/station/security/permabrig)
-"uiJ" = (
-/obj/structure/sign/poster/official/love_ian{
- pixel_y = -32
- },
-/obj/effect/mapping_helpers/turfs/damage,
-/turf/simulated/floor/wood,
-/area/station/maintenance/fpmaint)
"uiT" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -107099,6 +107206,14 @@
"vfn" = (
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
+"vft" = (
+/obj/item/decorations/sticky_decorations/flammable/heart,
+/obj/item/stack/sheet/wood{
+ name = "Ians Stick";
+ desc = "A large stick covered in bite marks and dried slobber.ss"
+ },
+/turf/simulated/floor/wood,
+/area/station/maintenance/fpmaint)
"vfu" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -119520,8 +119635,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/woodsiding,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"xEC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -121653,6 +121777,19 @@
/obj/structure/girder,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"ybJ" = (
+/obj/structure/sign/poster/official/love_ian{
+ pixel_y = -32
+ },
+/obj/item/kitchen/sushimat{
+ name = "Prayer Mat"
+ },
+/obj/item/clothing/suit/ianshirt{
+ desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in. This one in particular looks like it wasnt washed in months"
+ },
+/obj/effect/mapping_helpers/turfs/damage,
+/turf/simulated/floor/wood,
+/area/station/maintenance/fpmaint)
"ybL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -122462,6 +122599,14 @@
},
/turf/simulated/floor/carpet/blue,
/area/station/command/office/blueshield)
+"yjS" = (
+/obj/item/kirbyplants,
+/obj/effect/turf_decal/woodsiding{
+ dir = 5
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"yjU" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
@@ -148955,17 +149100,17 @@ jnP
jnP
jnP
jnP
-aZS
sik
sik
sik
-rtG
-rvy
sik
-vyj
rtG
-sik
-hjW
+rvy
+iPs
+iPs
+iPs
+iPs
+iPs
slw
pRV
ttR
@@ -149212,17 +149357,17 @@ jnP
jnP
jnP
jnP
-aZS
sik
bah
vqr
-hTO
+gsr
+aSK
tDQ
-fop
-sik
-jLq
+iPs
+dzM
+mJo
pXA
-hjW
+iPs
buP
vqN
dNw
@@ -149469,17 +149614,17 @@ jnP
jnP
jnP
jnP
-jnP
sik
vgB
iOz
-vtq
seW
-ofC
-hjW
-hjW
-hjW
-hjW
+vtq
+hxK
+iPs
+fZt
+cfS
+mNf
+iPs
uGP
xuN
czL
@@ -149726,17 +149871,17 @@ jnP
jnP
jnP
jnP
-jnP
sik
toV
fdc
-hde
-aSK
-hjW
-hjW
+seW
+iOz
+pXZ
+iPs
+rNI
rwZ
dOH
-hjW
+iPs
lZK
tMO
iZd
@@ -149983,13 +150128,13 @@ jnP
jnP
jnP
jnP
-jnP
sik
iWm
fdc
+aSK
cnZ
pck
-hjW
+iPs
rcg
hyc
jzm
@@ -150240,19 +150385,19 @@ jnP
jnP
jnP
jnP
-jnP
sik
qXC
+vft
oNy
-pXZ
-uiJ
-hjW
-chI
+aSK
+ybJ
+iPs
+jSa
tXb
xEx
rUQ
hoM
-gHY
+pdn
dat
lwr
mZC
@@ -150497,19 +150642,19 @@ aZS
aZS
aZS
jnP
-jnP
sik
vEd
fck
+ogi
lLd
pUl
-chh
-reI
+iPs
+yjS
cgE
muP
-mMY
-eNi
-xuN
+bSp
+imy
+jjE
slD
tnk
xtx
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 5921f1772e88..a8752eadf007 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -30,6 +30,11 @@
},
/turf/space,
/area/space)
+"aaT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"aaX" = (
/obj/docking_port/stationary{
dheight = 9;
@@ -464,12 +469,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"agh" = (
-/obj/structure/table,
-/obj/item/multitool,
+/obj/machinery/light{
+ dir = 8
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/machinery/requests_console/directional/west,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"agi" = (
/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
@@ -3339,12 +3345,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"awv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/maintenance/fsmaint)
"aww" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -5378,15 +5378,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
-"aFM" = (
-/obj/effect/spawner/random/barrier/grille_often,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/maintenance/fsmaint)
"aFO" = (
/obj/effect/spawner/random/fungus/frequent,
/turf/simulated/wall,
@@ -10007,13 +9998,6 @@
/obj/machinery/alarm/directional/west,
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
-"aWf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"aWi" = (
/obj/structure/extinguisher_cabinet{
name = "east bump";
@@ -12183,22 +12167,6 @@
icon_state = "dark"
},
/area/station/service/chapel)
-"bdr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"bds" = (
/obj/structure/rack{
dir = 8;
@@ -13773,15 +13741,37 @@
/turf/simulated/wall,
/area/station/service/janitor)
"bhr" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Trainer's Office";
+ id_tag = "nct"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "NCT"
+ },
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/procedure/trainer_office)
"bht" = (
/turf/simulated/wall,
/area/station/maintenance/maintcentral)
@@ -13907,20 +13897,18 @@
},
/area/station/engineering/tech_storage)
"bhK" = (
-/obj/structure/disposalpipe/segment/corner{
- dir = 2
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/obj/structure/closet/jcloset,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_switch{
- dir = 8;
- name = "custom placement";
- pixel_x = 24;
- pixel_y = -6
+/obj/machinery/camera{
+ c_tag = "Career Trainer's Office"
},
-/obj/machinery/firealarm/directional/north,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"bhL" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable{
@@ -14366,34 +14354,43 @@
},
/area/station/hallway/primary/central/nw)
"biY" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/reagent_dispensers/spacecleanertank{
- pixel_y = 30
- },
-/obj/machinery/light{
- dir = 8
+/obj/machinery/economy/vending/traindrobe,
+/obj/effect/turf_decal/woodsiding{
+ dir = 9
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"biZ" = (
+/obj/effect/turf_decal/woodsiding{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"bja" = (
-/obj/structure/closet/l3closet/janitor,
-/obj/machinery/alarm/directional/north,
+/obj/item/kirbyplants,
+/obj/effect/turf_decal/woodsiding{
+ dir = 5
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"bjb" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
@@ -15013,59 +15010,18 @@
},
/area/station/hallway/primary/central/nw)
"bkL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/chair/comfy/black,
+/obj/effect/turf_decal/woodsiding,
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/effect/landmark/start/janitor,
-/turf/simulated/floor/plating,
-/area/station/service/janitor)
-"bkM" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
-"bkN" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
-"bkO" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
-"bkP" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
-"bkQ" = (
-/obj/item/flashlight{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"bkS" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -15175,28 +15131,21 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
-"bll" = (
-/obj/structure/closet/emcloset,
-/obj/structure/sign/double/map/left{
- desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
- icon_state = "map-left-MS";
- pixel_y = 32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/hallway/primary/starboard)
"blm" = (
-/obj/structure/sign/double/map/right{
- desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown.";
- icon_state = "map-right-MS";
- pixel_y = 32
- },
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/hallway/primary/starboard)
+/obj/machinery/door/airlock,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"blo" = (
/turf/simulated/wall,
/area/station/hallway/primary/starboard/north)
@@ -15706,27 +15655,6 @@
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"bmC" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/mob/living/simple_animal/lizard{
- name = "Wags-His-Tail";
- real_name = "Wags-His-Tail"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
-"bmD" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
"bmE" = (
/obj/machinery/newscaster/directional/east,
/obj/structure/disposalpipe/segment/corner{
@@ -15791,6 +15719,7 @@
"bmQ" = (
/obj/structure/table,
/obj/structure/cable{
+ d2 = 4;
icon_state = "0-4"
},
/obj/item/key/janitor,
@@ -15804,15 +15733,6 @@
/obj/item/grenade/chem_grenade/cleaner,
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
-"bmR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/maintenance/fsmaint)
"bmT" = (
/obj/machinery/porta_turret/ai_turret,
/turf/simulated/floor/plasteel{
@@ -15933,15 +15853,6 @@
icon_state = "cautioncorner"
},
/area/station/hallway/primary/starboard)
-"bnj" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "cautioncorner"
- },
-/area/station/hallway/primary/starboard)
"bnk" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -16333,15 +16244,21 @@
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"bou" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/economy/vending/janidrobe,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/item/flag/nt,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"bov" = (
-/obj/structure/janitorialcart,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"bow" = (
/obj/machinery/atmospherics/portable/canister/nitrogen,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
@@ -16350,13 +16267,17 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"box" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/machinery/power/apc/directional/east,
+/obj/machinery/alarm/directional/south,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
},
-/obj/machinery/disposal,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"boy" = (
/obj/item/storage/box/lights/mixed,
/turf/simulated/floor/plating,
@@ -16464,24 +16385,16 @@
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"boN" = (
-/obj/item/restraints/legcuffs/beartrap,
-/obj/item/restraints/legcuffs/beartrap,
-/obj/machinery/requests_console/directional/west,
-/obj/machinery/camera{
- c_tag = "Custodial Closet";
- dir = 4
+/obj/effect/turf_decal/woodsiding{
+ dir = 10
},
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/rack{
- dir = 1
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
-/obj/item/clothing/gloves/color/orange,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/mousetraps,
-/obj/item/storage/box/mousetraps,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/structure/closet,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"boQ" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -16510,24 +16423,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
-"boV" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard)
"boX" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -16869,19 +16764,27 @@
},
/area/station/supply/sorting)
"bpQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/janitor,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom{
+/obj/machinery/button/windowtint{
+ id = "NCT";
+ pixel_x = 24;
+ dir = 8;
+ pixel_y = 5
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer,
+/obj/machinery/door/window/reinforced/normal{
+ name = "NCT"
+ },
+/obj/machinery/light_switch{
+ dir = 8;
name = "east bump";
- pixel_x = 28
+ pixel_x = 24;
+ pixel_y = -5
},
-/obj/structure/sink{
+/turf/simulated/floor/plasteel{
dir = 4;
- pixel_x = 12
+ icon_state = "darkgreen"
},
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/area/station/procedure/trainer_office)
"bpS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -17749,10 +17652,15 @@
},
/area/station/engineering/ai_transit_tube)
"bsE" = (
-/obj/machinery/light/small,
-/obj/vehicle/janicart,
-/turf/simulated/floor/plating,
-/area/station/service/janitor)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"bsG" = (
/obj/machinery/hologram/holopad,
/obj/machinery/light/small{
@@ -35729,6 +35637,20 @@
icon_state = "whiteblue"
},
/area/station/medical/paramedic)
+"cJS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/l3closet/janitor,
+/obj/structure/reagent_dispensers/spacecleanertank{
+ pixel_y = 30
+ },
+/obj/machinery/light_switch{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"cJT" = (
/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
@@ -43226,6 +43148,10 @@
icon_state = "green"
},
/area/station/security/permabrig)
+"ewi" = (
+/obj/effect/mapping_helpers/turfs/rust/probably,
+/turf/simulated/wall,
+/area/station/service/janitor)
"ewk" = (
/turf/simulated/floor/grass/no_creep,
/area/station/medical/virology)
@@ -44712,6 +44638,26 @@
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/security/defusal)
+"ffM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5;
+ level = 2
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"fga" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -47329,6 +47275,12 @@
icon_state = "white"
},
/area/station/maintenance/asmaint)
+"ghd" = (
+/obj/structure/table/wood,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/procedure/trainer_office)
"ghF" = (
/obj/structure/sign/securearea{
pixel_x = 32;
@@ -48804,6 +48756,16 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"gSv" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"gSO" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -49051,6 +49013,21 @@
"gWO" = (
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
+"gWX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack{
+ dir = 1
+ },
+/obj/item/storage/box/mousetraps,
+/obj/item/storage/box/mousetraps,
+/obj/item/clothing/gloves/color/orange,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/restraints/legcuffs/beartrap,
+/obj/item/restraints/legcuffs/beartrap,
+/obj/item/mop,
+/obj/machinery/firealarm/directional/north,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"gXg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -50732,6 +50709,23 @@
icon_state = "cult"
},
/area/station/legal/lawoffice)
+"hIp" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/starboard)
"hIG" = (
/obj/structure/window/reinforced{
dir = 8
@@ -51093,6 +51087,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
+"hQS" = (
+/obj/machinery/alarm/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/economy/vending/janidrobe,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"hQZ" = (
/obj/structure/closet/secure_closet/magistrate,
/obj/machinery/alarm/directional/north,
@@ -51261,21 +51261,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
-"hSX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/maintenance/fsmaint)
"hTg" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -51695,6 +51680,15 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"ieC" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"ieD" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -51799,6 +51793,26 @@
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
+"igE" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/starboard)
"igJ" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -53299,6 +53313,11 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/aft/south)
+"iQu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/vehicle/janicart,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"iQC" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
@@ -54139,6 +54158,27 @@
icon_state = "dark"
},
/area/station/engineering/control)
+"jnO" = (
+/obj/item/flashlight/lamp/green{
+ pixel_y = 15
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/door_control{
+ id = "nct";
+ name = "Office Door";
+ normaldoorcontrol = 1;
+ req_access = list(80);
+ pixel_y = -1
+ },
+/obj/structure/table/wood,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/procedure/trainer_office)
"jnZ" = (
/obj/item/kirbyplants/plant24,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -55013,6 +55053,23 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"jJw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/maintenance/fsmaint)
"jJI" = (
/obj/structure/bed/dogbed/runtime,
/mob/living/simple_animal/pet/cat/runtime,
@@ -55097,6 +55154,12 @@
},
/turf/space,
/area/space/nearstation)
+"jLc" = (
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"jLr" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -58262,6 +58325,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"lga" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/janitor,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"lgf" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4
@@ -59076,6 +59147,21 @@
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
+"lwd" = (
+/obj/effect/turf_decal/woodsiding{
+ dir = 6
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
"lwx" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/structure/lattice/catwalk,
@@ -59105,6 +59191,21 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"lxV" = (
+/mob/living/simple_animal/lizard{
+ name = "Wags-His-Tail";
+ real_name = "Wags-His-Tail"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"lyn" = (
/obj/machinery/door/airlock/hatch{
name = "Xenobiology Maintenance"
@@ -60932,21 +61033,6 @@
"mlV" = (
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
-"mmk" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/north)
"mmB" = (
/obj/structure/closet/secure_closet/atmos_personal,
/turf/simulated/floor/plasteel,
@@ -65407,6 +65493,16 @@
icon_state = "whitepurple"
},
/area/station/science/rnd)
+"onX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plating,
+/area/station/service/janitor)
"oob" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -65447,6 +65543,10 @@
/obj/item/seeds/eggplant,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
+"ooo" = (
+/obj/structure/sign/custodian,
+/turf/simulated/wall,
+/area/station/service/janitor)
"ooD" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -66100,6 +66200,21 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
+"oGK" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/starboard)
"oHb" = (
/obj/structure/sign/poster/official/safety_internals{
pixel_x = 30
@@ -67622,6 +67737,21 @@
/obj/structure/closet/secure_closet/brig/temp/cell_5,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"pnD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "cautioncorner"
+ },
+/area/station/hallway/primary/starboard)
"pos" = (
/obj/machinery/atmospherics/pipe/manifold/visible/green{
dir = 8
@@ -68614,6 +68744,18 @@
},
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
+"pKS" = (
+/obj/item/flashlight{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/maintcentral)
"pLD" = (
/obj/machinery/door_timer/cell_1{
pixel_x = -32
@@ -71465,6 +71607,16 @@
icon_state = "white"
},
/area/station/medical/chemistry)
+"ral" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+ id = "NCT"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
"rao" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -71912,6 +72064,30 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"rkM" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/north)
"rkT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -73795,6 +73971,15 @@
icon_state = "greenblue"
},
/area/station/service/hydroponics)
+"rXl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "cautioncorner"
+ },
+/area/station/hallway/primary/starboard)
"rXS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75019,21 +75204,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/warden)
-"sDT" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard)
"sEI" = (
/obj/machinery/atmospherics/trinary/filter,
/turf/simulated/floor/plasteel,
@@ -76888,6 +77058,24 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"ttp" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_y = 4;
+ pixel_x = -5
+ },
+/obj/item/pen{
+ pixel_x = 8;
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkgreen"
+ },
+/area/station/procedure/trainer_office)
"ttA" = (
/obj/structure/rack,
/obj/item/hand_labeler,
@@ -76916,6 +77104,18 @@
"ttE" = (
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
+"tub" = (
+/obj/machinery/camera{
+ c_tag = "Custodial Closet";
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/janitor,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"tug" = (
/obj/machinery/newscaster/directional/east,
/obj/machinery/atmospherics/binary/valve{
@@ -77289,6 +77489,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -78319,16 +78524,6 @@
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"ufr" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/fyellow,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"uft" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/glass/rag,
@@ -78697,6 +78892,12 @@
icon_state = "darkblue"
},
/area/station/medical/storage)
+"uoI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/jcloset,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"uoK" = (
/obj/structure/sign/poster/official/random{
pixel_y = -32
@@ -81044,6 +81245,12 @@
icon_state = "dark"
},
/area/station/legal/courtroom/gallery)
+"vrM" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plating,
+/area/station/service/janitor)
"vrO" = (
/obj/machinery/access_button{
autolink_id = "atmossouth_btn_ext";
@@ -81362,6 +81569,20 @@
icon_state = "white"
},
/area/station/medical/reception)
+"vAS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/obj/structure/janitorialcart,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
"vBv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -82733,6 +82954,20 @@
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
+"wnk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"wnn" = (
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
@@ -85798,6 +86033,9 @@
icon_state = "whitepurple"
},
/area/station/science/lobby)
+"xIX" = (
+/turf/simulated/wall,
+/area/station/procedure/trainer_office)
"xJy" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -109997,11 +110235,11 @@ lSa
aFE
xuG
bfK
-bhq
-bhq
-bhq
-bhq
-bhq
+xIX
+xIX
+xIX
+xIX
+xIX
bqc
bqc
ezM
@@ -110254,10 +110492,10 @@ lIM
bMC
xuG
bfK
-bhq
+gSv
biY
boN
-bmQ
+ttp
bou
bqc
bvp
@@ -110509,12 +110747,12 @@ iLs
oWs
eXm
bcM
-mmk
+rkM
tFb
bhr
biZ
bkL
-bmC
+ghd
bov
bqc
cfj
@@ -110768,10 +111006,10 @@ gYO
sTC
hdw
hiC
-bhq
+ral
bja
-bkM
-bmD
+lwd
+jnO
bsE
bqc
bvq
@@ -111025,9 +111263,9 @@ suO
nuz
xuG
bjA
-bhq
+xIX
bhK
-bkN
+ieC
bpQ
box
bje
@@ -111282,11 +111520,11 @@ bbh
bcM
bel
bfR
-bht
-bht
-bkO
-bht
-bht
+xIX
+xIX
+jLc
+xIX
+xIX
bht
brS
bje
@@ -111541,7 +111779,7 @@ qWN
acw
bht
bjc
-bkP
+bmF
bmF
boy
btP
@@ -111798,7 +112036,7 @@ bep
ccP
bhu
clO
-bkQ
+pKS
bpU
boz
bqe
@@ -121303,11 +121541,11 @@ aYK
aVc
alb
eTo
-aIo
-aLl
-aLl
-aLl
-bez
+bhq
+bhq
+bhq
+bhq
+bhq
bni
dnS
wwo
@@ -121560,13 +121798,13 @@ uPu
aLl
dAH
eTo
-sOy
+vrM
agh
-ufr
-aLl
-bll
-bnr
-boY
+tub
+bmQ
+ooo
+rXl
+oGK
bqA
bHA
bwp
@@ -121815,15 +122053,15 @@ aVV
fWg
aYK
aLl
-avA
-hSX
-awv
-sln
-avA
-aLl
+sOy
+jJw
+bhq
+gWX
+onX
+lxV
blm
-bnr
-sDT
+pnD
+igE
rEV
bHA
bus
@@ -122073,12 +122311,12 @@ aTp
aXm
aLl
mdS
-fvU
-dAH
-avA
-alb
-aLl
-aLl
+wnk
+bhq
+hQS
+lga
+iQu
+bhq
wnn
bcP
bqA
@@ -122329,15 +122567,15 @@ aTo
aTp
auO
aLl
-dAH
-bdr
-aFM
-aWf
-aWf
-bmR
-eMs
-bnj
-boV
+aaT
+ffM
+bhq
+cJS
+uoI
+vAS
+bhq
+bnr
+hIp
bqA
bsp
bxH
@@ -122588,11 +122826,11 @@ bbv
aLl
wVi
bPb
-aIo
-aLl
-edZ
-wPQ
-aLl
+bhq
+bhq
+bhq
+ewi
+bhq
bnk
gcq
lhu
diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm
index b946f7a75ba7..30a4f5c4dc8a 100644
--- a/code/__DEFINES/access_defines.dm
+++ b/code/__DEFINES/access_defines.dm
@@ -65,6 +65,7 @@
#define ACCESS_MINERAL_STOREROOM 76
#define ACCESS_CARGO_BAY 78
#define ACCESS_SUPPLY_SHUTTLE 79
+#define ACCESS_TRAINER 80
#define ACCESS_WEAPONS 99 //! Weapon authorization for secbots.
diff --git a/code/__DEFINES/job_defines.dm b/code/__DEFINES/job_defines.dm
index 54e041e11a35..161dd84541a4 100644
--- a/code/__DEFINES/job_defines.dm
+++ b/code/__DEFINES/job_defines.dm
@@ -22,6 +22,7 @@
#define JOB_JUDGE (1<<12)
#define JOB_BLUESHIELD (1<<13)
#define JOB_NANO (1<<14)
+#define JOB_INSTRUCTOR (1<<15)
#define JOBCAT_MEDSCI (1<<1)
diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm
index 0f21dba2b0f1..304399e86790 100644
--- a/code/controllers/subsystem/SSjobs.dm
+++ b/code/controllers/subsystem/SSjobs.dm
@@ -181,6 +181,9 @@ SUBSYSTEM_DEF(jobs)
if(job.admin_only) // No admin positions either.
continue
+ if(job.mentor_only) // Neither for mentor positions
+ continue
+
if(jobban_isbanned(player, job.title))
Debug("GRJ isbanned failed, Player: [player], Job: [job.title]")
continue
diff --git a/code/controllers/subsystem/tickets/SSmentor_tickets.dm b/code/controllers/subsystem/tickets/SSmentor_tickets.dm
index 10f87fe836c1..6f659339a569 100644
--- a/code/controllers/subsystem/tickets/SSmentor_tickets.dm
+++ b/code/controllers/subsystem/tickets/SSmentor_tickets.dm
@@ -31,7 +31,8 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets
"Clear Cache" = "To fix a blank screen, go to the 'Special Verbs' tab and press 'Reload UI Resources'. If that fails, clear your BYOND cache (instructions provided with 'Reload UI Resources'). If that still fails, please ask for help again, stating you have already done these steps.",
"Experiment!" = "Experiment! Part of the joy of this game is trying out various things, and dealing with the consequences if/when they go horribly wrong.",
"How to Objectives" = "There are lots of ways to accomplish your objectives as an antagonist. A direct frontal assault may work, provided you can get in and out before backup arrives. Sneaking in can work, too, as long as you're quick and avoid prying eyes. But don't forget roleplaying methods! Tricking your target into a maze of bear traps is much more interesting than just shooting them with a gun. Even if it fails, you and your target (or its guardians) are likely to have more fun this way, and that's the most important part.",
- "MHelp was in Russian" = "Привет! Ты попал на английский Paradise сервер. Возможно, ты ошибся. Русский имеет такое название: SS220\[RU]."
+ "MHelp was in Russian" = "Привет! Ты попал на английский Paradise сервер. Возможно, ты ошибся. Русский имеет такое название: SS220\[RU].",
+ "NCT Dispatch" = "A Nanotrasen Career Trainer will be assisting you in-game. You should be able to identify them by their green uniform and black coat."
)
if(GLOB.configuration.url.github_url)
@@ -71,6 +72,21 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets
if(message_key == null)
T.staffAssigned = null //if they cancel we dont need to hold this ticket anymore
return
+ if(message_key == "NCT Dispatch")
+ var/nct_active = list()
+ for(var/mob/living/carbon/human/trainer as anything in GLOB.human_list) // Let's check if we have any active NCTs
+ if(trainer.mind?.assigned_role != "Nanotrasen Career Trainer")
+ continue
+ nct_active += trainer
+ if(!length(nct_active))
+ to_chat(usr, "There are no active NCTs. Autoresponse canceled.") // If we don't, don't solve the ticket and then send feedback.
+ return
+ var/mob/living/carbon/human/trainee = get_mob_by_ckey(T.client_ckey)
+ for(var/mob/living/carbon/human/nct as anything in nct_active)
+ if(!locate(/obj/item/radio/headset) in list(nct.l_ear, nct.r_ear)) // If the NCT doesn't have a headset, ignore it.
+ continue
+ to_chat(nct, "Incoming priority transmission from Nanotrasen Training Center. Request information as follows: Career Trainer, we've received a request from an employee. [trainee.p_their(TRUE)] name is [trainee.real_name], [trainee.p_theyre()] a [trainee.mind.assigned_role]. See if [trainee.p_they()] need [trainee.p_s()] any help.")
+ SEND_SOUND(nct, 'sound/effects/headset_message.ogg')
SEND_SOUND(returnClient(N), sound('sound/effects/adminhelp.ogg'))
to_chat_safe(returnClient(N), "[key_name_hidden(C)] is autoresponding with: [response_phrases[message_key]]") //for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index e992ba111ed9..06832bfd3a1f 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -402,6 +402,10 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
if("Nanotrasen Representative")
clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ if("Nanotrasen Career Trainer")
+ clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "trainer_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "trainercoat"), ICON_OVERLAY)
if("Blueshield")
clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
diff --git a/code/datums/outfits/plasmamen_outfits.dm b/code/datums/outfits/plasmamen_outfits.dm
index 4ba5e9665a34..c18f4e4a0579 100644
--- a/code/datums/outfits/plasmamen_outfits.dm
+++ b/code/datums/outfits/plasmamen_outfits.dm
@@ -188,5 +188,12 @@
/datum/outfit/plasmaman/assistant
name = "Assistant Plasmaman"
+
head = /obj/item/clothing/head/helmet/space/plasmaman/assistant
uniform = /obj/item/clothing/under/plasmaman/assistant
+
+/datum/outfit/plasmaman/trainer
+ name = "Plasmaman Career Trainer"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/trainer
+ uniform = /obj/item/clothing/under/plasmaman/trainer
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 455c70489868..a545c1504e53 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -200,7 +200,8 @@
/datum/job/judge = /obj/item/organ/internal/cyberimp/arm/telebaton,
/datum/job/explorer = /obj/item/organ/internal/cyberimp/arm/toolset,
/datum/job/nanotrasenrep = /obj/item/organ/internal/heart/cybernetic/upgraded,
- /datum/job/blueshield = /obj/item/organ/internal/cyberimp/arm/flash
+ /datum/job/blueshield = /obj/item/organ/internal/cyberimp/arm/flash,
+ /datum/job/nanotrasentrainer = /obj/item/organ/internal/heart/cybernetic/upgraded
)
/datum/station_trait/cybernetic_revolution/New()
diff --git a/code/game/area/ss13_areas/procedure_areas.dm b/code/game/area/ss13_areas/procedure_areas.dm
new file mode 100644
index 000000000000..12d2e177b5b2
--- /dev/null
+++ b/code/game/area/ss13_areas/procedure_areas.dm
@@ -0,0 +1,4 @@
+
+/area/station/procedure/trainer_office
+ name = "\improper Trainer's Office"
+ icon_state = "procedure_nct"
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index bad65ed348e5..38703b6a9787 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
name = "changeling"
config_tag = "changeling"
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General", "Nanotrasen Career Trainer")
species_to_mindflayer = list("Machine")
required_players = 15
required_enemies = 1
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 12def9e3ef48..46ed0c4f3fea 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -7,7 +7,7 @@
/datum/game_mode/revolution
name = "revolution"
config_tag = "revolution"
- restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Magistrate", "Quartermaster")
+ restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Magistrate", "Quartermaster", "Nanotrasen Career Trainer")
required_players = 20
required_enemies = 1
recommended_enemies = 3
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 20ad639a645f..6ed1248aa9b4 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -2,7 +2,7 @@
name = "traitor"
config_tag = "traitor"
restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General", "Nanotrasen Career Trainer")
required_players = 0
required_enemies = 1
recommended_enemies = 4
diff --git a/code/game/gamemodes/trifecta/trifecta.dm b/code/game/gamemodes/trifecta/trifecta.dm
index 2e1798c8a8c9..1b081585202a 100644
--- a/code/game/gamemodes/trifecta/trifecta.dm
+++ b/code/game/gamemodes/trifecta/trifecta.dm
@@ -6,7 +6,7 @@
/datum/game_mode/trifecta
name = "Trifecta"
config_tag = "trifecta"
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Trans-Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Trans-Solar Federation General", "Nanotrasen Career Trainer")
restricted_jobs = list("Cyborg")
secondary_restricted_jobs = list("AI")
required_players = 25
diff --git a/code/game/gamemodes/vampire/vampire_gamemode.dm b/code/game/gamemodes/vampire/vampire_gamemode.dm
index 837577382339..b4553a8633aa 100644
--- a/code/game/gamemodes/vampire/vampire_gamemode.dm
+++ b/code/game/gamemodes/vampire/vampire_gamemode.dm
@@ -2,7 +2,7 @@
name = "vampire"
config_tag = "vampire"
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General", "Nanotrasen Career Trainer")
species_to_mindflayer = list("Machine")
required_players = 15
required_enemies = 1
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 7c99ca64c72c..4bd7839054f2 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -107,7 +107,7 @@
ACCESS_INTERNAL_AFFAIRS, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME,
ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY,
- ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY)
+ ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY, ACCESS_TRAINER)
/proc/get_all_centcom_access()
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SHUTTLES, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_COMMANDER)
@@ -126,7 +126,7 @@
if(REGION_ALL)
return get_all_accesses()
if(REGION_GENERAL) //station general
- return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_INTERNAL_AFFAIRS, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME)
+ return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_INTERNAL_AFFAIRS, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME, ACCESS_TRAINER)
if(REGION_SECURITY) //security
return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS)
if(REGION_MEDBAY) //medbay
@@ -302,6 +302,8 @@
return "AI Satellite"
if(ACCESS_WEAPONS)
return "Weapon Permit"
+ if(ACCESS_TRAINER)
+ return "Nanotrasen Career Trainer"
/proc/get_centcom_access_desc(A)
switch(A)
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 4b4708b1a97e..9532959e6c69 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -60,6 +60,7 @@
var/hidden_from_job_prefs = FALSE // if true, job preferences screen never shows this job.
var/admin_only = 0
+ var/mentor_only = 0
var/spawn_ert = 0
var/syndicate_command = 0
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 723ce4f0f603..2b41c27a9e18 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -175,7 +175,8 @@
ACCESS_SECURITY,
ACCESS_SUPPLY_SHUTTLE,
ACCESS_THEATRE,
- ACCESS_WEAPONS
+ ACCESS_WEAPONS,
+ ACCESS_TRAINER
)
blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/nanotrasenrep
@@ -276,7 +277,8 @@
ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS,
ACCESS_SECURITY,
- ACCESS_WEAPONS
+ ACCESS_WEAPONS,
+ ACCESS_TRAINER
)
blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/judge
@@ -349,3 +351,74 @@
bio_chips = list(/obj/item/bio_chip/mindshield)
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
+
+/datum/job/nanotrasentrainer
+ title = "Nanotrasen Career Trainer"
+ flag = JOB_INSTRUCTOR
+ department_flag = JOBCAT_ENGSEC
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "the Nanotrasen Representative"
+ department_head = list("Captain")
+ selection_color = "#ddddff"
+ mentor_only = TRUE
+ job_department_flags = DEP_FLAG_COMMAND
+ transfer_allowed = FALSE
+ access = list(
+ ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_CARGO,
+ ACCESS_MAILSORTING,
+ ACCESS_CONSTRUCTION,
+ ACCESS_COURT,
+ ACCESS_EVA,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_RESEARCH,
+ ACCESS_SEC_DOORS,
+ ACCESS_THEATRE,
+ ACCESS_INTERNAL_AFFAIRS,
+ ACCESS_TRAINER
+ )
+ blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
+ outfit = /datum/outfit/job/nct
+ important_information = "Your job is to try to assist as many crew members as possible regardless of department. You are NOT permitted to give command staff advice on any command SOP questions or aid in legal advice."
+
+/datum/outfit/job/nct
+ name = "Nanotrasen Career Trainer"
+ jobtype = /datum/job/nanotrasentrainer
+ uniform = /obj/item/clothing/under/rank/procedure/nct
+ suit = /obj/item/clothing/suit/storage/nct
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/centcom
+ head = /obj/item/clothing/head/beret/nct/green
+ glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
+ l_ear = /obj/item/radio/headset/headset_nct
+ id = /obj/item/card/id/nct
+ l_pocket = /obj/item/card/id/nct_data_chip
+ r_pocket = /obj/item/flash
+ pda = /obj/item/pda/heads/ntrep
+ backpack = /obj/item/storage/backpack/satchel
+
+ backpack_contents = list(
+ /obj/item/pinpointer/crew = 1,
+ /obj/item/healthanalyzer/advanced = 1,
+ /obj/item/book/manual/sop_ntinstructor,
+ /obj/item/laser_pointer/blue = 1
+ )
+
+ bio_chips = list(/obj/item/bio_chip/mindshield)
+
+/datum/outfit/job/nct/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(visualsOnly)
+ return
+
+ var/obj/item/card/id/nct_data_chip/I = H.l_store
+ I.registered_user = H.mind.current
+ I.registered_name = H.real_name
+ var/icon/newphoto = get_id_photo(H, "Nanotrasen Career Trainer")
+ I.photo = newphoto
+
+/datum/outfit/job/nct/on_mind_initialize(mob/living/carbon/human/H)
+ . = ..()
+ H.mind.offstation_role = TRUE
diff --git a/code/game/jobs/job_globals.dm b/code/game/jobs/job_globals.dm
index eafaadcfaa14..b81f5e410929 100644
--- a/code/game/jobs/job_globals.dm
+++ b/code/game/jobs/job_globals.dm
@@ -14,7 +14,8 @@ GLOBAL_LIST_INIT(command_positions, list(
"Quartermaster",
"Nanotrasen Representative",
"Magistrate",
- "Blueshield"
+ "Blueshield",
+ "Nanotrasen Career Trainer"
))
/// Only roles that are command of departments, for revolution and similar stuff
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 67247f5aa475..dd3c3014f01e 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -50,7 +50,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/job/nanotrasenrep,
/datum/job/chaplain,
/datum/job/officer,
- /datum/job/qm
+ /datum/job/qm,
+ /datum/job/nanotrasentrainer
)
//The scaling factor of max total positions in relation to the total amount of people on board the station in %
@@ -154,17 +155,19 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/obj/machinery/computer/card/attackby__legacy__attackchain(obj/item/card/id/id_card, mob/user, params)
if(!istype(id_card))
return ..()
+ if(istype(id_card, /obj/item/card/id/nct_data_chip))
+ return ..()
if(!scan && check_access(id_card))
user.drop_item()
id_card.forceMove(src)
scan = id_card
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
else if(!modify)
user.drop_item()
id_card.forceMove(src)
modify = id_card
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
SStgui.update_uis(src)
attack_hand(user)
@@ -425,14 +428,18 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
else if(Adjacent(usr))
var/obj/item/I = usr.get_active_hand()
if(istype(I, /obj/item/card/id))
+ if(istype(I, /obj/item/card/id/nct_data_chip))
+ playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ to_chat(usr, "The data chip doesn't fit!")
+ return FALSE
if(!check_access(I))
- playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, FALSE)
to_chat(usr, "This card does not have access.")
return FALSE
usr.drop_item()
I.forceMove(src)
scan = I
- playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
return
if("modify") // inserting or removing the ID you plan to modify
if(modify)
@@ -451,6 +458,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
else if(Adjacent(usr))
var/obj/item/I = usr.get_active_hand()
if(istype(I, /obj/item/card/id))
+ if(istype(I, /obj/item/card/id/nct_data_chip))
+ playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ to_chat(usr, "The data chip doesn't fit!")
+ return FALSE
usr.drop_item()
I.forceMove(src)
modify = I
diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm
index 52f90c600d64..3fe784f09c6b 100644
--- a/code/game/machinery/guestpass.dm
+++ b/code/game/machinery/guestpass.dm
@@ -61,6 +61,9 @@
my_terminal_id = ++global_terminal_id
/obj/machinery/computer/guestpass/attackby__legacy__attackchain(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/card/id/nct_data_chip))
+ to_chat(user, "[I] does not seem compatible with this terminal!")
+ return
if(istype(I, /obj/item/card/id))
if(!scan)
if(user.drop_item())
diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm
index e73d480a7b1b..7298d7c539f9 100644
--- a/code/game/machinery/machine_frame.dm
+++ b/code/game/machinery/machine_frame.dm
@@ -317,7 +317,8 @@ to destroy them and players will be able to make replacements.
"BarDrobe" = /obj/machinery/economy/vending/bardrobe,
"HydroDrobe" = /obj/machinery/economy/vending/hydrodrobe,
"JaniDrobe" = /obj/machinery/economy/vending/janidrobe,
- "LawDrobe" = /obj/machinery/economy/vending/lawdrobe)
+ "LawDrobe" = /obj/machinery/economy/vending/lawdrobe,
+ "TrainDrobe" = /obj/machinery/economy/vending/traindrobe)
var/static/list/unique_vendors = list(
"ShadyCigs Ultra" = /obj/machinery/economy/vending/cigarette/beach,
"SyndiMed Plus" = /obj/machinery/economy/vending/wallmed/syndicate)
diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm
index d2182137d897..993187499f13 100644
--- a/code/game/machinery/tcomms/nttc.dm
+++ b/code/game/machinery/tcomms/nttc.dm
@@ -132,6 +132,8 @@
"Journalist" = "srvradio",
"Librarian" = "srvradio",
"Mime" = "srvradio",
+ // Procedure
+ "Nanotrasen Career Trainer" = "proradio",
)
/// List of Command jobs
var/list/heads = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security", "Magistrate", "Quartermaster", "AI")
diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm
index a149a1b0d63c..9ef0c7459b3c 100644
--- a/code/game/machinery/vendors/wardrobe_vendors.dm
+++ b/code/game/machinery/vendors/wardrobe_vendors.dm
@@ -922,3 +922,41 @@
/obj/item/clothing/under/plasmaman/enviroslacks = 60)
refill_canister = /obj/item/vending_refill/lawdrobe
+
+/obj/machinery/economy/vending/traindrobe
+ name = "\improper TrainDrobe"
+ desc = "This wardrobe dispenses the attire of Nanotrasen's finest teaching force."
+ icon_state = "traindrobe"
+ icon_lightmask = "base_drobe"
+ icon_panel = "drobe"
+ icon_broken = "base_drobe"
+ icon_off = "base_drobe"
+ category = VENDOR_TYPE_CLOTHING
+ ads_list = list("You're gonna LEARN today!", "What am I supposed to do?")
+ vend_reply = "Thank you for using the TrainDrobe!"
+ products = list(
+ /obj/item/clothing/gloves/color/white = 2,
+ /obj/item/clothing/gloves/color/black = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/black = 2,
+ /obj/item/clothing/shoes/brown = 2,
+ /obj/item/clothing/head/drilltrainer = 2,
+ /obj/item/clothing/under/rank/procedure/nct = 2,
+ /obj/item/clothing/under/rank/procedure/nct/skirt = 2,
+ /obj/item/clothing/suit/storage/nct = 2,
+ /obj/item/clothing/head/helmet/space/plasmaman/trainer = 2,
+ /obj/item/clothing/under/plasmaman/trainer = 2,
+ /obj/item/clothing/accessory/armband/procedure = 2,
+ /obj/item/clothing/head/beret/nct/green = 2,
+ /obj/item/clothing/head/beret/nct/black = 2,
+ /obj/item/clothing/head/beret/sec = 2,
+ /obj/item/clothing/head/beret/med = 2,
+ /obj/item/clothing/head/beret/sci = 2,
+ /obj/item/clothing/head/beret/eng = 2,
+ /obj/item/clothing/head/beret/atmos = 2,
+ /obj/item/clothing/head/beret/cargo = 2,
+ /obj/item/clothing/head/beret/black = 2)
+
+ prices = list()
+
+ refill_canister = /obj/item/vending_refill/traindrobe
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 52439d7664e4..f03b08668d82 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -422,6 +422,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
name = "Warden"
icon_state = "Warden"
+/obj/effect/landmark/start/nanotrasen_career_trainer
+ name ="Nanotrasen Career Trainer"
+ icon_state = "NCT"
+
/obj/effect/landmark/start/set_tag()
tag = "start*[name]"
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 19c8c7319d64..a1999c826e88 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -172,3 +172,8 @@
desc = "Integrated encryption key."
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Procedure" = 1)
+
+/obj/item/encryptionkey/headset_nct
+ name = "NCT Radio Encryption Key"
+ icon_state = "com_cypherkey"
+ channels = list("Procedure" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 201ceb11fcfe..10770f412070 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -308,6 +308,13 @@
item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/ntrep
+/obj/item/radio/headset/headset_nct
+ name = "\improper Nanotrasen career trainer radio headset"
+ desc = "This is used by your well-taught corporate training team."
+ icon_state = "com_headset"
+ item_state = "headset"
+ ks2type = /obj/item/encryptionkey/headset_nct
+
/obj/item/radio/headset/heads/magistrate
name = "magistrate's headset"
desc = "The headset of the Magistrate."
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 38416775f880..c7bbac7a27c8 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -620,6 +620,13 @@
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_NTREP)
+/obj/item/card/id/nct
+ name = "\improper Nanotrasen Career Trainer ID"
+ registered_name = "Nanotrasen Career Trainer"
+ icon_state = "nctrainer"
+ access = list(ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_COURT, ACCESS_EVA, ACCESS_TRAINER, ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_THEATRE, ACCESS_INTERNAL_AFFAIRS)
+
/obj/item/card/id/blueshield
name = "Blueshield ID"
registered_name = "Blueshield"
@@ -776,6 +783,55 @@
/obj/item/card/id/data
icon_state = "data"
+/obj/item/card/id/nct_data_chip
+ name = "\improper NCT Trainee Access Chip"
+ desc = "A small electronic access token that allows its user to copy the access of their Trainee. Only accessible by NT Career Trainers!"
+ icon_state = "nct_chip"
+ assignment = "Nanotrasen Career Trainer"
+ var/registered_user = null
+ var/trainee = null
+
+/obj/item/card/id/nct_data_chip/examine(mob/user)
+ . = ..()
+ . += "
The current registered Trainee is: [trainee]"
+ . += "Use in hand to reset the assigned trainee and access."
+ . += "The datachip is unable to copy any access that has been deemed high-risk by Nanotrasen Officials. That includes some, if not most, head related access permissions."
+
+/obj/item/card/id/nct_data_chip/activate_self(mob/user)
+ if(..())
+ return
+ if(!trainee)
+ return
+
+ var/response = tgui_alert(user, "Would you like to remove [trainee] as your current active Trainee?", "Choose", list("Yes", "No"))
+ if(response == "Yes")
+ trainee = null
+ icon_state = "nct_chip"
+ access = list()
+
+/obj/item/card/id/nct_data_chip/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+ if(!istype(target, /obj/item/card/id))
+ return
+ if(!(isliving(user) && user.mind))
+ return
+
+ if(user.mind.current != registered_user)
+ to_chat(user, "You do not have access to use this NCT Trainee Access Chip!")
+ return
+
+ if(istype(target, /obj/item/card/id/ert))
+ to_chat(user, "The chip's screen blinks red as you attempt scanning this ID.")
+ return
+
+ var/obj/item/card/id/I = target
+ to_chat(user, "The chip's microscanners activate as you scan [I.registered_name]'s ID, copying its access.")
+ access = I.access
+ access.Remove(ACCESS_AI_UPLOAD, ACCESS_ARMORY, ACCESS_CAPTAIN, ACCESS_CE, ACCESS_RD, ACCESS_HOP, ACCESS_QM, ACCESS_CMO, ACCESS_HOS, ACCESS_NTREP,
+ ACCESS_MAGISTRATE, ACCESS_BLUESHIELD, ACCESS_HEADS_VAULT, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE,
+ ACCESS_CHANGE_IDS, ACCESS_MINISAT)
+ trainee = I.registered_name
+ icon_state = "nct_chip_active"
+
// Decals
/obj/item/id_decal
name = "identification card decal"
@@ -829,10 +885,10 @@
override_name = 1
/proc/get_station_card_skins()
- return list("data","id","gold","silver","security","detective","warden","internalaffairsagent","medical","coroner","chemist","virologist","paramedic","psychiatrist","geneticist","research","roboticist","quartermaster","cargo","shaftminer","engineering","atmostech","captain","HoP","HoS","CMO","RD","CE","assistant","clown","mime","botanist","librarian","chaplain","bartender","chef","janitor","rainbow","prisoner","explorer")
+ return list("data", "id", "gold", "silver", "security", "detective", "warden", "internalaffairsagent", "medical", "coroner", "chemist", "virologist", "paramedic", "psychiatrist", "geneticist", "research", "roboticist", "quartermaster", "cargo", "shaftminer", "engineering", "atmostech", "captain", "HoP", "HoS", "CMO", "RD", "CE", "assistant", "clown", "mime", "botanist", "librarian", "chaplain", "bartender", "chef", "janitor", "rainbow", "prisoner", "explorer", "nct")
/proc/get_centcom_card_skins()
- return list("centcom","blueshield","magistrate","ntrep","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","ERT_paranormal","deathsquad","commander","syndie","TDred","TDgreen")
+ return list("centcom", "blueshield", "magistrate", "ntrep", "ERT_leader", "ERT_empty", "ERT_security", "ERT_engineering", "ERT_medical", "ERT_janitorial", "ERT_paranormal", "deathsquad", "commander", "syndie", "TDred", "TDgreen")
/proc/get_all_card_skins()
return get_station_card_skins() + get_centcom_card_skins()
@@ -853,6 +909,8 @@
return "Security Officer"
if("internalaffairsagent")
return "Internal Affairs Agent"
+ if("nct")
+ return "Nanotrasen Career Trainer"
if("atmostech")
return "Life Support Specialist"
if("HoP")
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 23cf610f5cf0..7e43d87e2a64 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -996,6 +996,39 @@
title = "Science Standard Operating Procedures"
wiki_article_title = "Standard_Operating_Procedure_(Science)"
+/obj/item/book/manual/sop_ntinstructor
+ name = "Career Trainer SOP"
+ desc = "A set of guidelines for Instructors."
+ icon_state = "sop_legal"
+ author = "Nanotrasen"
+ title = "Instructor SOP"
+ pages = list({"
+
+
+
+
+
+ Instructor SOP
+
+
+ - NT Career Trainers are to wear their company-provided uniform and jacket OR their issued beret/hat at all times while on duty. They are free to choose a beret that best matches their primary field of knowledge if they so desire. Additionally, Identifying equipment SHOULD not be distributed to crew members.
+ - NT Career Trainers are to be available to all Crewmembers, regardless of Department. You may not only assist a singular Department.
+ - NT Career Trainers are not to do a Trainee's work for them.
+ - NT Career Trainers are to use NCT Data Chips only to acquire the access necessary for providing training. They are not to use said access for other purposes.
+ - In the event of a lost or stolen NCT Data Chip, the NT Career Trainer is to report the incident to their local Nanotrasen Representative or Station Captain.
+ - NT Career Trainers are permitted to carry a flash for self-defense.
+
+
+
+ "})
+
//* MANUAL SPAWNERS *// (and space Law)
/obj/item/book/manual/random
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index 6995d3ad4426..835b69599391 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -223,3 +223,7 @@
/obj/item/vending_refill/lawdrobe
machine_name = "LawDrobe"
icon_state = "refill_clothes"
+
+/obj/item/vending_refill/traindrobe
+ machine_name = "TrainDrobe"
+ icon_state = "refill_clothes"
diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm
index 57397c00ef0a..25843fd4cbca 100644
--- a/code/game/objects/mail.dm
+++ b/code/game/objects/mail.dm
@@ -198,7 +198,7 @@
/obj/item/toy/figure/crew/iaa,
/obj/item/toy/figure/crew/dsquad,
/obj/item/storage/box/scratch_cards)
- job_list = list("Captain", "Magistrate", "Nanotrasen Representative", "Blueshield", "Internal Affairs Agent")
+ job_list = list("Captain", "Magistrate", "Nanotrasen Representative", "Blueshield", "Internal Affairs Agent", "Nanotrasen Career Trainer")
/obj/item/envelope/misc
possible_contents = list(/obj/item/clothing/under/misc/assistantformal,
diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
index 449c116b3960..834442748a0f 100644
--- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
@@ -8,6 +8,7 @@
/// Jobs that cannot be the kidnapping target.
var/static/list/forbidden_jobs = list(
"Captain",
+ "Nanotrasen Career Trainer"
)
/// Static whitelist of area names that can be used as an extraction zone, structured by difficulty.
/// An area's difficulty should be measured in how crowded it generally is, how out of the way it is and so on.
diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm
index 7ce7b4501e69..4a08a3e22911 100644
--- a/code/modules/client/preference/character.dm
+++ b/code/modules/client/preference/character.dm
@@ -1535,6 +1535,17 @@
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
+ if(JOB_INSTRUCTOR)
+ clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "trainer_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "trainercoat"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
preview_icon.Blend(new /icon('icons/mob/clothing/eyes.dmi', "glasses"), ICON_OVERLAY)
@@ -2036,6 +2047,10 @@
if(job.hidden_from_job_prefs)
continue
+ if(job.mentor_only)
+ if(!check_rights(R_MENTOR | R_ADMIN, FALSE, user))
+ continue
+
index += 1
if((index >= limit) || (job.title in splitJobs))
if((index < limit) && (lastJob != null))
@@ -2058,6 +2073,7 @@
if(jobban_isbanned(user, job.title))
html += "[rank] \[BANNED] | "
continue
+
var/restrictions = job.get_exp_restrictions(user.client)
if(restrictions)
html += "[rank] \[[restrictions]] | "
diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm
index a4a8f50368c0..c3431ad4514f 100644
--- a/code/modules/client/preference/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference/loadout/loadout_accessories.dm
@@ -233,7 +233,7 @@
/datum/gear/accessory/armband_job/procedure
display_name = "Armband, procedure"
path = /obj/item/clothing/accessory/armband/procedure
- allowed_roles = list("Captain", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent")
+ allowed_roles = list("Captain", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Career Trainer")
/datum/gear/accessory/armband_job/service
display_name = "Armband, service"
diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm
index 0d39a0870cd8..0f8fe78cb0af 100644
--- a/code/modules/clothing/head/beret.dm
+++ b/code/modules/clothing/head/beret.dm
@@ -178,6 +178,26 @@
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
+//NT Career Trainer
+/obj/item/clothing/head/beret/nct/black
+ name = "\improper NT Career Trainer's beret"
+ desc = "A beret worn by the mentors and trainers of the Career Training Team. This one is black!"
+ icon_state = "beret_trainerblack"
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
+ )
+
+/obj/item/clothing/head/beret/nct/green
+ name = "\improper NT Career Trainer's beret"
+ desc = "A beret worn by the mentors and trainers of the Career Training Team. This one is green!"
+ icon_state = "beret_trainergreen"
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
+ )
//Special Roles
/obj/item/clothing/head/beret/solgov
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 2d9e423cd9f2..2a1b5b6ea744 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -193,3 +193,14 @@
desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark as the coroner's humor."
icon_state = "surgcap_black"
dog_fashion = /datum/dog_fashion/head/surgery
+
+// NT Career Trainer
+/obj/item/clothing/head/drilltrainer
+ name = "campaign hat"
+ desc = "A wide-brimmed campaign hat with a drill sergeant feel, worn by Career Trainers to project knowledge and guide new employees with classic style."
+ icon_state = "trainercampaign"
+ item_state = "trainercampaign"
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
+ )
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 91cfe6e8e4cd..b72c0f71d524 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -359,3 +359,9 @@
if(!H.is_in_hands(src) || HAS_TRAIT(H, TRAIT_HANDS_BLOCKED))
return FALSE
return TRUE
+
+/obj/item/clothing/head/helmet/space/plasmaman/trainer
+ name = "\improper NT Career Trainer envirosuit helmet"
+ desc = "A plasmaman envirohelm designed for the nanotrasen career trainer."
+ icon_state = "trainer_envirohelm"
+ item_state = "trainer_envirohelm"
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 59d1a603287e..6ec623bc7c51 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -410,3 +410,19 @@
item_state = "rdmantle"
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
+
+//NT Career Trainer
+/obj/item/clothing/suit/storage/nct
+ name = "\improper NT Career Trainer's jacket"
+ desc = "A sharp black coat with beige trim around the cuffs and collar, offering a mix of professionalism and approachability."
+ icon_state = "trainercoat"
+ blood_overlay_type = "coat"
+ body_parts_covered = UPPER_TORSO|ARMS
+ ignore_suitadjust = TRUE
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ )
diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
index a11e17175869..b7fa92dcbcc9 100644
--- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
@@ -134,3 +134,10 @@
item_state = "tacticool_envirosuit"
item_color = "tacticool_envirosuit"
has_sensor = FALSE
+
+/obj/item/clothing/under/plasmaman/trainer
+ name = "\improper NT career trainer's envirosuit"
+ desc = "An envirosuit designed for plasmamen employed as the nanotrasen career trainer."
+ icon_state = "trainer_envirosuit"
+ item_state = "trainer_envirosuit"
+ item_color = "trainer_envirosuit"
diff --git a/code/modules/clothing/under/jobs/procedure.dm b/code/modules/clothing/under/jobs/procedure.dm
index 33a997dc2186..7351e2a245b7 100644
--- a/code/modules/clothing/under/jobs/procedure.dm
+++ b/code/modules/clothing/under/jobs/procedure.dm
@@ -159,3 +159,17 @@
icon_state = "iaa_formal_goodman_skirt"
item_state = "iaa_formal_goodman_skirt"
item_color = "iaa_formal_goodman_skirt"
+
+/obj/item/clothing/under/rank/procedure/nct
+ name = "\improper NT Career Trainer's uniform"
+ desc = "A neatly pressed olive green shirt paired with black jeans, worn by those dedicated to shaping the future of the workforce."
+ icon_state = "trainer"
+ item_state = "trainer"
+ item_color = "trainer"
+
+/obj/item/clothing/under/rank/procedure/nct/skirt
+ name = "\improper NT Career Trainer's skirt"
+ desc = "A neatly pressed olive green shirt paired with a sleek black skirt, worn by those committed to mentoring the next generation."
+ icon_state = "trainer_skirt"
+ item_state = "trainer_skirt"
+ item_color = "trainer_skirt"
diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm
index abb4187273c8..320b563ac32a 100644
--- a/code/modules/events/bureaucratic_error.dm
+++ b/code/modules/events/bureaucratic_error.dm
@@ -21,7 +21,8 @@
/datum/job/hop,
/datum/job/nanotrasenrep,
/datum/job/judge,
- /datum/job/qm
+ /datum/job/qm,
+ /datum/job/nanotrasentrainer
)
/datum/event/bureaucratic_error/announce()
diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index 6b6506c6fc28..e1e542aaf6e4 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -492,3 +492,10 @@
/obj/effect/mapping_helpers/airlock/access/all/centcomm/traders
access = ACCESS_TRADE_SOL
+
+// -------------------- Procedure access helpers
+/obj/effect/mapping_helpers/airlock/access/all/procedure
+ icon_state = "access_helper_pro"
+
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer
+ access = ACCESS_TRAINER
diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm
index d193060c9a5f..dca6f386b5ac 100644
--- a/code/modules/mapping/windoor_access_helpers.dm
+++ b/code/modules/mapping/windoor_access_helpers.dm
@@ -446,3 +446,10 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/mule_bot
access = ACCESS_CARGO_BOT
+
+// -------------------- Procedure access helpers
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure
+ icon_state = "access_windoor_pro"
+
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer
+ access = ACCESS_TRAINER
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 774181c27857..91303d807667 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -147,6 +147,9 @@
if("Assistant")
O = new /datum/outfit/plasmaman/assistant
+ if("Nanotrasen Career Trainer")
+ O = new /datum/outfit/plasmaman/trainer
+
H.equipOutfit(O, visualsOnly)
H.internal = H.r_hand
H.update_action_buttons_icon()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 98002094fcd4..aa320349eafb 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -277,6 +277,8 @@
return FALSE
if(job.get_exp_restrictions(client))
return FALSE
+ if(job.mentor_only && !check_rights(R_MENTOR | R_ADMIN, FALSE))
+ return FALSE
if(GLOB.configuration.jobs.assistant_limit)
if(job.title == "Assistant")
diff --git a/code/modules/supply/supply_packs/pack_vendor.dm b/code/modules/supply/supply_packs/pack_vendor.dm
index ae1054479b83..969378756839 100644
--- a/code/modules/supply/supply_packs/pack_vendor.dm
+++ b/code/modules/supply/supply_packs/pack_vendor.dm
@@ -84,3 +84,8 @@
name = "Chinese Supply Crate"
contains = list(/obj/item/vending_refill/chinese)
containername = "chinese supply crate"
+
+/datum/supply_packs/vending/trainer
+ name = "TrainDrobe Supply Crate"
+ contains = list(/obj/item/vending_refill/traindrobe)
+ containername = "traindrobe supply crate"
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index eb702d225df5..ca99e6fc18ce 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/effects/spawner_icons.dmi b/icons/effects/spawner_icons.dmi
index 3f8518c5e123..9ba31a537ca5 100644
Binary files a/icons/effects/spawner_icons.dmi and b/icons/effects/spawner_icons.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 866d32557e33..5fbb0f01023c 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi
index bc5b8facb798..5b1df173b2a7 100644
Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ
diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi
index 7254e00ca5b6..30e60a411f83 100644
Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index 764bb78c135f..1ec8cc17a93f 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/procedure.dmi b/icons/mob/clothing/species/drask/under/procedure.dmi
index 916ecd9f68c2..dd7a0080a454 100644
Binary files a/icons/mob/clothing/species/drask/under/procedure.dmi and b/icons/mob/clothing/species/drask/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
index a16b779e26fe..eedd850ff7d5 100644
Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/procedure.dmi b/icons/mob/clothing/species/grey/under/procedure.dmi
index 94850a5ae561..1fab9081bad3 100644
Binary files a/icons/mob/clothing/species/grey/under/procedure.dmi and b/icons/mob/clothing/species/grey/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi
index da7fb0c82a7d..883012947395 100644
Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/procedure.dmi b/icons/mob/clothing/species/kidan/under/procedure.dmi
index 1007af530f0b..49e9f892e52d 100644
Binary files a/icons/mob/clothing/species/kidan/under/procedure.dmi and b/icons/mob/clothing/species/kidan/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/suit.dmi b/icons/mob/clothing/species/kidan/under/suit.dmi
index 8dc146c45489..c648a85e9177 100644
Binary files a/icons/mob/clothing/species/kidan/under/suit.dmi and b/icons/mob/clothing/species/kidan/under/suit.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi
index 04feebb6aa9b..64b5361aa4ca 100644
Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi
index bf1e7080881c..23eb37b89d2f 100644
Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi
index f98d218d01a0..d375080b891f 100644
Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ
diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi
index 827f085bf540..1a3d4308f5d2 100644
Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 7f23a6c79cb8..104f5ee6452f 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/procedure.dmi b/icons/mob/clothing/species/vox/under/procedure.dmi
index e06e6c2b2bcb..a83061dcf9cc 100644
Binary files a/icons/mob/clothing/species/vox/under/procedure.dmi and b/icons/mob/clothing/species/vox/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/suit.dmi b/icons/mob/clothing/species/vox/under/suit.dmi
index 7021585a4aec..44ed7d6794e3 100644
Binary files a/icons/mob/clothing/species/vox/under/suit.dmi and b/icons/mob/clothing/species/vox/under/suit.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 06ab83e88584..453030cf414b 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/procedure.dmi b/icons/mob/clothing/under/procedure.dmi
index 9b781e24ba38..329b28a15375 100644
Binary files a/icons/mob/clothing/under/procedure.dmi and b/icons/mob/clothing/under/procedure.dmi differ
diff --git a/icons/mob/hud/sechud.dmi b/icons/mob/hud/sechud.dmi
index 20f7cdf6495e..33f28a9f69be 100644
Binary files a/icons/mob/hud/sechud.dmi and b/icons/mob/hud/sechud.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index afadfaa14da0..f89f5d783bfd 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 255c1d7f9340..020c2e847166 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi
index fae5d85c0e95..075c5f6f2fa0 100644
Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi
index f216a84f05a6..27aba871aa9d 100644
Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi
index 3486bd07b43d..bddb3b810563 100644
Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index b866b44ad753..9df0744a09ca 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/under/procedure.dmi b/icons/obj/clothing/under/procedure.dmi
index 5a04123668d4..cc5e677c64ac 100644
Binary files a/icons/obj/clothing/under/procedure.dmi and b/icons/obj/clothing/under/procedure.dmi differ
diff --git a/icons/obj/flag.dmi b/icons/obj/flag.dmi
index fc10ab104d00..ac37ee5bd377 100644
Binary files a/icons/obj/flag.dmi and b/icons/obj/flag.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 0f9f31c90031..174a89c25e18 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 371e919052e4..d27c76b49de6 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 1918b63de9c8..15f021e07a81 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -109,8 +109,8 @@
#include "code\__DEFINES\radio_defines.dm"
#include "code\__DEFINES\reagents_defines.dm"
#include "code\__DEFINES\regex.dm"
-#include "code\__DEFINES\revolution_defines.dm"
#include "code\__DEFINES\resonator_defines.dm"
+#include "code\__DEFINES\revolution_defines.dm"
#include "code\__DEFINES\role_preferences.dm"
#include "code\__DEFINES\rolebans.dm"
#include "code\__DEFINES\rust.dm"
@@ -720,6 +720,7 @@
#include "code\game\area\ss13_areas\legal_areas.dm"
#include "code\game\area\ss13_areas\maintenance_areas.dm"
#include "code\game\area\ss13_areas\medical_areas.dm"
+#include "code\game\area\ss13_areas\procedure_areas.dm"
#include "code\game\area\ss13_areas\public_areas.dm"
#include "code\game\area\ss13_areas\science_areas.dm"
#include "code\game\area\ss13_areas\security_areas.dm"