diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index c5279a8dacd..1cef8160da3 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -325,6 +325,9 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -431,9 +434,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -933,7 +934,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plating,
/area/security/permabrig)
@@ -1517,7 +1518,7 @@
"aeZ" = (
/obj/machinery/power/apc{
dir = 1;
- name = "Prisoner Education Chamber APC";
+ name = "north bump";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -1576,6 +1577,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"afo" = (
@@ -1723,7 +1725,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -2514,7 +2516,7 @@
/area/security/armoury)
"ahf" = (
/obj/machinery/alarm{
- pixel_y = 28
+ pixel_y = 24
},
/obj/structure/rack,
/obj/item/gun/energy/ionrifle,
@@ -2632,10 +2634,7 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/item/wrench,
/turf/simulated/floor/plasteel{
@@ -2862,10 +2861,8 @@
/area/security/permabrig)
"ahO" = (
/obj/machinery/power/apc{
- cell_type = 5000;
dir = 1;
- name = "Prison Wing APC";
- pixel_x = 1;
+ name = "north bump";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -3010,7 +3007,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -3204,9 +3201,7 @@
},
/area/security/armoury)
"air" = (
-/turf/simulated/floor/plasteel{
- name = "Holodeck Projector Floor"
- },
+/turf/simulated/floor/engine,
/area/holodeck/alphadeck)
"aiu" = (
/obj/structure/rack,
@@ -3328,7 +3323,7 @@
"aiG" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -3372,7 +3367,7 @@
"aiL" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/chair/comfy/black{
dir = 4
@@ -4066,9 +4061,7 @@
/area/security/permabrig)
"akg" = (
/obj/machinery/power/apc{
- cell_type = 5000;
- name = "Armory APC";
- pixel_x = 1;
+ name = "south bump";
pixel_y = -24
},
/obj/machinery/light,
@@ -4891,7 +4884,7 @@
},
/area/security/main)
"alH" = (
-/obj/machinery/vending/secdrobe,
+/obj/structure/closet/wardrobe/red,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -5032,6 +5025,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/machinery/vending/cart,
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/fitness{
name = "\improper Arcade"
@@ -5348,7 +5342,7 @@
dir = 1
},
/obj/machinery/alarm{
- pixel_y = 28
+ pixel_y = 24
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -5884,7 +5878,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -5916,7 +5909,7 @@
/area/security/main)
"anS" = (
/obj/machinery/alarm{
- pixel_y = 28
+ pixel_y = 24
},
/obj/structure/table,
/obj/machinery/computer/med_data/laptop,
@@ -7733,15 +7726,16 @@
},
/area/security/evidence)
"asg" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
/obj/structure/cable{
+ d1 = 2;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "2-8"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/engine/gravitygenerator)
"ash" = (
@@ -9447,7 +9441,7 @@
"avI" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/hologram/holopad,
/obj/structure/cable/yellow{
@@ -9583,8 +9577,9 @@
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"avW" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Supply Bay Bridge Access"
+/obj/machinery/door/airlock/maintenance{
+ name = "Supply Bay Bridge Access";
+ req_access_txt = "12"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
@@ -10070,7 +10065,7 @@
"awV" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/item/clothing/under/suit_jacket/burgundy,
/turf/simulated/floor/carpet,
@@ -10150,7 +10145,6 @@
/area/engine/gravitygenerator)
"axd" = (
/obj/machinery/door/airlock/engineering{
- icon_state = "door_closed";
name = "Fore Starboard Solar Access";
req_access_txt = "10"
},
@@ -10298,9 +10292,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 4;
- sortType = 2
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/fore)
@@ -10648,6 +10641,7 @@
pixel_x = 6
},
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"axY" = (
@@ -10886,10 +10880,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ayy" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"ayz" = (
@@ -10931,7 +10922,7 @@
"ayE" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/machinery/drone_fabricator,
/turf/simulated/floor/plasteel{
@@ -11528,6 +11519,7 @@
/area/maintenance/fore)
"azQ" = (
/obj/item/stack/sheet/cardboard,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -11553,7 +11545,6 @@
name = "Mining Office";
req_access_txt = "48"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -11564,7 +11555,7 @@
/obj/structure/table/wood,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
@@ -11925,7 +11916,7 @@
"aAJ" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/item/clothing/under/assistantformal,
/turf/simulated/floor/wood,
@@ -12043,19 +12034,11 @@
name = "Port Maintenance"
})
"aBa" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/miningdock{
+ name = "\improper Mining Office"
+ })
"aBb" = (
/turf/simulated/wall/r_wall,
/area/security/nuke_storage)
@@ -12366,15 +12349,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aBV" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -12382,6 +12360,12 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/bridge)
"aBX" = (
@@ -12403,11 +12387,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aBY" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
@@ -12419,6 +12398,12 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/bridge)
"aBZ" = (
@@ -12612,16 +12597,16 @@
},
/area/security/brig)
"aCw" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/landmark/start{
+ name = "Shaft Miner"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/quartermaster/miningdock{
+ name = "\improper Mining Office"
+ })
"aCx" = (
/obj/structure/closet/secure_closet/freezer/money,
/obj/item/clothing/head/bearpelt,
@@ -12641,7 +12626,7 @@
/area/security/nuke_storage)
"aCz" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light{
dir = 1
@@ -12690,7 +12675,7 @@
/area/engine/engineering)
"aCE" = (
/obj/machinery/alarm{
- pixel_y = 28
+ pixel_y = 24
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12933,19 +12918,6 @@
name = "\improper Restrooms"
})
"aCV" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -12953,6 +12925,17 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/bridge)
"aCW" = (
@@ -13127,7 +13110,10 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -13675,11 +13661,6 @@
name = "\improper Mining Office"
})
"aEt" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
@@ -13691,6 +13672,12 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/bridge)
"aEu" = (
@@ -13867,8 +13854,10 @@
/area/space)
"aEJ" = (
/obj/machinery/door/airlock/external{
+ id_tag = "mining_home";
locked = 1;
- name = "Mining Dock Airlock"
+ name = "Mining Dock Airlock";
+ req_access_txt = "48"
},
/obj/structure/fans/tiny,
/turf/simulated/floor/plating,
@@ -13882,6 +13871,7 @@
})
"aEL" = (
/obj/machinery/door/airlock/mining/glass{
+ id_tag = "mining_home";
locked = 1;
name = "Mining Dock";
req_access_txt = "48"
@@ -13908,7 +13898,6 @@
/obj/effect/landmark/start{
name = "Shaft Miner"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
@@ -14158,7 +14147,7 @@
"aFq" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -14284,6 +14273,10 @@
/obj/machinery/light_switch{
pixel_y = 38
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -14363,8 +14356,18 @@
},
/area/crew_quarters/sleep)
"aFM" = (
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/vending/engidrobe,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aFO" = (
@@ -14379,12 +14382,7 @@
name = "\improper Mining Office"
})
"aFP" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -14392,6 +14390,12 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/engine/chiefs_office)
"aFQ" = (
@@ -14461,37 +14465,27 @@
},
/area/engine/engineering)
"aGb" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/camera{
- c_tag = "Engineering - Fore"
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 21
},
+/obj/machinery/camera{
+ c_tag = "Engineering - Fore"
+ },
+/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aGc" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aGf" = (
/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -14502,8 +14496,10 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start{
+ name = "Shaft Miner"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -14692,15 +14688,16 @@
},
/area/security/brig)
"aGy" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
/obj/structure/cable/yellow{
+ d1 = 2;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "2-4"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/construction/Storage{
name = "Storage Wing"
@@ -14886,7 +14883,10 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aGU" = (
-/obj/machinery/door/airlock/tranquillite,
+/obj/machinery/door/airlock/tranquillite{
+ name = "Mime's Office";
+ req_access_txt = "46"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -14946,12 +14946,16 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aHb" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
-/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/construction/Storage{
name = "Storage Wing"
@@ -14980,7 +14984,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/structure/chair{
dir = 8
@@ -14995,15 +14999,16 @@
/turf/simulated/floor/plating,
/area/engine/engineering)
"aHj" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/construction/Storage{
name = "Storage Wing"
@@ -15059,22 +15064,20 @@
name = "\improper Mining Office"
})
"aHs" = (
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
})
"aHt" = (
-/obj/structure/closet/secure_closet/miner,
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
+/obj/structure/closet/secure_closet/miner,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -15146,7 +15149,6 @@
})
"aHB" = (
/obj/machinery/door/airlock/vault{
- icon_state = "door_locked";
locked = 1;
req_access_txt = "53"
},
@@ -15261,12 +15263,16 @@
},
/area/hallway/primary/fore)
"aHR" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
-/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/construction/Storage{
name = "Storage Wing"
@@ -15422,7 +15428,18 @@
},
/area/crew_quarters/sleep)
"aIa" = (
-/obj/machinery/vending/detdrobe,
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/storage/briefcase{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/storage/secure/briefcase{
+ pixel_x = 2;
+ pixel_y = -2
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -15514,7 +15531,7 @@
/area/crew_quarters/sleep)
"aIm" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/chair/office/light,
/obj/effect/landmark/start{
@@ -15728,12 +15745,10 @@
},
/area/security/detectives_office)
"aIH" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
-/obj/structure/cable/yellow,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -15741,6 +15756,12 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/bridge)
"aIJ" = (
@@ -15778,9 +15799,11 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start{
+ name = "Shaft Miner"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -15861,19 +15884,21 @@
name = "Storage Wing"
})
"aIZ" = (
-/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/construction/Storage{
name = "Storage Wing"
@@ -15881,7 +15906,7 @@
"aJa" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -16254,14 +16279,13 @@
"aJG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aJI" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -16272,7 +16296,10 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"aJK" = (
-/obj/machinery/door/airlock/bananium/glass,
+/obj/machinery/door/airlock/bananium{
+ name = "Clown's Office";
+ req_access_txt = "46"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -16416,6 +16443,7 @@
/obj/item/shovel{
pixel_x = -5
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -16428,9 +16456,11 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/start{
+ name = "Shaft Miner"
+ },
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -16469,7 +16499,6 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;63;48;50"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -16946,7 +16975,7 @@
/obj/machinery/light/small,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -16977,7 +17006,7 @@
/area/crew_quarters/sleep)
"aLj" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light/small{
dir = 1
@@ -17202,6 +17231,11 @@
/area/construction)
"aLK" = (
/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "qmshutter";
+ name = "Quartermaster's privacy shutter"
+ },
/turf/simulated/floor/plating,
/area/quartermaster/qm)
"aLL" = (
@@ -17246,7 +17280,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -17255,7 +17288,6 @@
/obj/machinery/firealarm{
pixel_y = 27
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aLR" = (
@@ -17265,7 +17297,6 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"aLS" = (
-/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -17273,7 +17304,6 @@
/obj/machinery/light_switch{
pixel_y = 28
},
-/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aLU" = (
@@ -17342,8 +17372,8 @@
name = "\improper Mining Office"
})
"aMc" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -17353,7 +17383,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aMd" = (
@@ -17616,7 +17645,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17664,12 +17692,13 @@
/turf/simulated/floor/plasteel,
/area/construction)
"aMP" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
+ d1 = 1;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "1-4"
},
/obj/structure/cable/yellow,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/turret_protected/ai_upload)
"aMQ" = (
@@ -17698,7 +17727,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -17722,7 +17750,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/vending/cargodrobe,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aMU" = (
@@ -17785,7 +17812,6 @@
icon_state = "map-right-MS";
pixel_y = 32
},
-/obj/effect/decal/warning_stripes/northeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -17800,11 +17826,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/effect/decal/warning_stripes/southeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -17837,7 +17858,6 @@
dir = 1;
icon_state = "pipe-c"
},
-/obj/effect/decal/warning_stripes/northwestcorner,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -17848,10 +17868,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -18020,28 +18036,36 @@
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc{
+ name = "Port Maintenance APC";
+ pixel_y = -24
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"aNn" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/window/reinforced,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/area/quartermaster/miningdock{
+ name = "\improper Mining Office"
+ })
"aNo" = (
/turf/simulated/wall,
/area/security/processing)
"aNp" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
+ d1 = 1;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "1-8"
},
/obj/structure/cable/yellow,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/turret_protected/ai_upload)
"aNq" = (
@@ -18286,7 +18310,7 @@
/turf/simulated/floor/plating,
/area/storage/secure)
"aNV" = (
-/obj/machinery/shieldgen,
+/obj/machinery/suit_storage_unit/engine/secure,
/turf/simulated/floor/plating,
/area/storage/secure)
"aNX" = (
@@ -18311,10 +18335,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -18355,10 +18375,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -18426,7 +18442,7 @@
"aOk" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/construction)
@@ -18439,7 +18455,7 @@
/area/construction)
"aOp" = (
/obj/machinery/door/poddoor{
- id_tag = "QMLoaddoor";
+ id_tag = "QMLoaddoor2";
name = "supply dock loading door"
},
/obj/machinery/conveyor/east{
@@ -18478,25 +18494,16 @@
name = "\improper Restrooms"
})
"aOx" = (
-/obj/machinery/door/firedoor,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/mining{
- name = "Cargo Bay";
- req_one_access_txt = "48;50"
- },
-/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel,
-/area/construction/Storage{
- name = "Storage Wing"
- })
+/area/quartermaster/storage)
"aOy" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -18633,8 +18640,9 @@
/turf/simulated/floor/wood,
/area/lawoffice)
"aOW" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/northeastcorner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aOX" = (
@@ -18741,17 +18749,14 @@
})
"aPk" = (
/obj/effect/decal/cleanable/cobweb,
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/wirecutters,
/obj/item/weldingtool,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aPl" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/shieldgen,
/turf/simulated/floor/plating,
/area/storage/secure)
"aPm" = (
@@ -18862,7 +18867,6 @@
pixel_y = 24;
req_access_txt = "50"
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aPx" = (
@@ -18992,7 +18996,7 @@
"aPI" = (
/obj/machinery/seed_extractor,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -19025,9 +19029,6 @@
/obj/effect/decal/warning_stripes/arrow{
dir = 8
},
-/obj/effect/decal/warning_stripes/yellow/partial{
- dir = 8
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aPN" = (
@@ -19214,7 +19215,7 @@
/area/turret_protected/ai_upload)
"aQk" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -19223,7 +19224,7 @@
"aQp" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19344,9 +19345,6 @@
/obj/effect/decal/warning_stripes/arrow{
dir = 8
},
-/obj/effect/decal/warning_stripes/yellow/partial{
- dir = 8
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aQH" = (
@@ -19480,6 +19478,7 @@
/obj/effect/landmark{
name = "blobstart"
},
+/obj/machinery/portable_atmospherics/canister/toxins,
/turf/simulated/floor/plating,
/area/storage/secure)
"aQU" = (
@@ -19868,10 +19867,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 8
- },
/mob/living/simple_animal/mouse,
+/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -19952,12 +19949,7 @@
},
/area/crew_quarters/locker)
"aRZ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted{
- dir = 5;
- max_integrity = 120;
- reinf = 0
- },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -20059,6 +20051,7 @@
/area/quartermaster/storage)
"aSm" = (
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aSn" = (
@@ -20109,7 +20102,6 @@
/obj/effect/landmark/start{
name = "Cargo Technician"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aSA" = (
@@ -20197,6 +20189,13 @@
/area/crew_quarters/sleep)
"aSI" = (
/obj/structure/closet/secure_closet/quartermaster,
+/obj/machinery/door_control{
+ id = "qmshutter";
+ name = "Privacy Shutters Control";
+ pixel_x = -6;
+ pixel_y = 24;
+ req_access_txt = "41"
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
@@ -20229,10 +20228,10 @@
name = "\improper Restrooms"
})
"aSK" = (
-/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
+/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/light{
dir = 1
},
@@ -20677,6 +20676,9 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disaster_counter/supermatter{
+ pixel_x = 32
+ },
/turf/simulated/floor/engine,
/area/engine/engineering)
"aTK" = (
@@ -20762,6 +20764,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "qmshutter";
+ name = "Quartermaster's privacy shutter"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/qm)
"aTX" = (
@@ -20846,18 +20853,15 @@
/obj/effect/decal/warning_stripes/arrow{
dir = 8
},
-/obj/effect/decal/warning_stripes/yellow/partial{
- dir = 8
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aUe" = (
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
/obj/machinery/light_switch{
pixel_x = -25
},
-/obj/machinery/alarm{
- pixel_y = 23
- },
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -21057,6 +21061,9 @@
/area/quartermaster/storage)
"aUu" = (
/obj/item/storage/toolbox/emergency,
+/obj/machinery/light/small{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -21291,7 +21298,6 @@
dir = 4;
icon_state = "pipe-c"
},
-/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -21329,7 +21335,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -21474,16 +21479,16 @@
/turf/simulated/floor/plasteel,
/area/storage/primary)
"aVv" = (
+/obj/machinery/alarm{
+ dir = 8;
+ pixel_x = 24
+ },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/table,
-/obj/machinery/alarm{
- dir = 8;
- pixel_x = 24
- },
/obj/machinery/camera{
c_tag = "Cargo Bay - Starboard";
dir = 8
@@ -21492,7 +21497,6 @@
pixel_x = -1;
pixel_y = 6
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aVw" = (
@@ -21877,10 +21881,7 @@
pixel_y = -26
},
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen/multi,
/turf/simulated/floor/wood,
/area/lawoffice)
@@ -22136,6 +22137,9 @@
/area/engine/engineering)
"aWO" = (
/obj/machinery/computer/supplycomp,
+/obj/machinery/light_switch{
+ pixel_x = -23
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
@@ -22181,10 +22185,7 @@
},
/area/quartermaster/qm)
"aWS" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
@@ -22326,7 +22327,6 @@
/obj/item/folder/yellow,
/obj/item/paper,
/obj/item/paper,
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aXo" = (
@@ -22370,9 +22370,6 @@
/area/engine/engineering)
"aXt" = (
/obj/machinery/computer/security/mining,
-/obj/machinery/light_switch{
- pixel_x = -23
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -22657,7 +22654,6 @@
pixel_x = -27
},
/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-03";
layer = 4.1
},
/turf/simulated/floor/plasteel{
@@ -22673,10 +22669,7 @@
name = "Arrivals"
})
"aYb" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -22698,10 +22691,7 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aYj" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/machinery/light{
dir = 8
},
@@ -22712,16 +22702,23 @@
},
/area/storage/primary)
"aYk" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/obj/structure/disposalpipe/segment{
- dir = 1;
+ dir = 4;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plasteel,
-/area/quartermaster/storage)
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"aYl" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ sortType = 2
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -22737,11 +22734,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/requests_console{
- department = "Security";
- departmentType = 5;
- pixel_y = 30
- },
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -22754,6 +22746,7 @@
pixel_x = 6
},
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aYp" = (
@@ -22844,7 +22837,6 @@
/area/hallway/primary/central)
"aYy" = (
/obj/machinery/door/airlock/highsecurity{
- icon_state = "door_closed";
name = "AI Upload";
req_access_txt = "16"
},
@@ -23333,6 +23325,9 @@
/area/turret_protected/ai_upload)
"aZy" = (
/obj/item/flag/cargo,
+/obj/machinery/status_display/supply_display{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -23365,12 +23360,12 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aZC" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
+/obj/structure/table,
+/obj/item/storage/belt/utility,
/obj/item/storage/box/lights/mixed,
/turf/simulated/floor/plasteel{
icon_state = "brown"
@@ -23833,7 +23828,6 @@
dir = 4;
pixel_x = 24
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"baD" = (
@@ -23867,7 +23861,6 @@
/obj/machinery/status_display{
pixel_x = 32
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"baG" = (
@@ -24081,8 +24074,8 @@
"bbf" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
- name = "Engineering Foyer";
- req_one_access_txt = "32;19;70"
+ name = "Engineering";
+ req_access_txt = "32"
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -24154,7 +24147,7 @@
/area/turret_protected/ai_upload_foyer)
"bbm" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/item/twohanded/required/kirbyplants{
icon_state = "applebush";
@@ -24561,7 +24554,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -24674,7 +24666,7 @@
network = list("SS13","RD","AIUpload")
},
/obj/machinery/alarm{
- pixel_y = 26
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -24696,7 +24688,6 @@
/area/engine/engineering)
"bcs" = (
/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -24738,6 +24729,10 @@
/area/quartermaster/office)
"bcA" = (
/obj/machinery/vending/cigarette,
+/obj/machinery/status_display{
+ layer = 4;
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -24972,6 +24967,7 @@
/area/maintenance/starboard)
"bdm" = (
/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bdp" = (
@@ -25330,7 +25326,7 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bdT" = (
-/obj/machinery/status_display,
+/obj/machinery/status_display/supply_display,
/turf/simulated/wall,
/area/quartermaster/storage)
"bdU" = (
@@ -25388,11 +25384,17 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"beb" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/southeastcorner,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bec" = (
@@ -25419,7 +25421,7 @@
/obj/machinery/light_switch{
pixel_x = 27
},
-/obj/effect/decal/warning_stripes/southeast,
+/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bef" = (
@@ -26068,8 +26070,7 @@
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+ dir = 4
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -26125,7 +26126,6 @@
})
"bfv" = (
/obj/structure/closet/secure_closet/cargotech,
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -26264,7 +26264,7 @@
"bfO" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26344,7 +26344,7 @@
"bfZ" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -26659,7 +26659,6 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bgA" = (
@@ -26680,13 +26679,17 @@
icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"bgC" = (
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/telepad,
+/obj/machinery/telepad_cargo,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -26866,12 +26869,9 @@
pixel_y = -2
},
/obj/effect/decal/warning_stripes/south,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bgW" = (
@@ -26930,8 +26930,14 @@
name = "Arrivals"
})
"bhc" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/wall,
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "packageSort2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/quartermaster/office)
"bhd" = (
/obj/structure/table,
@@ -27108,9 +27114,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/visible,
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 8
- },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -27554,9 +27557,8 @@
})
"biz" = (
/obj/effect/decal/warning_stripes/southwest,
-/obj/structure/rack,
+/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/item/flashlight,
-/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"biA" = (
@@ -27565,9 +27567,8 @@
pixel_y = 28
},
/obj/effect/decal/warning_stripes/southeast,
-/obj/structure/rack,
+/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/item/flashlight,
-/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"biB" = (
@@ -27582,9 +27583,9 @@
},
/obj/machinery/space_heater,
/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+ dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -27593,7 +27594,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/wall,
/area/quartermaster/office)
"biE" = (
@@ -27630,6 +27630,9 @@
id = "packageSort2"
},
/obj/structure/plasticflaps,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"biI" = (
@@ -27794,7 +27797,7 @@
"bja" = (
/obj/structure/closet/l3closet/janitor,
/obj/machinery/alarm{
- pixel_y = 28
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -27873,7 +27876,7 @@
},
/area/quartermaster/office)
"bjg" = (
-/obj/machinery/status_display{
+/obj/machinery/status_display/supply_display{
pixel_y = 32
},
/obj/structure/table,
@@ -28181,16 +28184,16 @@
},
/area/engine/chiefs_office)
"bjI" = (
+/obj/machinery/alarm{
+ dir = 8;
+ pixel_x = 24
+ },
/obj/structure/closet/secure_closet/engineering_chief,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/alarm{
- dir = 8;
- pixel_x = 24
- },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -28548,8 +28551,9 @@
name = "Mailroom Maintenance";
req_access_txt = "50"
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"bkv" = (
@@ -28596,7 +28600,7 @@
"bkz" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -28668,7 +28672,7 @@
},
/area/hallway/primary/central)
"bkK" = (
-/obj/machinery/status_display{
+/obj/machinery/status_display/supply_display{
pixel_y = 32
},
/turf/simulated/floor/plasteel{
@@ -28798,9 +28802,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/binary/valve{
- name = "output gas to space"
- },
+/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -28810,6 +28812,7 @@
dir = 4
},
/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -28857,16 +28860,6 @@
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
-"blf" = (
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -22
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/central)
"blg" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -29231,7 +29224,7 @@
"blX" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/closet,
/obj/item/crowbar,
@@ -29315,7 +29308,7 @@
})
"bmd" = (
/obj/structure/disposalpipe/trunk{
- dir = 1
+ dir = 8
},
/obj/machinery/disposal/deliveryChute{
dir = 8
@@ -29324,27 +29317,44 @@
/turf/simulated/floor/plating,
/area/quartermaster/office)
"bme" = (
-/obj/machinery/space_heater,
-/obj/structure/disposalpipe/wrapsortjunction{
- dir = 1
+/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
-"bmf" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
-/turf/simulated/wall,
+/turf/simulated/floor/plasteel,
/area/quartermaster/office)
+"bmf" = (
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "bridge blast";
+ name = "Bridge Blast Doors";
+ opacity = 0
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/bridge)
"bmg" = (
/obj/structure/disposaloutlet{
dir = 4
},
/obj/structure/disposalpipe/trunk{
- dir = 8
+ dir = 1
},
/obj/structure/window/reinforced{
dir = 1
@@ -29990,7 +30000,7 @@
/area/hallway/primary/starboard)
"bnn" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light{
dir = 1
@@ -30044,7 +30054,7 @@
"bnu" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/light,
/obj/machinery/camera{
@@ -30391,7 +30401,10 @@
name = "blobstart"
},
/obj/effect/decal/warning_stripes/east,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -30405,16 +30418,31 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;48;50;1"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"boe" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/wall,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "bridge blast";
+ name = "Bridge Blast Doors";
+ opacity = 0
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/bridge)
"bof" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -31205,6 +31233,10 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "neutral"
@@ -31216,7 +31248,10 @@
icon_state = "map-left-MS";
pixel_y = 32
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -31335,14 +31370,14 @@
},
/area/quartermaster/office)
"bpP" = (
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -24
+ },
/obj/item/storage/box,
/obj/structure/table,
/obj/item/storage/box,
/obj/item/storage/box,
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
/obj/item/hand_labeler,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -31531,6 +31566,7 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -31623,7 +31659,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
@@ -32326,6 +32362,10 @@
},
/area/hallway/primary/central)
"brP" = (
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -24
+ },
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 10
@@ -32334,10 +32374,6 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -23
- },
/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -32390,17 +32426,12 @@
/area/hallway/primary/port)
"brW" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/computer/turbine_computer{
- id = "incineratorturbine"
- },
/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/meter,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"brX" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -32976,7 +33007,6 @@
pixel_x = -25
},
/obj/machinery/door/airlock/highsecurity{
- icon_state = "door_locked";
locked = 1;
name = "AI Chamber";
req_access_txt = "16"
@@ -33168,7 +33198,9 @@
},
/area/hallway/primary/port)
"btC" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -33469,7 +33501,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -34293,7 +34325,7 @@
/area/engine/break_room)
"bvu" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/table,
/obj/item/paper_bin{
@@ -34325,7 +34357,7 @@
"bvw" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/obj/structure/showcase{
density = 0;
@@ -34572,6 +34604,7 @@
},
/obj/structure/disposalpipe/sortjunction{
dir = 8;
+ name = "Quartermasters Office";
sortType = 3
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -34934,7 +34967,6 @@
})
"bwt" = (
/obj/structure/table/wood,
-/obj/item/stamp/captain,
/obj/machinery/computer/security/wooden_tv,
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
@@ -35393,7 +35425,7 @@
"bxr" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -35756,7 +35788,7 @@
"bxX" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -36133,14 +36165,6 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/storage/briefcase{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/storage/secure/briefcase{
- pixel_x = 2;
- pixel_y = -2
- },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"byE" = (
@@ -36260,10 +36284,14 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byN" = (
+/obj/structure/closet/gmcloset{
+ desc = "It's a storage unit.";
+ name = "spare gear"
+ },
+/obj/item/wrench,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/obj/machinery/vending/bardrobe,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byO" = (
@@ -37022,9 +37050,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet{
- icon_state = "carpet6-2"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -37034,24 +37060,26 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet14-10"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
"bAo" = (
-/turf/simulated/floor/carpet{
- icon_state = "carpet14-10"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/crew_quarters/captain{
- name = "\improper Captain's Quarters"
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
})
"bAp" = (
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/carpet{
- icon_state = "carpet14-10"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -37060,9 +37088,7 @@
c_tag = "Captain's Office";
dir = 8
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet10-8"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -37155,7 +37181,7 @@
"bAA" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/obj/machinery/light/small{
dir = 8
@@ -37727,6 +37753,9 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/machinery/light_switch{
+ pixel_y = -24
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bBW" = (
@@ -37777,10 +37806,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/light_switch{
- pixel_x = 38;
- pixel_y = -4
- },
/obj/machinery/door_control{
id = "hopqueue";
name = "Queue Shutters Control";
@@ -37800,6 +37825,10 @@
pixel_x = 38;
pixel_y = 6
},
+/obj/machinery/door_control/ticket_machine_button{
+ pixel_x = 39;
+ pixel_y = -4
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bCd" = (
@@ -37914,15 +37943,6 @@
products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/random = 4)
},
/turf/simulated/floor/wood,
-/area/crew_quarters/captain{
- name = "\improper Captain's Quarters"
- })
-"bCn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet{
- icon_state = "carpet7-3"
- },
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -37977,9 +37997,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet11-12"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -38057,7 +38075,7 @@
"bCB" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -38479,7 +38497,7 @@
"bDx" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -38524,7 +38542,7 @@
"bDB" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -38843,9 +38861,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet6-2"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -38856,9 +38872,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet15-11"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -38905,9 +38919,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet11-12"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -39108,7 +39120,7 @@
/obj/item/wrench,
/obj/item/clothing/mask/gas,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/table,
/obj/item/storage/box,
@@ -39191,7 +39203,7 @@
"bEQ" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -39275,7 +39287,7 @@
/area/atmos)
"bEY" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Atmospherics - Distro Loop"
@@ -39729,9 +39741,7 @@
dir = 8;
pixel_x = -24
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet5-1"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -39750,11 +39760,12 @@
},
/area/hallway/primary/port)
"bFX" = (
-/turf/simulated/floor/carpet{
- icon_state = "carpetside"
+/obj/machinery/light/small{
+ dir = 4
},
-/area/crew_quarters/captain{
- name = "\improper Captain's Quarters"
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
})
"bFY" = (
/obj/structure/table/wood,
@@ -39788,6 +39799,9 @@
icon_state = "0-4"
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/light/small{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -39999,10 +40013,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen{
pixel_x = -3;
pixel_y = 5
@@ -40247,7 +40258,7 @@
pixel_y = 3
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light_switch{
pixel_x = -26
@@ -40298,7 +40309,7 @@
/obj/machinery/computer/message_monitor,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -40459,9 +40470,7 @@
"bHz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet{
- icon_state = "carpetside"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -40486,9 +40495,7 @@
pixel_y = -29
},
/mob/living/simple_animal/pet/dog/fox/Renault,
-/turf/simulated/floor/carpet{
- icon_state = "carpetside"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -40523,9 +40530,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/turf/simulated/floor/carpet{
- icon_state = "carpet9-4"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -40831,19 +40836,12 @@
},
/turf/space,
/area/space/nearstation)
-"bIv" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/wall/r_wall,
-/area/atmos)
"bIw" = (
/obj/machinery/atmospherics/unary/vent_pump{
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
+ icon_state = "in";
id_tag = "waste_out";
initialize_directions = 1;
internal_pressure_bound = 4000;
@@ -40851,18 +40849,13 @@
pressure_checks = 2;
pump_direction = 0
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"bIx" = (
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
+/obj/machinery/camera{
+ c_tag = "Atmospherics Waste Tank"
},
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"bIy" = (
/obj/item/radio/intercom{
@@ -40870,9 +40863,7 @@
name = "Station Intercom (General)";
pixel_y = -26
},
-/turf/simulated/floor/carpet{
- icon_state = "carpetside"
- },
+/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
@@ -41412,7 +41403,7 @@
})
"bJB" = (
/obj/machinery/alarm{
- pixel_y = 32
+ pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -41760,27 +41751,19 @@
id_tag = "waste_sensor";
output = 63
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"bKi" = (
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"bKj" = (
/obj/structure/table/wood,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/wood,
/area/library)
@@ -41937,7 +41920,7 @@
name = "Port Maintenance"
})
"bKz" = (
-/obj/machinery/light_construct{
+/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/wood,
@@ -42084,7 +42067,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -42788,25 +42771,23 @@
/turf/space,
/area/space/nearstation)
"bMk" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/structure/grille,
+/obj/machinery/meter,
/turf/simulated/wall/r_wall,
/area/atmos)
"bMl" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 8;
frequency = 1441;
+ icon_state = "on";
id = "waste_in";
+ on = 1;
pixel_y = 1
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"bMm" = (
/obj/machinery/power/apc{
@@ -42967,7 +42948,6 @@
name = "Arrivals"
})
"bMC" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -43131,6 +43111,10 @@
},
/obj/effect/decal/warning_stripes/arrow,
/obj/effect/decal/warning_stripes/yellow/partial,
+/obj/machinery/ticket_machine{
+ layer = 4;
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel,
/area/bridge/meeting_room{
name = "\improper Command Hallway"
@@ -43393,7 +43377,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/camera{
c_tag = "Kitchen - Coldroom";
@@ -43564,15 +43548,16 @@
/turf/simulated/floor/plating,
/area/gateway)
"bNT" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/gateway)
"bNU" = (
@@ -44007,15 +43992,7 @@
/turf/simulated/floor/wood,
/area/ntrep)
"bOO" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - Mix";
- dir = 8
- },
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"bOP" = (
/obj/structure/cable/yellow{
@@ -44396,6 +44373,7 @@
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
+ icon_state = "in";
id_tag = "n2o_out";
initialize_directions = 1;
internal_pressure_bound = 4000;
@@ -44568,7 +44546,9 @@
dir = 1
},
/obj/structure/closet/secure_closet/medical2,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"bQb" = (
/obj/structure/closet/firecloset,
@@ -44641,10 +44621,7 @@
name = "E.V.A. Storage"
})
"bQi" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/stack/sheet/rglass{
amount = 50
},
@@ -44766,7 +44743,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -44940,20 +44917,24 @@
pixel_x = 6;
pixel_y = -30
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -30
- },
/obj/machinery/computer/card/minor/cmo,
+/obj/machinery/keycard_auth{
+ pixel_x = -26;
+ pixel_y = -7
+ },
+/obj/machinery/door_control{
+ id = "cmoprivacy";
+ name = "Privacy Shutters Control";
+ pixel_x = -26;
+ pixel_y = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"bQW" = (
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen{
pixel_x = -3;
pixel_y = 5
@@ -44978,10 +44959,7 @@
},
/area/crew_quarters/hor)
"bQX" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/crowbar,
/obj/item/storage/toolbox/emergency,
/obj/item/radio/off,
@@ -45083,7 +45061,8 @@
"bRn" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
- name = "Coroner"
+ name = "Morgue";
+ req_access_txt = "6"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -45247,7 +45226,7 @@
/turf/simulated/floor/wood,
/area/security/vacantoffice)
"bRC" = (
-/obj/machinery/light_construct{
+/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/wood,
@@ -45260,10 +45239,7 @@
name = "Port Maintenance"
})
"bRE" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -45537,10 +45513,7 @@
/turf/simulated/floor/wood,
/area/ntrep)
"bSh" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
@@ -45633,7 +45606,7 @@
"bSq" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/plasteel{
@@ -45939,10 +45912,12 @@
},
/area/atmos)
"bSV" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 8;
frequency = 1441;
+ icon_state = "on";
id = "n2o_in";
+ on = 1;
pixel_y = 1
},
/turf/simulated/floor/engine/n20,
@@ -45979,7 +45954,8 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
- name = "Morgue"
+ name = "Morgue";
+ req_access_txt = "6"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -45994,7 +45970,8 @@
"bSZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
- name = "Morgue"
+ name = "Morgue";
+ req_access_txt = "6"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -46017,7 +45994,7 @@
/area/medical/morgue)
"bTb" = (
/obj/machinery/alarm{
- pixel_y = 32
+ pixel_y = 24
},
/obj/structure/morgue,
/turf/simulated/floor/plasteel{
@@ -46159,7 +46136,6 @@
pixel_y = -32
},
/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-03";
layer = 4.1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -46214,7 +46190,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -46229,10 +46205,7 @@
},
/area/hallway/primary/fore)
"bTr" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/rack_parts,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
@@ -46282,7 +46255,7 @@
/obj/machinery/light/small,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/wood,
/area/library)
@@ -46409,7 +46382,7 @@
"bTK" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -46463,7 +46436,7 @@
/obj/structure/closet/secure_closet/medical1,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -46631,6 +46604,7 @@
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
filter_type = 4;
+ name = "Gas filter (N2O tank)";
on = 1
},
/obj/structure/window/reinforced{
@@ -46643,12 +46617,15 @@
},
/area/atmos)
"bUu" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - N2O";
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
-/turf/simulated/floor/engine/n20,
-/area/atmos)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/hallway/primary/port)
"bUv" = (
/obj/machinery/atmospherics/binary/pump{
dir = 0;
@@ -46822,7 +46799,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -46955,7 +46932,7 @@
/area/blueshield)
"bUY" = (
/obj/structure/table/wood,
-/obj/item/paper_bin,
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen/blue,
/obj/item/folder/blue{
pixel_x = 4;
@@ -47450,6 +47427,7 @@
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
+ icon_state = "in";
id_tag = "tox_out";
initialize_directions = 1;
internal_pressure_bound = 4000;
@@ -47463,12 +47441,24 @@
/turf/simulated/floor/engine/plasma,
/area/atmos)
"bVW" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/engine/plasma,
-/area/atmos)
+/obj/structure/disposalpipe/sortjunction{
+ dir = 8;
+ name = "Cargo warehouse";
+ sortType = 2
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/port)
"bVX" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb2,
@@ -47554,7 +47544,7 @@
"bWh" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/cable/yellow{
d1 = 2;
@@ -47817,7 +47807,7 @@
/area/ntrep)
"bWO" = (
/obj/structure/table/wood,
-/obj/item/paper_bin,
+/obj/item/paper_bin/nanotrasen,
/obj/item/flashlight/lamp/green{
pixel_x = -5;
pixel_y = 12
@@ -48073,7 +48063,7 @@
/obj/item/clothing/mask/cigarette/pipe,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/camera{
c_tag = "Theatre - Backstage";
@@ -48705,15 +48695,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bYI" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -48721,6 +48706,12 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"bYJ" = (
@@ -48769,10 +48760,12 @@
/turf/simulated/floor/wood,
/area/ntrep)
"bYO" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 8;
frequency = 1441;
+ icon_state = "on";
id = "tox_in";
+ on = 1;
pixel_y = 1
},
/turf/simulated/floor/engine/plasma,
@@ -48856,16 +48849,7 @@
name = "Port Maintenance"
})
"bYX" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -48873,6 +48857,17 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"bYY" = (
@@ -48898,9 +48893,9 @@
})
"bZa" = (
/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
+/obj/item/paper_bin/nanotrasen,
+/obj/machinery/status_display/supply_display{
+ pixel_x = 32
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -48910,7 +48905,7 @@
"bZb" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/machinery/power/apc{
name = "Kitchen APC";
@@ -49175,14 +49170,14 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bZG" = (
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -24
+ },
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -23
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -49205,6 +49200,7 @@
"bZK" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
+ name = "Gas filter (Toxins tank)";
on = 1
},
/obj/structure/window/reinforced{
@@ -49216,10 +49212,6 @@
},
/area/atmos)
"bZL" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 0;
- name = "Port to Filter"
- },
/obj/machinery/light/small{
dir = 8
},
@@ -49227,6 +49219,7 @@
c_tag = "Atmospherics - Starboard";
dir = 4
},
+/obj/machinery/atmospherics/binary/valve/digital,
/turf/simulated/floor/plasteel,
/area/atmos)
"bZM" = (
@@ -49237,11 +49230,8 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bZN" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - Toxins";
- dir = 8
- },
-/turf/simulated/floor/engine/plasma,
+/obj/effect/spawner/window/reinforced/plasma,
+/turf/simulated/floor/plating,
/area/atmos)
"bZO" = (
/obj/effect/decal/cleanable/dirt,
@@ -49300,7 +49290,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/wood,
/area/library)
@@ -49712,11 +49702,16 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"caT" = (
+/obj/structure/closet{
+ name = "spare parts locker"
+ },
+/obj/item/rack_parts,
+/obj/item/rack_parts,
+/obj/item/wrench,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/vending/chefdrobe,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"caU" = (
@@ -49769,12 +49764,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"caY" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -49782,6 +49772,12 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"caZ" = (
@@ -49853,9 +49849,8 @@
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"cbg" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8;
- name = "Port to Filter"
+/obj/machinery/atmospherics/binary/valve/digital{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -49887,6 +49882,7 @@
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
+ icon_state = "in";
id_tag = "co2_out";
initialize_directions = 1;
internal_pressure_bound = 4000;
@@ -49900,8 +49896,12 @@
/turf/simulated/floor/engine/co2,
/area/atmos)
"cbn" = (
+/obj/structure/table/glass,
+/obj/item/book/manual/sop_service{
+ pixel_x = 2;
+ pixel_y = 5
+ },
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/vending/hydrodrobe,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"cbo" = (
@@ -50085,10 +50085,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"cbJ" = (
-/obj/machinery/light_switch{
- pixel_x = -25;
- pixel_y = -5
- },
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
@@ -50398,13 +50394,12 @@
/turf/simulated/floor/plasteel,
/area/hydroponics)
"cct" = (
-/obj/structure/rack{
+/obj/machinery/atmospherics/binary/pump{
dir = 8;
- layer = 2.9
+ name = "Port to Filter"
},
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/turf/simulated/floor/plasteel,
+/area/atmos)
"ccu" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -50437,6 +50432,9 @@
/obj/effect/landmark{
name = "blobstart"
},
+/obj/machinery/light/small{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"ccz" = (
@@ -50561,7 +50559,7 @@
"ccI" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -50618,7 +50616,7 @@
"ccU" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -50767,6 +50765,9 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 6
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cdq" = (
@@ -50811,6 +50812,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/atmos)
"cdt" = (
@@ -50823,6 +50827,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -50837,6 +50844,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"cdv" = (
@@ -50849,6 +50859,9 @@
dir = 8;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"cdw" = (
@@ -50857,6 +50870,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"cdx" = (
@@ -50867,6 +50883,9 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"cdy" = (
@@ -50882,10 +50901,12 @@
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
"cdz" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 8;
frequency = 1441;
+ icon_state = "on";
id = "co2_in";
+ on = 1;
pixel_y = 1
},
/turf/simulated/floor/engine/co2,
@@ -50950,12 +50971,14 @@
name = "Port Maintenance"
})
"cdG" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+/obj/machinery/light{
+ dir = 1;
+ on = 1
},
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry{
+ name = "Arrivals"
})
"cdH" = (
/obj/structure/closet,
@@ -50967,6 +50990,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
+/obj/item/storage/backpack/satchel_hyd,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -51015,6 +51039,7 @@
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
filter_type = 3;
+ name = "Gas filter (CO2 tank)";
on = 1
},
/obj/structure/window/reinforced{
@@ -51036,11 +51061,11 @@
/turf/simulated/floor/engine/vacuum,
/area/space/nearstation)
"cdS" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - CO2";
- dir = 8
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8;
+ name = "Port to Turbine"
},
-/turf/simulated/floor/engine/co2,
+/turf/simulated/floor/plasteel,
/area/atmos)
"cdT" = (
/turf/simulated/wall,
@@ -51172,8 +51197,10 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cel" = (
-/obj/machinery/door/airlock/medical{
- name = "Paramedic"
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = null;
+ name = "Paramedic";
+ req_access_txt = "66"
},
/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
@@ -51219,8 +51246,10 @@
},
/area/hydroponics)
"ceq" = (
-/obj/machinery/door/airlock/medical{
- name = "Paramedic"
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = null;
+ name = "Paramedic";
+ req_access_txt = "66"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -51263,6 +51292,7 @@
/area/maintenance/aft)
"cev" = (
/obj/structure/closet/secure_closet/hydroponics,
+/obj/item/storage/backpack/satchel_hyd,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -51354,8 +51384,8 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"ceI" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 6
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -51453,6 +51483,9 @@
dir = 4
},
/obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ceS" = (
@@ -51508,7 +51541,7 @@
/area/quartermaster/office)
"ceY" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/table,
/obj/item/paper_bin{
@@ -51558,10 +51591,7 @@
/area/maintenance/aft)
"cfd" = (
/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen{
pixel_x = -3;
pixel_y = 5
@@ -51649,10 +51679,7 @@
},
/obj/item/storage/secure/briefcase,
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 4
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen{
pixel_x = -3;
pixel_y = 5
@@ -51701,10 +51728,7 @@
/area/maintenance/aft)
"cfn" = (
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen{
pixel_x = -3;
pixel_y = 5
@@ -51802,6 +51826,9 @@
dir = 4
},
/obj/effect/decal/warning_stripes/north,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cfz" = (
@@ -51812,7 +51839,7 @@
name = "Station Intercom (Medbay)";
pixel_y = 30
},
-/obj/machinery/vending/medidrobe,
+/obj/structure/closet/wardrobe/medical_white,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -51924,6 +51951,8 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"cfM" = (
@@ -51954,11 +51983,7 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"cfQ" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 1;
- name = "N2 to Airmix";
- on = 1
- },
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/plasteel,
/area/atmos)
"cfR" = (
@@ -51976,17 +52001,18 @@
/obj/machinery/light_switch{
pixel_x = -26
},
+/obj/item/storage/backpack/satchel_hyd,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
/area/hydroponics)
"cfT" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
+ },
+/obj/machinery/light{
+ dir = 8
},
/obj/machinery/camera{
c_tag = "Atmospherics - Port-Aft";
@@ -52050,6 +52076,7 @@
/area/maintenance/aft)
"cgc" = (
/obj/machinery/atmospherics/trinary/mixer{
+ name = "Gas mixer (N2/O2)";
node1_concentration = 0.8;
node2_concentration = 0.2;
on = 1;
@@ -52568,6 +52595,7 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"chf" = (
@@ -52615,8 +52643,9 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"chk" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 1
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8;
+ name = "O2 to Pure"
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -52632,10 +52661,7 @@
/turf/simulated/floor/plasteel,
/area/hydroponics)
"chn" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/storage/box/donkpockets,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
@@ -52794,7 +52820,6 @@
/obj/machinery/door/airlock/research/glass{
autoclose = 0;
frequency = 1449;
- icon_state = "door_locked";
id_tag = "tox_airlock_exterior";
locked = 1;
name = "Mixing Room Exterior Airlock";
@@ -52896,8 +52921,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 1
},
/obj/machinery/meter,
/turf/simulated/floor/plasteel{
@@ -52995,7 +53020,7 @@
"chZ" = (
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/obj/machinery/computer/crew,
/turf/simulated/floor/plasteel{
@@ -53139,11 +53164,8 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
/obj/effect/decal/warning_stripes/north,
+/obj/machinery/atmospherics/binary/pump,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"civ" = (
@@ -53234,10 +53256,6 @@
name = "Inner Pipe Access";
req_access_txt = "24"
},
-/obj/machinery/atmospherics/binary/pump{
- dir = 1;
- name = "O2 to Pure"
- },
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
},
@@ -53282,8 +53300,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -53296,6 +53314,10 @@
/turf/simulated/floor/plating,
/area/atmos)
"ciJ" = (
+/obj/machinery/alarm/all_access{
+ dir = 8;
+ pixel_x = 24
+ },
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
@@ -53303,14 +53325,9 @@
/obj/machinery/power/terminal{
dir = 1
},
-/obj/machinery/alarm{
- desc = "This particular atmos control unit appears to have no access restrictions.";
- dir = 8;
- locked = 0;
- name = "all-access air alarm";
- pixel_x = 24;
- req_access = "0";
- req_one_access = "0"
+/obj/effect/landmark{
+ name = "xeno_spawn";
+ pixel_x = -1
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -53337,6 +53354,7 @@
/obj/machinery/atmospherics/trinary/filter{
dir = 4;
filter_type = 2;
+ name = "Gas filter (N2 tank)";
on = 1
},
/obj/structure/window/reinforced,
@@ -53362,10 +53380,8 @@
/area/atmos)
"ciO" = (
/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/binary/pump{
- dir = 1;
- name = "Nitrogen Outlet";
- on = 1
+/obj/machinery/atmospherics/binary/valve/digital/open{
+ name = "Nitrogen Outlet Valve"
},
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -53394,6 +53410,7 @@
/obj/machinery/atmospherics/trinary/filter{
dir = 4;
filter_type = 1;
+ name = "Gas filter (O2 tank)";
on = 1
},
/turf/simulated/floor/plasteel{
@@ -53418,10 +53435,8 @@
/area/atmos)
"ciS" = (
/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/binary/pump{
- dir = 1;
- name = "O2 to Airmix";
- on = 1
+/obj/machinery/atmospherics/binary/valve/digital/open{
+ name = "Oxygen Outlet Valve"
},
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -53634,10 +53649,7 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cjq" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8;
- name = "output gas connector port"
- },
+/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/portable_atmospherics/canister,
/obj/structure/extinguisher_cabinet{
pixel_x = 31
@@ -53767,9 +53779,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 1
- },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -53950,7 +53959,7 @@
"cjZ" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/hydroponics/constructable,
/obj/effect/decal/warning_stripes/north,
@@ -53988,9 +53997,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
@@ -54526,7 +54532,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/atmospherics/binary/valve{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -54602,12 +54610,9 @@
"cll" = (
/obj/item/wrench,
/obj/item/clothing/suit/apron,
+/obj/item/clothing/accessory/armband/hydro,
/obj/structure/table/glass,
/obj/effect/decal/warning_stripes/northwest,
-/obj/item/book/manual/sop_service{
- pixel_x = 2;
- pixel_y = 5
- },
/turf/simulated/floor/plasteel,
/area/hydroponics)
"clm" = (
@@ -54734,7 +54739,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+ dir = 6
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -54751,11 +54758,12 @@
/turf/simulated/floor/plating,
/area/assembly/robotics)
"clD" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 10
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+ dir = 8;
+ initialize_directions = 11
},
-/turf/simulated/wall/r_wall,
-/area/maintenance/incinerator)
+/turf/simulated/floor/plasteel,
+/area/atmos)
"clE" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -54804,16 +54812,14 @@
},
/area/medical/morgue)
"clJ" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+ dir = 4
},
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/incinerator)
"clK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -55009,7 +55015,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -55082,16 +55088,6 @@
},
/area/medical/morgue)
"cmv" = (
-/obj/machinery/door_control{
- id = "cmoprivacy";
- name = "Privacy Shutters Control";
- pixel_x = -26;
- pixel_y = 4
- },
-/obj/machinery/keycard_auth{
- pixel_x = -26;
- pixel_y = -7
- },
/obj/structure/filingcabinet/filingcabinet,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -55145,7 +55141,7 @@
/area/toxins/explab)
"cmD" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma{
@@ -55244,12 +55240,15 @@
/turf/space,
/area/space/nearstation)
"cmM" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 8
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/space,
-/area/space/nearstation)
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
+ },
+/area/maintenance/incinerator)
"cmN" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -55392,7 +55391,7 @@
"cnd" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -55699,7 +55698,6 @@
},
/area/medical/research)
"cnH" = (
-/obj/item/storage/toolbox/emergency,
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
@@ -55707,6 +55705,9 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -31
},
+/obj/machinery/computer/turbine_computer{
+ id = "incineratorturbine"
+ },
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"cnI" = (
@@ -55793,10 +55794,7 @@
/area/maintenance/starboard)
"cnS" = (
/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -55858,27 +55856,27 @@
name = "\improper Secure Lab"
})
"cnY" = (
-/obj/machinery/atmospherics/pipe/simple,
-/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/grille,
+/obj/machinery/meter,
/turf/simulated/wall/r_wall,
/area/atmos)
"cnZ" = (
-/obj/machinery/atmospherics/pipe/simple,
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/structure/grille,
/obj/machinery/meter{
id = "mair_in_meter";
name = "Mixed Air Tank In"
},
-/obj/structure/grille,
/turf/simulated/wall/r_wall,
/area/atmos)
"coa" = (
-/obj/machinery/atmospherics/pipe/simple,
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/structure/grille,
/obj/machinery/meter{
id = "mair_out_meter";
name = "Mixed Air Tank Out"
},
-/obj/structure/grille,
/turf/simulated/wall/r_wall,
/area/atmos)
"cob" = (
@@ -55960,14 +55958,16 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"coi" = (
-/obj/machinery/bodyscanner,
+/obj/machinery/bodyscanner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whiteblue"
},
/area/medical/exam_room)
"coj" = (
-/obj/structure/closet/secure_closet/personal/patient,
+/obj/machinery/sleeper,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whiteblue"
@@ -55980,6 +55980,9 @@
/obj/machinery/camera{
c_tag = "Medbay Surgery 1 North"
},
+/obj/machinery/defibrillator_mount/loaded{
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -56062,6 +56065,7 @@
pixel_y = -24;
req_access_txt = "12"
},
+/obj/item/storage/toolbox/emergency,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -56107,6 +56111,8 @@
/obj/structure/sign/fire{
pixel_x = 32
},
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/meter,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -56303,10 +56309,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"coN" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/item/cane,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/warning_stripes/north,
@@ -56460,10 +56463,13 @@
name = "\improper Secure Lab"
})
"cph" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 1;
frequency = 1441;
- id = "n2_in"
+ icon_state = "on";
+ id = "n2_in";
+ on = 1;
+ volume_rate = 200
},
/turf/simulated/floor/engine/n2,
/area/atmos)
@@ -56479,6 +56485,7 @@
dir = 1;
external_pressure_bound = 0;
frequency = 1441;
+ icon_state = "in";
id_tag = "n2_out";
initialize_directions = 1;
internal_pressure_bound = 4000;
@@ -56489,10 +56496,12 @@
/turf/simulated/floor/engine/n2,
/area/atmos)
"cpk" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 1;
frequency = 1441;
- id = "o2_in"
+ icon_state = "on";
+ id = "o2_in";
+ on = 1
},
/turf/simulated/floor/engine/o2,
/area/atmos)
@@ -56508,6 +56517,7 @@
dir = 1;
external_pressure_bound = 0;
frequency = 1441;
+ icon_state = "in";
id_tag = "o2_out";
initialize_directions = 1;
internal_pressure_bound = 4000;
@@ -56518,10 +56528,13 @@
/turf/simulated/floor/engine/o2,
/area/atmos)
"cpn" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 1;
- frequency = 1443;
- id = "air_in"
+ frequency = 1441;
+ icon_state = "on";
+ id = "o2_in";
+ on = 1;
+ volume_rate = 200
},
/turf/simulated/floor/engine/air,
/area/atmos)
@@ -56629,18 +56642,6 @@
/obj/machinery/computer/arcade,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"cpB" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "acutesep";
- name = "Acute Separation Privacy Shutters";
- opacity = 0
- },
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/medical/exam_room)
"cpC" = (
/obj/machinery/disposal{
pixel_x = 5
@@ -56915,15 +56916,11 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "gas_turbine_interior";
locked = 1;
name = "Incinerator Interior Airlock";
req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 5
- },
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cqb" = (
@@ -57108,7 +57105,7 @@
/obj/machinery/computer/rdconsole/core,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -57233,7 +57230,9 @@
/turf/simulated/floor/engine/n2,
/area/atmos)
"cqL" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/portable_atmospherics/canister/nitrogen{
+ anchored = 1
+ },
/turf/simulated/floor/engine/n2,
/area/atmos)
"cqM" = (
@@ -57251,7 +57250,9 @@
/turf/simulated/floor/engine/o2,
/area/atmos)
"cqO" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/portable_atmospherics/canister/oxygen{
+ anchored = 1
+ },
/turf/simulated/floor/engine/o2,
/area/atmos)
"cqP" = (
@@ -57263,23 +57264,29 @@
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cqQ" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
-/turf/simulated/floor/engine/air,
-/area/atmos)
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/binary/pump/on,
+/turf/space,
+/area/space/nearstation)
"cqR" = (
-/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/portable_atmospherics/canister/air{
+ anchored = 1
+ },
/turf/simulated/floor/engine/air,
/area/atmos)
"cqS" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - N2";
- dir = 8
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/engine/n2,
-/area/atmos)
+/obj/effect/decal/warning_stripes/west,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cqT" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1
@@ -57367,11 +57374,11 @@
},
/area/maintenance/aft)
"crd" = (
-/obj/machinery/sleeper,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/exam_room)
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"crf" = (
/obj/machinery/door/poddoor/shutters{
density = 0;
@@ -57380,7 +57387,6 @@
name = "Acute Separation Privacy Shutters";
opacity = 0
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -57417,12 +57423,9 @@
},
/area/medical/reception)
"crl" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - O2";
- dir = 8
- },
-/turf/simulated/floor/engine/o2,
-/area/atmos)
+/obj/effect/spawner/airlock/e_to_w,
+/turf/simulated/wall,
+/area/maintenance/aft)
"crm" = (
/obj/machinery/light{
dir = 1;
@@ -57434,12 +57437,18 @@
},
/area/medical/reception)
"crq" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Tank - Air";
- dir = 8
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "Aft Starboard Maintenance APC";
+ pixel_x = -26;
+ pixel_y = 3
},
-/turf/simulated/floor/engine/air,
-/area/atmos)
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"crr" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -57883,7 +57892,6 @@
/area/maintenance/aft)
"csh" = (
/obj/machinery/door/airlock/maintenance{
- icon_state = "door_closed";
name = "Storage Room";
req_access_txt = "12"
},
@@ -57960,11 +57968,11 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cso" = (
-/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/binary/pump/on,
-/turf/space,
-/area/space/nearstation)
+/obj/machinery/atmospherics/pipe/manifold/visible/purple,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
+ },
+/area/maintenance/incinerator)
"csp" = (
/obj/item/wrench,
/turf/simulated/floor/plating/airless,
@@ -58203,7 +58211,6 @@
name = "Acute Separation Privacy Shutters";
opacity = 0
},
-/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -58320,7 +58327,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters{
density = 0;
- dir = 2;
icon_state = "open";
id_tag = "acute1";
name = "Acute 1 Privacy Shutters";
@@ -58570,7 +58576,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "gas_turbine_exterior";
locked = 1;
name = "Incinerator Exterior Airlock";
@@ -58862,11 +58867,12 @@
},
/area/medical/exam_room)
"cui" = (
+/obj/structure/closet/wardrobe/chemistry_white,
+/obj/item/storage/backpack/satchel_chem,
/obj/effect/decal/warning_stripes/south,
/obj/structure/disaster_counter/chemistry{
pixel_y = 32
},
-/obj/machinery/vending/chemdrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59252,13 +59258,6 @@
/area/medical/surgery1)
"cvc" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- icon_state = "open";
- id_tag = "acute2";
- name = "Acute 2 Privacy Shutters";
- opacity = 0
- },
/obj/machinery/door/airlock/medical{
name = "Acute Treatment 2";
req_access_txt = "5"
@@ -59887,10 +59886,7 @@
},
/area/toxins/explab)
"cwd" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen";
- opened = 1
- },
+/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
@@ -60130,7 +60126,7 @@
"cwK" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/structure/sink{
dir = 8;
@@ -60624,10 +60620,19 @@
name = "\improper Research Testing Range"
})
"cxT" = (
-/turf/simulated/floor/plating/airless,
-/area/toxins/xenobiology{
- name = "\improper Secure Lab"
- })
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cxU" = (
/turf/simulated/wall,
/area/crew_quarters/hor)
@@ -61183,7 +61188,7 @@
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -62826,9 +62831,12 @@
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/palebush,
/obj/structure/window/reinforced{
- dir = 5;
- max_integrity = 1e+007
+ dir = 1
},
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced,
/turf/simulated/floor/grass,
/area/medical/surgeryobs)
"cCr" = (
@@ -62853,16 +62861,19 @@
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/flora/ausbushes/sunnybush,
-/obj/structure/window/reinforced{
- dir = 5;
- max_integrity = 1e+007
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
/turf/simulated/floor/grass,
/area/medical/surgeryobs)
"cCt" = (
@@ -63165,17 +63176,6 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
-"cCU" = (
-/obj/structure/closet/emcloset,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- icon_state = "space";
- layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_x = -32
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cCV" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/alarm{
@@ -63287,8 +63287,9 @@
/obj/machinery/light_switch{
pixel_y = 28
},
+/obj/structure/rack,
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/vending/atmosdrobe,
+/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"cDe" = (
@@ -63489,6 +63490,13 @@
/obj/item/tank/internals/air,
/obj/item/wrench,
/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
+ icon_state = "space";
+ layer = 4;
+ name = "EXTERNAL AIRLOCK";
+ pixel_x = -32
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cDC" = (
@@ -63564,7 +63572,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -63614,6 +63622,9 @@
"cDO" = (
/obj/structure/bed/dogbed,
/mob/living/simple_animal/pet/cat/Runtime,
+/obj/machinery/light_switch{
+ pixel_y = -25
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -63641,17 +63652,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
-"cDR" = (
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cDS" = (
/obj/structure/sign/lifestar,
/turf/simulated/wall,
@@ -63914,6 +63914,10 @@
"cEC" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/fungus,
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 4;
+ initialize_directions = 11
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -64432,6 +64436,9 @@
dir = 1
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -64613,7 +64620,7 @@
"cGi" = (
/obj/structure/table,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light{
dir = 1;
@@ -64785,11 +64792,11 @@
/turf/simulated/floor/plasteel,
/area/medical/cryo)
"cGx" = (
+/obj/structure/closet/secure_closet/scientist,
/obj/machinery/light_switch{
pixel_y = 28
},
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/vending/scidrobe,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -65020,6 +65027,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -65032,7 +65044,7 @@
dir = 8
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -65438,7 +65450,9 @@
pixel_x = -25
},
/obj/effect/decal/warning_stripes/northwest,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/toxins/misc_lab{
name = "\improper Research Testing Range"
})
@@ -65449,7 +65463,9 @@
icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/northeast,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/toxins/misc_lab{
name = "\improper Research Testing Range"
})
@@ -65513,7 +65529,9 @@
})
"cHK" = (
/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/toxins/misc_lab{
name = "\improper Research Testing Range"
})
@@ -65595,6 +65613,15 @@
dir = 4
},
/obj/effect/decal/warning_stripes/southeastcorner,
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "Toxins Launch Room APC";
+ pixel_x = 26
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -65780,6 +65807,9 @@
},
/obj/effect/decal/warning_stripes/west,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/wrapsortjunction{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -66299,7 +66329,9 @@
pixel_y = 26
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cJk" = (
/obj/machinery/mecha_part_fabricator,
@@ -66311,7 +66343,9 @@
dir = 1
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cJl" = (
/obj/structure/disposalpipe/segment,
@@ -66323,7 +66357,9 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cJm" = (
/obj/machinery/mecha_part_fabricator,
@@ -66332,7 +66368,9 @@
network = list("SS13","RD")
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cJn" = (
/obj/structure/sign/nosmoking_2{
@@ -66346,7 +66384,9 @@
/obj/item/storage/belt/utility,
/obj/item/reagent_containers/glass/beaker/large,
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cJo" = (
/obj/item/radio/intercom{
@@ -66421,14 +66461,13 @@
})
"cJw" = (
/obj/machinery/light/small,
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disaster_counter/toxins{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -66575,7 +66614,7 @@
/area/medical/virology)
"cJO" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
/turf/simulated/floor/plasteel{
@@ -66678,7 +66717,9 @@
},
/obj/item/clothing/glasses/science,
/obj/effect/decal/warning_stripes/southwest,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/toxins/misc_lab{
name = "\improper Research Testing Range"
})
@@ -66691,7 +66732,9 @@
/obj/structure/table,
/obj/structure/cable/yellow,
/obj/effect/decal/warning_stripes/southeast,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/toxins/misc_lab{
name = "\improper Research Testing Range"
})
@@ -66734,7 +66777,7 @@
},
/area/medical/genetics_cloning)
"cKo" = (
-/obj/machinery/vending/genedrobe,
+/obj/structure/closet/wardrobe/black,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -66777,7 +66820,9 @@
},
/obj/machinery/light,
/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/toxins/misc_lab{
name = "\improper Research Testing Range"
})
@@ -67091,7 +67136,7 @@
"cKY" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -67126,7 +67171,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -67147,7 +67192,7 @@
},
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -67176,7 +67221,7 @@
"cLg" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/camera{
c_tag = "Aft Primary Hallway - Middle";
@@ -67340,15 +67385,6 @@
},
/area/medical/medbay3)
"cLx" = (
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 4;
- external_pressure_bound = 0;
- initialize_directions = 1;
- internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
- },
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -67357,7 +67393,6 @@
/obj/machinery/door/airlock/research/glass{
autoclose = 0;
frequency = 1449;
- icon_state = "door_locked";
id_tag = "tox_airlock_interior";
locked = 1;
name = "Mixing Room Interior Airlock";
@@ -67686,7 +67721,9 @@
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cMh" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -67716,7 +67753,9 @@
},
/obj/item/stack/cable_coil,
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cMm" = (
/obj/structure/disposalpipe/segment{
@@ -67745,7 +67784,9 @@
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/photocopier,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cMp" = (
/obj/structure/cable/yellow{
@@ -68096,7 +68137,6 @@
/obj/machinery/door/airlock/medical{
autoclose = 0;
frequency = 1449;
- icon_state = "door_locked";
id_tag = "virology_airlock_interior";
locked = 1;
name = "Virology Interior Airlock";
@@ -68173,7 +68213,6 @@
/obj/machinery/door/airlock/medical{
autoclose = 0;
frequency = 1449;
- icon_state = "door_locked";
id_tag = "virology_airlock_exterior";
locked = 1;
name = "Virology Exterior Airlock";
@@ -68244,7 +68283,9 @@
pixel_x = -8;
pixel_y = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cMY" = (
/obj/structure/disposalpipe/segment,
@@ -68324,19 +68365,23 @@
pixel_x = 27
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cNf" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
},
/obj/machinery/r_n_d/circuit_imprinter,
/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cNg" = (
/obj/structure/disposalpipe/segment,
@@ -68598,7 +68643,9 @@
pixel_x = -31
},
/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cNR" = (
/obj/structure/disposalpipe/segment{
@@ -68706,7 +68753,9 @@
/obj/effect/decal/warning_stripes/yellow,
/obj/item/storage/firstaid/machine,
/obj/item/storage/firstaid/machine,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cNZ" = (
/obj/structure/disposalpipe/segment,
@@ -68912,7 +68961,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/effect/decal/warning_stripes/northwestcorner,
/turf/simulated/floor/plasteel{
@@ -69049,11 +69098,12 @@
},
/area/medical/virology)
"cOD" = (
+/obj/structure/closet/wardrobe/virology_white,
+/obj/item/storage/backpack/satchel_vir,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
-/obj/machinery/vending/virodrobe,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -69238,7 +69288,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cOW" = (
/obj/structure/window/reinforced{
@@ -69248,11 +69300,15 @@
/obj/structure/closet/secure_closet/roboticist{
pixel_x = 2
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cOX" = (
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cOZ" = (
/turf/simulated/floor/plasteel{
@@ -69401,7 +69457,9 @@
pixel_x = 3
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cPp" = (
/obj/item/bedsheet/medical,
@@ -69724,12 +69782,16 @@
/turf/space,
/area/space/nearstation)
"cPV" = (
+/obj/structure/closet/wardrobe/robotics_black{
+ pixel_x = 2
+ },
/obj/structure/window/reinforced{
dir = 8
},
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/vending/robodrobe,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cPW" = (
/obj/machinery/door/window/eastleft{
@@ -69738,7 +69800,9 @@
req_access_txt = "29"
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cPX" = (
/obj/structure/sink{
@@ -69985,7 +70049,7 @@
/obj/item/hand_labeler,
/obj/item/radio/headset/headset_med,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Virology - Cells";
@@ -70195,7 +70259,9 @@
pixel_y = 4
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"cQP" = (
/obj/machinery/door/airlock/maintenance{
@@ -70768,7 +70834,7 @@
},
/area/medical/medbay3)
"cRW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -70882,7 +70948,6 @@
},
/area/chapel/office)
"cSh" = (
-/obj/structure/table/wood,
/obj/item/spellbook/oneuse/smoke{
name = "mysterious old book of "
},
@@ -71187,7 +71252,7 @@
"cSN" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
@@ -71774,8 +71839,10 @@
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/palebush,
/obj/structure/window/reinforced{
- dir = 5;
- max_integrity = 1e+007
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
},
/turf/simulated/floor/grass,
/area/hallway/secondary/exit{
@@ -71951,7 +72018,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -72248,10 +72315,6 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cUN" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
@@ -72389,8 +72452,10 @@
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/flora/ausbushes/sunnybush,
/obj/structure/window/reinforced{
- dir = 5;
- max_integrity = 1e+007
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
},
/turf/simulated/floor/grass,
/area/hallway/secondary/exit{
@@ -72644,13 +72709,10 @@
name = "memorial board";
pixel_y = 32
},
-/obj/item/storage/fancy/candle_box,
-/obj/item/storage/fancy/candle_box{
- pixel_x = -2;
- pixel_y = 2
- },
/obj/effect/decal/cleanable/cobweb,
/obj/structure/table/wood,
+/obj/item/storage/fancy/candle_box/eternal,
+/obj/item/storage/fancy/candle_box/eternal,
/turf/simulated/floor/carpet,
/area/chapel/main)
"cVO" = (
@@ -73343,7 +73405,6 @@
/obj/machinery/door/airlock/research{
autoclose = 0;
frequency = 1449;
- icon_state = "door_locked";
id_tag = "xeno_airlock_interior";
locked = 1;
name = "Secure Lab Internal Airlock";
@@ -73458,7 +73519,7 @@
"cXE" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -73964,9 +74025,9 @@
"cYL" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whitegreen"
@@ -74240,7 +74301,7 @@
/obj/structure/closet/secure_closet/chaplain,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -74490,7 +74551,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "chapel"
@@ -75293,7 +75354,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/gps,
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/chapel/main)
@@ -75650,7 +75710,7 @@
},
/obj/machinery/disposal,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
@@ -76140,7 +76200,7 @@
"der" = (
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance";
- req_access_txt = "5"
+ req_access_txt = "64"
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -76693,7 +76753,7 @@
"dfK" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -76964,11 +77024,21 @@
name = "Arrivals"
})
"dgu" = (
-/obj/effect/decal/warning_stripes/south,
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
+/obj/structure/cable/yellow{
+ 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/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
})
"dgv" = (
/obj/effect/decal/warning_stripes/south,
@@ -77092,7 +77162,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/engine,
/area/hallway/secondary/entry{
@@ -77467,11 +77537,9 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "sol_inner";
locked = 1;
- name = "Arrivals External Access";
- req_access = null
+ name = "Arrivals External Access"
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
@@ -77670,16 +77738,17 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"dYi" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/engine/gravitygenerator)
"dZe" = (
@@ -77690,7 +77759,6 @@
},
/area/medical/cryo)
"dZM" = (
-/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -77704,6 +77772,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/medical/cmo)
"ebA" = (
@@ -78171,20 +78240,6 @@
icon_state = "white"
},
/area/medical/virology)
-"fBo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/northwestcorner,
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
"fBO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -78503,6 +78558,12 @@
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
+"gtu" = (
+/obj/machinery/vending/medical,
+/turf/simulated/floor/plasteel{
+ icon_state = "whiteblue"
+ },
+/area/medical/reception)
"gwJ" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plating,
@@ -78694,6 +78755,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"hgW" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"hht" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79014,11 +79086,13 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/effect/landmark/start{
+ name = "Shaft Miner"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -79084,6 +79158,17 @@
},
/turf/space,
/area/space)
+"idx" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/bluegrid,
+/area/maintenance/aft)
"ied" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -79158,6 +79243,12 @@
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
+"ikO" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/assembly/robotics)
"ilf" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -79221,6 +79312,13 @@
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
+"isf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"iuh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79390,7 +79488,7 @@
"iWv" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel/dark,
/area/tcommsat/server)
@@ -79658,9 +79756,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"kgV" = (
@@ -79789,6 +79890,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/decal/warning_stripes/northwestcorner,
/obj/effect/decal/warning_stripes/southeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79796,7 +79898,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"kzH" = (
@@ -80074,7 +80175,6 @@
/turf/simulated/floor/plasteel,
/area/security/brig)
"lid" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
@@ -80123,7 +80223,6 @@
name = "Port Maintenance"
})
"lBy" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
@@ -80230,18 +80329,13 @@
name = "Arrivals"
})
"lSh" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted{
- dir = 5;
- max_integrity = 120;
- reinf = 0
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -80301,11 +80395,9 @@
"mea" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "sol_outer";
locked = 1;
- name = "Arrivals External Access";
- req_access = null
+ name = "Arrivals External Access"
},
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -80481,17 +80573,6 @@
icon_state = "whitebluecorner"
},
/area/medical/medbay3)
-"mGz" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/northeastcorner,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/quartermaster/storage)
"mGK" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -80673,7 +80754,8 @@
"nig" = (
/obj/effect/decal/warning_stripes/south,
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -80794,6 +80876,10 @@
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"nIZ" = (
@@ -80813,7 +80899,6 @@
/turf/simulated/floor/wood,
/area/ntrep)
"nLH" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -80841,6 +80926,13 @@
icon_state = "dark"
},
/area/engine/engineering)
+"nTF" = (
+/obj/effect/decal/warning_stripes/north,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"nUW" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -81106,7 +81198,6 @@
/obj/machinery/door/airlock/research{
autoclose = 0;
frequency = 1449;
- icon_state = "door_locked";
id_tag = "xeno_airlock_exterior";
locked = 1;
name = "Secure Lab External Airlock";
@@ -81184,6 +81275,17 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
+"phx" = (
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "cmoprivacy";
+ name = "privacy shutters";
+ opacity = 0
+ },
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/medical/cmo)
"pjn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -81669,7 +81771,7 @@
"qxn" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -81722,6 +81824,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/effect/landmark/start{
+ name = "Shaft Miner"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -81829,7 +81934,6 @@
/area/engine/engineering)
"rdz" = (
/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-06";
level = 4.1
},
/obj/effect/decal/warning_stripes/northwest,
@@ -82370,6 +82474,18 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/carpet,
/area/library)
+"srJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"ssZ" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -83170,6 +83286,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"vjL" = (
@@ -83499,7 +83616,6 @@
/obj/effect/landmark/start{
name = "Cargo Technician"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -83556,6 +83672,7 @@
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/quartermaster/office)
"wxE" = (
@@ -83600,6 +83717,19 @@
/area/crew_quarters/fitness{
name = "\improper Arcade"
})
+"wAn" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters{
+ density = 0;
+ icon_state = "open";
+ id_tag = "acute1";
+ name = "Acute 1 Privacy Shutters";
+ opacity = 0
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitebluefull"
+ },
+/area/medical/exam_room)
"wAP" = (
/obj/structure/transit_tube{
icon_state = "D-SW"
@@ -83886,6 +84016,19 @@
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
+"xJB" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"xLf" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 10
@@ -94974,7 +95117,7 @@ aUN
baJ
bTH
aWD
-dgi
+cdG
bBt
dgx
dgz
@@ -95490,7 +95633,7 @@ bUW
aWD
dgk
bBt
-dgu
+dgx
dgz
dgz
dgz
@@ -97288,7 +97431,7 @@ bRy
bTm
apf
bLK
-rvu
+dgu
apf
bZP
bZS
@@ -98312,12 +98455,12 @@ anE
apf
aqB
apd
-apd
+bFX
apd
apd
bWi
cgo
-rvu
+dgu
bZS
bZS
bZS
@@ -99091,8 +99234,8 @@ ayB
rvu
apf
apd
-aEj
-cdG
+bFX
+apd
apf
aaa
aaa
@@ -99866,7 +100009,7 @@ dan
ceN
chP
ceN
-ceN
+xJB
ckv
ceN
cof
@@ -99884,8 +100027,8 @@ bZU
cFR
bZU
bZU
-clJ
-bZU
+bgZ
+crl
bZU
aaa
abq
@@ -100092,7 +100235,7 @@ abq
apf
cHr
bgY
-bgY
+aYk
cIi
bqk
bod
@@ -100139,8 +100282,8 @@ chy
cyU
bZU
cFS
+chy
bZU
-cCU
cEL
cDB
bZU
@@ -100351,8 +100494,8 @@ bgB
azQ
biC
boc
-bme
-boe
+apd
+apf
bpH
brE
bts
@@ -100373,7 +100516,7 @@ bFp
bFp
bFp
apf
-avU
+hgW
bZU
cbs
cuV
@@ -100398,7 +100541,7 @@ bZU
cFR
bZU
bZU
-cDR
+bgZ
bZU
bZU
cPG
@@ -100605,10 +100748,10 @@ aZt
aZt
aZt
bfo
-bhc
+bfw
biD
bku
-bmf
+bfw
bfw
btL
brF
@@ -100654,8 +100797,8 @@ bZU
bZU
bZU
bZU
-cct
-cEL
+cOx
+cqS
cdN
bZU
cNa
@@ -100843,7 +100986,7 @@ apf
aCs
aFE
aEM
-aEM
+aCw
aHr
aIN
aNg
@@ -100864,7 +101007,7 @@ bfh
bgK
bfw
biE
-bpm
+bme
bmg
bfw
bfw
@@ -100894,7 +101037,7 @@ ceE
chy
cEB
cfU
-ceE
+nTF
clu
bZU
ebA
@@ -100913,7 +101056,7 @@ cDk
cuV
cuV
bgZ
-chy
+clP
bZU
cNb
cJy
@@ -101356,12 +101499,12 @@ apf
apf
aCs
aFF
-aEK
+aBa
aGf
aHs
-aEK
+aBa
aKd
-ayK
+aNn
afl
axX
aSm
@@ -101374,7 +101517,7 @@ aYo
aSm
vjp
bdm
-bdZ
+qaM
nig
bkE
biG
@@ -101399,7 +101542,7 @@ bBK
bRG
apd
atj
-apd
+crd
apf
avU
bZU
@@ -101668,7 +101811,7 @@ bZU
bib
bgZ
bZU
-cog
+srJ
coC
coC
coC
@@ -101888,10 +102031,10 @@ aSb
aRo
nYP
aRo
-bdZ
+aOx
bjd
bfw
-biG
+bhc
bpy
bmk
boh
@@ -102402,10 +102545,10 @@ baT
aRo
bdC
bfx
-aRo
+aOW
bju
bfw
-biG
+bhc
bfw
bpF
bok
@@ -102419,12 +102562,12 @@ bXI
bDL
bgY
bgY
-bgY
+bAo
bgY
aSM
bgY
bgY
-bgY
+bAo
bgY
bgY
bgY
@@ -102434,7 +102577,7 @@ apf
chn
apf
ceV
-cfV
+idx
dgG
cuV
clU
@@ -102661,7 +102804,7 @@ tca
bcv
beb
bfv
-bhc
+bfw
bmd
bfw
bmn
@@ -102686,7 +102829,7 @@ bTr
aoX
bWo
cgm
-cgo
+isf
apf
apf
apf
@@ -102905,14 +103048,14 @@ clW
aCu
aLS
aMZ
-aOW
-aOu
+aRo
+aRo
aSz
-beb
-mGz
-aOu
-aOu
-aYk
+aRo
+nYP
+aRo
+aRo
+aRo
iZz
baV
bdZ
@@ -103664,9 +103807,9 @@ apb
aGl
ajg
axs
-ayG
+alW
aMc
-aNn
+caj
aCu
aCu
aCu
@@ -103675,13 +103818,13 @@ aCu
aCu
aCu
aNa
-aOx
+hDK
apf
aPR
apf
aLK
aTW
-aVl
+aLK
aVl
bfw
bfw
@@ -103923,13 +104066,13 @@ ajg
axt
aAY
iip
-aBa
-aCw
-aCw
+aAY
+aAY
+aAY
bMC
bMC
-aCw
-aCw
+aAY
+aAY
aKi
aMH
aOf
@@ -103983,7 +104126,7 @@ cdN
cmX
cok
cpb
-crd
+cpb
csG
cua
djx
@@ -104210,8 +104353,8 @@ bmt
bss
btR
bfw
-btv
-bvH
+bUu
+bVW
bxT
bai
bBS
@@ -104247,7 +104390,7 @@ cvd
cwj
cxt
csJ
-cys
+phx
cBp
dZM
csJ
@@ -104496,10 +104639,10 @@ cmJ
cjo
cmX
cmX
-cpB
+crf
crf
csI
-cpB
+crf
cmX
cwj
cxt
@@ -105011,7 +105154,7 @@ cdT
cmX
cok
cpb
-crd
+cpb
csN
rJk
imZ
@@ -105525,7 +105668,7 @@ clY
cmX
cmX
cmX
-cri
+wAn
csP
cmX
cmX
@@ -109902,7 +110045,7 @@ cia
cxG
cmq
aac
-cnn
+gtu
czC
cCi
cBA
@@ -111102,7 +111245,7 @@ aiP
ajM
akg
agA
-alH
+alC
alX
anN
aof
@@ -111401,7 +111544,7 @@ bes
bfU
aYx
abq
-aCV
+bmf
bqd
boF
bqi
@@ -112429,7 +112572,7 @@ bek
bfV
aYx
abq
-aBY
+boe
bqj
boG
mAa
@@ -112686,7 +112829,7 @@ bek
bfV
aYx
abq
-aBY
+boe
bql
bsc
btZ
@@ -113774,8 +113917,8 @@ cNg
cOb
cPE
cQD
-cLr
-cLr
+ikO
+ikO
cQP
cXx
cTN
@@ -113980,7 +114123,7 @@ bwm
byC
bCd
bAm
-bCn
+bHz
bEj
bHz
uuE
@@ -114239,7 +114382,7 @@ byz
bAn
bCo
bEk
-bFX
+blb
bhw
bMF
bLm
@@ -114493,7 +114636,7 @@ boI
buf
bwt
cfn
-bAo
+blb
bCp
bEl
bHC
@@ -116027,7 +116170,7 @@ bek
bgb
bfV
bjm
-blf
+bCB
bfV
bsV
bfV
@@ -117373,7 +117516,7 @@ cOr
cEK
cln
clN
-chy
+crq
chy
bgZ
cPT
@@ -117630,7 +117773,7 @@ cOc
cQg
cQE
cPj
-cPj
+cxT
cRP
clT
cPT
@@ -117903,7 +118046,7 @@ aaa
aaa
aaa
aaa
-cxT
+aaa
cVG
cmG
cXV
@@ -123259,7 +123402,7 @@ clz
bkY
brW
clF
-cso
+cqQ
bKx
bKx
bKx
@@ -123512,7 +123655,7 @@ cfK
cfK
chQ
aRQ
-cly
+cso
cly
cor
clA
@@ -123724,7 +123867,7 @@ nMC
aNV
sBY
sBY
-sBY
+aNV
nMC
aST
aUK
@@ -123769,7 +123912,7 @@ cfL
ciu
ciH
bhv
-biB
+clJ
biB
bul
clB
@@ -124027,8 +124170,8 @@ cgW
chX
cjB
cle
-cle
-cle
+cmM
+cmM
cqa
cqP
ctn
@@ -124286,7 +124429,7 @@ cjq
cEC
bkZ
cou
-clD
+cNm
cqI
cNm
cuO
@@ -125513,8 +125656,8 @@ azs
aCg
aEy
aEz
-aHa
-fBo
+aHg
+iof
aCg
vRY
aJZ
@@ -125570,7 +125713,7 @@ ciN
ckh
bzL
abq
-bzL
+bZN
cpi
cqL
csq
@@ -125822,14 +125965,14 @@ cce
cdx
uUE
cfQ
-bSP
+clD
ciO
ckj
chR
cmL
cnY
cpj
-cqS
+cqK
cqK
bGL
abq
@@ -126076,7 +126219,7 @@ bWU
bCN
biz
ccf
-bGG
+bIq
nzX
bIn
chi
@@ -126333,10 +126476,10 @@ bCN
bCN
cDd
ccf
-bGG
-nzX
-bGG
bIq
+nzX
+bIo
+bIp
ciQ
cki
cgn
@@ -126589,16 +126732,16 @@ bXJ
bZG
bCN
biA
-ccf
-bGG
+cct
+cdS
nzX
-bGG
+chk
bIq
ciR
ckk
bzL
abq
-bzL
+bZN
cpl
cqO
csr
@@ -126846,18 +126989,18 @@ bXw
bYL
bZL
bKa
-bMc
-bGG
+bGK
+bMd
nzX
ceI
chj
ciS
ckj
chR
-cmM
+cmL
cnY
cpm
-crl
+cqN
cqN
bGL
abq
@@ -127107,11 +127250,11 @@ bGG
bGG
nzX
bPw
-chk
+bIq
ciE
-ckj
-chR
-cmN
+ckh
+bzL
+abq
bGL
bGL
bGL
@@ -127371,7 +127514,7 @@ cij
cmO
cnZ
cpn
-cqQ
+css
css
bGL
abq
@@ -127626,7 +127769,7 @@ ciV
ckh
bzL
abq
-bzL
+bZN
cpo
cqR
cst
@@ -127885,7 +128028,7 @@ cij
cmO
coa
cpp
-crq
+css
css
bGL
abq
@@ -129146,20 +129289,20 @@ abq
aaa
abq
bGL
-bIv
-bzL
+bMk
+bZN
bMk
bGL
-bIv
-bzL
+bMk
+bZN
bMk
bGL
-bIv
-bzL
+bMk
+bZN
bMk
bGL
-bIv
-bzL
+bMk
+bZN
bMk
bGL
abq
@@ -129661,8 +129804,8 @@ aaa
abq
bGL
bIx
-bIx
-bIx
+bOO
+bOO
bGL
bPE
bRk
@@ -129917,21 +130060,21 @@ abq
abq
abq
bGL
-bIx
+bOO
bKi
bOO
bGL
bPE
bRl
-bUu
+bPE
bGL
-bVW
+bVV
bXB
-bZN
+bVV
bGL
cbl
ccj
-cdS
+cbl
bGL
abq
aUV
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 48b0d4b883f..e79851a8d0c 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -238,7 +238,7 @@
to_chat(user, "You no longer deflect objects thrown at you. You can attack during this time")
deflectmode = FALSE
else
- to_chat(user, "You need to wait until you can deflect again. The ability will be ready in [time2text(lastdeflect - world.time, "m:ss")]")
+ to_chat(user, "You need to wait until you can deflect again. The ability will be ready in [time2text(lastdeflect - world.time, "mm:ss")]")
return ..()
if(homerun_ready)
to_chat(user, "You're already ready to do a home run!")
diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png
index 57ea91fad18..e6de831a97d 100644
Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ