diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 3c64b9f6ad..f88a891b39 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -64,8 +64,8 @@
/turf/closed/wall,
/area/maintenance/port/fore)
"aam" = (
-/obj/structure/table,
-/obj/item/storage/box/lights/mixed,
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -90,15 +90,13 @@
/turf/open/floor/plasteel/airless/solarpanel,
/area/solar/starboard/fore)
"aap" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/closed/wall,
+/area/crew_quarters/observatory)
"aaq" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/observatory)
"aar" = (
/obj/machinery/conveyor/auto{
dir = 8;
@@ -664,14 +662,6 @@
},
/turf/open/floor/plating/airless,
/area/router/aux)
-"abF" = (
-/obj/machinery/mass_driver{
- dir = 8;
- id = "sb_out";
- name = "Router Driver"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"abG" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -709,13 +699,6 @@
/obj/item/paper/fluff/cogstation/cluwne,
/turf/open/floor/plating,
/area/crew_quarters/theatre/clown)
-"abJ" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "sb_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"abK" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -819,17 +802,10 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
-"abZ" = (
-/obj/machinery/conveyor{
- dir = 1;
- id = "sb_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"aca" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 5;
- id = "pb_off"
+ id = "pb"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -858,17 +834,9 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"ace" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "pb_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
-"acf" = (
-/obj/machinery/mass_driver{
- dir = 4;
- id = "pb_out";
- name = "Router Driver"
+ id = "pb"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -898,9 +866,9 @@
name = "Medical Booth"
})
"acj" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "solar_off"
+ id = "solar"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -973,8 +941,8 @@
/obj/structure/disposalpipe/junction{
dir = 4
},
-/obj/machinery/conveyor{
- id = "solar_off"
+/obj/machinery/conveyor/auto{
+ id = "solar"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -1052,25 +1020,10 @@
/obj/structure/rack,
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
-"acz" = (
-/obj/machinery/mass_driver{
- dir = 4;
- id = "sb_in";
- name = "Router Driver"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
-"acA" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "sb_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"acB" = (
/obj/machinery/conveyor{
dir = 6;
- id = "sb_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -1109,9 +1062,9 @@
/turf/closed/wall,
/area/crew_quarters/lounge)
"acG" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "pb_off"
+ id = "pb"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -1142,8 +1095,8 @@
/area/crew_quarters/lounge)
"acJ" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/conveyor{
- id = "solar_off"
+/obj/machinery/conveyor/auto{
+ id = "solar"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -1297,18 +1250,11 @@
},
/turf/closed/wall/r_wall,
/area/security/brig)
-"adc" = (
-/obj/machinery/conveyor{
- id = "sb_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"add" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 6
},
-/turf/open/floor/plating,
+/turf/closed/wall,
/area/crew_quarters/observatory)
"ade" = (
/obj/machinery/atmospherics/components/binary/valve/digital/on,
@@ -1332,11 +1278,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/lounge)
"adh" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 10
},
-/turf/open/floor/plating,
+/turf/closed/wall,
/area/crew_quarters/observatory)
"adi" = (
/turf/open/floor/plasteel,
@@ -1349,8 +1294,8 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/machinery/conveyor{
- id = "solar_off"
+/obj/machinery/conveyor/auto{
+ id = "solar"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -1494,9 +1439,8 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/observatory)
"adG" = (
-/obj/machinery/mass_driver{
- id = "serv_in";
- name = "Router Driver"
+/obj/machinery/mass_driver/pressure_plate{
+ id = "hydro_in"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -1535,13 +1479,6 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/stairs/medium,
/area/security/brig)
-"adL" = (
-/obj/machinery/mass_driver{
- id = "starboard_in";
- name = "Router Driver"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"adM" = (
/turf/closed/wall,
/area/crew_quarters/observatory)
@@ -2671,8 +2608,9 @@
/turf/open/floor/plating,
/area/construction)
"agy" = (
-/obj/effect/landmark/xeno_spawn,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"agz" = (
@@ -4478,6 +4416,7 @@
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
+ id = "security_out";
name = "Security Router"
},
/turf/open/floor/plating,
@@ -4661,7 +4600,7 @@
"als" = (
/obj/machinery/mass_driver{
dir = 1;
- id = "sec_out";
+ id = "security_out";
name = "Router Driver"
},
/turf/open/floor/plating,
@@ -5525,16 +5464,15 @@
dir = 8
},
/obj/item/destTagger,
-/obj/machinery/button/door{
- id = "secblock";
- name = "Router Access Control";
- pixel_x = 8;
- pixel_y = 24;
- req_access_txt = "1"
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
+/obj/machinery/button/massdriver{
+ id = "security_out";
+ name = "Security Driver Control";
+ pixel_x = 8;
+ pixel_y = 24
+ },
/turf/open/floor/plasteel,
/area/router/sec)
"ant" = (
@@ -5817,9 +5755,9 @@
/turf/open/floor/plating,
/area/maintenance/solars/port)
"anW" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "sec_off"
+ id = "sec"
},
/turf/open/floor/plating,
/area/router/sec)
@@ -6276,20 +6214,20 @@
"aoS" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/conveyor{
- id = "serv_off"
- },
/obj/machinery/door/poddoor{
- id = "servblock";
+ id = "hydro_in";
name = "Service Router"
},
+/obj/machinery/conveyor/auto{
+ id = "service"
+ },
/turf/open/floor/plating,
/area/router/service)
"aoT" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
- id = "servblock";
+ id = "hydro_out";
name = "Service Router"
},
/turf/open/floor/plating,
@@ -6478,11 +6416,6 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/machinery/button/massdriver{
- id = "sec_out";
- pixel_x = 24;
- pixel_y = 24
- },
/turf/open/floor/plasteel,
/area/router/sec)
"aps" = (
@@ -6792,8 +6725,8 @@
},
/area/chapel/main)
"aqe" = (
-/obj/machinery/conveyor{
- id = "serv_off"
+/obj/machinery/conveyor/auto{
+ id = "service"
},
/turf/open/floor/plating,
/area/router/service)
@@ -6933,7 +6866,7 @@
"aqy" = (
/obj/machinery/mass_driver{
dir = 1;
- id = "serv_out";
+ id = "hydro_out";
name = "Router Driver"
},
/turf/open/floor/plating,
@@ -7497,11 +7430,6 @@
light_color = "#ffc1c1"
},
/obj/item/destTagger,
-/obj/machinery/button/massdriver{
- id = "serv_out";
- pixel_x = 8;
- pixel_y = -4
- },
/obj/machinery/requests_console{
department = "Service Router";
name = "Service Router RC";
@@ -7510,9 +7438,9 @@
/turf/open/floor/plasteel,
/area/router/service)
"arL" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "serv_off"
+ id = "service"
},
/turf/open/floor/plating,
/area/router/service)
@@ -7962,12 +7890,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/machinery/button/door{
- id = "servblock";
- name = "Router Access Control";
+/obj/machinery/button/massdriver{
+ id = "hydro_out";
+ name = "Service Driver Control";
pixel_x = 8;
- pixel_y = 24;
- req_one_access_txt = "12;25;26;28;35;46"
+ pixel_y = 24
},
/turf/open/floor/plasteel,
/area/router/service)
@@ -8538,7 +8465,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/effect/landmark/xeno_spawn,
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"atZ" = (
@@ -9047,9 +8973,9 @@
dir = 8
},
/obj/machinery/turnstile{
- name = "Genpop Entrance Turnstile";
- icon_state = "turnstile_map";
dir = 8;
+ icon_state = "turnstile_map";
+ name = "Genpop Entrance Turnstile";
req_access_txt = "69"
},
/turf/open/floor/plasteel,
@@ -9730,9 +9656,9 @@
name = "Brig Lockdown"
},
/obj/machinery/turnstile{
- name = "Genpop Entrance Turnstile";
- icon_state = "turnstile_map";
dir = 8;
+ icon_state = "turnstile_map";
+ name = "Genpop Entrance Turnstile";
req_access_txt = "69"
},
/turf/open/floor/plasteel,
@@ -10134,9 +10060,6 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"axt" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -10473,12 +10396,6 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
/turf/open/floor/engine,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -11341,10 +11258,9 @@
/turf/open/floor/plasteel,
/area/security/prison)
"azO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plasteel,
-/area/hydroponics/lobby)
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
"azP" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/cola/random,
@@ -11515,6 +11431,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/solars/port)
"aAj" = (
@@ -12941,9 +12858,6 @@
"aCZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/electricshock,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plating,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -15408,7 +15322,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
- areastring = "/area/maintenance/central";
+ areastring = "/area/security/main";
dir = 1;
name = "Security Office APC";
pixel_y = 24
@@ -18668,6 +18582,9 @@
})
"aOl" = (
/obj/effect/turf_decal/delivery,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/engine,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -18988,6 +18905,9 @@
/turf/open/floor/plating,
/area/crew_quarters/fitness/cogpool)
"aOV" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/stairs,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -19401,7 +19321,7 @@
icon_state = "0-8"
},
/turf/open/floor/plating,
-/area/space/nearstation)
+/area/crew_quarters/fitness/cogpool)
"aPO" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
dir = 8
@@ -19667,16 +19587,10 @@
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/crew_quarters/fitness/cogpool)
"aQq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/closed/wall/r_wall,
-/area/space/nearstation)
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aQr" = (
/obj/structure/grille,
/obj/structure/disposalpipe/segment{
@@ -19689,7 +19603,7 @@
icon_state = "0-4"
},
/turf/open/floor/plating,
-/area/space/nearstation)
+/area/crew_quarters/lounge/jazz)
"aQs" = (
/obj/machinery/firealarm{
dir = 1;
@@ -20145,6 +20059,9 @@
/area/crew_quarters/heads/hop)
"aRp" = (
/obj/structure/sign/warning/fire,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/closed/wall/r_wall,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -20304,7 +20221,9 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
/turf/open/floor/engine,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -21439,6 +21358,9 @@
dir = 1;
pixel_y = -26
},
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/engine/engineering{
name = "Engine Room"
@@ -21744,10 +21666,6 @@
/turf/open/floor/plating,
/area/maintenance/department/eva)
"aUR" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 8;
- icon_state = "intact"
- },
/obj/structure/cable{
icon_state = "4-8"
},
@@ -21936,19 +21854,14 @@
dir = 8;
pixel_y = -22
},
-/obj/machinery/button/massdriver{
- id = "public_out";
- pixel_x = 24;
- pixel_y = -6
- },
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/machinery/button/door{
- id = "pubblock";
- name = "Router Access Control";
+/obj/machinery/button/massdriver{
+ id = "public_out";
+ name = "Public Router Control";
pixel_x = 24;
- pixel_y = 24
+ pixel_y = -8
},
/turf/open/floor/plasteel,
/area/router/public)
@@ -25118,9 +25031,11 @@
/turf/open/space/basic,
/area/space/nearstation)
"bcc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 8
+ },
/turf/closed/wall/r_wall,
-/area/space/nearstation)
+/area/crew_quarters/lounge/jazz)
"bcd" = (
/obj/item/kirbyplants{
icon_state = "plant-14"
@@ -25134,8 +25049,8 @@
id = "public"
},
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "cargoblock";
+/obj/machinery/door/poddoor{
+ id = "public_in";
name = "Public Router"
},
/turf/open/floor/plating,
@@ -25148,8 +25063,8 @@
"bcg" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "cargoblock";
+/obj/machinery/door/poddoor{
+ id = "public_out";
name = "Public Router"
},
/turf/open/floor/plating,
@@ -25426,7 +25341,7 @@
dir = 5
},
/turf/closed/wall/r_wall,
-/area/space/nearstation)
+/area/crew_quarters/fitness/cogpool)
"bcP" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -25447,9 +25362,6 @@
/area/hallway/primary/central)
"bcS" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Courtroom"
- },
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/security/courtroom)
@@ -25492,10 +25404,12 @@
/turf/closed/wall,
/area/hallway/primary/central)
"bcY" = (
-/obj/machinery/power/smes,
/obj/structure/cable{
icon_state = "0-2"
},
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"bcZ" = (
@@ -25775,15 +25689,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bdE" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 8;
- icon_state = "intact"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/bridge)
+/obj/effect/landmark/xeno_spawn,
+/turf/open/floor/grass,
+/area/hydroponics/garden{
+ name = "Nature Preserve"
+ })
"bdF" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -26013,6 +25923,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel,
/area/science/mixing)
"bel" = (
@@ -26079,7 +25990,7 @@
dir = 8
},
/turf/closed/wall/r_wall,
-/area/space/nearstation)
+/area/crew_quarters/fitness/cogpool)
"bet" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -26128,7 +26039,7 @@
dir = 8
},
/turf/closed/wall/r_wall/rust,
-/area/space/nearstation)
+/area/crew_quarters/fitness/cogpool)
"bez" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -26165,7 +26076,7 @@
dir = 10
},
/turf/closed/wall/r_wall,
-/area/space/nearstation)
+/area/crew_quarters/lounge/jazz)
"beE" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -26173,6 +26084,10 @@
},
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
+/obj/machinery/door/poddoor{
+ id = "starboardbelthell_in";
+ name = "Belt Hell"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"beF" = (
@@ -26874,11 +26789,15 @@
/turf/open/space/basic,
/area/space/nearstation)
"bgi" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/space/basic,
-/area/space)
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"bgj" = (
/obj/structure/table,
/obj/item/weldingtool/mini,
@@ -27474,6 +27393,7 @@
id = "sec"
},
/obj/machinery/door/poddoor{
+ id = "security_in";
name = "Security Router"
},
/turf/open/floor/plating,
@@ -27570,8 +27490,12 @@
/turf/open/floor/plasteel,
/area/maintenance/department/chapel)
"bhI" = (
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"bhJ" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -27847,12 +27771,6 @@
/area/quartermaster/storage)
"bim" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/massdriver{
- id = "router_in";
- name = "mass driver button (Router)";
- pixel_x = 24;
- pixel_y = -8
- },
/turf/open/floor/plating,
/area/maintenance/disposal)
"bin" = (
@@ -27966,9 +27884,6 @@
/area/quartermaster/storage)
"bix" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Courtroom"
- },
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
@@ -28112,9 +28027,10 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"biO" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plating,
-/area/maintenance/solars/starboard/fore)
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/simple/brown/visible,
+/turf/closed/wall/r_wall,
+/area/engine/atmos)
"biP" = (
/obj/machinery/light{
dir = 4;
@@ -28721,6 +28637,11 @@
dir = 9;
id = "mail"
},
+/obj/structure/window/reinforced{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced,
/turf/open/floor/plating,
/area/quartermaster/sorting)
"bkc" = (
@@ -29042,6 +28963,9 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/engine/engineering{
name = "Engine Room"
@@ -29936,10 +29860,13 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bmz" = (
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/brown/visible,
+/turf/open/space/basic,
+/area/space/nearstation)
"bmA" = (
/obj/item/stack/tile/plasteel{
pixel_x = 10;
@@ -30321,6 +30248,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bng" = (
@@ -30448,6 +30378,9 @@
/area/crew_quarters/lounge/jazz)
"bnp" = (
/obj/effect/turf_decal/delivery,
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bnq" = (
@@ -30608,7 +30541,6 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fore)
"bnI" = (
@@ -31542,7 +31474,7 @@
})
"bpL" = (
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "1-2"
},
/turf/closed/wall/r_wall,
/area/engine/engine_smes{
@@ -31555,10 +31487,7 @@
"bpN" = (
/obj/structure/grille,
/obj/machinery/power/terminal,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
+/obj/structure/cable/yellow{
icon_state = "0-4"
},
/turf/open/floor/plating,
@@ -32182,9 +32111,9 @@
},
/area/maintenance/central)
"brf" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plating,
-/area/maintenance/starboard/central)
+/obj/machinery/atmospherics/pipe/manifold/green/visible,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"brg" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -32770,7 +32699,6 @@
name = "Station Intercom (Common)";
pixel_x = 26
},
-/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/maintenance/disposal)
@@ -33277,8 +33205,8 @@
"bts" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/light_construct/small{
- icon_state = "bulb-construct-stage1";
- dir = 1
+ dir = 1;
+ icon_state = "bulb-construct-stage1"
},
/turf/open/floor/plasteel,
/area/maintenance/aft)
@@ -33519,17 +33447,21 @@
"btZ" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "public_in";
+ name = "Public Router"
+ },
/turf/open/floor/plating,
/area/router)
"bua" = (
/turf/closed/wall/r_wall,
/area/science/robotics/mechbay)
"bub" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/light,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"buc" = (
@@ -33543,6 +33475,10 @@
/obj/machinery/conveyor{
id = "router_off"
},
+/obj/machinery/door/poddoor{
+ id = "public_out";
+ name = "Public Router"
+ },
/turf/open/floor/plating,
/area/router)
"bue" = (
@@ -33644,10 +33580,9 @@
/area/maintenance/department/chapel)
"bus" = (
/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 1;
- id = "public_in";
- name = "Router Driver"
+ id = "public_in"
},
/turf/open/floor/plating,
/area/router)
@@ -34430,17 +34365,6 @@
name = "Routing Depot RC";
pixel_y = 28
},
-/obj/machinery/button/massdriver{
- id = "eva_in";
- name = "mass driver button (EVA)";
- pixel_x = -24
- },
-/obj/machinery/button/massdriver{
- id = "public_in";
- name = "mass driver button (Public)";
- pixel_x = -24;
- pixel_y = 8
- },
/turf/open/floor/plasteel,
/area/router)
"bwi" = (
@@ -34783,9 +34707,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -35059,6 +34983,12 @@
pixel_x = 3;
pixel_y = 1
},
+/obj/machinery/button/massdriver{
+ id = "trash";
+ name = "Trash Driver";
+ pixel_x = -24;
+ pixel_y = -8
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"bxt" = (
@@ -35105,7 +35035,6 @@
/area/tcommsat/computer)
"bxy" = (
/obj/item/trash/candle,
-/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -35122,6 +35051,9 @@
dir = 1
},
/obj/item/paper/guides/cogstation/letter_eng,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bxA" = (
@@ -35536,7 +35468,6 @@
/area/maintenance/starboard/central)
"byu" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/central)
@@ -35616,11 +35547,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/button/massdriver{
- id = "eva_out";
- pixel_x = 24;
- pixel_y = 24
- },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 9
},
@@ -35633,7 +35559,7 @@
},
/obj/machinery/conveyor/auto{
dir = 4;
- id = "EVA"
+ id = "eva"
},
/turf/open/floor/plating,
/area/router/eva)
@@ -35954,7 +35880,7 @@
dir = 4;
id = "MiningConveyer"
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"bzv" = (
/obj/effect/turf_decal/stripes/line,
@@ -35966,7 +35892,7 @@
id = "MiningConveyer"
},
/obj/structure/plasticflaps,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"bzw" = (
/obj/structure/disposalpipe/segment{
@@ -36032,8 +35958,8 @@
"bzD" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "evablock";
+/obj/machinery/door/poddoor{
+ id = "eva_out";
name = "EVA Router"
},
/turf/open/floor/plating,
@@ -36041,17 +35967,21 @@
"bzE" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/conveyor{
+/obj/machinery/door/poddoor{
+ id = "eva_out";
+ name = "EVA Router"
+ },
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
"bzF" = (
/obj/structure/window/reinforced/spawner,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -36067,6 +35997,7 @@
"bzH" = (
/obj/structure/disposalpipe/segment,
/obj/structure/grille/broken,
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/disposal)
"bzI" = (
@@ -37032,9 +36963,12 @@
"bBE" = (
/obj/structure/grille,
/obj/machinery/power/terminal,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
icon_state = "0-8"
},
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/engine/engine_smes{
name = "Power Monitoring"
@@ -37392,6 +37326,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/button/massdriver{
+ id = "eva_out";
+ name = "EVA Driver Control";
+ pixel_x = 24;
+ pixel_y = -22
+ },
/turf/open/floor/plasteel,
/area/router/eva)
"bCv" = (
@@ -37433,9 +37373,8 @@
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/clothing/under/misc/overalls,
/obj/structure/window/reinforced/spawner/east,
+/obj/structure/closet/firecloset,
/turf/open/floor/plasteel,
/area/storage/primary)
"bCA" = (
@@ -37471,8 +37410,8 @@
},
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "evablock";
+/obj/machinery/door/poddoor{
+ id = "eva_in";
name = "EVA Router"
},
/turf/open/floor/plating,
@@ -37561,10 +37500,9 @@
"bCR" = (
/obj/structure/window/reinforced/spawner/north,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 8;
- id = "airbridge_in";
- name = "Router Driver"
+ id = "eva_in"
},
/turf/open/floor/plating,
/area/router)
@@ -37580,9 +37518,9 @@
/obj/structure/window/reinforced/spawner/north,
/obj/effect/turf_decal/stripes/line,
/obj/structure/disposalpipe/sorting/mail/flip,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -37636,13 +37574,13 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bCZ" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "router_off"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/conveyor/auto{
+ dir = 8;
+ id = "router"
+ },
/turf/open/floor/plating,
/area/router)
"bDa" = (
@@ -37909,14 +37847,14 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/conveyor{
- dir = 8;
- id = "router_off"
- },
/obj/structure/disposalpipe/junction/flip{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/conveyor/auto{
+ dir = 8;
+ id = "router"
+ },
/turf/open/floor/plating,
/area/router)
"bDE" = (
@@ -38139,12 +38077,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/conveyor{
- dir = 8;
- id = "router_off"
- },
/obj/structure/disposalpipe/sorting/mail{
- dir = 4
+ dir = 4;
+ sortType = 9
+ },
+/obj/machinery/conveyor/auto{
+ dir = 8;
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -38167,9 +38106,9 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -38359,9 +38298,9 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/disposalpipe/segment,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -38491,7 +38430,9 @@
/area/crew_quarters/bar)
"bEK" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/machinery/space_heater,
+/obj/machinery/space_heater{
+ anchored = 1
+ },
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
@@ -39424,18 +39365,6 @@
pixel_x = 26
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/massdriver{
- id = "eng_in";
- name = "mass driver button (Engineering)";
- pixel_x = 24;
- pixel_y = -8
- },
-/obj/machinery/button/massdriver{
- id = "router_out";
- name = "mass driver button (Other)";
- pixel_x = 24;
- pixel_y = 12
- },
/turf/open/floor/plasteel,
/area/router)
"bGz" = (
@@ -39527,12 +39456,6 @@
/obj/item/clothing/gloves/color/grey,
/turf/open/floor/plating,
/area/maintenance/starboard/central)
-"bGK" = (
-/obj/machinery/conveyor{
- id = "starboard_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"bGL" = (
/obj/structure/chair{
dir = 1
@@ -39574,14 +39497,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
-"bGP" = (
-/obj/machinery/mass_driver{
- dir = 1;
- id = "secserv";
- name = "Router Driver"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"bGQ" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment{
@@ -39696,13 +39611,6 @@
name = "EVA Router APC";
pixel_x = 24
},
-/obj/machinery/button/door{
- id = "evablock";
- name = "Router Access Control";
- pixel_x = 24;
- pixel_y = 10;
- req_access_txt = "19"
- },
/turf/open/floor/plasteel,
/area/router/eva)
"bHb" = (
@@ -40583,8 +40491,9 @@
/area/maintenance/department/chapel)
"bIY" = (
/obj/machinery/atmospherics/pipe/simple/violet/hidden,
+/obj/structure/lattice,
/turf/open/space/basic,
-/area/space)
+/area/space/nearstation)
"bIZ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -42717,20 +42626,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 4;
- id = "router_out";
- name = "Router Driver"
+ id = "starboardbelthell_out"
},
/turf/open/floor/plating,
/area/router)
-"bNo" = (
-/obj/machinery/conveyor{
- dir = 1;
- id = "starboard_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"bNp" = (
/obj/machinery/light{
dir = 1
@@ -42756,6 +42657,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bNr" = (
@@ -43726,7 +43628,6 @@
/turf/open/space/basic,
/area/space/nearstation)
"bPB" = (
-/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
@@ -43736,13 +43637,12 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPC" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 4;
- name = "Waste In"
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPD" = (
@@ -43963,7 +43863,7 @@
dir = 8
},
/obj/structure/disposalpipe/sorting/mail{
- sortType = 1
+ sortType = 2
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
@@ -44382,7 +44282,6 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start/atmospheric_technician,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -45195,6 +45094,7 @@
/area/science/mixing)
"bSm" = (
/obj/machinery/modular_computer/console/preset/engineering,
+/obj/structure/cable/yellow,
/turf/open/floor/plasteel,
/area/engine/engine_smes{
name = "Power Monitoring"
@@ -45207,12 +45107,12 @@
name = "Power Monitoring"
})
"bSo" = (
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/engine/engine_smes{
- name = "Power Monitoring"
+/turf/open/floor/engine,
+/area/engine/supermatter{
+ name = "Thermo-Electric Generator"
})
"bSp" = (
/obj/structure/cable{
@@ -45325,7 +45225,7 @@
},
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 1;
- sortType = 11
+ sortType = 9
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -45837,6 +45737,7 @@
"bTF" = (
/obj/structure/grille/broken,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/router)
"bTG" = (
@@ -46008,15 +45909,15 @@
/turf/open/space/basic,
/area/space/nearstation)
"bUa" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Atmospherics - Entrance"
},
/obj/machinery/firealarm{
pixel_y = 26
},
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUb" = (
@@ -47053,10 +46954,10 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bVY" = (
@@ -47260,9 +47161,6 @@
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bWq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/machinery/airalarm{
dir = 8;
@@ -47414,12 +47312,10 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWG" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bWH" = (
@@ -48037,9 +47933,9 @@
/area/maintenance/aft)
"bXM" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "router_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router)
@@ -48060,11 +47956,11 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bXP" = (
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+ dir = 4
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"bXQ" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/turf_decal/tile/purple,
@@ -48117,11 +48013,12 @@
name = "Research Sector"
})
"bXV" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "Pure to Mix"
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"bXW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48197,11 +48094,9 @@
name = "Research Sector"
})
"bYd" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/closed/wall/r_wall,
-/area/hallway/primary/central)
+/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"bYe" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
@@ -48220,6 +48115,10 @@
id = "router"
},
/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "starboardbelthell_in";
+ name = "Belt Hell"
+ },
/turf/open/floor/plating,
/area/router)
"bYg" = (
@@ -48576,14 +48475,15 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bYP" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
/obj/structure/cable{
- icon_state = "0-8"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "Distro to Waste"
},
/turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/area/engine/atmos)
"bYQ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -49034,12 +48934,22 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"bZQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -30
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -30
+ },
+/obj/structure/tank_dispenser{
+ pixel_x = -1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/atmos)
"bZR" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
@@ -49174,6 +49084,7 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cai" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
@@ -49194,7 +49105,7 @@
"cak" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cal" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 10
@@ -49206,7 +49117,7 @@
"cam" = (
/obj/machinery/door/poddoor/incinerator_atmos_main,
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"can" = (
/obj/machinery/power/turbine{
dir = 8
@@ -49215,7 +49126,7 @@
icon_state = "0-4"
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cao" = (
/obj/machinery/power/compressor{
dir = 4
@@ -49227,7 +49138,7 @@
icon_state = "0-4"
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cap" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -49238,7 +49149,7 @@
},
/obj/machinery/igniter/incinerator_atmos,
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"caq" = (
/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior,
/obj/effect/mapping_helpers/airlock/locked,
@@ -49249,7 +49160,7 @@
dir = 4
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"car" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
/turf/open/floor/plasteel,
@@ -49263,7 +49174,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"cat" = (
@@ -49273,7 +49183,7 @@
"cau" = (
/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cav" = (
/turf/closed/wall/r_wall,
/area/science/explab)
@@ -49545,6 +49455,7 @@
"cbe" = (
/obj/structure/table/reinforced,
/obj/item/clothing/mask/gas,
+/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/science/explab)
"cbf" = (
@@ -49926,13 +49837,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/central)
-"cbS" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "starboard_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"cbT" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
@@ -49940,28 +49844,28 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/firealarm{
- dir = 1;
- pixel_x = -2;
- pixel_y = -27
- },
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cbU" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 8;
- name = "Air to Distro"
- },
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/engine/atmos";
name = "Atmospherics APC";
- pixel_y = -28
+ pixel_y = -24
},
/obj/structure/cable,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/manifold/supplymain/visible,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/vending/wardrobe/atmos_wardrobe,
+/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cbV" = (
/obj/structure/disposalpipe/segment,
@@ -50055,9 +49959,9 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "starboard_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -50084,9 +49988,8 @@
/area/router)
"cci" = (
/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/mass_driver{
- id = "workshop_in";
- name = "Router Driver"
+/obj/machinery/mass_driver/pressure_plate{
+ id = "portbelthell_out"
},
/turf/open/floor/plating,
/area/router)
@@ -50184,9 +50087,9 @@
/area/router/aux)
"ccs" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "starboard_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -50247,6 +50150,10 @@
id = "router"
},
/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "portbelthell_in";
+ name = "Airbridge Router"
+ },
/turf/open/floor/plating,
/area/router)
"ccz" = (
@@ -50320,11 +50227,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"ccE" = (
-/obj/machinery/mass_driver{
- id = "eng_in";
- name = "Router Driver"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/mass_driver/pressure_plate{
+ id = "engi_in"
+ },
/turf/open/floor/plating,
/area/router)
"ccF" = (
@@ -50349,10 +50255,9 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"ccH" = (
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 8;
- id = "disposal_in";
- name = "Router Driver"
+ id = "recycle_in"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -50368,13 +50273,6 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
-"ccJ" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "starboard_off"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"ccK" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 9
@@ -50409,7 +50307,8 @@
"ccO" = (
/obj/structure/grille,
/obj/structure/disposalpipe/sorting/mail{
- dir = 8
+ dir = 8;
+ sortType = 21
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -50673,10 +50572,7 @@
/turf/open/space/basic,
/area/space/nearstation)
"cdq" = (
-/obj/machinery/mass_driver{
- id = "sq_in";
- name = "Router Driver"
- },
+/obj/machinery/mass_driver/pressure_plate,
/turf/open/floor/plating/airless,
/area/router/aux)
"cdr" = (
@@ -50820,8 +50716,8 @@
"cdG" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "engblock";
+/obj/machinery/door/poddoor{
+ id = "engi_out";
name = "Engineering Router"
},
/turf/open/floor/plating,
@@ -50961,8 +50857,8 @@
id = "eng"
},
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "engblock";
+/obj/machinery/door/poddoor{
+ id = "engi_in";
name = "Engineering Router"
},
/turf/open/floor/plating,
@@ -51172,7 +51068,7 @@
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/mass_driver{
dir = 1;
- id = "eng_out";
+ id = "engi_out";
name = "Router Driver"
},
/obj/structure/window/reinforced/spawner/west,
@@ -51391,17 +51287,11 @@
dir = 1
},
/obj/machinery/button/massdriver{
- id = "eng_out";
+ id = "engi_out";
+ name = "Engineering Driver Control";
pixel_x = -24;
pixel_y = 24
},
-/obj/machinery/button/door{
- id = "engblock";
- name = "Router Access Control";
- pixel_x = -24;
- pixel_y = 32;
- req_access_txt = "31"
- },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
@@ -51483,12 +51373,12 @@
/turf/open/floor/plasteel,
/area/router/eng)
"ceU" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
- dir = 9
- },
/obj/structure/fireaxecabinet{
pixel_y = -32
},
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+ dir = 9
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"ceV" = (
@@ -51888,15 +51778,15 @@
name = "Canister Storage"
})
"cfM" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold/supplymain/visible{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cfN" = (
@@ -51921,13 +51811,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"cfP" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "Mix to Distro"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cfQ" = (
@@ -51954,10 +51845,16 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"cfT" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1;
+ name = "Air to Mix"
+ },
+/obj/machinery/atmospherics/pipe/simple/brown/visible{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cfU" = (
@@ -52061,6 +51958,10 @@
id = "disposal"
},
/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "starboardbelthell_out";
+ name = "Belt Hell"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"cge" = (
@@ -52097,20 +51998,14 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cgg" = (
-/obj/effect/landmark/start/atmospheric_technician,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 10
- },
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cgh" = (
/obj/machinery/pipedispenser,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
/obj/effect/turf_decal/stripes/end{
dir = 1
},
@@ -52260,10 +52155,12 @@
/turf/open/floor/plasteel/dark,
/area/engine/teg_hot)
"cgx" = (
-/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cgy" = (
@@ -52271,10 +52168,10 @@
/turf/closed/wall/rust,
/area/maintenance/solars/starboard/aft)
"cgz" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 4
- },
/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/components/binary/pump{
+ name = "Port to Filter"
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cgA" = (
@@ -52629,37 +52526,23 @@
name = "Nature Preserve"
})
"chn" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 1
- },
/obj/machinery/light{
dir = 8
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/disposal/incinerator";
- dir = 8;
- name = "Incinerator APC";
- pixel_x = -24
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
+/obj/machinery/atmospherics/pipe/manifold4w/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cho" = (
/turf/closed/wall/r_wall/rust,
/area/maintenance/department/eva)
"chp" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
/turf/open/floor/plasteel,
/area/engine/atmos)
"chq" = (
@@ -52712,10 +52595,10 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"chx" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"chy" = (
@@ -52826,21 +52709,21 @@
/turf/open/floor/plating,
/area/engine/teg_cold)
"chL" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 6
- },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"chM" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 4
- },
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"chN" = (
@@ -52919,11 +52802,13 @@
/turf/open/floor/engine,
/area/science/storage)
"chS" = (
-/obj/machinery/suit_storage_unit/atmos,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 6
+ },
+/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"chT" = (
@@ -53102,12 +52987,11 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/mass_driver{
- dir = 8;
- id = "router_in";
- name = "Router Driver"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/mass_driver/pressure_plate{
+ dir = 8;
+ id = "starboardbelthell_in"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"cil" = (
@@ -53127,7 +53011,7 @@
"cim" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 1;
- sortType = 11
+ sortType = 9
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -53150,11 +53034,10 @@
/turf/closed/wall,
/area/science/robotics/mechbay)
"cip" = (
-/obj/machinery/mass_driver{
- id = "cargo_in";
- name = "Router Driver"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/mass_driver/pressure_plate{
+ id = "cargo_in"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"ciq" = (
@@ -53187,6 +53070,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"ciu" = (
@@ -53242,7 +53126,7 @@
"ciB" = (
/obj/structure/frame/computer,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
/area/maintenance/port/fore)
"ciC" = (
/obj/structure/table,
@@ -53280,12 +53164,13 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"ciG" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "disposal_off"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/maintenance/disposal)
+/turf/closed/wall/r_wall,
+/area/engine/engineering{
+ name = "Engine Room"
+ })
"ciH" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 6
@@ -53351,10 +53236,9 @@
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/kitchen)
"ciO" = (
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 4;
- id = "disposal_out";
- name = "Router Driver"
+ id = "recycle_out"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
@@ -53487,7 +53371,8 @@
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
/obj/machinery/door/poddoor{
- name = "Disposal Router"
+ id = "recycle_out";
+ name = "Belt Hell"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
@@ -53539,6 +53424,10 @@
dir = 1;
id = "disposal"
},
+/obj/machinery/door/poddoor{
+ id = "cargo_out";
+ name = "Cargo Router"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"cjj" = (
@@ -53897,9 +53786,6 @@
/area/engine/teg_cold)
"cjV" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Engineering Sector"
- },
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53929,8 +53815,8 @@
/obj/machinery/button/door{
id = "hos";
name = "HoS Office Shutters";
- pixel_y = -32;
- pixel_x = -5
+ pixel_x = -5;
+ pixel_y = -32
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
@@ -55207,8 +55093,8 @@
"cmH" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "cargoblock";
+/obj/machinery/door/poddoor{
+ id = "cargo_out";
name = "Cargo Router"
},
/turf/open/floor/plating,
@@ -55275,14 +55161,18 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"cmL" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/light,
+/obj/machinery/suit_storage_unit/atmos,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/atmos)
"cmM" = (
/obj/structure/sign/poster/official/safety_internals{
pixel_x = -32
},
-/obj/effect/landmark/blobstart,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cmN" = (
@@ -55421,6 +55311,9 @@
/area/quartermaster/qm)
"cmX" = (
/obj/machinery/light/small,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/engine,
/area/engine/supermatter{
name = "Thermo-Electric Generator"
@@ -55535,9 +55428,11 @@
/turf/open/floor/plasteel,
/area/engine/teg_cold)
"cni" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/obj/machinery/atmospherics/components/binary/pump{
+ name = "Port to Fuel Pipe"
+ },
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"cnj" = (
/obj/machinery/camera{
c_tag = "Research - Observatory";
@@ -55570,7 +55465,6 @@
dir = 1;
pixel_x = 5
},
-/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"cnm" = (
@@ -55646,7 +55540,8 @@
id = "disposal"
},
/obj/machinery/door/poddoor{
- name = "Disposal Router"
+ id = "recycle_in";
+ name = "Belt Hell"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
@@ -55815,14 +55710,6 @@
/obj/item/target/clown,
/turf/open/floor/plasteel,
/area/science/mixing)
-"cnM" = (
-/obj/machinery/mass_driver{
- dir = 8;
- id = "pb_in";
- name = "Router Driver"
- },
-/turf/open/floor/plating/airless,
-/area/router/aux)
"cnN" = (
/obj/structure/bookcase/random/fiction,
/obj/effect/turf_decal/tile/neutral,
@@ -56008,13 +55895,15 @@
name = "Electrical Substation"
})
"coh" = (
-/obj/machinery/power/smes,
/obj/structure/cable{
icon_state = "0-4"
},
/obj/structure/cable{
icon_state = "0-8"
},
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
/turf/open/floor/plating,
/area/engine/storage_shared{
name = "Electrical Substation"
@@ -56203,8 +56092,8 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
@@ -56248,7 +56137,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"coE" = (
@@ -56679,8 +56568,8 @@
id = "cargo"
},
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "cargoblock";
+/obj/machinery/door/poddoor{
+ id = "cargo_in";
name = "Cargo Router"
},
/turf/open/floor/plating,
@@ -56792,6 +56681,10 @@
"cpE" = (
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
+/obj/machinery/door/poddoor{
+ id = "cargo_in";
+ name = "Cargo Router"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"cpF" = (
@@ -56901,12 +56794,18 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 6
+ },
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cpO" = (
/obj/structure/closet/secure_closet/atmospherics,
/obj/item/cartridge/atmos,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cpP" = (
@@ -56917,14 +56816,12 @@
/turf/open/floor/plasteel/white,
/area/gateway)
"cpQ" = (
-/obj/machinery/vending/wardrobe/atmos_wardrobe,
/obj/effect/turf_decal/stripes/line{
dir = 6;
layer = 2.03
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/manifold/orange/visible,
+/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cpR" = (
@@ -57238,6 +57135,9 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"cqt" = (
@@ -57260,6 +57160,9 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"cqv" = (
@@ -57273,6 +57176,9 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"cqw" = (
@@ -57617,11 +57523,6 @@
name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES";
pixel_y = 32
},
-/obj/machinery/button/massdriver{
- id = "cargo_out";
- pixel_x = -8;
- pixel_y = -4
- },
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"cre" = (
@@ -58608,9 +58509,9 @@
/obj/machinery/button/door{
id = "robotics";
name = "Shutters Control Button";
+ pixel_x = -24;
pixel_y = 8;
- req_access_txt = "29";
- pixel_x = -24
+ req_access_txt = "29"
},
/turf/open/floor/plasteel/dark/side{
dir = 8
@@ -58648,8 +58549,6 @@
dir = 8;
light_color = "#e8eaff"
},
-/obj/effect/landmark/blobstart,
-/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine,
/area/science/explab)
"ctc" = (
@@ -58998,6 +58897,10 @@
/area/science/explab)
"ctJ" = (
/obj/structure/plasticflaps,
+/obj/machinery/door/poddoor{
+ id = "portbelthell_in";
+ name = "Airbridge Router"
+ },
/turf/open/floor/plating,
/area/engine/workshop)
"ctK" = (
@@ -59005,6 +58908,10 @@
/obj/machinery/conveyor{
id = "workshop_off"
},
+/obj/machinery/door/poddoor{
+ id = "portbelthell_out";
+ name = "Airbridge Router"
+ },
/turf/open/floor/plating,
/area/engine/workshop)
"ctL" = (
@@ -59474,7 +59381,7 @@
dir = 4
},
/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/crew_quarters/fitness/cogpool)
"cuy" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -59685,17 +59592,16 @@
/area/router/air)
"cuS" = (
/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 1;
- id = "workshop_out";
- name = "Router Driver"
+ id = "portbelthell_in"
},
/turf/open/floor/plating,
/area/engine/workshop)
"cuT" = (
/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/conveyor{
- id = "workshop_off"
+/obj/machinery/conveyor/auto{
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/engine/workshop)
@@ -59908,9 +59814,9 @@
/area/router/air)
"cvq" = (
/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "workshop_off"
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/engine/workshop)
@@ -60422,12 +60328,11 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/machinery/button/door{
- id = "cargoblock";
- name = "Router Access Control";
+/obj/machinery/button/massdriver{
+ id = "cargo_out";
+ name = "Cargo Driver Control";
pixel_x = -24;
- pixel_y = 24;
- req_access_txt = "31"
+ pixel_y = 24
},
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
@@ -60587,6 +60492,9 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/engine_smes{
name = "Power Monitoring"
@@ -60894,6 +60802,7 @@
/obj/machinery/airalarm{
pixel_y = 24
},
+/obj/structure/cable/yellow,
/turf/open/floor/plasteel,
/area/engine/engine_smes{
name = "Power Monitoring"
@@ -66167,15 +66076,16 @@
},
/obj/machinery/button/massdriver{
id = "airbridge_out";
+ name = "Airbridge Driver Control";
pixel_x = -8;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/router/air)
"cGa" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "airbridge_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router/air)
@@ -66261,9 +66171,9 @@
/area/medical/medbay/central)
"cGf" = (
/obj/structure/window/reinforced/spawner,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "airbridge_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router/air)
@@ -66273,9 +66183,9 @@
dir = 1
},
/obj/structure/window/reinforced/spawner,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "airbridge_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/router/air)
@@ -66287,7 +66197,7 @@
/obj/structure/window/reinforced/spawner,
/obj/machinery/mass_driver{
dir = 4;
- id = "airbridge_in";
+ id = "airbridge_out";
name = "Router Driver"
},
/turf/open/floor/plating,
@@ -66730,7 +66640,6 @@
/turf/open/floor/engine,
/area/science/storage)
"cGW" = (
-/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -67029,7 +66938,6 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
},
@@ -67284,6 +67192,7 @@
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
+ id = "airbridge_out";
name = "Airbridge Router"
},
/turf/open/floor/plating,
@@ -67326,7 +67235,6 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cId" = (
-/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 5
},
@@ -67363,17 +67271,21 @@
/area/medical/genetics)
"cIh" = (
/obj/structure/plasticflaps,
-/obj/machinery/conveyor{
+/obj/machinery/door/poddoor{
+ id = "airbridge_out";
+ name = "Airbridge Router"
+ },
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "workshop_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/engine/workshop)
"cIi" = (
/obj/structure/window/reinforced/spawner,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "workshop_off"
+ id = "router"
},
/turf/open/floor/plating,
/area/engine/workshop)
@@ -67473,9 +67385,9 @@
"cIq" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "workshop_off"
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/engine/workshop)
@@ -67502,13 +67414,13 @@
name = "Atmospherics";
req_access_txt = "24"
},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cIt" = (
@@ -67737,9 +67649,6 @@
/area/hallway/primary/aft)
"cIN" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Engineering Sector"
- },
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -68040,17 +67949,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
-"cJo" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/pump,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner,
-/area/engine/atmos)
"cJp" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
@@ -68103,14 +68001,10 @@
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"cJu" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 4;
+ name = "Mix to Engine"
},
-/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cJv" = (
@@ -68256,14 +68150,9 @@
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"cJH" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
+ dir = 9
},
-/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cJI" = (
@@ -68982,11 +68871,12 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 5
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 1;
+ name = "Unfiltered & Air to Mix"
},
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/brown/visible{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -69016,10 +68906,10 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/violet/visible,
/obj/structure/extinguisher_cabinet{
pixel_y = 29
},
+/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cLh" = (
@@ -69075,7 +68965,6 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/closed/wall/r_wall,
/area/engine/atmos)
"cLn" = (
@@ -69262,8 +69151,8 @@
/area/router/air)
"cLK" = (
/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/conveyor{
- id = "airbridge_off"
+/obj/machinery/conveyor/auto{
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/router/air)
@@ -69289,9 +69178,9 @@
/area/medical/virology)
"cLO" = (
/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "airbridge_off"
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/router/air)
@@ -69328,6 +69217,7 @@
id = "airbridge_off"
},
/obj/machinery/door/poddoor{
+ id = "airbridge_in";
name = "Airbridge Router"
},
/turf/open/floor/plating,
@@ -69338,10 +69228,9 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 8;
- id = "workshop_in";
- name = "Router Driver"
+ id = "airbridge_in"
},
/turf/open/floor/plating,
/area/engine/workshop)
@@ -69363,8 +69252,8 @@
/turf/open/floor/plating/airless,
/area/medical/virology)
"cLV" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
- dir = 4
+/obj/machinery/atmospherics/components/binary/pump/on{
+ name = "Waste to Filter"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -69381,19 +69270,13 @@
dir = 6
},
/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cLY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{
dir = 4
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
-"cLZ" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cMa" = (
/obj/machinery/light/small{
dir = 1;
@@ -69404,21 +69287,17 @@
dir = 4
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cMb" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/closed/wall/r_wall,
/area/engine/atmos)
"cMc" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 9
- },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMd" = (
@@ -69451,9 +69330,10 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMi" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+ dir = 1
+ },
+/turf/open/floor/plating/airless,
/area/engine/atmos)
"cMj" = (
/obj/structure/cable{
@@ -69463,7 +69343,7 @@
dir = 1
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cMk" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -69527,7 +69407,7 @@
dir = 4
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cMu" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -69535,7 +69415,7 @@
dir = 8
},
/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cMv" = (
/obj/machinery/button/door/incinerator_vent_atmos_main{
pixel_x = -24;
@@ -69545,29 +69425,27 @@
pixel_x = -40;
pixel_y = 8
},
-/obj/machinery/atmospherics/pipe/simple/general/visible{
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMw" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- name = "Waste Release"
- },
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMx" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 5
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -30
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 5
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMy" = (
@@ -69659,14 +69537,20 @@
/turf/open/floor/plasteel/white/corner,
/area/engine/atmos)
"cMG" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 5
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"cMH" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
-/turf/closed/wall/r_wall,
+/obj/machinery/suit_storage_unit/atmos,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cMI" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -69717,13 +69601,12 @@
/turf/open/floor/plating,
/area/engine/atmos)
"cMP" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
},
-/turf/open/floor/plating/airless,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
/area/engine/atmos)
"cMQ" = (
/obj/structure/lattice,
@@ -69755,16 +69638,16 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "workshop_off"
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/engine/workshop)
"cMV" = (
-/obj/machinery/conveyor{
- dir = 10;
- id = "workshop_off"
+/obj/machinery/conveyor/auto{
+ dir = 8;
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/engine/workshop)
@@ -69943,17 +69826,10 @@
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/router/air)
-"cNm" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "airbridge_off"
- },
-/turf/open/floor/plating,
-/area/router/air)
"cNn" = (
-/obj/machinery/conveyor{
- dir = 10;
- id = "airbridge_off"
+/obj/machinery/conveyor/auto{
+ dir = 8;
+ id = "airbridge"
},
/turf/open/floor/plating,
/area/router/air)
@@ -70359,6 +70235,7 @@
icon_state = "2-4"
},
/obj/effect/landmark/event_spawn,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cOr" = (
@@ -70499,6 +70376,12 @@
dir = 4;
pixel_x = -22
},
+/obj/machinery/button/massdriver{
+ id = "research_out";
+ name = "Medsci Driver Control";
+ pixel_x = -24;
+ pixel_y = -24
+ },
/turf/open/floor/plasteel,
/area/router/medsci)
"cOF" = (
@@ -70527,8 +70410,8 @@
/turf/closed/wall/r_wall,
/area/router/medsci)
"cOJ" = (
-/obj/machinery/conveyor{
- id = "medsci_off"
+/obj/machinery/conveyor/auto{
+ id = "medsci"
},
/turf/open/floor/plating,
/area/router/medsci)
@@ -70538,11 +70421,6 @@
/obj/item/hand_labeler,
/obj/item/destTagger,
/obj/machinery/light,
-/obj/machinery/button/massdriver{
- id = "medsci_out";
- pixel_x = -8;
- pixel_y = 8
- },
/obj/machinery/requests_console{
department = "MedSci Router";
name = "MedSci Router RC";
@@ -70551,9 +70429,9 @@
/turf/open/floor/plating,
/area/router/medsci)
"cOL" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "medsci_off"
+ id = "medsci"
},
/turf/open/floor/plating,
/area/router/medsci)
@@ -70579,7 +70457,7 @@
/area/janitor/aux)
"cOP" = (
/obj/machinery/mass_driver{
- id = "medsci_out";
+ id = "research_out";
name = "Router Driver"
},
/turf/open/floor/plating,
@@ -70649,6 +70527,7 @@
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
+ id = "research_out";
name = "MedSci Router"
},
/turf/open/floor/plating,
@@ -70657,11 +70536,12 @@
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
+ id = "research_in";
name = "MedSci Router"
},
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "medsci_off"
+ id = "medsci"
},
/turf/open/floor/plating,
/area/router/medsci)
@@ -70691,6 +70571,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel,
/area/janitor/aux)
"cOX" = (
@@ -70768,100 +70649,88 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"cPd" = (
-/obj/machinery/conveyor{
- id = "sq_off"
+/obj/machinery/conveyor/auto{
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPe" = (
-/obj/machinery/mass_driver{
- dir = 1;
- id = "sq_out";
- name = "Router Driver"
+/obj/machinery/mass_driver/pressure_plate{
+ dir = 1
},
/turf/open/floor/plating/airless,
/area/router/aux)
-"cPf" = (
-/obj/machinery/conveyor/auto,
-/turf/open/floor/plating/airless,
-/area/router/aux)
"cPg" = (
-/obj/machinery/mass_driver{
+/obj/machinery/mass_driver/pressure_plate{
dir = 1;
- id = "medsci_in";
- name = "Router Driver"
+ id = "research_in"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPh" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "sq_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPi" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 1;
- id = "viro_off"
+ id = "pq"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPj" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 9;
- id = "viro_off"
+ id = "medsci"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPk" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "viro_off"
+ id = "medsci"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPl" = (
-/obj/machinery/mass_driver{
- dir = 8;
- id = "viro_in";
- name = "Router Driver"
+/obj/machinery/mass_driver/pressure_plate{
+ dir = 8
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPm" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 8;
- id = "sq_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPn" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 10;
- id = "sq_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPo" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "viro_off"
+/obj/machinery/conveyor/auto{
+ id = "pq"
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPp" = (
-/obj/machinery/mass_driver{
- dir = 4;
- id = "viro_out";
- name = "Router Driver"
+/obj/machinery/mass_driver/pressure_plate{
+ dir = 4
},
/turf/open/floor/plating/airless,
/area/router/aux)
"cPq" = (
-/obj/machinery/conveyor{
+/obj/machinery/conveyor/auto{
dir = 4;
- id = "sq_off"
+ id = "starboard"
},
/turf/open/floor/plating/airless,
/area/router/aux)
@@ -71867,7 +71736,7 @@
id = "MiningConveyorBlastDoor";
name = "Asteroid Mining Load Door"
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"cRb" = (
/obj/machinery/computer/cloning,
@@ -71932,13 +71801,7 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/pump,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/light,
-/turf/open/floor/plasteel/white/corner,
+/turf/open/floor/plasteel,
/area/engine/atmos)
"cRh" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -71972,8 +71835,8 @@
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000;
- pixel_y = 3;
- pixel_x = 4
+ pixel_x = 4;
+ pixel_y = 3
},
/obj/item/stock_parts/cell/high{
charge = 100;
@@ -72137,29 +72000,41 @@
name = "Medbay Treatment Center"
})
"cVq" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
+/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/hallway/primary/aft)
"cVO" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engine/atmos)
"dpO" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"dwH" = (
+/obj/structure/plasticflaps,
+/obj/machinery/conveyor/auto{
+ dir = 1;
+ id = "router"
+ },
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "engi_out";
+ name = "Engineering Router"
+ },
+/turf/open/floor/plating,
+/area/router)
"dVR" = (
-/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
-/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"dYm" = (
@@ -72170,12 +72045,12 @@
/turf/open/floor/engine,
/area/science/storage)
"eCy" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 9
- },
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+ dir = 9
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"eIh" = (
@@ -72194,13 +72069,15 @@
},
/area/engine/atmos)
"eKM" = (
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_y = -30
- },
/obj/machinery/atmospherics/pipe/manifold/supplymain/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"eSd" = (
+/obj/machinery/mass_driver/pressure_plate{
+ id = "security_in"
+ },
+/turf/open/floor/plating/airless,
+/area/router/aux)
"eTZ" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -72208,10 +72085,9 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
+/obj/machinery/atmospherics/pipe/manifold/brown/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"eUF" = (
@@ -72238,24 +72114,25 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"fkx" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
- dir = 4
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
},
+/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/hallway/primary/aft)
"fti" = (
-/obj/machinery/atmospherics/components/binary/pump,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
dir = 8
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"fui" = (
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 4
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
},
-/turf/open/space/basic,
-/area/space)
+/obj/machinery/portable_atmospherics/pump,
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"fuE" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
@@ -72271,32 +72148,22 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
-"fIw" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 4
- },
-/obj/machinery/meter,
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"guK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/space/basic,
/area/space)
"gDY" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8;
- name = "Fuel Pipe to Incinerator"
- },
/obj/machinery/light,
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"gGG" = (
/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 5
},
/turf/open/space/basic,
/area/space/nearstation)
@@ -72330,24 +72197,15 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"hlo" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 1
- },
-/obj/machinery/meter,
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/quartermaster/miningdock/airless)
"hlV" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/storage/tech)
"hDz" = (
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
- dir = 4
- },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
/area/engine/atmos)
"hFa" = (
@@ -72358,19 +72216,10 @@
/turf/open/floor/engine,
/area/science/storage)
"hKC" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"hMZ" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- name = "Pure to Port"
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"hXk" = (
@@ -72384,17 +72233,10 @@
/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/turf/open/space/basic,
/area/space/nearstation)
-"iAW" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"iQY" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 4
},
-/obj/structure/closet/firecloset,
/turf/open/floor/plasteel,
/area/engine/atmos)
"jiZ" = (
@@ -72403,19 +72245,8 @@
},
/turf/closed/wall/r_wall,
/area/engine/atmos)
-"jml" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- layer = 2.4
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"jon" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+/obj/machinery/atmospherics/pipe/simple/violet/visible{
dir = 4
},
/turf/open/floor/plasteel,
@@ -72435,16 +72266,6 @@
/area/engine/secure_construction{
name = "Engineering Construction Area"
})
-"jXo" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 10
- },
-/turf/closed/wall/r_wall,
-/area/engine/atmos)
-"kxw" = (
-/obj/machinery/atmospherics/pipe/simple/violet/visible,
-/turf/open/space/basic,
-/area/space)
"kzb" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
@@ -72455,16 +72276,12 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Mix to Engine"
- },
+/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"lcD" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- name = "Air to Port"
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -72472,8 +72289,9 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
- dir = 8
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8;
+ name = "Mix to Filter"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -72487,7 +72305,10 @@
name = "Engine Room"
})
"mqB" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 4;
+ name = "Air to Ports"
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"mxW" = (
@@ -72497,13 +72318,12 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"mBP" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"mEa" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
-/obj/machinery/meter,
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8;
+ name = "Air to Distro"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"mIm" = (
@@ -72530,36 +72350,14 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
-"mNN" = (
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"ntC" = (
-/obj/machinery/atmospherics/components/binary/pump{
- name = "Port to Fuel Pipe"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"nvn" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 1
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"nAF" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- name = "Mix to Port"
- },
+/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"nBM" = (
@@ -72570,26 +72368,9 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
-"nEX" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 6
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"nLV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/engine/atmos)
"ony" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
+/obj/machinery/atmospherics/pipe/manifold/brown/visible{
dir = 4
},
/turf/open/floor/plating,
@@ -72618,6 +72399,13 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"pZq" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ sortType = 12
+ },
+/turf/open/floor/plating/airless,
+/area/router/aux)
"qeq" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -72625,41 +72413,72 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"qgO" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"qlJ" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/turf/open/space/basic,
/area/space/nearstation)
-"qvB" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/heater{
- dir = 8
+"qGi" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/engine/atmos)
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes{
+ name = "Power Monitoring"
+ })
"qHL" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/brown/visible{
+ dir = 6
},
/turf/open/floor/plating,
/area/engine/atmos)
-"qWY" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- name = "Waste In"
+"qMN" = (
+/obj/structure/plasticflaps,
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "starboardbelthell_out";
+ name = "Belt Hell"
},
+/turf/open/floor/plating,
+/area/router)
+"qWY" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"rdF" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
- dir = 6
- },
+/obj/machinery/atmospherics/pipe/simple/dark/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"rke" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes{
+ name = "Power Monitoring"
+ })
+"rqk" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes{
+ name = "Power Monitoring"
+ })
+"rOE" = (
+/obj/structure/plasticflaps,
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "eva_in";
+ name = "EVA Router"
+ },
+/turf/open/floor/plating,
+/area/router)
"rTW" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/violet/visible{
@@ -72673,22 +72492,28 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
-"sdp" = (
-/obj/structure/reagent_dispensers/foamtank,
-/turf/open/floor/engine,
-/area/engine/secure_construction{
- name = "Engineering Construction Area"
- })
-"sHB" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 4
+"sky" = (
+/obj/machinery/conveyor/auto{
+ dir = 4;
+ id = "pq"
},
+/turf/open/floor/plating/airless,
+/area/router/aux)
+"sAm" = (
+/obj/structure/plasticflaps,
+/obj/machinery/door/poddoor{
+ id = "airbridge_out";
+ name = "Airbridge Router"
+ },
+/turf/open/floor/plating,
+/area/engine/workshop)
+"sHB" = (
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engine/atmos)
"sRD" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 5
- },
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/engine/atmos)
"sVC" = (
@@ -72699,6 +72524,15 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/turf/open/space/basic,
/area/space/nearstation)
+"tff" = (
+/obj/structure/plasticflaps,
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "portbelthell_out";
+ name = "Airbridge Router"
+ },
+/turf/open/floor/plating,
+/area/router)
"tjb" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -72714,12 +72548,15 @@
/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/space/basic,
/area/space/nearstation)
-"tuF" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 6
+"tsU" = (
+/obj/structure/plasticflaps,
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id = "engi_in";
+ name = "Engineering Router"
},
-/turf/closed/wall/r_wall,
-/area/engine/atmos)
+/turf/open/floor/plating,
+/area/router)
"tyI" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
@@ -72728,36 +72565,28 @@
/area/engine/atmos)
"tXV" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- layer = 2.4
+ name = "Pure to Ports"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"tZj" = (
-/obj/structure/tank_dispenser{
- pixel_x = -1
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 6
- },
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"tZC" = (
-/obj/machinery/atmospherics/pipe/manifold4w/orange/visible,
-/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"urj" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 8;
- icon_state = "intact"
- },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 4
},
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/dark,
/area/bridge)
"uwK" = (
@@ -72778,27 +72607,18 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"uVD" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/brown/visible{
+ dir = 9
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"vcb" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/brown/visible,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
-"vsO" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/atmos)
"vxU" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/structure/extinguisher_cabinet{
@@ -72818,7 +72638,9 @@
/turf/open/space/basic,
/area/space/nearstation)
"wWH" = (
-/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
+/obj/machinery/atmospherics/components/unary/thermomachine/heater{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"xcO" = (
@@ -72828,24 +72650,8 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 4
- },
/obj/machinery/atmospherics/components/binary/pump{
- dir = 0;
- name = "Mix Outlet Pump"
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"xjk" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"xkC" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 9
+ name = "Mix to Ports"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -72862,9 +72668,8 @@
/turf/closed/wall,
/area/quartermaster/storage)
"xCy" = (
-/obj/machinery/atmospherics/components/binary/pump,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/violet/visible{
+ dir = 9
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -92048,7 +91853,7 @@ aaa
aaa
bcy
bdf
-mBP
+bdf
crJ
blT
bqJ
@@ -92763,7 +92568,7 @@ auL
aAc
aGq
aJX
-bdE
+cQQ
cen
aGq
cvK
@@ -95885,7 +95690,7 @@ bhS
beJ
beJ
bGI
-bXP
+aaU
aaa
aaa
aaa
@@ -96142,7 +95947,7 @@ bdg
beJ
beJ
bGI
-bXV
+aaU
aaa
aaa
aaa
@@ -96399,7 +96204,7 @@ bdg
beJ
ceI
bGI
-bXV
+aaU
aaa
aaa
aaa
@@ -96656,7 +96461,7 @@ bdg
cmd
beT
bGI
-bXV
+aaU
aaa
aaa
aaa
@@ -96913,7 +96718,7 @@ bdg
beJ
bfd
bdg
-bXV
+aaU
aaa
aaa
ceD
@@ -97170,7 +96975,7 @@ bdg
beJ
bfd
bdg
-bXV
+aaU
aaa
bdg
buB
@@ -97427,7 +97232,7 @@ bdg
caW
bJy
bdg
-bXV
+aaU
aaU
bdg
bjg
@@ -97684,7 +97489,7 @@ bdg
beJ
bfd
bGI
-bYd
+bGI
bGI
bGI
bzb
@@ -97941,7 +97746,7 @@ beJ
beJ
bfd
blc
-bYP
+beJ
coS
aXc
aXc
@@ -98116,7 +97921,7 @@ aak
aak
aak
aak
-aak
+eSd
aaa
aaa
aaa
@@ -98198,7 +98003,7 @@ bzB
bgA
bWf
bXm
-bZQ
+bgA
bWq
ccN
cei
@@ -98263,10 +98068,10 @@ aaa
aaa
aaa
aaa
-cPf
-cPf
-cPf
-cPf
+cPo
+cPo
+cPo
+cPo
cPo
abp
aaa
@@ -98524,7 +98329,7 @@ abM
abR
abM
abM
-cPo
+sky
aaU
aaa
aaa
@@ -98781,7 +98586,7 @@ cPg
cPi
cPj
abR
-cPo
+sky
aaU
aaa
aaa
@@ -99038,7 +98843,7 @@ aaa
aaa
cPk
abR
-cPo
+sky
aaU
aaa
aaa
@@ -99399,7 +99204,7 @@ aaa
aaU
aar
abM
-acf
+cPp
aaU
aaa
aaa
@@ -99661,12 +99466,12 @@ aaU
aaa
aaa
aaa
+adM
adj
adj
adj
adj
-adj
-adj
+adM
aaU
aaU
aaa
@@ -99918,12 +99723,12 @@ aaU
aaa
aaa
aaa
-adj
+adM
aeC
afv
adF
agM
-adj
+adM
aaa
aaU
aaU
@@ -100175,12 +99980,12 @@ aaU
aaa
aaa
aaa
-adj
+adM
aeR
afx
aga
afI
-adj
+adM
aaa
aaa
aaU
@@ -100432,20 +100237,20 @@ aaU
add
adC
adC
-adC
+aap
aeS
adj
adj
agN
+aiX
ahL
ahL
-ahL
-ahL
+aaq
afD
afQ
age
age
-agy
+age
age
age
afC
@@ -100697,8 +100502,8 @@ aad
aad
aad
aad
-adM
-aaj
+aiM
+agy
aaI
ami
akX
@@ -100955,7 +100760,7 @@ aad
aad
aad
aiM
-aaj
+azO
aaI
aco
akX
@@ -101020,7 +100825,7 @@ bRf
cCG
cCH
cCG
-bUw
+bgi
bVJ
cCG
bWF
@@ -101277,7 +101082,7 @@ bcf
bcf
bCs
bcf
-bwU
+bhI
bCD
bcf
bcf
@@ -101469,7 +101274,7 @@ aad
aad
aad
aiM
-aap
+aco
abd
abT
akX
@@ -101725,8 +101530,8 @@ aad
aad
aad
aad
-adM
-aaq
+aiM
+aco
aaI
acF
akX
@@ -101982,7 +101787,7 @@ agO
adj
adj
adj
-adM
+aiM
aat
abf
acF
@@ -103105,7 +102910,7 @@ aaa
cuR
cGa
cuR
-cNm
+cNn
cuR
cIH
cgv
@@ -103927,7 +103732,7 @@ aaa
aaa
aaa
aaa
-aaa
+cpB
ckl
ckl
ckl
@@ -105619,7 +105424,7 @@ aYi
baU
bdh
aOJ
-aog
+bdE
aog
axV
aHV
@@ -106149,7 +105954,7 @@ aaU
aaa
btT
bzE
-btZ
+rOE
btT
aaa
aaa
@@ -106188,7 +105993,7 @@ aaa
aaa
ctG
cIh
-ctJ
+sAm
ctG
cIy
bjm
@@ -106925,7 +106730,7 @@ bKl
bQW
bUp
cci
-btZ
+tff
aSq
bgh
bIY
@@ -107163,7 +106968,7 @@ bdP
bfF
bha
bdP
-abp
+aOJ
aPN
bes
aaU
@@ -107208,8 +107013,8 @@ aPg
aPg
cet
bpL
-bBO
-bBO
+bpL
+rqk
bBO
bBO
ctG
@@ -107228,7 +107033,7 @@ bZq
bZh
cEE
bpD
-cmL
+bpD
cyS
byQ
byQ
@@ -107420,7 +107225,7 @@ bdW
bfJ
bhc
bdP
-abp
+aOJ
aPN
bes
aaU
@@ -107466,7 +107271,7 @@ cdV
cdV
bpN
bCa
-bSo
+bSp
bSv
cfl
ctX
@@ -107677,7 +107482,7 @@ bdY
bfM
bhg
bdP
-abp
+aOJ
aPN
bey
aaU
@@ -107934,7 +107739,7 @@ bdP
bdP
bhl
bdP
-abp
+aOJ
aPN
bes
aaU
@@ -107978,7 +107783,7 @@ cmf
cnK
cnK
cdV
-bBO
+rke
bUB
bSq
bVf
@@ -108191,7 +107996,7 @@ aaU
aaU
cuA
cuy
-bcc
+blD
bcO
bes
aaU
@@ -108448,7 +108253,7 @@ aaa
aaa
aaa
aaU
-brs
+aQq
aPR
cux
aaU
@@ -108492,7 +108297,7 @@ cmE
cok
cok
cdV
-bBO
+rke
bPv
cBd
cfi
@@ -108705,7 +108510,7 @@ aaa
aaa
aaa
aaU
-brs
+aQq
aQp
cux
aaU
@@ -108749,7 +108554,7 @@ cmG
coT
cpL
cpZ
-bBO
+qGi
cxd
cBd
cfj
@@ -108962,9 +108767,9 @@ aaU
aaU
aaU
aaU
-abp
-aQq
-bes
+aUq
+bmO
+bcc
aaU
aaa
aaa
@@ -109006,7 +108811,7 @@ cmY
cdV
cdV
cdV
-bBO
+qGi
bSm
cBk
cfk
@@ -109066,7 +108871,7 @@ aaa
aaa
aaa
aaa
-aaa
+cpB
aaa
ckl
ckl
@@ -109219,9 +109024,9 @@ aaa
aaa
aaa
aaU
-abp
+aUq
aQr
-bes
+bcc
aaU
aaa
aaa
@@ -109239,7 +109044,7 @@ bBv
bXM
ccn
ccA
-ccy
+dwH
aTl
bsz
cdG
@@ -109263,7 +109068,7 @@ cks
crv
crx
aeI
-bBO
+rke
bSn
cBl
bSn
@@ -109476,7 +109281,7 @@ aaa
aaa
aaa
aaU
-abp
+aUq
aQr
beD
cuy
@@ -109496,7 +109301,7 @@ bUc
bXM
cco
ccE
-btZ
+tsU
aTl
bsz
cdU
@@ -109534,7 +109339,7 @@ cNt
beZ
cIS
coz
-bty
+fkx
bBl
aaU
aaU
@@ -110046,9 +109851,9 @@ cJy
cNg
cNs
cIB
-cIM
-bXX
-bty
+cMG
+cVq
+fui
bBl
aaU
bIm
@@ -110262,7 +110067,7 @@ aaa
btT
bBX
btT
-btZ
+qMN
btT
aaa
aaU
@@ -110303,9 +110108,9 @@ cvi
cuN
cNv
bhT
-cIM
-bXX
-bty
+cMG
+cVq
+fui
bzr
byT
cfc
@@ -110799,12 +110604,12 @@ aCZ
aRG
aOl
aOV
-avQ
+bSo
cmX
aRp
bkJ
aUf
-aeI
+ciG
bnp
cmO
cfU
@@ -112870,7 +112675,7 @@ biV
cKg
cLn
cLz
-bmz
+cLz
biV
cdP
bXX
@@ -113177,7 +112982,7 @@ aaa
aaa
aaa
aaa
-aaa
+cpB
aaa
aaa
ckl
@@ -113336,7 +113141,7 @@ cAM
bCP
boA
aYC
-brf
+att
att
att
att
@@ -114066,7 +113871,7 @@ aaa
aaU
aio
akZ
-biO
+aKe
bEt
bEA
aik
@@ -114643,7 +114448,7 @@ aaa
bsz
anr
bcI
-sdp
+bgw
bUX
bgw
uwK
@@ -116226,7 +116031,7 @@ btz
bPm
bxH
bSf
-bzd
+hlV
bQD
bxH
bxH
@@ -116873,7 +116678,7 @@ aaa
aaa
aaa
aaU
-cnM
+cPl
abM
acj
aaU
@@ -117470,8 +117275,8 @@ aaa
aaa
aaa
aaa
-bgi
-fui
+bMp
+bJv
aaa
cwK
aaa
@@ -117727,8 +117532,8 @@ aZG
aaa
aaa
aaa
-bgi
-fui
+bMp
+bJv
aaa
cwI
aaa
@@ -117984,8 +117789,8 @@ aaa
aaa
aaa
aaa
-bgi
-fui
+bMp
+bJv
aaa
cwK
aaa
@@ -118026,7 +117831,7 @@ bYh
bYn
bYn
bYE
-cni
+bYn
cyf
cgy
bIz
@@ -118488,16 +118293,16 @@ bzO
caD
bzn
bjz
-ciG
+ciq
bAK
ciV
aMI
aaa
bJj
bLS
-kxw
-kxw
-kxw
+bHg
+bHg
+bHg
bPA
wPS
aaa
@@ -118931,7 +118736,7 @@ aaa
aaU
aav
abM
-acz
+cPp
aaU
aaa
aaa
@@ -118961,7 +118766,7 @@ avz
awx
axU
ayL
-azO
+azU
aAu
awp
aCP
@@ -119533,10 +119338,10 @@ cPD
bVE
cbT
cww
-bhI
-bhI
+cww
+cww
can
-bhI
+cww
aaa
anr
aaa
@@ -119786,15 +119591,15 @@ bNb
bPL
cwB
cwB
-cwB
+hDz
bVX
eKM
+bZQ
+cww
cww
-bhI
-bhI
cao
-bhI
-bhI
+cww
+cww
anr
aaa
aaU
@@ -120041,13 +119846,13 @@ cww
bjE
bNq
bQK
-qgO
+cwB
chO
cpN
bWG
cRg
-jiZ
-bhI
+cmL
+cww
cLY
cap
cMt
@@ -120301,14 +120106,14 @@ bNd
bNE
cww
cpO
-bWG
-cJo
+bYP
+cRg
cMH
-bhI
-cLZ
+cww
+cMb
caq
-cLZ
-bhI
+cMb
+cww
anr
aaa
aaU
@@ -120557,15 +120362,15 @@ cww
cww
cww
cww
-cww
+cLm
cIs
tyI
-cMJ
+cww
cLX
cMa
cMj
cMu
-cMG
+jiZ
anr
aaU
aaU
@@ -120812,17 +120617,17 @@ pgu
pgu
pgu
gGG
-vsO
+cww
chS
cpQ
cfM
cbU
-jXo
+cww
cLm
cMb
cas
cMb
-cMH
+cMJ
anr
aaa
aaa
@@ -121069,9 +120874,9 @@ aXx
aXx
aXx
bfW
-tuF
+cww
lRy
-fti
+cMl
cfP
mEa
cLV
@@ -121326,7 +121131,7 @@ bca
cat
cKX
bQN
-nLV
+cLb
cLd
fti
cfT
@@ -121337,7 +121142,7 @@ chx
chM
gDY
jiZ
-hlV
+anr
aaa
aaa
aaU
@@ -121595,7 +121400,7 @@ rUl
cMw
cfs
cMP
-aaa
+cMi
aaa
aaU
aaa
@@ -121838,14 +121643,14 @@ aXx
bca
bca
cKQ
-cKY
-bQO
+biO
+bmz
ony
xcO
hKC
cVO
-sRD
-cMe
+nAF
+cni
cai
rdF
cMk
@@ -122099,12 +121904,12 @@ aXx
bfW
cww
bUa
-cMr
+brf
sRD
-cMo
+nAF
cgz
-cai
-fkx
+cJH
+cwB
cMl
cMx
cMJ
@@ -122356,13 +122161,13 @@ cKX
bQN
cLb
cLe
-cMo
-hMZ
+bXP
+sRD
nAF
lcD
-cai
-fkx
-mNN
+cwB
+cwB
+cwB
cLo
nBM
cfD
@@ -122613,12 +122418,12 @@ bZR
bfW
cwA
cLf
-cMo
-iAW
-fIw
+bXV
+sRD
+nAF
wWH
-ntC
-nEX
+cwB
+cwB
hDz
cLp
oMB
@@ -122870,11 +122675,11 @@ cKY
bQO
cLc
eIh
-car
+bYd
tXV
tZj
-jml
-cVq
+cwB
+cwB
cMc
cMm
cMy
@@ -123128,10 +122933,10 @@ bfW
cww
bhJ
cMo
-iAW
+cwB
cJu
-iAW
-cJH
+cwB
+cwB
cMd
cMn
cMz
@@ -123385,10 +123190,10 @@ bQN
cLb
cLh
cMo
-iAW
-cJu
-hlo
-cJH
+cwB
+jon
+cwB
+cwB
cMe
cMo
cLq
@@ -123643,9 +123448,9 @@ bWK
cLi
xKr
nvn
-cJu
-iAW
-cJH
+jon
+cwB
+cwB
cMe
cMo
cMA
@@ -123899,10 +123704,10 @@ cLa
cLc
fgS
car
-iAW
+cwB
jon
-xjk
-cai
+cwB
+cwB
cMg
cMq
cMB
@@ -124159,7 +123964,7 @@ kOG
dVR
xCy
sHB
-xkC
+cwB
cMe
cMr
cMC
@@ -124413,7 +124218,7 @@ bQS
cLb
cLj
cMo
-qvB
+cwB
cgh
cgA
chq
@@ -124931,7 +124736,7 @@ prx
vxU
cLW
ccG
-cMi
+prx
iQY
cMF
cMO
@@ -125728,7 +125533,7 @@ cNB
cNB
cNB
cNG
-cNN
+hlo
cNT
cNy
cNX
@@ -125941,7 +125746,7 @@ aaa
aaa
aaa
aaU
-cbS
+cPq
abM
ccH
aaU
@@ -126125,9 +125930,9 @@ aaa
aaa
aaa
aaU
-abF
+cPl
abM
-acA
+cPq
aaU
aaa
aaa
@@ -126198,9 +126003,9 @@ aaa
aaa
aaa
aaU
-cbS
+cPq
abR
-ccJ
+cPm
aaU
aaa
aaa
@@ -126382,9 +126187,9 @@ aaa
aaa
aaa
aaU
-abJ
+cPm
abR
-acA
+cPq
aaU
aaU
aaU
@@ -126639,12 +126444,12 @@ aaa
aaa
aaa
aaU
-abJ
+cPm
abR
acB
-adc
-adc
-adL
+cPd
+cPd
+cdq
aaa
aaa
aaa
@@ -126709,14 +126514,14 @@ aaU
aaa
aaa
aaa
-bGK
-bGK
+cPd
+cPd
bUe
ccc
abR
-aaY
+pZq
cdb
-bGK
+cPd
cdq
aaa
aaa
@@ -126896,7 +126701,7 @@ aaa
aaa
aaa
aaU
-abJ
+cPm
abM
abR
abM
@@ -127153,12 +126958,12 @@ aaa
aaa
aaa
abp
-abJ
-abZ
-abZ
-abZ
-abZ
-abZ
+cPm
+cPh
+cPh
+cPh
+cPh
+cPh
aaa
aaa
aaa
@@ -127223,15 +127028,15 @@ aaU
aaa
aaa
aaa
-bGP
-bNo
-bNo
+cPe
+cPh
+cPh
ccf
ccs
ccP
cdi
-bNo
-bNo
+cPh
+cPh
aaa
aaa
aaa
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index db44dfb92a..e5232746f2 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1240,13 +1240,26 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hop)
"abL" = (
-/obj/structure/sign/warning/securearea,
-/turf/closed/wall,
-/area/maintenance/starboard/fore)
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/plasteel/airless/solarpanel,
+/area/solar/starboard/fore)
"abM" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/space/basic,
+/area/solar/starboard/fore)
"abN" = (
/obj/structure/sign/warning/vacuum,
/turf/closed/wall,
@@ -1602,15 +1615,16 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hop)
"acu" = (
-/obj/structure/sign/warning/vacuum{
- pixel_x = 32;
- pixel_y = 32
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/plasteel/airless/solarpanel,
+/area/solar/starboard/fore)
"acv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -2131,20 +2145,12 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hop)
"adm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable/white{
- icon_state = "0-2"
+/obj/structure/sign/warning/securearea{
+ pixel_x = 32;
+ pixel_y = -32
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/starboard/fore";
- dir = 4;
- name = "Starboard Bow Maintenance APC";
- pixel_x = 26
- },
-/turf/open/floor/plating{
- icon_state = "platingdmg2"
- },
-/area/maintenance/starboard/fore)
+/turf/open/space/basic,
+/area/space)
"adn" = (
/turf/closed/wall,
/area/quartermaster/storage)
@@ -2157,15 +2163,9 @@
/turf/closed/wall,
/area/quartermaster/storage)
"adq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/closet/emcloset/anchored,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/solar/starboard/fore)
"adr" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -2194,20 +2194,12 @@
/turf/open/floor/plating,
/area/engine/supermatter)
"adt" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
+/turf/open/space/basic,
+/area/solar/starboard/fore)
"adu" = (
/turf/closed/wall,
/area/quartermaster/qm)
@@ -2393,13 +2385,18 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"adM" = (
-/obj/structure/sign/warning/vacuum{
- pixel_x = 32;
- pixel_y = 32
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/space/basic,
+/area/solar/starboard/fore)
"adN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/radio/intercom{
@@ -2597,11 +2594,12 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aef" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/turf/open/space/basic,
+/area/solar/starboard/fore)
"aeg" = (
/obj/machinery/conveyor{
dir = 8;
@@ -3099,6 +3097,7 @@
"aeS" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery,
+/obj/item/toy/figure/cargotech,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aeT" = (
@@ -5559,7 +5558,8 @@
icon_state = "plant-21"
},
/obj/machinery/camera{
- c_tag = "Chemistry"
+ c_tag = "Chemistry";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -6262,12 +6262,8 @@
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
"ajP" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/landmark/start/research_director,
-/turf/open/floor/plasteel,
-/area/science/mixing)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/hor)
"ajQ" = (
/obj/effect/turf_decal/loading_area{
dir = 8
@@ -7432,7 +7428,8 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Chief Engineer's Office"
+ c_tag = "Chief Engineer's Office";
+ network = list("ss13","engine")
},
/mob/living/simple_animal/parrot/Poly,
/turf/open/floor/plasteel/dark,
@@ -12020,18 +12017,28 @@
},
/area/engine/atmos)
"asH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Atmospherics North East";
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/turf/open/floor/plasteel/checker,
+/obj/machinery/atmospherics/components/binary/pump{
+ name = "Plasma to Pure"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+ c_tag = "Atmospherics North";
+ network = list("ss13","engine")
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"asI" = (
/obj/structure/sign/warning/vacuum{
@@ -15126,7 +15133,8 @@
"axu" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/camera{
- c_tag = "Atmospherics Monitoring"
+ c_tag = "Atmospherics Monitoring";
+ network = list("ss13","engine")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -15702,6 +15710,10 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/item/toy/figure/atmos{
+ pixel_x = -2;
+ pixel_y = 2
+ },
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
@@ -18253,23 +18265,25 @@
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"aCF" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 4;
- name = "Air to External Air Ports"
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
- c_tag = "Atmospherics South East";
- dir = 1
+ c_tag = "Atmospherics North West";
+ dir = 4;
+ network = list("ss13","engine")
},
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark/corner{
+ dir = 1
+ },
/area/engine/atmos)
"aCG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -19324,7 +19338,8 @@
},
/obj/machinery/camera{
c_tag = "Engineering Secure Storage";
- dir = 4
+ dir = 4;
+ network = list("ss13","engine")
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral,
@@ -20192,7 +20207,8 @@
},
/obj/machinery/camera{
c_tag = "SMES Access";
- dir = 8
+ dir = 8;
+ network = list("ss13","engine")
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -20226,23 +20242,22 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aFB" = (
-/obj/machinery/shower{
- dir = 8;
- name = "emergency shower"
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+/obj/machinery/power/terminal{
dir = 4
},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/airalarm{
+ pixel_y = 24
+ },
/obj/machinery/camera{
- c_tag = "Engineering Access";
- dir = 8
+ c_tag = "Starboard Bow Solar";
+ network = list("ss13","engine")
},
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/plasteel,
-/area/engine/engineering)
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
"aFC" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -20787,7 +20802,8 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Engineering Foyer";
- dir = 1
+ dir = 1;
+ network = list("ss13","engine")
},
/obj/machinery/power/apc{
areastring = "/area/engine/break_room";
@@ -21227,22 +21243,20 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"aGY" = (
-/obj/structure/bed/dogbed/runtime,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/obj/structure/sign/poster/official/medical_green_cross{
- pixel_x = -32
- },
/obj/machinery/camera{
- c_tag = "CMO's Office";
- dir = 4
+ c_tag = "Genetics Cloning";
+ dir = 4;
+ network = list("ss13","medbay")
},
-/mob/living/simple_animal/pet/cat/Runtime,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/cmo)
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/genetics)
"aGZ" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -21343,7 +21357,8 @@
"aHg" = (
/obj/machinery/camera{
c_tag = "Gravity Generator Room";
- dir = 8
+ dir = 8;
+ network = list("ss13","engine")
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -22188,7 +22203,8 @@
pixel_x = -32
},
/obj/machinery/camera{
- c_tag = "Engineering Monitoring"
+ c_tag = "Engineering Monitoring";
+ network = list("ss13","engine")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -22593,28 +22609,24 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"aJe" = (
-/obj/structure/table,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = -23
+/obj/machinery/firealarm{
+ pixel_y = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -24;
+ pixel_y = 32
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/clipboard,
-/obj/item/folder/white,
-/obj/item/storage/pill_bottle/mutadone{
- pixel_x = -8;
- pixel_y = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/camera{
+ c_tag = "Gravity Generator Entry";
+ network = list("ss13","engine");
+ pixel_x = 23
},
-/obj/item/storage/pill_bottle/mannitol{
- pixel_x = -8;
- pixel_y = 2
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
},
-/obj/item/radio/headset/headset_medsci,
-/turf/open/floor/plasteel/dark,
-/area/medical/genetics)
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"aJf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -22684,23 +22696,30 @@
/turf/open/floor/plating,
/area/engine/gravity_generator)
"aJk" = (
-/obj/machinery/firealarm{
- pixel_y = 24
+/obj/structure/table/reinforced,
+/obj/item/lightreplacer,
+/obj/structure/cable/white{
+ icon_state = "1-8"
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -24;
- pixel_y = 32
+/obj/structure/cable/white{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/machinery/camera{
- c_tag = "Gravity Generator Entry";
- pixel_x = 23
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/item/toy/figure/engineer,
/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
+/area/engine/engineering)
"aJl" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/engine/gravity_generator";
@@ -23106,19 +23125,13 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aJO" = (
-/obj/machinery/camera{
- c_tag = "Genetics Cloning";
- dir = 4
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "rdprivacy";
+ name = "Director's Privacy Blast Door"
},
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/genetics)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hor)
"aJP" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -23394,21 +23407,9 @@
/turf/closed/wall,
/area/maintenance/port/aft)
"aKo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/obj/structure/lattice,
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
"aKp" = (
/obj/machinery/airalarm{
dir = 4;
@@ -23446,17 +23447,16 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"aKr" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
},
-/obj/effect/landmark/xeno_spawn,
-/obj/structure/sign/warning/vacuum{
- pixel_x = -32;
- pixel_y = 32
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/obj/effect/turf_decal/box,
+/turf/open/floor/plasteel/airless/solarpanel,
+/area/solar/port/aft)
"aKs" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -23600,11 +23600,15 @@
/turf/open/floor/engine,
/area/engine/supermatter)
"aKB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/space/basic,
+/area/solar/port/aft)
"aKC" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Gas to Chamber"
@@ -23624,24 +23628,16 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"aKF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/obj/effect/turf_decal/box,
+/turf/open/floor/plasteel/airless/solarpanel,
+/area/solar/port/aft)
"aKG" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -23750,29 +23746,15 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aKM" = (
-/obj/structure/table/reinforced,
-/obj/item/lightreplacer,
-/obj/structure/cable/white{
- icon_state = "1-8"
- },
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/machinery/light_switch{
+ pixel_y = -24
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/l3closet/janitor,
+/obj/item/toy/figure/janitor,
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/janitor)
"aKN" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -24268,13 +24250,18 @@
},
/area/maintenance/port/aft)
"aLz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/machinery/light/small,
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space/basic,
+/area/solar/port/aft)
"aLA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -24292,12 +24279,8 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aLC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/item/cigbutt,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/turf/closed/wall,
+/area/maintenance/solars/port/aft)
"aLD" = (
/obj/machinery/power/port_gen/pacman,
/obj/effect/turf_decal/stripes/line{
@@ -24396,11 +24379,13 @@
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aLL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/turf/open/floor/plating/airless,
-/area/maintenance/port/aft)
+/obj/machinery/power/tracker,
+/turf/open/floor/plasteel/airless/solarpanel,
+/area/solar/port/aft)
"aLM" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -24938,27 +24923,19 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aMH" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Maintenance Hatch";
- req_access_txt = "12"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/turf/open/space/basic,
+/area/solar/port/aft)
"aMI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/port/aft)
+/turf/open/space/basic,
+/area/solar/port/aft)
"aMJ" = (
/turf/closed/wall/r_wall,
/area/tcommsat/server)
@@ -25024,21 +25001,18 @@
/turf/open/floor/engine,
/area/engine/engineering)
"aMQ" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/port/aft)
+/turf/open/space/basic,
+/area/solar/port/aft)
"aMR" = (
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
@@ -25257,14 +25231,32 @@
/turf/open/floor/plasteel,
/area/janitor)
"aNl" = (
-/obj/machinery/light_switch{
- pixel_y = -24
+/obj/structure/table,
+/obj/machinery/airalarm/unlocked{
+ dir = 4;
+ pixel_x = -23
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/l3closet/janitor,
-/turf/open/floor/plasteel,
-/area/janitor)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/clipboard,
+/obj/item/folder/white,
+/obj/item/storage/pill_bottle/mutadone{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/item/storage/pill_bottle/mannitol{
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/radio/headset/headset_medsci,
+/obj/item/toy/figure/geneticist{
+ pixel_x = 5;
+ pixel_y = 13
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/genetics)
"aNm" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/wardrobe/jani_wardrobe,
@@ -25575,23 +25567,17 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"aNO" = (
-/obj/machinery/camera{
- c_tag = "Genetics Lab";
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
},
-/obj/machinery/computer/scan_consolenew{
- icon_state = "computer";
- dir = 1
+/obj/structure/sign/poster/official/anniversary_vintage_reprint{
+ pixel_x = 32
},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/dark,
-/area/medical/genetics)
+/turf/open/floor/plasteel/white,
+/area/science/research)
"aNP" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -25744,22 +25730,10 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
"aOc" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Maintenance Hatch";
- req_access_txt = "12"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/obj/structure/lattice/catwalk,
+/obj/effect/landmark/xeno_spawn,
+/turf/open/space/basic,
+/area/solar/port/aft)
"aOd" = (
/obj/machinery/power/apc{
areastring = "/area/engine/engineering";
@@ -26119,17 +26093,18 @@
/turf/open/floor/engine,
/area/engine/engineering)
"aOH" = (
-/obj/structure/cable/white{
- icon_state = "1-2"
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/turf/open/space/basic,
+/area/solar/port/aft)
"aOI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -26329,21 +26304,15 @@
/turf/closed/wall,
/area/medical/genetics)
"aOX" = (
-/obj/machinery/requests_console{
- department = "Medbay";
- departmentType = 1;
- name = "Medbay RC";
- pixel_x = -30
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
- c_tag = "Medbay Storage"
+ c_tag = "R&D";
+ dir = 1;
+ network = list("ss13","rd")
},
-/obj/machinery/rnd/production/techfab/department/medical,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/box,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/medical/medbay/zone3)
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel/white,
+/area/science/lab)
"aOY" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -27125,18 +27094,24 @@
},
/area/hallway/primary/port/aft)
"aQe" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/camera{
+ c_tag = "Genetics Lab";
+ dir = 8;
+ network = list("ss13","medbay")
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/stamp/cmo,
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/heads/cmo)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/computer/scan_consolenew{
+ icon_state = "computer";
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/dark,
+/area/medical/genetics)
"aQf" = (
/obj/machinery/firealarm{
dir = 1;
@@ -27424,40 +27399,12 @@
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"aQE" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/cable/white{
- icon_state = "0-8"
- },
-/obj/structure/table/wood,
-/obj/item/storage/box/bodybags{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/bodybags,
-/obj/machinery/power/apc{
- areastring = "/area/medical/morgue";
+/obj/machinery/airalarm/unlocked{
dir = 4;
- name = "Morgue APC";
- pixel_x = 26
+ pixel_x = -23
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Morgue";
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
+/turf/open/floor/plating/asteroid,
+/area/crew_quarters/heads/hor)
"aQF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -28844,24 +28791,20 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"aTn" = (
-/obj/effect/landmark/start/virologist,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
+/obj/structure/table/plasmaglass,
+/obj/machinery/recharger,
+/obj/item/paicard{
+ pixel_x = 15
},
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/medical/virology";
- dir = 1;
- name = "Virology APC";
- pixel_y = 24
+/obj/structure/sign/poster/official/ue_no{
+ pixel_y = 32
},
-/obj/structure/cable/white{
- icon_state = "0-4"
+/obj/item/toy/figure/rd{
+ pixel_x = -8;
+ pixel_y = 14
},
-/obj/machinery/camera{
- c_tag = "Virology"
- },
-/turf/open/floor/plasteel,
-/area/medical/virology)
+/turf/open/floor/plating/asteroid,
+/area/crew_quarters/heads/hor)
"aTo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
@@ -30095,14 +30038,24 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"aVz" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+/obj/machinery/shower{
+ dir = 8;
+ name = "emergency shower"
+ },
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/purple{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Engineering Access";
+ dir = 8;
+ network = list("ss13","engine")
},
-/turf/open/floor/plasteel/white,
-/area/science/research)
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"aVA" = (
/turf/closed/wall,
/area/science/research)
@@ -30425,6 +30378,10 @@
/obj/item/reagent_containers/glass/bottle/epinephrine,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/dropper,
+/obj/item/toy/figure/chemist{
+ pixel_x = -6;
+ pixel_y = 11
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"aWg" = (
@@ -30517,14 +30474,24 @@
/turf/open/floor/plasteel/white,
/area/science/lab)
"aWm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/camera{
- c_tag = "R&D";
- dir = 1
+/obj/structure/table,
+/obj/item/storage/box/gloves{
+ pixel_x = 3;
+ pixel_y = 3
},
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel/white,
-/area/science/lab)
+/obj/item/storage/box/beakers,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -26
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay West";
+ network = list("ss13","medbay")
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/medical/medbay/zone3)
"aWn" = (
/obj/machinery/firealarm{
dir = 1;
@@ -31057,23 +31024,22 @@
/turf/open/floor/plasteel/dark,
/area/library)
"aXm" = (
-/obj/structure/table,
-/obj/item/storage/box/gloves{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/beakers,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -26
- },
-/obj/machinery/camera{
- c_tag = "Medbay West"
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/medical/medbay/zone3)
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/camera{
+ c_tag = "Research Division North";
+ network = list("ss13","rd")
+ },
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/science/research)
"aXn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue{
@@ -31712,18 +31678,26 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"aYp" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 24
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/camera{
- c_tag = "Research Division South";
+ c_tag = "Communications Relay";
+ dir = 8;
+ network = list("ss13","tcomms")
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/machinery/vending/wardrobe/science_wardrobe,
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel/white,
-/area/science/research)
+/turf/open/floor/plasteel/dark/telecomms,
+/area/tcommsat/server)
"aYq" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
dir = 1
@@ -31881,21 +31855,25 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aYB" = (
-/obj/machinery/shower{
- desc = "From what you understand it was put in rather recently, but the design looks right out of the 2510's. Weird.";
- dir = 1;
- icon_state = "shower";
- name = "Emergency Shower"
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/airlock/command{
+ name = "Research Director's Office";
+ req_access_txt = "30"
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 4
},
-/obj/machinery/camera{
- c_tag = "Virology Access";
- dir = 1
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/medical/virology)
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/hor)
"aYC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/event_spawn,
@@ -32695,6 +32673,17 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"aZS" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/solar/port/aft)
+"aZT" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/airless,
+/area/solar/port/aft)
"aZU" = (
/obj/machinery/recharge_station,
/obj/effect/landmark/start/cyborg,
@@ -32822,6 +32811,25 @@
},
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bae" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/aft)
"baf" = (
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
@@ -32895,6 +32903,148 @@
icon_state = "platingdmg1"
},
/area/maintenance/starboard)
+"baj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/landmark/xeno_spawn,
+/obj/structure/sign/warning/vacuum{
+ pixel_x = -32;
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/aft)
+"bak" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/aft)
+"bal" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/aft)
+"bam" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/sign/warning/vacuum{
+ pixel_y = 32
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"ban" = (
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bao" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/warning/electricshock{
+ pixel_y = -32
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bap" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch";
+ req_access_txt = "12"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"baq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bar" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space/basic,
+/area/solar/port/aft)
+"bas" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/small,
+/obj/structure/closet/emcloset/anchored,
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/aft)
+"bat" = (
+/turf/closed/wall/r_wall/rust,
+/area/maintenance/solars/port/aft)
+"bau" = (
+/turf/closed/wall/r_wall,
+/area/maintenance/solars/port/aft)
+"bav" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/closed/wall,
+/area/maintenance/solars/port/aft)
"baw" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/departments/medbay/alt,
@@ -33015,6 +33165,17 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
+"baE" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/engineering{
+ name = "Port Quarter Solar Access";
+ req_access_txt = "10"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
"baF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/blue,
@@ -33125,28 +33286,22 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"baN" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
+/obj/machinery/computer/card/minor/rd,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/structure/cable/white{
- icon_state = "1-2"
+/obj/item/aicard,
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
},
-/obj/structure/cable/white{
- icon_state = "1-4"
- },
-/obj/machinery/camera{
- c_tag = "Mech Bay";
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/science/robotics/mechbay)
+/area/crew_quarters/heads/hor)
"baO" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/structure/cable/white{
@@ -33292,6 +33447,165 @@
},
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bbb" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bbc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/item/cigbutt,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bbd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bbe" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating/airless,
+/area/maintenance/port/aft)
+"bbf" = (
+/obj/machinery/power/smes,
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bbg" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/landmark/xeno_spawn,
+/turf/open/space/basic,
+/area/solar/starboard/fore)
+"bbh" = (
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bbi" = (
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/port/aft";
+ dir = 4;
+ name = "Port Quarter Solar APC";
+ pixel_x = 26
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bbj" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch";
+ req_access_txt = "12"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
+"bbk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port/aft)
+"bbl" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port/aft)
+"bbm" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch";
+ req_access_txt = "12"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
+"bbn" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bbo" = (
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
"bbp" = (
/obj/machinery/light{
dir = 8
@@ -33605,6 +33919,153 @@
},
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bbP" = (
+/obj/machinery/modular_computer/console/preset/research,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bbQ" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space/basic,
+/area/solar/starboard/fore)
+"bbR" = (
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/white,
+/obj/machinery/power/solar_control{
+ dir = 8;
+ id = "aftport";
+ name = "Port Quarter Solar Control"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bbS" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/space/basic,
+/area/solar/port/aft)
+"bbT" = (
+/turf/closed/wall,
+/area/maintenance/solars/starboard/fore)
+"bbU" = (
+/turf/closed/wall/r_wall,
+/area/maintenance/solars/starboard/fore)
+"bbV" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space/basic,
+/area/solar/starboard/fore)
+"bbW" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/space/basic,
+/area/solar/starboard/fore)
+"bbX" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/closet/emcloset/anchored,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/fore)
+"bbY" = (
+/obj/structure/lattice/catwalk,
+/turf/open/floor/plating/airless,
+/area/solar/starboard/fore)
+"bbZ" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/fore)
+"bca" = (
+/obj/structure/sign/warning/vacuum{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/effect/landmark/xeno_spawn,
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/fore)
+"bcb" = (
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/fore)
+"bcc" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/fore)
"bcd" = (
/obj/item/retractor,
/obj/item/hemostat,
@@ -33923,12 +34384,166 @@
},
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bcD" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/space/basic,
+/area/solar/starboard/fore)
"bcE" = (
/obj/structure/closet/l3closet/scientist{
pixel_x = -2
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"bcF" = (
+/obj/structure/sign/warning/securearea,
+/turf/closed/wall/r_wall,
+/area/maintenance/solars/starboard/fore)
+"bcG" = (
+/obj/structure/sign/warning/vacuum{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcH" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcI" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcJ" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/box,
+/obj/machinery/power/tracker,
+/turf/open/floor/plasteel/airless/solarpanel,
+/area/solar/starboard/fore)
+"bcK" = (
+/obj/machinery/power/smes,
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcL" = (
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/solar_control{
+ dir = 2;
+ id = "forestarboard";
+ name = "Starboard Bow Solar Control"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcM" = (
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/warning/electricshock{
+ pixel_x = 32;
+ pixel_y = -32
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/engineering{
+ name = "Starboard Bow Solar Access";
+ req_access_txt = "10"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcP" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcQ" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/turf/open/space/basic,
+/area/solar/starboard/fore)
+"bcR" = (
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bcS" = (
+/obj/structure/lattice,
+/obj/structure/sign/warning/securearea{
+ pixel_x = -32
+ },
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
+"bcT" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
"bcU" = (
/obj/item/circular_saw,
/obj/item/surgicaldrill{
@@ -34174,6 +34789,15 @@
},
/turf/open/floor/plating,
/area/security/checkpoint)
+"bdi" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bdj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -34319,20 +34943,20 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"bdv" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 8
},
-/obj/item/clothing/gloves/color/latex,
-/obj/item/surgical_drapes,
-/obj/item/cautery,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/camera{
+ c_tag = "Atmospherics North East";
+ dir = 8;
+ network = list("ss13","engine")
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/turf/open/floor/plasteel/checker,
+/area/engine/atmos)
"bdw" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/purple{
@@ -34380,6 +35004,243 @@
/obj/structure/sign/warning/fire,
/turf/closed/wall,
/area/science/mixing)
+"bdB" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating/airless,
+/area/solar/starboard/fore)
+"bdC" = (
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bdD" = (
+/obj/structure/displaycase/labcage,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/hor";
+ dir = 1;
+ name = "RD Office APC";
+ pixel_y = 26
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdE" = (
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/starboard/fore";
+ dir = 2;
+ name = "Starboard Bow Solar APC";
+ pixel_y = -26
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
+"bdF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard/fore";
+ dir = 4;
+ name = "Starboard Bow Maintenance APC";
+ pixel_x = 26
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"bdG" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
+"bdH" = (
+/obj/machinery/requests_console{
+ department = "Medbay";
+ departmentType = 1;
+ name = "Medbay RC";
+ pixel_x = -30
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay Storage";
+ network = list("ss13","medbay")
+ },
+/obj/machinery/rnd/production/techfab/department/medical,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/box,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/medical/medbay/zone3)
+"bdI" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdJ" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/landmark/start/research_director,
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdK" = (
+/obj/machinery/computer/mecha{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdL" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/landmark/start/research_director,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdM" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdN" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/keycard_auth{
+ pixel_x = 24;
+ pixel_y = -24
+ },
+/obj/machinery/button/door{
+ id = "rdprivacy";
+ name = "Director's Privacy Toggle";
+ pixel_x = 24;
+ pixel_y = -38
+ },
+/obj/machinery/light_switch{
+ pixel_x = 40;
+ pixel_y = -24
+ },
+/obj/machinery/button/door{
+ id = "rdxeno";
+ name = "Xenobiology Containment Lockdown";
+ pixel_x = 38;
+ pixel_y = -38;
+ req_access_txt = "47"
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bdO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/hor)
+"bdP" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#c1caff"
+ },
+/obj/structure/flora/tree/palm,
+/turf/open/floor/plating/asteroid,
+/area/crew_quarters/heads/hor)
"bdQ" = (
/obj/structure/closet/secure_closet/medical2,
/obj/machinery/airalarm{
@@ -34487,25 +35348,23 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"bdW" = (
-/obj/structure/closet/crate/freezer/blood,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -26
+/obj/structure/bed/dogbed/runtime,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+/obj/effect/turf_decal/delivery,
+/obj/structure/sign/poster/official/medical_green_cross{
+ pixel_x = -32
},
/obj/machinery/camera{
- c_tag = "Medbay Recovery Room";
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+ c_tag = "CMO's Office";
+ dir = 4;
+ network = list("ss13","medbay")
},
+/mob/living/simple_animal/pet/cat/Runtime,
/turf/open/floor/plasteel/dark,
-/area/medical/medbay/zone3)
+/area/crew_quarters/heads/cmo)
"bdX" = (
/obj/machinery/computer/crew{
dir = 4
@@ -34790,10 +35649,174 @@
/obj/machinery/door/poddoor/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
+"beu" = (
+/obj/machinery/portable_atmospherics/pump,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bev" = (
+/obj/structure/table/plasmaglass,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/stamp/rd,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/turf/open/floor/plating/asteroid,
+/area/crew_quarters/heads/hor)
+"bew" = (
+/obj/machinery/computer/aifixer{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bex" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"bey" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/stamp/cmo,
+/obj/machinery/light_switch{
+ pixel_x = 24;
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/heads/cmo)
+"bez" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"beA" = (
+/obj/structure/closet/bombcloset,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beB" = (
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beC" = (
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/machinery/camera{
+ c_tag = "Mech Bay";
+ dir = 4;
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/science/robotics/mechbay)
+"beD" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/poster/official/soft_cap_pop_art{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
"beE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/medical/medbay/zone3)
+"beF" = (
+/obj/machinery/camera{
+ c_tag = "Toxins Lab West";
+ network = list("ss13","rd")
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
"beG" = (
/obj/structure/sign/departments/medbay/alt,
/turf/closed/wall,
@@ -34930,6 +35953,146 @@
},
/turf/closed/wall/r_wall,
/area/science/robotics/lab)
+"beR" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/camera{
+ c_tag = "Research Director's Office";
+ dir = 1;
+ network = list("ss13","rd")
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_y = -26
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"beS" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "Research Director's Desk";
+ departmentType = 5;
+ name = "Research Director RC";
+ pixel_x = 0;
+ pixel_y = -32;
+ receive_ore_updates = 1
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
+"beT" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beU" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/closet/bombcloset,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beX" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"beY" = (
+/obj/structure/sign/warning/nosmoking/circle,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/hor)
+"beZ" = (
+/obj/machinery/light_switch{
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfa" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfb" = (
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/item/storage/firstaid/toxin,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfc" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfd" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
"bfe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/airalarm/unlocked{
@@ -34969,6 +36132,37 @@
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"bfh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfi" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfj" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bfk" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/science/mixing)
"bfl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -35033,6 +36227,15 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
+"bfq" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
"bfr" = (
/obj/structure/cable/white{
icon_state = "1-8"
@@ -35045,6 +36248,32 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"bfs" = (
+/obj/machinery/vending/wardrobe/science_wardrobe,
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"bft" = (
+/obj/structure/closet/secure_closet/RD,
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/item/circuitboard/aicore,
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
"bfu" = (
/turf/closed/wall,
/area/chapel/main)
@@ -35063,6 +36292,27 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
/area/chapel/main)
+"bfw" = (
+/obj/machinery/suit_storage_unit/rd,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/rd{
+ dir = 1;
+ icon_state = "telescreen";
+ pixel_y = -28
+ },
+/turf/open/floor/plasteel{
+ icon_state = "sepia"
+ },
+/area/crew_quarters/heads/hor)
"bfx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -35075,16 +36325,148 @@
},
/turf/closed/wall,
/area/chapel/main)
+"bfz" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
"bfA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall,
/area/chapel/main)
+"bfB" = (
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/science/mixing)
"bfC" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/closed/wall/rust,
/area/chapel/main)
+"bfD" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/structure/table/wood,
+/obj/item/storage/box/bodybags{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/bodybags,
+/obj/machinery/power/apc{
+ areastring = "/area/medical/morgue";
+ dir = 4;
+ name = "Morgue APC";
+ pixel_x = 26
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Morgue";
+ dir = 8;
+ network = list("ss13","medbay")
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
+"bfE" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/item/clothing/gloves/color/latex,
+/obj/item/surgical_drapes,
+/obj/item/cautery,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/item/toy/figure/roboticist{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
+"bfF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Surgery Operating";
+ dir = 1;
+ network = list("ss13","medbay");
+ pixel_x = 22
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/medical/medbay/zone3)
+"bfG" = (
+/obj/structure/closet/crate/freezer/blood,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -26
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay Recovery Room";
+ dir = 8;
+ network = list("ss13","medbay")
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/medbay/zone3)
+"bfH" = (
+/obj/effect/landmark/start/virologist,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/medical/virology";
+ dir = 1;
+ name = "Virology APC";
+ pixel_y = 24
+ },
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/obj/machinery/camera{
+ c_tag = "Virology";
+ network = list("ss13","medbay")
+ },
+/turf/open/floor/plasteel,
+/area/medical/virology)
"bfI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
@@ -35162,6 +36544,36 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"bfM" = (
+/obj/machinery/shower{
+ desc = "From what you understand it was put in rather recently, but the design looks right out of the 2510's. Weird.";
+ dir = 1;
+ icon_state = "shower";
+ name = "Emergency Shower"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/camera{
+ c_tag = "Virology Access";
+ dir = 1;
+ network = list("ss13","medbay")
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/virology)
+"bfN" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/camera{
+ c_tag = "Xenobiology North";
+ dir = 4;
+ network = list("ss13","rd");
+ pixel_y = -5
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"bfO" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -35367,6 +36779,48 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
+"bgc" = (
+/obj/machinery/shower{
+ dir = 4;
+ name = "emergency shower"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Xenobiology Central";
+ dir = 4;
+ network = list("ss13","rd");
+ pixel_y = -5
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"bgd" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/beakers{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/syringes,
+/obj/item/extinguisher/mini,
+/obj/machinery/airalarm/unlocked{
+ dir = 4;
+ pixel_x = -23
+ },
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
+/obj/machinery/camera{
+ c_tag = "Xenobiology Lab";
+ dir = 4;
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"bge" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
@@ -35401,6 +36855,88 @@
heat_capacity = 1e+006
},
/area/hallway/primary/aft)
+"bgg" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/monkeycubes,
+/obj/machinery/status_display{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/camera{
+ c_tag = "Xenobiology South";
+ dir = 1;
+ network = list("ss13","rd")
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"bgh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/machinery/camera{
+ c_tag = "Atmospherics South West";
+ dir = 1;
+ network = list("ss13","engine")
+ },
+/turf/open/floor/plasteel,
+/area/engine/atmos)
+"bgi" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 4;
+ name = "Air to External Air Ports"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/camera{
+ c_tag = "Atmospherics South East";
+ dir = 1;
+ network = list("ss13","engine")
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/atmos)
+"bgj" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airlock_sensor{
+ id_tag = "incinerator_airlock_sensor";
+ master_tag = "incinerator_airlock_control";
+ pixel_y = 24
+ },
+/obj/machinery/camera/autoname{
+ network = list("ss13","engine")
+ },
+/turf/open/floor/engine,
+/area/maintenance/disposal/incinerator)
+"bgk" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small,
+/obj/machinery/camera{
+ c_tag = "Port Quarter Solar";
+ dir = 1;
+ network = list("ss13","engine")
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
"bgl" = (
/obj/machinery/vending/cola/random,
/obj/machinery/newscaster{
@@ -35428,6 +36964,20 @@
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
+"bgn" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/camera{
+ c_tag = "Research Division South";
+ dir = 8;
+ network = list("ss13","rd")
+ },
+/obj/machinery/vending/wardrobe/science_wardrobe,
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel/white,
+/area/science/research)
"bgo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/white{
@@ -36710,22 +38260,6 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
-"biC" = (
-/obj/machinery/shower{
- dir = 4;
- name = "emergency shower"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Xenobiology Central";
- dir = 4;
- pixel_y = -5
- },
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
"biD" = (
/obj/machinery/shower{
dir = 8;
@@ -37396,46 +38930,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
-"bjP" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/beakers{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/syringes,
-/obj/item/extinguisher/mini,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = -23
- },
-/obj/machinery/newscaster{
- pixel_y = -32
- },
-/obj/machinery/camera{
- c_tag = "Xenobiology Lab";
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
-"bjQ" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
-/obj/machinery/status_display{
- pixel_y = -32
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "Xenobiology South";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
"bjR" = (
/obj/machinery/computer/camera_advanced/xenobio{
dir = 1
@@ -37844,22 +39338,6 @@
/obj/machinery/telecomms/broadcaster/preset_left/birdstation,
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
-"blr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/machinery/camera{
- c_tag = "Research Division North"
- },
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/science/research)
"bls" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -37881,27 +39359,6 @@
heat_capacity = 1e+006
},
/area/hallway/primary/aft)
-"blt" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Surgery Operating";
- dir = 1;
- pixel_x = 22
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/medbay/zone3)
"blv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -38715,26 +40172,6 @@
},
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
-"buU" = (
-/obj/machinery/camera{
- c_tag = "Communications Relay";
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark/telecomms,
-/area/tcommsat/server)
"buW" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
@@ -39149,9 +40586,6 @@
heat_capacity = 1e+006
},
/area/hallway/secondary/entry)
-"bxZ" = (
-/turf/closed/wall,
-/area/maintenance/starboard/fore)
"bye" = (
/turf/closed/wall/rust,
/area/maintenance/fore)
@@ -39206,14 +40640,6 @@
dir = 1
},
/area/engine/atmos)
-"bNB" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"bOJ" = (
/obj/machinery/camera{
c_tag = "Toxins Launch Room Access";
@@ -39227,15 +40653,6 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
-"bWO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/science/mixing)
"bYE" = (
/obj/structure/sign/warning/fire,
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -39374,19 +40791,6 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
-"cGz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
-/obj/machinery/camera{
- c_tag = "Atmospherics South West";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"cRz" = (
/obj/machinery/button/door{
id = "supplybridge";
@@ -39595,18 +40999,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"edA" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
"eew" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
@@ -39738,18 +41130,6 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
-"eFp" = (
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/camera{
- c_tag = "Xenobiology North";
- dir = 4;
- pixel_y = -5
- },
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
"eGm" = (
/turf/closed/wall/r_wall,
/area/science/storage)
@@ -40201,12 +41581,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"hns" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall/rust,
-/area/science/mixing)
"hpr" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=3.2-AtriumSW";
@@ -40512,14 +41886,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"iXB" = (
-/obj/structure/closet/bombcloset,
-/obj/machinery/light_switch{
- pixel_y = 28
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"iZQ" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input,
/turf/open/floor/engine/co2,
@@ -40725,13 +42091,6 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
-"jLT" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/item/storage/firstaid/toxin,
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"jRe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -40890,10 +42249,6 @@
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
/area/science/storage)
-"lmr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"low" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -40965,26 +42320,6 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
-"lAs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom{
- name = "Station Intercom";
- pixel_y = 24
- },
-/obj/machinery/camera{
- c_tag = "Atmospherics North West";
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/plasteel/dark/corner{
- dir = 1
- },
-/area/engine/atmos)
"lCg" = (
/obj/machinery/door/airlock/external{
name = "Supply Dock Airlock";
@@ -41084,13 +42419,6 @@
"meo" = (
/turf/closed/wall/r_wall/rust,
/area/science/mixing)
-"mfj" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/science/mixing)
"mgs" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
dir = 1
@@ -41494,15 +42822,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
-"oRo" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/science/mixing)
"pbT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -41701,10 +43020,6 @@
},
/turf/closed/wall/r_wall,
/area/engine/atmos)
-"pXH" = (
-/obj/machinery/vending/wardrobe/science_wardrobe,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"pZU" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -41879,23 +43194,6 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"rjV" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/airlock_sensor{
- id_tag = "incinerator_airlock_sensor";
- master_tag = "incinerator_airlock_control";
- pixel_y = 24
- },
-/obj/machinery/camera/autoname,
-/turf/open/floor/engine,
-/area/maintenance/disposal/incinerator)
"rlq" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -41908,13 +43206,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
-"rpy" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/structure/sign/warning/nosmoking/circle,
-/turf/closed/wall,
-/area/science/mixing)
"rzn" = (
/obj/machinery/status_display,
/turf/closed/wall,
@@ -41994,18 +43285,6 @@
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/starboard)
-"scn" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/science/mixing)
"sdL" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/hydroponics/soil,
@@ -44840,12 +46119,6 @@
"tin" = (
/turf/open/floor/engine/vacuum,
/area/science/mixing)
-"tms" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/maintenance/starboard/aft)
"ttp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -45025,29 +46298,6 @@
},
/turf/closed/wall/r_wall,
/area/engine/atmos)
-"uoy" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/components/binary/pump{
- name = "Plasma to Pure"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera{
- c_tag = "Atmospherics North"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/atmos)
"upN" = (
/obj/machinery/door/airlock/research{
name = "Toxins Launch Room";
@@ -45778,14 +47028,6 @@
/obj/structure/grille,
/turf/closed/wall/r_wall,
/area/engine/atmos)
-"xLe" = (
-/obj/structure/closet/bombcloset,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/science/mixing)
"xPz" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
@@ -70446,22 +71688,22 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
jFP
jFP
jFP
@@ -70703,22 +71945,22 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-uXD
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
jFP
jFP
jFP
@@ -70961,19 +72203,19 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
+sdX
+pZU
+pZU
+pZU
+sdX
+aLL
+sdX
+pZU
+pZU
+pZU
+sdX
+pZU
aaa
aaa
jFP
@@ -71218,19 +72460,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
aaa
aaa
aaa
aaa
+aMH
aaa
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -71475,19 +72717,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
+aKr
+aKr
+aKr
+aKr
+aMI
+aKr
+aKr
+aKr
+aKr
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -71732,19 +72974,19 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+sdX
+sdX
+aKB
+aLz
+aLz
+aLz
+aMQ
+bar
+bar
+bar
+bbS
+sdX
+sdX
aaa
aaa
jFP
@@ -71989,19 +73231,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
+aKF
+aKF
+aKF
+aKF
+aMH
+aKF
+aKF
+aKF
+aKF
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -72227,7 +73469,7 @@ aad
aad
aad
gdA
-rjV
+bgj
fsJ
eyu
uvg
@@ -72246,19 +73488,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
aaa
aaa
aaa
aaa
+aOc
aaa
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -72503,19 +73745,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
+aKr
+aKr
+aKr
+aKr
+aMI
+aKr
+aKr
+aKr
+aKr
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -72760,19 +74002,19 @@ aac
aac
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
+sdX
+aKB
+aLz
+aLz
+aLz
+aOH
+bar
+bar
+bar
+bbS
+sdX
+sdX
aaa
aaa
jFP
@@ -72990,7 +74232,7 @@ aad
aad
aad
aqz
-lAs
+aCF
qTa
oJp
hUG
@@ -73017,19 +74259,19 @@ aad
aac
aac
aac
+sdX
aaa
+aKF
+aKF
+aKF
+aKF
+aMH
+aKF
+aKF
+aKF
+aKF
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -73257,7 +74499,7 @@ bGL
vuN
jkl
eew
-cGz
+bgh
qUW
aqz
aqz
@@ -73274,19 +74516,19 @@ aad
aad
aad
aad
-aac
-aac
-aaa
+aKo
aaa
aaa
aaa
aaa
aaa
+aZS
aaa
aaa
aaa
aaa
aaa
+pZU
aaa
aaa
jFP
@@ -73531,19 +74773,19 @@ aad
aad
aad
aad
-aad
+adx
aad
aac
aad
aad
aad
-bvg
+aZT
aac
aaa
aaa
aaa
aaa
-aaa
+pZU
aaa
aaa
jFP
@@ -73793,14 +75035,14 @@ aad
aad
aad
aad
-aKm
-aKo
-aKm
-aKm
-aaa
-aaa
-aaa
-aaa
+aLC
+bae
+aLC
+aLC
+sdX
+sdX
+sdX
+sdX
aaa
aaa
aaa
@@ -74051,13 +75293,13 @@ aMJ
aMJ
sJV
aMJ
-aKr
-aLz
-aKm
-aaa
+baj
+bas
+aLC
aaa
aaa
aaa
+pZU
aaa
aaa
aaa
@@ -74308,13 +75550,13 @@ buJ
buO
sKn
aMJ
-aKB
-aLs
-aKm
-aac
-aaa
-aaa
+bak
+bat
+aLC
+aLC
+aLC
aaa
+pZU
aaa
aaa
aaa
@@ -74549,7 +75791,7 @@ anv
anK
aoo
aGe
-aJk
+aJe
aKt
aLH
aMK
@@ -74565,13 +75807,13 @@ buK
sKj
buR
aMJ
-aKF
-aqo
-aad
-aac
-aaa
-aaa
+bal
+bau
+bbf
+bbo
+aLC
aaa
+pZU
aaa
aaa
aaa
@@ -74822,13 +76064,13 @@ buL
buP
buS
aMJ
-aKJ
-aKm
-aad
-aad
-aaa
-aaa
-aaa
+bam
+bav
+bdC
+bgk
+aLC
+sdX
+sdX
aaa
aaa
aaa
@@ -75079,13 +76321,13 @@ buK
sKj
buR
aMJ
-aKJ
-aKm
-aad
-aad
-aaa
-aaa
+ban
+baE
+bbh
+bdG
+aLC
aaa
+pZU
aaa
aaa
aaa
@@ -75302,7 +76544,7 @@ pNE
oOk
xej
oaV
-uoy
+asH
lqz
fFw
auq
@@ -75334,15 +76576,15 @@ aTZ
blq
buN
buQ
-buU
+aYp
sJV
-aKJ
-aqo
-aad
-aaa
-aaa
-aaa
+bao
+bau
+bbi
+bbR
+aLC
aaa
+pZU
aaa
aaa
aaa
@@ -75593,13 +76835,13 @@ sJV
aMJ
aMJ
sJV
-aKJ
-aqo
-aLs
-aac
-aaa
-aaa
+bap
+bau
+bat
+aLC
+aLC
aaa
+pZU
aaa
aaa
aaa
@@ -75850,13 +77092,13 @@ aad
bvo
aad
aKm
-aLp
-aLB
+baq
+bbb
aKm
aac
aac
aac
-aac
+aKo
aaa
aaa
aaa
@@ -76108,12 +77350,12 @@ aUQ
aXc
aKm
aqo
-aLC
+bbc
aLv
aac
aac
aac
-aad
+adx
aad
aaa
aaa
@@ -76365,7 +77607,7 @@ aUR
aUQ
bvo
aLs
-aKJ
+bbd
aKm
aac
aad
@@ -76622,7 +77864,7 @@ aWz
aVL
bvo
aqo
-aLL
+bbe
aKm
aad
aad
@@ -76879,7 +78121,7 @@ aWz
aUQ
bvg
aKm
-aKJ
+bbd
aKm
aKm
aad
@@ -77136,7 +78378,7 @@ aWz
aVL
bvg
aLv
-aKJ
+bbd
aME
aKm
aad
@@ -77393,7 +78635,7 @@ aUU
aUQ
bvg
aKm
-aKJ
+bbd
aMF
aKm
aac
@@ -77650,7 +78892,7 @@ aWz
aVL
bvg
aKm
-aKJ
+bbd
aMG
aKm
aKm
@@ -77907,8 +79149,8 @@ aWz
aUQ
bvo
aKm
-aLp
-aLB
+baq
+bbb
aOI
aPQ
aPQ
@@ -78130,7 +79372,7 @@ asA
asD
sAx
arA
-asH
+bdv
atI
auB
avG
@@ -78165,7 +79407,7 @@ aVL
bvo
aqo
aKm
-aMH
+bbj
axU
aKm
aMG
@@ -78422,7 +79664,7 @@ aUQ
aad
aLs
aLX
-aMI
+bbk
aOL
aPR
aQV
@@ -78679,7 +79921,7 @@ aVL
aad
aqo
aMv
-aMQ
+bbl
aOM
aPS
aRc
@@ -78911,10 +80153,10 @@ ayl
azr
aAt
aBB
-aCF
+bgi
aDu
aEz
-aFB
+aVz
aGo
aHu
aIr
@@ -78936,7 +80178,7 @@ bvo
bvo
aqo
aMw
-aMI
+bbk
aON
aPT
aRd
@@ -78945,7 +80187,7 @@ aUm
aKm
aVH
aRe
-aTn
+bfH
aWL
aZB
aTv
@@ -79193,7 +80435,7 @@ axX
aEg
aEg
aMD
-aOc
+bbm
aOS
aPU
aRj
@@ -79450,7 +80692,7 @@ aFM
aFM
aKl
aFM
-aOH
+bbn
aOT
aPV
uXV
@@ -79717,7 +80959,7 @@ aKm
aSQ
aKV
aWJ
-aYB
+bfM
aKV
aYA
aZJ
@@ -80461,7 +81703,7 @@ aGt
aHz
aIw
aJF
-aKM
+aJk
aMa
aNe
aEt
@@ -81504,7 +82746,7 @@ aVT
aVQ
aXg
ajG
-aGY
+bdW
aOl
aOQ
aCy
@@ -82019,7 +83261,7 @@ aVQ
aXk
ajG
aOZ
-aQe
+bey
aOK
aCy
aPE
@@ -82776,7 +84018,7 @@ aIC
aJK
aKR
aMg
-aNl
+aKM
aID
aOU
aQc
@@ -82794,7 +84036,7 @@ aNS
aPz
aPB
aPH
-aQE
+bfD
aQL
aRb
aVc
@@ -83039,13 +84281,13 @@ aEh
aFh
aGf
aHG
-aJe
+aNl
aJo
aLo
aLu
aMl
aOW
-aOX
+bdH
aGZ
aOE
aPv
@@ -83557,7 +84799,7 @@ aJg
aJA
aLr
aLA
-aNO
+aQe
ail
aXQ
aYI
@@ -83823,7 +85065,7 @@ baw
aSh
bcf
bcW
-blt
+bfF
ooX
avB
bfA
@@ -84068,11 +85310,11 @@ bxQ
sJJ
ail
aGF
-aJO
+aGY
aNL
aNo
aNP
-aXm
+aWm
aXS
aYK
aZG
@@ -85108,7 +86350,7 @@ baB
bbr
bci
bcZ
-bdW
+bfG
aSh
atE
bfA
@@ -89216,7 +90458,7 @@ aXy
aYi
aZb
aZU
-baN
+beC
bbC
bct
bdl
@@ -89724,7 +90966,7 @@ aSw
aTI
aUC
aVv
-aWm
+aOX
aWV
aXA
aYk
@@ -90263,7 +91505,7 @@ nTi
jdD
bhb
bhO
-bjP
+bgd
bfP
aad
aad
@@ -90497,7 +91739,7 @@ aSz
aTL
aWp
aWW
-blr
+aXm
aYn
aZf
aZY
@@ -90512,15 +91754,15 @@ bfQ
bgq
bhc
bhP
-eFp
+bfN
bhP
pLb
bhP
-biC
+bgc
bhP
bjq
bjD
-bjQ
+bgg
bfP
aad
aad
@@ -90954,9 +92196,9 @@ sOk
aae
aae
aaf
-aaa
-aaa
-aaa
+sdX
+sdX
+sdX
aae
aad
abs
@@ -91008,11 +92250,11 @@ aRv
aSB
aTN
aUG
-aVz
+aNO
aWr
aWX
aXE
-aYp
+bgn
aZh
baa
baU
@@ -91210,12 +92452,12 @@ aad
aad
aaa
aaa
-aae
-aaa
-aaa
-bxZ
-abL
-bxZ
+bbT
+bbT
+bbT
+bbT
+bcF
+bbT
swz
abs
abs
@@ -91466,17 +92708,17 @@ sMq
aad
aad
aaa
-aaa
-aae
-aad
-aac
-edA
-abM
-acu
-adt
-adM
-aef
adm
+bbT
+bbX
+bbZ
+bcc
+bcG
+bcM
+bcT
+bym
+bdi
+bdF
bxw
bym
afB
@@ -91724,13 +92966,13 @@ aad
aad
aaa
aad
-aah
-aad
-aad
-bxZ
-bxZ
-adq
-bxZ
+bbU
+bbT
+bca
+bbT
+bcH
+bcN
+bbT
adY
aei
adn
@@ -91789,7 +93031,7 @@ bad
baX
bbL
bcA
-bdv
+bfE
beo
aZl
sPK
@@ -91982,11 +93224,11 @@ aac
aaa
aad
aad
-aad
-aad
-aad
-bxZ
-bxZ
+bbT
+bcb
+bbT
+bcI
+bcO
adu
adu
aej
@@ -92239,11 +93481,11 @@ aac
aaa
aaa
aad
-aac
-aac
-aad
-aad
-aad
+bbY
+bdB
+bbT
+aFB
+bcP
ady
adZ
aek
@@ -92491,16 +93733,16 @@ sMq
sMr
sMr
aad
+adx
+sdX
+sdX
+bbW
+bcQ
+adq
aad
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-aad
-aad
-aad
+bbT
+bcK
+bdE
adu
aea
aen
@@ -92748,16 +93990,16 @@ aad
aad
aad
aad
-aac
+aKo
+aaa
+aaa
+aef
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aad
-aad
-aad
+bbT
+bcL
+bcR
adu
aeb
aeP
@@ -93002,19 +94244,19 @@ aad
aad
aac
aac
-aad
+adx
aaa
aaa
+sdX
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aac
-aac
+adq
+sdX
+sdX
+sdX
+bbT
+bbT
+bbU
adu
adu
adu
@@ -93259,19 +94501,19 @@ aad
aac
aac
aaa
+sdX
+aaa
+aaa
+sdX
+aaa
+aaa
+adq
aaa
aaa
aaa
+sdX
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aac
+bcS
aad
aad
aad
@@ -93324,8 +94566,8 @@ auu
avz
avF
abv
-sON
-tms
+hXc
+orV
hXc
abP
jLF
@@ -93516,19 +94758,19 @@ aad
aaa
aaa
aaa
+pZU
aaa
+abL
+abL
+abL
+abL
+adt
+abL
+abL
+abL
+abL
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aac
+aKo
aac
aad
aad
@@ -93581,8 +94823,8 @@ aux
avA
avH
abv
-aad
-orV
+beA
+beV
iio
tPn
wOe
@@ -93773,19 +95015,19 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
+sdX
+abM
+bbQ
+bbQ
+bbQ
+adM
+bbV
+bbV
+bbV
+bcD
+sdX
+pZU
aaa
aaa
aac
@@ -93838,9 +95080,9 @@ atF
atF
atF
swG
-aad
-hns
-iXB
+beF
+beW
+beZ
hVE
sPq
hVE
@@ -94030,19 +95272,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
+acu
+acu
+acu
+acu
+aef
+acu
+acu
+acu
+acu
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
aaa
@@ -94094,14 +95336,14 @@ aaa
aaa
aaa
aad
-aad
-aad
-hns
-xLe
+iio
+beB
+beX
+bfa
+bfc
+bfi
hVE
-ajP
-hVE
-pXH
+bfs
sVt
vCu
tin
@@ -94287,19 +95529,19 @@ aaa
aaa
aaa
aaa
+pZU
aaa
aaa
aaa
aaa
aaa
+bbg
aaa
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+pZU
aaa
aaa
aaa
@@ -94349,13 +95591,13 @@ aaa
aaa
aaa
aaa
-aac
aad
-aad
-aad
-orV
+ajP
+ajP
+aYB
+ajP
nMh
-hVE
+beW
sPq
wPr
jIk
@@ -94544,19 +95786,19 @@ aaa
aaa
aaa
aaa
+sdX
aaa
+abL
+abL
+abL
+abL
+adt
+abL
+abL
+abL
+abL
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+sdX
aaa
aaa
aaa
@@ -94606,14 +95848,14 @@ aaa
aaa
aaa
aaa
-aac
-aac
aad
-aad
-orV
+ajP
+aQE
+bex
+ajP
pdX
-hVE
-bWO
+bfd
+bfj
oKp
dXv
sVt
@@ -94798,23 +96040,23 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
aaa
aaa
aaa
+pZU
+sdX
+abM
+bbQ
+bbQ
+bbQ
+adM
+bbV
+bbV
+bbV
+bcD
+sdX
+pZU
+aaa
aaa
aaa
aaa
@@ -94862,15 +96104,15 @@ aaf
aaa
aaa
aaa
-aaa
aac
aad
-aad
-aad
-rpy
-jLT
-lmr
-oRo
+ajP
+bdP
+bez
+beY
+bfb
+bfh
+bfk
pAN
nTg
gcw
@@ -95055,23 +96297,23 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
aaa
aaa
aaa
+pZU
+aaa
+acu
+acu
+acu
+acu
+aef
+acu
+acu
+acu
+acu
+aaa
+pZU
+aaa
aaa
aaa
aaa
@@ -95119,15 +96361,15 @@ aaf
aaa
aaa
aaa
-aaa
-aac
aad
aad
-aad
-sVt
-bNB
-hVE
-sPq
+ajP
+aTn
+beD
+bdO
+beu
+mvB
+beT
hVE
lzC
sVt
@@ -95312,23 +96554,23 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
aaa
aaa
aaa
+pZU
+aaa
+aaa
+aaa
+aaa
+aaa
+adt
+aaa
+aaa
+aaa
+aaa
+aaa
+pZU
+aaa
aaa
aaa
aaa
@@ -95376,15 +96618,15 @@ aaf
aaa
aaa
aaa
-aaa
-aac
aad
-aad
-aad
-sVt
+ajP
+ajP
+bev
+beR
+ajP
jXX
wwT
-sPq
+beU
tFk
hVE
lzG
@@ -95569,23 +96811,23 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
aaa
aaa
aaa
+sdX
+sdX
+pZU
+pZU
+pZU
+sdX
+bcJ
+sdX
+pZU
+pZU
+pZU
+sdX
+sdX
+aaa
aaa
aaa
aaa
@@ -95633,16 +96875,16 @@ aaa
aaa
aaa
aaa
-aaa
-aac
-aad
-aad
-aad
-meo
+ajP
+ajP
+bdD
+bdL
+beS
+ajP
xiZ
wvy
-sPq
-mfj
+bfz
+bfB
mvB
mvB
kqH
@@ -95826,20 +97068,20 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -95890,12 +97132,12 @@ aaa
aaa
aaa
aaa
-aaa
-aac
-aac
-aad
-aad
-sVt
+aJO
+baN
+bdI
+bdM
+bft
+ajP
mhf
kCG
ybw
@@ -96083,20 +97325,20 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -96147,12 +97389,12 @@ aaf
aaa
aaa
aaa
-aaa
-aac
-aac
-aad
-aad
-sVt
+aJO
+bbP
+bdJ
+bdN
+bfw
+ajP
sVt
sVt
sVt
@@ -96340,20 +97582,20 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -96404,16 +97646,16 @@ aaf
aaa
aaa
aaa
-aaa
-aaa
-aad
-aad
-eGm
-eGm
+aJO
+aJO
+bdK
+bew
+ajP
+ajP
eGm
meo
uiT
-scn
+bfq
bpj
iio
aad
@@ -96597,20 +97839,20 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -96662,10 +97904,10 @@ aaa
aaa
aaa
aaa
-aaa
-aad
-aad
-leU
+aJO
+aJO
+aJO
+ajP
dfK
dfK
sVt
@@ -96854,20 +98096,20 @@ jFP
jFP
jFP
jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 2af7ec5c49..aed6d100d9 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -290,6 +290,10 @@
#define COMPONENT_INTERRUPT_LIFE_BIOLOGICAL 1 // interrupt biological processes
#define COMPONENT_INTERRUPT_LIFE_PHYSICAL 2 // interrupt physical handling
+#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life" //from base of mob/living/BiologicalLife() (seconds, times_fired)
+
+#define COMSIG_LIVING_PHYSICAL_LIFE "physical_life" //from base of mob/living/PhysicalLife() (seconds, times_fired)
+
// /mob/living/carbon physiology signals
#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L)
#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L)
diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm
index 77e8d82aca..03110ad04e 100644
--- a/code/__DEFINES/food.dm
+++ b/code/__DEFINES/food.dm
@@ -12,6 +12,7 @@
#define TOXIC (1<<11)
#define PINEAPPLE (1<<12)
#define BREAKFAST (1<<13)
+#define ANTITOXIC (1<<14)
#define DRINK_NICE 1
#define DRINK_GOOD 2
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index 94059c0880..767894050d 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -54,3 +54,16 @@
//donator items
#define LOADOUT_CATEGORY_DONATOR "Donator"
+
+//how many prosthetics can we have
+#define MAXIMUM_LOADOUT_PROSTHETICS 2
+
+//what limbs can be amputated or be prosthetic
+#define LOADOUT_ALLOWED_LIMB_TARGETS list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
+
+//options for modifiying limbs
+#define LOADOUT_LIMB_NORMAL "Normal"
+#define LOADOUT_LIMB_PROSTHETIC "Prosthetic"
+#define LOADOUT_LIMB_AMPUTATED "Amputated"
+
+#define LOADOUT_LIMBS list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
\ No newline at end of file
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 71c2b2e13b..09d4aadf50 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -279,7 +279,8 @@ GLOBAL_LIST_INIT(unlocked_mutant_parts, list("horns", "insect_fluff"))
//parts in either of the above two lists that require a second option that allows them to be coloured
GLOBAL_LIST_INIT(colored_mutant_parts, list("insect_wings" = "wings_color", "deco_wings" = "wings_color", "horns" = "horns_color"))
-//species ids that have greyscale sprites
+//body ids that have greyscale sprites
GLOBAL_LIST_INIT(greyscale_limb_types, list("human","moth","lizard","pod","plant","jelly","slime","golem","lum","stargazer","mush","ethereal","snail","c_golem","b_golem","mammal","xeno","ipc","insect","synthliz","avian","aquatic"))
-//species ids that need snowflake coloring applied
+//body ids that have prosthetic sprites
+GLOBAL_LIST_INIT(prosthetic_limb_types, list("xion","bishop","cybersolutions","grayson","hephaestus","nanotrasen","talon"))
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 0bc4e6665a..9af86653f4 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -396,6 +396,7 @@ SUBSYSTEM_DEF(ticker)
SSjob.EquipRank(N, player.mind.assigned_role, 0)
if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
+ N.client.prefs.post_copy_to(player)
CHECK_TICK
if(captainless)
for(var/mob/dead/new_player/N in GLOB.player_list)
diff --git a/code/datums/elements/polychromic.dm b/code/datums/elements/polychromic.dm
index 1c438c86c5..7ae0d04b05 100644
--- a/code/datums/elements/polychromic.dm
+++ b/code/datums/elements/polychromic.dm
@@ -61,7 +61,7 @@
A.AddElement(/datum/element/update_icon_updates_onmob)
RegisterSignal(A, COMSIG_ITEM_WORN_OVERLAYS, .proc/apply_worn_overlays)
if(suits_with_helmet_typecache[A.type])
- RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, .proc/register_helmet)
+ RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, .proc/register_helmet) //you better work now you slut
else if(_flags & POLYCHROMIC_ACTION && ismob(A)) //in the event mob update icon procs are ever standarized.
var/datum/action/polychromic/P = new(A)
RegisterSignal(P, COMSIG_ACTION_TRIGGER, .proc/activate_action)
@@ -166,6 +166,15 @@
examine_list += "Alt-click to recolor it."
/datum/element/polychromic/proc/register_helmet(atom/source, obj/item/clothing/head/H)
+ if(!isitem(H)) //backup in case if it messes up somehow
+ if(istype(source,/obj/item/clothing/suit/hooded)) //so how come it be like this, where toggleable headslots are named separately (helmet/hood) anyways?
+ var/obj/item/clothing/suit/hooded/sourcesuit = source
+ H = sourcesuit.hood
+ else if(istype(source,/obj/item/clothing/suit/space/hardsuit))
+ var/obj/item/clothing/suit/space/hardsuit/sourcesuit = source
+ H = sourcesuit.helmet
+ else
+ return
suit_by_helmet[H] = source
helmet_by_suit[source] = H
colors_by_atom[H] = colors_by_atom[source]
diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm
index 30a04d7382..76e60bc6dc 100644
--- a/code/datums/materials/basemats.dm
+++ b/code/datums/materials/basemats.dm
@@ -285,6 +285,17 @@ Unless you know what you're doing, only use the first three numbers. They're in
beauty_modifier = -0.15
texture_layer_icon_state = "runed"
+/datum/material/brass
+ name = "brass"
+ desc = "Tybel gb-Ratvar"
+ color = "#917010"
+ categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
+ strength_modifier = 1.3 // Replicant Alloy is very good for skull beatings..
+ sheet_type = /obj/item/stack/tile/brass
+ value_per_unit = 0.75
+ armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //But it has.. a few problems that can't easily be compensated for.
+ beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it?
+
/datum/material/bronze
name = "bronze"
desc = "Clock Cult? Never heard of it."
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 38b004a657..1abe077980 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -204,6 +204,11 @@
mood_change = -1
timeout = 2 MINUTES
+/datum/mood_event/plush_bite
+ description = "IT BIT ME!! OW!\n"
+ mood_change = -3
+ timeout = 2 MINUTES
+
//Cursed stuff below
/datum/mood_event/emptypred
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 68b5d6f987..322fba0a33 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -211,24 +211,27 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/paraplegic/on_spawn()
- if(quirk_holder.buckled) // Handle late joins being buckled to arrival shuttle chairs.
- quirk_holder.buckled.unbuckle_mob(quirk_holder)
+ if(quirk_holder.client)
+ var/modified_limbs = quirk_holder.client.prefs.modified_limbs
+ if(!(modified_limbs[BODY_ZONE_L_LEG] == LOADOUT_LIMB_AMPUTATED && modified_limbs[BODY_ZONE_R_LEG] == LOADOUT_LIMB_AMPUTATED && !isjellyperson(quirk_holder)))
+ if(quirk_holder.buckled) // Handle late joins being buckled to arrival shuttle chairs.
+ quirk_holder.buckled.unbuckle_mob(quirk_holder)
- var/turf/T = get_turf(quirk_holder)
- var/obj/structure/chair/spawn_chair = locate() in T
+ var/turf/T = get_turf(quirk_holder)
+ var/obj/structure/chair/spawn_chair = locate() in T
- var/obj/vehicle/ridden/wheelchair/wheels = new(T)
- if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking
- wheels.setDir(spawn_chair.dir)
+ var/obj/vehicle/ridden/wheelchair/wheels = new(T)
+ if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking
+ wheels.setDir(spawn_chair.dir)
- wheels.buckle_mob(quirk_holder)
+ wheels.buckle_mob(quirk_holder)
- // During the spawning process, they may have dropped what they were holding, due to the paralysis
- // So put the things back in their hands.
+ // During the spawning process, they may have dropped what they were holding, due to the paralysis
+ // So put the things back in their hands.
- for(var/obj/item/I in T)
- if(I.fingerprintslast == quirk_holder.ckey)
- quirk_holder.put_in_hands(I)
+ for(var/obj/item/I in T)
+ if(I.fingerprintslast == quirk_holder.ckey)
+ quirk_holder.put_in_hands(I)
/datum/quirk/poor_aim
name = "Poor Aim"
@@ -244,42 +247,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
mob_trait = TRAIT_PROSOPAGNOSIA
medical_record_text = "Patient suffers from prosopagnosia and cannot recognize faces."
-/datum/quirk/prosthetic_limb
- name = "Prosthetic Limb"
- desc = "An accident caused you to lose one of your limbs. Because of this, you now have a random prosthetic!"
- value = -1
- var/slot_string = "limb"
-
-/datum/quirk/prosthetic_limb/on_spawn()
- var/mob/living/carbon/human/H = quirk_holder
- var/limb_slot
- if(HAS_TRAIT(H, TRAIT_PARA))//Prevent paraplegic legs being replaced
- limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
- else
- limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- var/obj/item/bodypart/old_part = H.get_bodypart(limb_slot)
- var/obj/item/bodypart/prosthetic
- switch(limb_slot)
- if(BODY_ZONE_L_ARM)
- prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(quirk_holder)
- slot_string = "left arm"
- if(BODY_ZONE_R_ARM)
- prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder)
- slot_string = "right arm"
- if(BODY_ZONE_L_LEG)
- prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder)
- slot_string = "left leg"
- if(BODY_ZONE_R_LEG)
- prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
- slot_string = "right leg"
- prosthetic.replace_limb(H)
- qdel(old_part)
- H.regenerate_icons()
-
-/datum/quirk/prosthetic_limb/post_add()
- to_chat(quirk_holder, "Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
- you need to use a welding tool and cables to repair it, instead of bruise packs and ointment.")
-
/datum/quirk/insanity
name = "Reality Dissociation Syndrome"
desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. This is not a license to grief."
diff --git a/code/game/machinery/computer/arcade/minesweeper.dm b/code/game/machinery/computer/arcade/minesweeper.dm
index ad325455ad..a9c9b5dfd9 100644
--- a/code/game/machinery/computer/arcade/minesweeper.dm
+++ b/code/game/machinery/computer/arcade/minesweeper.dm
@@ -178,9 +178,12 @@
table[y1][x1] += 10
if(href_list["same_board"]) //Reset the board... kinda
if(game_status != MINESWEEPER_GAME_PLAYING)
+ mine_sound = TRUE
game_status = MINESWEEPER_GAME_PLAYING
if(table[y1][x1] >= 10) //If revealed, become unrevealed!
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)
+ if(mine_sound)
+ playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)
+ mine_sound = FALSE
table[y1][x1] -= 10
if(table[y1][x1] > 10 && !reset_board)
safe_squares_revealed += 1
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index a8fa31d5fb..0b89b117c4 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -38,3 +38,14 @@
if(stat & (BROKEN|NOPOWER))
return
drive()
+
+/obj/machinery/mass_driver/pressure_plate
+ name = "pressure plated mass driver"
+ var/drive_delay = 10
+
+/obj/machinery/mass_driver/pressure_plate/Crossed(atom/movable/O)
+ . = ..()
+ if(isliving(O))
+ var/mob/living/L = O
+ to_chat(L, "You feel something click beneath you!")
+ addtimer(CALLBACK(src, .proc/drive), drive_delay)
\ No newline at end of file
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 6f1aec287b..7e14fb9d35 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -255,7 +255,7 @@
/obj/item/choice_beacon/box/plushie/generate_display_names()
var/list/plushie_list = list()
//plushie set 1: just subtypes of /obj/item/toy/plush
- var/list/plushies_set_one = subtypesof(/obj/item/toy/plush) - list(/obj/item/toy/plush/narplush, /obj/item/toy/plush/awakenedplushie, /obj/item/toy/plush/random_snowflake, /obj/item/toy/plush/random) //don't allow these special ones (you can still get narplush/hugbox)
+ var/list/plushies_set_one = subtypesof(/obj/item/toy/plush) - list(/obj/item/toy/plush/narplush, /obj/item/toy/plush/awakenedplushie, /obj/item/toy/plush/random_snowflake, /obj/item/toy/plush/plushling, /obj/item/toy/plush/random) //don't allow these special ones (you can still get narplush/hugbox)
for(var/V in plushies_set_one)
var/atom/A = V
plushie_list[initial(A.name)] = A
@@ -272,4 +272,3 @@
icon_state = "skub"
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("skubbed")
-
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 44205f4884..9a8f1214f0 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -167,7 +167,7 @@
return
log_game("[key_name(user)] activated a hidden grenade in [src].")
grenade.preprime(user, msg = FALSE, volume = 10)
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet)
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet)
else
to_chat(user, "You try to pet [src], but it has no stuffing. Aww...")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plush_nostuffing", /datum/mood_event/plush_nostuffing)
@@ -754,8 +754,8 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
attack_verb = list("headbutt", "scritched", "bit")
squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)
can_random_spawn = FALSE
-
-
+
+
/obj/item/toy/plush/hairball
name = "Hairball"
desc = "A bundle of undigested fibers and scales. Yuck."
@@ -765,3 +765,78 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
squeak_override = list('sound/misc/splort.ogg'=1)
attack_verb = list("sploshed", "splorted", "slushed")
can_random_spawn = FALSE
+
+/obj/item/toy/plush/plushling
+ name = "peculiar plushie"
+ desc = "An adorable stuffed toy- wait, did it just move?"
+ can_random_spawn = FALSE
+ var/absorb_cooldown = 100 //ticks cooldown between absorbs
+ var/next_absorb = 0 //When can it absorb another plushie
+ var/check_interval = 20
+ var/next_check = 0
+
+//Overrides parent proc
+/obj/item/toy/plush/plushling/attack_self(mob/user)
+ if(!user) //hmmmmm
+ return
+ to_chat(user, "You try to pet the plushie, but recoil as it bites your hand instead! OW!")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plush_bite", /datum/mood_event/plush_bite)
+ var/mob/living/carbon/human/H = user
+ if(!H)
+ return //Type safety.
+ H.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
+ addtimer(CALLBACK(H, /mob/living/carbon/human.proc/dropItemToGround, src, TRUE), 1)
+
+/obj/item/toy/plush/plushling/New()
+ var/initial_state = pick("plushie_lizard", "plushie_snake", "plushie_slime", "fox")
+ icon_state = initial_state
+ item_state = initial_state
+ START_PROCESSING(SSobj, src)
+ . = ..()
+
+/obj/item/toy/plush/plushling/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ . = ..()
+
+/obj/item/toy/plush/plushling/process()
+ if(world.time < next_absorb || world.time < next_check)
+ return
+ next_check = world.time + check_interval
+ var/obj/item/toy/plush/target
+ for(var/obj/item/toy/plush/possible_target in loc) //First, it tries to get anything in its same location, be it a tile or a backpack
+ if(possible_target == src || istype(possible_target, /obj/item/toy/plush/plushling))
+ continue
+ target = possible_target
+ break
+ if(!target)
+ if(!isturf(loc))
+ return
+ for(var/obj/item/toy/plush/P in oview(1, src)) //If that doesn't work, it hunts for plushies adjacent to its own tile
+ if(istype(P, /obj/item/toy/plush/plushling)) //These do not hunt their own kind
+ continue
+ src.throw_at(P, 1, 2)
+ visible_message("[src] leaps at [P]!")
+ break
+ return
+ if(istype(target, /obj/item/toy/plush/plushling)) //These do not consume their own.
+ return
+ next_absorb = world.time + absorb_cooldown
+ plushie_absorb(target)
+
+/obj/item/toy/plush/plushling/proc/plushie_absorb(obj/item/toy/plush/victim)
+ if(!victim)
+ return
+ visible_message("[src] gruesomely mutilliates [victim], leaving nothing more than dust!")
+ name = victim.name
+ desc = victim.desc + " Wait, did it just move..?"
+ icon_state = victim.icon_state
+ item_state = victim.item_state
+ squeak_override = victim.squeak_override
+ attack_verb = victim.attack_verb
+ new /obj/effect/decal/cleanable/ash(get_turf(victim))
+ qdel(victim)
+
+/obj/item/toy/plush/plushling/love(obj/item/toy/plush/Kisser, mob/living/user) //You shouldn't have come here, poor plush.
+ if(!Kisser)
+ return
+ plushie_absorb(Kisser)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 9ed930b8c7..c3028c2fd5 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -636,7 +636,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
null, \
new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty), \
new/datum/stack_recipe("brass smith's hammer", /obj/item/melee/smith/hammer/ratvar, 6), \
- new/datum/stack_recipe("brass ingot", /obj/item/ingot/bronze/ratvar, 6, time = 100), \
+ new/datum/stack_recipe("brass ingot", /obj/item/ingot/ratvar, 6, time = 100), \
))
/obj/item/stack/tile/brass
diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
index 1fcffff810..5af2a49b1b 100644
--- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
@@ -138,7 +138,7 @@
if(owner.current.gender == MALE)
if(prob(10)) // Gender override
bloodsucker_reputation = pick("King of the Damned", "Blood King", "Emperor of Blades", "Sinlord", "God-King")
- else
+ else if(owner.current.gender == FEMALE)
if(prob(10)) // Gender override
bloodsucker_reputation = pick("Queen of the Damned", "Blood Queen", "Empress of Blades", "Sinlady", "God-Queen")
@@ -341,10 +341,12 @@
//This handles the application of antag huds/special abilities
/datum/antagonist/bloodsucker/apply_innate_effects(mob/living/mob_override)
+ RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,.proc/LifeTick)
return
//This handles the removal of antag huds/special abilities
/datum/antagonist/bloodsucker/remove_innate_effects(mob/living/mob_override)
+ UnregisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE)
return
//Assign default team and creates one for one of a kind team antagonists
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index d06ebe9d9d..242538a1e5 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -94,6 +94,7 @@
B.decoy_override = FALSE
remove_changeling_powers()
owner.special_role = null
+ owner.current.hud_used?.lingchemdisplay?.invisibility = INVISIBILITY_ABSTRACT
. = ..()
/datum/antagonist/changeling/proc/remove_clownmut()
@@ -225,6 +226,8 @@
else //not dead? no chem/geneticdamage caps.
chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage)
geneticdamage = max(0, geneticdamage-1)
+ owner.current.hud_used?.lingchemdisplay?.invisibility = 0
+ owner.current.hud_used?.lingchemdisplay?.maptext = "[round(chem_charges)]
"
/datum/antagonist/changeling/proc/get_dna(dna_owner)
@@ -357,10 +360,12 @@
B.organ_flags &= ~ORGAN_VITAL
B.decoy_override = TRUE
update_changeling_icons_added()
+ RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,.proc/regenerate)
return
/datum/antagonist/changeling/remove_innate_effects()
update_changeling_icons_removed()
+ UnregisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE)
return
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index 8e9a54a69a..149b869649 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -13,7 +13,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/obj/machinery/syndicatebomb/badmin/clown,
/obj/machinery/syndicatebomb/empty,
/obj/machinery/syndicatebomb/self_destruct,
- /obj/machinery/syndicatebomb/training
+ /obj/machinery/syndicatebomb/training,
+ /obj/machinery/gravity_generator,
+ /obj/machinery/gravity_generator/main
)))
//The malf AI action subtype. All malf actions are subtypes of this.
diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm
index c9b2690784..97de452398 100644
--- a/code/modules/arousal/arousal.dm
+++ b/code/modules/arousal/arousal.dm
@@ -68,7 +68,7 @@
R.reaction(turfing ? target : target.loc, TOUCH, 1, 0)
if(!turfing)
R.trans_to(target, R.total_volume * (spill ? G.fluid_transfer_factor : 1))
- G.time_since_last_orgasm = 0
+ G.last_orgasmed = world.time
R.clear_reagents()
/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30) //This is used for forced orgasms and other hands-free climaxes
diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm
index 8f88076af9..65eeca75fe 100644
--- a/code/modules/arousal/genitals.dm
+++ b/code/modules/arousal/genitals.dm
@@ -16,7 +16,7 @@
var/fluid_efficiency = 1
var/fluid_rate = CUM_RATE
var/fluid_mult = 1
- var/time_since_last_orgasm = 500
+ var/last_orgasmed = 0
var/aroused_state = FALSE //Boolean used in icon_state strings
var/obj/item/organ/genital/linked_organ
var/linked_organ_slot //used for linking an apparatus' organ to its other half on update_link().
@@ -24,10 +24,6 @@
/obj/item/organ/genital/Initialize(mapload, do_update = TRUE)
. = ..()
- if(fluid_id)
- create_reagents(fluid_max_volume, NONE, NO_REAGENTS_VALUE)
- if(CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
- reagents.add_reagent(fluid_id, fluid_max_volume)
if(do_update)
update()
@@ -140,8 +136,6 @@
/obj/item/organ/genital/proc/modify_size(modifier, min = -INFINITY, max = INFINITY)
fluid_max_volume += modifier*2.5
fluid_rate += modifier/10
- if(reagents)
- reagents.maximum_volume = fluid_max_volume
return
/obj/item/organ/genital/proc/update_size()
@@ -151,18 +145,14 @@
if(!owner || owner.stat == DEAD)
aroused_state = FALSE
-/obj/item/organ/genital/on_life()
- . = ..()
- if(!reagents || !.)
- return
- reagents.maximum_volume = fluid_max_volume
- if(fluid_id && CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
- time_since_last_orgasm++
-
/obj/item/organ/genital/proc/generate_fluid(datum/reagents/R)
- var/amount = clamp(fluid_rate * time_since_last_orgasm * fluid_mult,0,fluid_max_volume)
+ var/amount = clamp((fluid_rate * ((world.time - last_orgasmed) / SSmobs.wait) * fluid_mult),0,fluid_max_volume)
R.clear_reagents()
- R.add_reagent(fluid_id,amount)
+ R.maximum_volume = fluid_max_volume
+ if(fluid_id)
+ R.add_reagent(fluid_id,amount)
+ else if(linked_organ?.fluid_id)
+ R.add_reagent(linked_organ.fluid_id,amount)
return TRUE
/obj/item/organ/genital/proc/update_link()
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 14f480d33a..0c6ca13e86 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -331,6 +331,7 @@
var/heat = thermal_conductivity*delta_temperature* \
(heat_capacity*HEAT_CAPACITY_VACUUM/(heat_capacity+HEAT_CAPACITY_VACUUM))
temperature -= heat/heat_capacity
+ temperature = max(temperature,T0C) //otherwise we just sorta get stuck at super cold temps forever
/turf/open/proc/temperature_share_open_to_solid(turf/sharer)
sharer.temperature = air.temperature_share(null, sharer.thermal_conductivity, sharer.temperature, sharer.heat_capacity)
@@ -344,3 +345,5 @@
temperature -= heat/heat_capacity
sharer.temperature += heat/sharer.heat_capacity
+ temperature = max(temperature,T0C)
+ sharer.temperature = max(sharer.temperature,T0C)
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index c0f66be7de..bb65bdcaa4 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -40,6 +40,9 @@
/datum/gas_reaction/proc/react(datum/gas_mixture/air, atom/location)
return NO_REACTION
+/datum/gas_reaction/proc/test()
+ return list("success" = TRUE)
+
/datum/gas_reaction/nobliumsupression
priority = INFINITY
name = "Hyper-Noblium Reaction Suppression"
@@ -70,6 +73,8 @@
air.adjust_moles(/datum/gas/water_vapor,-MOLES_GAS_VISIBLE)
. = REACTING
+// no test cause it's entirely based on location
+
//tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic
/datum/gas_reaction/tritfire
priority = -1 //fire should ALWAYS be last, but tritium fires happen before plasma fires
@@ -126,6 +131,18 @@
return cached_results["fire"] ? REACTING : NO_REACTION
+/datum/gas_reaction/tritfire/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/tritium,50)
+ G.set_moles(/datum/gas/oxygen,50)
+ G.set_temperature(500)
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(!G.reaction_results["fire"])
+ return list("success" = FALSE, "message" = "Trit fires aren't setting fire results correctly!")
+ return ..()
+
//plasma combustion: combustion of oxygen and plasma (treated as hydrocarbons). creates hotspots. exothermic
/datum/gas_reaction/plasmafire
priority = -2 //fire should ALWAYS be last, but plasma fires happen after tritium fires
@@ -198,6 +215,28 @@
return cached_results["fire"] ? REACTING : NO_REACTION
+/datum/gas_reaction/plasmafire/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/plasma,50)
+ G.set_moles(/datum/gas/oxygen,50)
+ G.set_volume(1000)
+ G.set_temperature(500)
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(!G.reaction_results["fire"])
+ return list("success" = FALSE, "message" = "Plasma fires aren't setting fire results correctly!")
+ if(!G.get_moles(/datum/gas/carbon_dioxide))
+ return list("success" = FALSE, "message" = "Plasma fires aren't making CO2!")
+ G.clear()
+ G.set_moles(/datum/gas/plasma,10)
+ G.set_moles(/datum/gas/oxygen,1000)
+ G.set_temperature(500)
+ result = G.react()
+ if(!G.get_moles(/datum/gas/tritium))
+ return list("success" = FALSE, "message" = "Plasma fires aren't making trit!")
+ return ..()
+
//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again!
//Fusion Rework Counter: Please increment this if you make a major overhaul to this system again.
//6 reworks
@@ -282,6 +321,31 @@
air.set_temperature(clamp(((air.return_temperature()*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB,INFINITY))
return REACTING
+/datum/gas_reaction/fusion/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/carbon_dioxide,300)
+ G.set_moles(/datum/gas/plasma,1000)
+ G.set_moles(/datum/gas/tritium,100.61)
+ G.set_moles(/datum/gas/nitryl,1)
+ G.set_temperature(15000)
+ G.set_volume(1000)
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(abs(G.analyzer_results["fusion"] - 3) > 0.0000001)
+ var/instability = G.analyzer_results["fusion"]
+ return list("success" = FALSE, "message" = "Fusion is not calculating analyzer results correctly, should be 3.000000045, is instead [instability]")
+ if(abs(G.get_moles(/datum/gas/plasma) - 850.616) > 0.5)
+ var/plas = G.get_moles(/datum/gas/plasma)
+ return list("success" = FALSE, "message" = "Fusion is not calculating plasma correctly, should be 850.616, is instead [plas]")
+ if(abs(G.get_moles(/datum/gas/carbon_dioxide) - 1699.384) > 0.5)
+ var/co2 = G.get_moles(/datum/gas/carbon_dioxide)
+ return list("success" = FALSE, "message" = "Fusion is not calculating co2 correctly, should be 1699.384, is instead [co2]")
+ if(abs(G.return_temperature() - 27600) > 200) // calculating this manually sucks dude
+ var/temp = G.return_temperature()
+ return list("success" = FALSE, "message" = "Fusion is not calculating temperature correctly, should be around 27600, is instead [temp]")
+ return ..()
+
/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.
priority = 3
name = "Nitryl formation"
@@ -313,6 +377,20 @@
air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB))
return REACTING
+/datum/gas_reaction/nitrylformation/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/oxygen,30)
+ G.set_moles(/datum/gas/nitrogen,30)
+ G.set_moles(/datum/gas/nitrous_oxide,10)
+ G.set_volume(1000)
+ G.set_temperature(150000)
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(!G.get_moles(/datum/gas/nitryl) < 0.8)
+ return list("success" = FALSE, "message" = "Nitryl isn't being generated correctly!")
+ return ..()
+
/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
priority = 4
name = "BZ Gas formation"
@@ -348,6 +426,19 @@
air.set_temperature(max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB))
return REACTING
+/datum/gas_reaction/bzformation/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/plasma,15)
+ G.set_moles(/datum/gas/nitrous_oxide,15)
+ G.set_volume(1000)
+ G.set_temperature(10)
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(!G.get_moles(/datum/gas/bz) < 4) // efficiency is 4.0643 and bz generation == efficiency
+ return list("success" = FALSE, "message" = "Nitryl isn't being generated correctly!")
+ return ..()
+
/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
priority = 5
name = "Stimulum formation"
@@ -380,6 +471,23 @@
air.set_temperature(max(((air.return_temperature()*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB))
return REACTING
+/datum/gas_reaction/stimformation/test()
+ //above mentioned "strange pattern" is a basic quintic polynomial, it's fine, can calculate it manually
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/bz,30)
+ G.set_moles(/datum/gas/plasma,1000)
+ G.set_moles(/datum/gas/tritium,1000)
+ G.set_moles(/datum/gas/nitryl,1000)
+ G.set_volume(1000)
+ G.set_temperature(12998000) // yeah, really
+
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(!G.get_moles(/datum/gas/stimulum) < 900)
+ return list("success" = FALSE, "message" = "Stimulum isn't being generated correctly!")
+ return ..()
+
/datum/gas_reaction/nobliumformation //Hyper-Noblium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
priority = 6
name = "Hyper-Noblium condensation"
@@ -408,6 +516,19 @@
if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
air.set_temperature(max(((air.return_temperature()*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB))
+/datum/gas_reaction/nobliumformation/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/nitrogen,100)
+ G.set_moles(/datum/gas/tritium,500)
+ G.set_volume(1000)
+ G.set_temperature(5000000) // yeah, really
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ if(abs(G.thermal_energy() - 23000000000) > 1000000) // god i hate floating points
+ return list("success" = FALSE, "message" = "Hyper-nob formation isn't removing the right amount of heat! Should be 23,000,000,000, is instead [G.thermal_energy()]")
+ return ..()
+
/datum/gas_reaction/miaster //dry heat sterilization: clears out pathogens in the air
priority = -10 //after all the heating from fires etc. is done
@@ -433,3 +554,20 @@
//Possibly burning a bit of organic matter through maillard reaction, so a *tiny* bit more heat would be understandable
air.set_temperature(air.return_temperature() + cleaned_air * 0.002)
SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, cleaned_air*MIASMA_RESEARCH_AMOUNT)//Turns out the burning of miasma is kinda interesting to scientists
+
+/datum/gas_reaction/miaster/test()
+ var/datum/gas_mixture/G = new
+ G.set_moles(/datum/gas/miasma,1)
+ G.set_volume(1000)
+ G.set_temperature(450)
+ var/result = G.react()
+ if(result != REACTING)
+ return list("success" = FALSE, "message" = "Reaction didn't go at all!")
+ G.clear()
+ G.set_moles(/datum/gas/miasma,1)
+ G.set_temperature(450)
+ G.set_moles(/datum/gas/water_vapor,0.5)
+ result = G.react()
+ if(result != NO_REACTION)
+ return list("success" = FALSE, "message" = "Miasma sterilization not stopping due to water vapor correctly!")
+ return ..()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 51e027522c..cff3040926 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -163,6 +163,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
)
var/custom_speech_verb = "default" //if your say_mod is to be something other than your races
var/custom_tongue = "default" //if your tongue is to be something other than your races
+ var/modified_limbs = list() //prosthetic/amputated limbs
var/chosen_limb_id //body sprite selected to load for the users limbs, null means default, is sanitized when loaded
/// Security record note section
@@ -429,12 +430,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
"
if(gender != NEUTER && pref_species.sexes)
dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"]
"
+ dat += "Limb Modification:
"
+ dat += "Modify Limbs
"
+ for(var/modification in modified_limbs)
+ if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC)
+ dat += "[modification]: [modified_limbs[modification][2]]
"
+ else
+ dat += "[modification]: [modified_limbs[modification][1]]
"
+ dat += "
"
dat += "Species:[pref_species.name]
"
dat += "Custom Species Name:[custom_species ? custom_species : "None"]
"
dat += "Random Body:Randomize!
"
dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
"
dat += "
Cycle background:[bgstate]
"
-
var/use_skintones = pref_species.use_skintones
if(use_skintones)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -1235,6 +1243,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
for(var/V in all_quirks)
var/datum/quirk/T = SSquirks.quirks[V]
bal -= initial(T.value)
+ for(var/modification in modified_limbs)
+ if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC)
+ return bal + 1 //max 1 point regardless of how many prosthetics
return bal
/datum/preferences/proc/GetPositiveQuirkCount()
@@ -1492,6 +1503,29 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("cycle_bg")
bgstate = next_list_item(bgstate, bgstate_options)
+ if("modify_limbs")
+ var/limb_type = input(user, "Choose the limb to modify:", "Character Preference") as null|anything in LOADOUT_ALLOWED_LIMB_TARGETS
+ if(limb_type)
+ var/modification_type = input(user, "Choose the modification to the limb:", "Character Preference") as null|anything in LOADOUT_LIMBS
+ if(modification_type)
+ if(modification_type == LOADOUT_LIMB_PROSTHETIC)
+ var/prosthetic_type = input(user, "Choose the type of prosthetic", "Character Preference") as null|anything in (list("prosthetic") + GLOB.prosthetic_limb_types)
+ if(prosthetic_type)
+ var/number_of_prosthetics = 0
+ for(var/modification in modified_limbs)
+ if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC)
+ number_of_prosthetics += 1
+ if(number_of_prosthetics >= MAXIMUM_LOADOUT_PROSTHETICS && !(limb_type in modified_limbs && modified_limbs[limb_type][1] == LOADOUT_LIMB_PROSTHETIC))
+ to_chat(user, "You can only have up to two prosthetic limbs!")
+ else
+ //save the actual prosthetic data
+ modified_limbs[limb_type] = list(modification_type, prosthetic_type)
+ else
+ if(modification_type == LOADOUT_LIMB_NORMAL)
+ modified_limbs -= limb_type
+ else
+ modified_limbs[limb_type] = list(modification_type)
+
if("underwear")
var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_list
if(new_underwear)
@@ -2478,7 +2512,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
ShowChoices(user)
return 1
-/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE)
+/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, initial_spawn = FALSE)
if(be_random_name)
real_name = pref_species.random_name(gender)
@@ -2573,6 +2607,35 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(custom_speech_verb != "default")
character.dna.species.say_mod = custom_speech_verb
+ //limb stuff, only done when initially spawning in
+ if(initial_spawn)
+ //delete any existing prosthetic limbs to make sure no remnant prosthetics are left over
+ for(var/obj/item/bodypart/part in character.bodyparts)
+ if(part.status == BODYPART_ROBOTIC)
+ qdel(part)
+ character.regenerate_limbs() //regenerate limbs so now you only have normal limbs
+ for(var/modified_limb in modified_limbs)
+ var/modification = modified_limbs[modified_limb][1]
+ var/obj/item/bodypart/old_part = character.get_bodypart(modified_limb)
+ if(modification == LOADOUT_LIMB_PROSTHETIC)
+ var/obj/item/bodypart/new_limb
+ switch(modified_limb)
+ if(BODY_ZONE_L_ARM)
+ new_limb = new/obj/item/bodypart/l_arm/robot/surplus(character)
+ if(BODY_ZONE_R_ARM)
+ new_limb = new/obj/item/bodypart/r_arm/robot/surplus(character)
+ if(BODY_ZONE_L_LEG)
+ new_limb = new/obj/item/bodypart/l_leg/robot/surplus(character)
+ if(BODY_ZONE_R_LEG)
+ new_limb = new/obj/item/bodypart/r_leg/robot/surplus(character)
+ var/prosthetic_type = modified_limbs[modified_limb][2]
+ if(prosthetic_type != "prosthetic") //lets just leave the old sprites as they are
+ new_limb.icon = file("icons/mob/augmentation/cosmetic_prosthetic/[prosthetic_type].dmi")
+ new_limb.replace_limb(character)
+ qdel(old_part)
+
+ if(length(modified_limbs))
+ character.regenerate_icons()
SEND_SIGNAL(character, COMSIG_HUMAN_PREFS_COPIED_TO, src, icon_updates, roundstart_checks)
@@ -2581,6 +2644,18 @@ GLOBAL_LIST_EMPTY(preferences_datums)
character.update_body()
character.update_hair()
+/datum/preferences/proc/post_copy_to(mob/living/carbon/human/character)
+ //if no legs, and not a paraplegic or a slime, give them a free wheelchair
+ if(modified_limbs[BODY_ZONE_L_LEG] == LOADOUT_LIMB_AMPUTATED && modified_limbs[BODY_ZONE_R_LEG] == LOADOUT_LIMB_AMPUTATED && !character.has_quirk(/datum/quirk/paraplegic) && !isjellyperson(character))
+ if(character.buckled)
+ character.buckled.unbuckle_mob(character)
+ var/turf/T = get_turf(character)
+ var/obj/structure/chair/spawn_chair = locate() in T
+ var/obj/vehicle/ridden/wheelchair/wheels = new(T)
+ if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking
+ wheels.setDir(spawn_chair.dir)
+ wheels.buckle_mob(character)
+
/datum/preferences/proc/get_default_name(name_id)
switch(name_id)
if("human")
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 8591d77e50..5856a7b6e1 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -514,6 +514,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["scars3"] >> scars_list["3"]
S["scars4"] >> scars_list["4"]
S["scars5"] >> scars_list["5"]
+ var/limbmodstr
+ S["modified_limbs"] >> limbmodstr
+ if(length(limbmodstr))
+ modified_limbs = safe_json_decode(limbmodstr)
+ else
+ modified_limbs = list()
S["chosen_limb_id"] >> chosen_limb_id
S["hide_ckey"] >> hide_ckey //saved per-character
@@ -845,8 +851,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_ooc_notes"], features["ooc_notes"])
- WRITE_FILE(S["chosen_limb_id"], chosen_limb_id)
-
//Custom names
for(var/custom_name_id in GLOB.preferences_custom_names)
var/savefile_slot_name = custom_name_id + "_name" //TODO remove this
@@ -874,6 +878,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["scars3"] , scars_list["3"])
WRITE_FILE(S["scars4"] , scars_list["4"])
WRITE_FILE(S["scars5"] , scars_list["5"])
+ if(islist(modified_limbs))
+ WRITE_FILE(S["modified_limbs"] , safe_json_encode(modified_limbs))
+ WRITE_FILE(S["chosen_limb_id"], chosen_limb_id)
//gear loadout
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 632d59187f..f496468371 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -5,9 +5,9 @@
var/obj/item/clothing/head/hooded/hood
var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
-/obj/item/clothing/suit/hooded/New()
+/obj/item/clothing/suit/hooded/Initialize()
+ . = ..()
hood = MakeHelmet()
- ..()
/obj/item/clothing/suit/hooded/Destroy()
. = ..()
@@ -48,7 +48,7 @@
/obj/item/clothing/suit/hooded/update_icon_state()
icon_state = "[initial(icon_state)]"
- if(ishuman(hood.loc))
+ if(ishuman(hood?.loc))
var/mob/living/carbon/human/H = hood.loc
if(H.head == hood)
icon_state += "_t"
@@ -131,8 +131,8 @@
//Hardsuit toggle code
/obj/item/clothing/suit/space/hardsuit/Initialize()
- helmet = MakeHelmet()
. = ..()
+ helmet = MakeHelmet()
/obj/item/clothing/suit/space/hardsuit/Destroy()
if(helmet)
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
index 1117dbc3d3..be07826a7f 100644
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ b/code/modules/food_and_drinks/food/snacks_cake.dm
@@ -133,7 +133,7 @@
slices_num = 5
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+ foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC
/obj/item/reagent_containers/food/snacks/cakeslice/lime
name = "lime cake slice"
@@ -141,7 +141,7 @@
icon_state = "limecake_slice"
filling_color = "#00FF00"
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+ foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC
/obj/item/reagent_containers/food/snacks/store/cake/lemon
name = "lemon cake"
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 39c9c6c04f..32a89dbd58 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -103,7 +103,7 @@
icon_state = "lime_sc"
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5)
tastes = list("ice" = 1, "water" = 1, "limes" = 5)
- foodtype = FRUIT
+ foodtype = FRUIT | ANTITOXIC
/obj/item/reagent_containers/food/snacks/snowcones/lemon
name = "lemon snowcone"
@@ -191,7 +191,7 @@
icon_state = "fruitsalad_sc"
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5)
tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
- foodtype = FRUIT
+ foodtype = FRUIT | ANTITOXIC
/obj/item/reagent_containers/food/snacks/snowcones/pineapple
name = "pineapple snowcone"
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index e0697cecea..b771a90907 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -232,7 +232,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //lollipop, but vitamins = toxins
filling_color = "#00800"
tastes = list("cobwebs" = 1, "sugar" = 2)
- foodtype = JUNKFOOD | SUGAR
+ foodtype = JUNKFOOD | SUGAR | ANTITOXIC
/obj/item/reagent_containers/food/snacks/tobiko
name = "tobiko"
@@ -451,7 +451,7 @@
var/mutable_appearance/head
var/headcolor = rgb(0, 0, 0)
tastes = list("candy" = 1)
- foodtype = JUNKFOOD | SUGAR
+ foodtype = JUNKFOOD | SUGAR | ANTITOXIC
/obj/item/reagent_containers/food/snacks/lollipop/Initialize()
. = ..()
@@ -756,4 +756,4 @@
bitesize = 2
name = "hot-cross bun"
desc = "The Cross represents the Assistants that died for your sins."
- icon_state = "hotcrossbun"
\ No newline at end of file
+ icon_state = "hotcrossbun"
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index d65907daea..13a46395ea 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -509,7 +509,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 3)
cooked_type = null
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
- foodtype = GRAIN
+ foodtype = GRAIN | ANTITOXIC
/obj/item/reagent_containers/food/snacks/dankpocket
name = "\improper Dank-pocket"
@@ -556,9 +556,11 @@
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
bonus_reagents = list(/datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+ foodtype += ANTITOXIC
. = ..()
if(fey)
reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
+ foodtype += ANTITOXIC
/obj/item/reagent_containers/food/snacks/cracker
name = "cracker"
diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index 81805f5529..24522503c1 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -171,8 +171,10 @@
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
+ foodtype += ANTITOXIC
if(fey)
reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
+ foodtype += ANTITOXIC
/obj/item/reagent_containers/food/snacks/pie/xemeatpie
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index f30c182963..75cf8ffb82 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -109,7 +109,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
- foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
+ foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC
/obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket
name = "donkpocket pizza slice"
@@ -117,7 +117,7 @@
icon_state = "donkpocketpizzaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
- foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
+ foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC
/obj/item/reagent_containers/food/snacks/pizza/dank
name = "dank pizza"
@@ -127,7 +127,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
- foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
+ foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY | ANTITOXIC
/obj/item/reagent_containers/food/snacks/pizzaslice/dank
name = "dank pizza slice"
@@ -135,7 +135,7 @@
icon_state = "dankpizzaslice"
filling_color = "#2E8B57"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
- foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
+ foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY | ANTITOXIC
/obj/item/reagent_containers/food/snacks/pizza/sassysage
name = "sassysage pizza"
@@ -187,6 +187,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
+
/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM)
@@ -244,4 +245,4 @@
icon_state = "meatpizzaslice"
filling_color = "#A52A2A"
tastes = list("cardboard" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2)
- foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
\ No newline at end of file
+ foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm
index be7c3d25da..8c6eecb829 100644
--- a/code/modules/food_and_drinks/food/snacks_salad.dm
+++ b/code/modules/food_and_drinks/food/snacks_salad.dm
@@ -20,7 +20,7 @@
bonus_reagents = list(/datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/medicine/omnizine = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("leaves" = 1)
- foodtype = VEGETABLES
+ foodtype = VEGETABLES | ANTITOXIC
/obj/item/reagent_containers/food/snacks/salad/herbsalad
name = "herb salad"
@@ -38,7 +38,7 @@
bonus_reagents = list(/datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
- foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
+ foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT | ANTITOXIC
/obj/item/reagent_containers/food/snacks/salad/oatmeal
name = "oatmeal"
@@ -133,7 +133,7 @@
trash = /obj/item/reagent_containers/glass/bowl
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/medicine/earthsblood = 3, /datum/reagent/medicine/omnizine = 5, /datum/reagent/drug/happiness = 2)
tastes = list("hope" = 1)
- foodtype = VEGETABLES
+ foodtype = VEGETABLES | ANTITOXIC
/obj/item/reagent_containers/food/snacks/salad/gumbo
name = "black eyed gumbo"
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index ffafcc6b1e..eea7cdb87d 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -89,7 +89,7 @@
icon_state = "nettlesoup"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("nettles" = 1)
- foodtype = VEGETABLES
+ foodtype = VEGETABLES | ANTITOXIC
/obj/item/reagent_containers/food/snacks/soup/mystery
name = "mystery soup"
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index b4c7c89b74..4e8687fc23 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -89,7 +89,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5)
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
- foodtype = GRAIN | FRUIT | VEGETABLES
+ foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
custom_price = PRICE_CHEAP
/obj/item/reagent_containers/food/snacks/energybar
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index e84025208a..b8480a1901 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -49,6 +49,7 @@
seed = /obj/item/seeds/ambrosia/deus
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
+ foodtype = VEGETABLES | ANTITOXIC
icon_state = "ambrosiadeus"
filling_color = "#008B8B"
wine_power = 50
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 6525ac42d4..e4fe7fcdbc 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -104,6 +104,7 @@
seed = /obj/item/seeds/cannabis/death
name = "death cannabis leaf"
desc = "Looks a bit dark. Oh well."
+ foodtype = VEGETABLES | TOXIC
icon_state = "blackcannabis"
wine_power = 40
@@ -111,6 +112,7 @@
seed = /obj/item/seeds/cannabis/white
name = "white cannabis leaf"
desc = "It feels smooth and nice to the touch."
+ foodtype = VEGETABLES | ANTITOXIC
icon_state = "whitecannabis"
wine_power = 10
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index d130d50aa5..e199c2c6b1 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -29,6 +29,7 @@
seed = /obj/item/seeds/lime
name = "lime"
desc = "It's so sour, your face will twist."
+ foodtype = FRUIT | ANTITOXIC
icon_state = "lime"
filling_color = "#00FF00"
juice_results = list(/datum/reagent/consumable/limejuice = 0)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 1238b37919..0feceaf1a8 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -80,6 +80,9 @@
if(mind_traits)
for(var/t in mind_traits)
ADD_TRAIT(H.mind, t, JOB_TRAIT)
+ if(/datum/quirk/paraplegic in blacklisted_quirks)
+ H.regenerate_limbs() //if you can't be a paraplegic, attempt to regenerate limbs to stop amputated limb selection
+ H.set_resting(FALSE, TRUE) //they probably shouldn't be on the floor because they had no legs then suddenly had legs
/datum/job/proc/announce(mob/living/carbon/human/H)
if(head_announce)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 72e52176bb..82492052a9 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -93,7 +93,7 @@
new /obj/item/gun/magic/wand/book/spark(src)
/obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents()
- var/loot = rand(1,11)
+ var/loot = rand(1,14)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -120,10 +120,7 @@
new /obj/item/bedsheet/cosmos(src)
new /obj/item/melee/skateboard/hoverboard(src)
if(11)
- if(prob(50))
- new /obj/item/malf_upgrade
- else
- new /obj/item/disk/tech_disk/illegal
+ new /obj/item/disk/tech_disk/illegal(src)
if(12)
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(13)
@@ -135,7 +132,7 @@
new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src)
/obj/structure/closet/crate/necropolis/tendril/all/PopulateContents()
- var/loot = rand(1,31)
+ var/loot = rand(1,29)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -162,44 +159,44 @@
new /obj/item/bedsheet/cosmos(src)
new /obj/item/melee/skateboard/hoverboard(src)
if(11)
- new /obj/item/disk/tech_disk/illegal
- if(15)
+ new /obj/item/disk/tech_disk/illegal(src)
+ if(12)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src)
- if(16)
+ if(13)
new /obj/item/nullrod/scythe/talking(src)
- if(17)
+ if(14)
new /obj/item/nullrod/armblade(src)
- if(18)
+ if(15)
new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src)
- if(19)
+ if(16)
new /obj/item/grenade/clusterbuster/inferno(src)
- if(20)
+ if(17)
new /obj/item/gun/magic/wand/book/shock(src)
- if(21)
+ if(18)
new /obj/item/gun/magic/wand/book/page(src)
- if(22)
+ if(19)
new /obj/item/gun/magic/wand/book/spark(src)
- if(23)
+ if(20)
new /obj/item/soulstone/anybody(src)
- if(24)
+ if(21)
new /obj/item/rod_of_asclepius(src)
- if(25)
+ if(22)
new /obj/item/organ/heart/cursed/wizard(src)
- if(26)
+ if(23)
new /obj/item/book/granter/spell/summonitem(src)
- if(27)
+ if(24)
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
- if(28)
+ if(25)
new /obj/item/clothing/neck/necklace/memento_mori(src)
- if(28)
+ if(26)
new /obj/item/warp_cube/red(src)
- if(29)
+ if(27)
new /obj/item/immortality_talisman(src)
- if(30)
+ if(28)
new /obj/item/gun/magic/wand/book/healing(src)
- if(31)
+ if(29)
new /obj/item/reagent_containers/glass/bottle/ichor/red(src)
new /obj/item/reagent_containers/glass/bottle/ichor/blue(src)
new /obj/item/reagent_containers/glass/bottle/ichor/green(src)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 768c4c943e..312449064f 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -414,6 +414,8 @@
give_magic(humanc)
if(GLOB.curse_of_madness_triggered)
give_madness(humanc, GLOB.curse_of_madness_triggered)
+ if(humanc.client)
+ humanc.client.prefs.post_copy_to(humanc)
GLOB.joined_player_list += character.ckey
GLOB.latejoiners += character
@@ -567,7 +569,7 @@
client.prefs.scars_list["[cur_scar_index]"] = valid_scars
client.prefs.save_character()
- client.prefs.copy_to(H)
+ client.prefs.copy_to(H, initial_spawn = TRUE)
H.dna.update_dna_identity()
if(mind)
if(transfer_after)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 9a0d9f9242..b77fae68c8 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -41,7 +41,7 @@
var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
// Apply the Dummy's preview background first so we properly layer everything else on top of it.
mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
- copy_to(mannequin)
+ copy_to(mannequin, initial_spawn = TRUE)
if(previewJob && equip_job)
mannequin.job = previewJob.title
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index d63686691d..0a2434055f 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -40,9 +40,6 @@
if(move_delay_add > 0)
move_delay_add = max(0, move_delay_add - rand(1, 2))
-/mob/living/carbon/alien/handle_changeling()
- return
-
/mob/living/carbon/alien/handle_fire()//Aliens on fire code
if(..())
return
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index 2f5c94b784..ed1ba3852f 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -18,6 +18,9 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
/mob/living/carbon/human/dummy/Life()
return
+/mob/living/carbon/human/dummy/update_mobility()
+ return
+
/mob/living/carbon/human/dummy/proc/wipe_state()
delete_equipment()
icon_render_key = null
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 49c55f70b3..43f5ca5526 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -18,7 +18,8 @@
var/datum/action/innate/regenerate_limbs/regenerate_limbs
var/datum/action/innate/slime_change/slime_change //CIT CHANGE
liked_food = TOXIC | MEAT
- toxic_food = null
+ disliked_food = null
+ toxic_food = ANTITOXIC
coldmod = 6 // = 3x cold damage
heatmod = 0.5 // = 1/4x heat damage
burnmod = 0.5 // = 1/2x generic burn damage
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index e29c6b9ffe..8f181d47fd 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -1,8 +1,4 @@
/mob/living/carbon/BiologicalLife(seconds, times_fired)
- //Updates the number of stored chemicals for powers
- handle_changeling()
- //Handles the unique mentabolism of bloodsuckers, look at /datum/antagonist/bloodsucker/proc/LifeTick()
- handle_bloodsucker()
//Reagent processing needs to come before breathing, to prevent edge cases.
handle_organs()
. = ..() // if . is false, we are dead.
@@ -410,25 +406,7 @@
for(var/thing in all_wounds)
var/datum/wound/W = thing
if(W.processes) // meh
- W.handle_process()
-
-//todo generalize this and move hud out
-/mob/living/carbon/proc/handle_changeling()
- if(mind && hud_used && hud_used.lingchemdisplay)
- var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- changeling.regenerate()
- hud_used.lingchemdisplay.invisibility = 0
- hud_used.lingchemdisplay.maptext = "[round(changeling.chem_charges)]
"
- else
- hud_used.lingchemdisplay.invisibility = INVISIBILITY_ABSTRACT
-
-
-/mob/living/carbon/proc/handle_bloodsucker()
- if(mind && AmBloodsucker(src))
- var/datum/antagonist/bloodsucker/B = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
- B.LifeTick()
-
+ W.handle_process()
/mob/living/carbon/handle_mutations_and_radiation()
if(dna && dna.temporary_mutations.len)
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 89321082c9..9de75702db 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -43,6 +43,7 @@
* Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop.
*/
/mob/living/proc/BiologicalLife(seconds, times_fired)
+ SEND_SIGNAL(src,COMSIG_LIVING_BIOLOGICAL_LIFE, seconds, times_fired)
handle_diseases()// DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not.
handle_wounds()
@@ -78,6 +79,7 @@
* Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop.
*/
/mob/living/proc/PhysicalLife(seconds, times_fired)
+ SEND_SIGNAL(src,COMSIG_LIVING_PHYSICAL_LIFE, seconds, times_fired)
if(digitalinvis)
handle_diginvis() //AI becomes unable to see mob
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index 56510fac87..88f56f111d 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -42,7 +42,7 @@
for (var/x in 1 to PILL_STYLE_COUNT)
var/list/SL = list()
SL["id"] = x
- SL["htmltag"] = assets.icon_tag("pill[x]")
+ SL["class_name"] = assets.icon_class_name("pill[x]")
pill_styles += list(SL)
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 4034759c72..289b92f06d 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2280,6 +2280,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
quality = RACE_DRINK
else
C.adjust_disgust(disgust)
+ return ..()
/datum/reagent/consumable/ethanol/species_drink/coldscales
name = "Coldscales"
@@ -2289,7 +2290,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "coldscales"
glass_name = "glass of Coldscales"
glass_desc = "A soft green drink that looks inviting!"
-
species_required = "lizard"
/datum/reagent/consumable/ethanol/species_drink/oil_drum
@@ -2301,7 +2301,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "oil_drum"
glass_name = "Drum of oil"
glass_desc = "A gray can of booze and oil..."
-
species_required = "robot"
/datum/reagent/consumable/ethanol/species_drink/nord_king
@@ -2312,7 +2311,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "nord_king"
glass_name = "Keg of Nord King"
glass_desc = "A dripping keg of red mead."
-
species_required = "basic"
/datum/reagent/consumable/ethanol/species_drink/velvet_kiss
@@ -2324,7 +2322,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "velvet_kiss"
glass_name = "glass of Velvet Kiss"
glass_desc = "Red and white drink for the upper classes or undead."
-
species_required = "undead"
/datum/reagent/consumable/ethanol/species_drink/abduction_fruit
@@ -2336,7 +2333,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "abduction_fruit"
glass_name = "glass of Abduction Fruit"
glass_desc = "Mixed fruits that were never meant to be mixed..."
-
species_required = "alien"
/datum/reagent/consumable/ethanol/species_drink/bug_zapper
@@ -2348,7 +2344,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bug_zapper"
glass_name = "glass of Bug Zapper"
glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption."
-
species_required = "bug"
/datum/reagent/consumable/ethanol/species_drink/mush_crush
@@ -2360,7 +2355,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "mush_crush"
glass_name = "glass of Mush Crush"
glass_desc = "Popular among people that want to grow their own food rather than drink the soil."
-
species_required = "plant"
/datum/reagent/consumable/ethanol/species_drink/darkbrew
@@ -2372,7 +2366,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "darkbrew"
glass_name = "glass of Darkbrew"
glass_desc = "A pitch black drink that's commonly confused with a type of coffee."
-
species_required = "shadow"
/datum/reagent/consumable/ethanol/species_drink/hollow_bone
@@ -2384,7 +2377,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "hollow_bone"
glass_name = "skull of Hollow Bone"
glass_desc = "Mixing of milk and bone hurting juice for the enjoyment of rather skinny people."
-
species_required = "skeleton"
/datum/reagent/consumable/ethanol/species_drink/frisky_kitty
@@ -2396,7 +2388,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "frisky_kitty"
glass_name = "cup of Drisky Kitty"
glass_desc = "Warm milk and some catnip."
-
species_required = "furry"
/datum/reagent/consumable/ethanol/species_drink/jell_wyrm
@@ -2408,7 +2399,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "jell_wyrm"
glass_name = "glass of Jell Wyrm"
glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for."
-
species_required = "jelly"
/datum/reagent/consumable/ethanol/species_drink/laval_spit //Yes Laval
@@ -2420,7 +2410,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "laval_spit"
glass_name = "glass of Laval Spit"
glass_desc = "Piping hot drink for those who can stomach the heat of lava."
-
species_required = "golem"
///////////////
diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm
index df30a01f8c..6d10d33a75 100644
--- a/code/modules/smithing/smithed_items.dm
+++ b/code/modules/smithing/smithed_items.dm
@@ -79,10 +79,9 @@
/obj/item/ingot/bronze
custom_materials = list(/datum/material/bronze=12000)
-/obj/item/ingot/bronze/ratvar
- material_flags = MATERIAL_COLOR
- name = "brass ingnot"
- desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually more structurally stable bronze. Ratvar must have transformed the brass into bronze. Somehow."
+/obj/item/ingot/ratvar
+ custom_materials = list(/datum/material/brass=12000)
+ desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking."
/obj/item/smithing/attackby(obj/item/I, mob/user)
@@ -382,7 +381,7 @@
finalitem = /obj/item/melee/smith/twohand/glaive
icon_state = "glaive"
-/obj/item/smithing/glaive/startfinish()
+/obj/item/smithing/glaivehead/startfinish()
var/obj/item/melee/smith/twohand/glaive/finalforreal = new /obj/item/melee/smith/twohand/glaive(src)
finalforreal.force += quality
finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
diff --git a/code/modules/unit_tests/reactions.dm b/code/modules/unit_tests/reactions.dm
new file mode 100644
index 0000000000..66d9b49099
--- /dev/null
+++ b/code/modules/unit_tests/reactions.dm
@@ -0,0 +1,6 @@
+/datum/unit_test/reactions/Run()
+ for(var/datum/gas_reaction/G in SSair.gas_reactions)
+ var/test_info = G.test()
+ if(!test_info["success"])
+ var/message = test_info["message"]
+ Fail("Gas reaction [G.name] is failing its unit test with the following message: [message]")
diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm
index 58cb43996d..898b716775 100644
--- a/code/modules/uplink/uplink_items/uplink_dangerous.dm
+++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm
@@ -20,6 +20,7 @@
desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader."
item = /obj/item/storage/box/syndie_kit/revolver
cost = 13
+ player_minimum = 15
surplus = 50
exclude_modes = list(/datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
diff --git a/html/changelog.html b/html/changelog.html
index f440b8c76c..8775145e00 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,100 @@
-->
+
17 September 2020
+
DeltaFire15 updated:
+
+ - Failing the plushmium reaction can now create peculiar plushies, depending on reaction volume.
+ - The mood-buff from petting a plushie now works properly again.
+ - Fixed wacky necropolis loot chest behavior
+
+
EmeraldSundisk updated:
+
+ - Adds the Research Director's office to Omega Station
+ - Adds 2 new solar arrays (and control rooms)
+ - Adds some action figures that weren't there previously
+ - The CMO's office now has a light switch
+ - Slight readjustments to impacted areas
+ - Readjusts the toxins air supply line to (ideally) be easier to service
+ - Department camera consoles should now be able to actually check appropriate cameras
+ - Xenobiology can now be locked down (by the Research Director)
+
+
MrJWhit updated:
+
+ - Adds a brain damage line
+
+
Putnam3145 updated:
+
+ - Your balls finally feel full, again.
+
+
timothyteakettle updated:
+
+ - due to changes in policy, and several lawsuits, Nanotrasen has been forced to allow disabled people to sign up
+
+
+
16 September 2020
+
timothyteakettle updated:
+
+
+
12 September 2020
+
BlueWildrose updated:
+
+ - The Polychromic winter coat's hoodie will now polychrome, alongside any other new polychromic items with toggleable headwear.
+ - Minesweeper will no longer blow up the player's ears when they select "Play on the same board"
+ - Slimepeople will find warm donk pockets among other toxin healing items even more repulsive, as they are anti-toxic.
+ - Slimepeople are now neutral to gross foods.
+
+
DeltaFire15 updated:
+
+ - AIs can no longer qdel() the gravity generator
+
+
Putnam3145 updated:
+
+ - Added some unit tests for reactions.
+ - replaced handle_changeling and handle_bloodsucker with signal registration
+
+
Sonic121x updated:
+
+ - Fixed pill button on chemical press
+
+
TheObserver-sys updated:
+
+ - Brass now has a proper datum. Aspiring Forgetenders rejoice!
+
+
Trilbyspaceclone updated:
+
+ - Race based drinks will no longer stay inside your blood for ever.
+
+
Tupinambis updated:
+
+ - Redid Cogstation atmos pipes to make it less cluttered.
+ - Removed a few doors from the main hallway to mitigate chokepoint issues
+ - All belt hell conveyers are now on by default, so that belt hell actually works.
+ - IDs for poddoors and belts and the like. Everything is now properly hooked and should work as expected (except for the pressure triggered mass drivers)
+ - addresses most if not all roundstart active turfs.
+ - Issue where wires were connected to the SMES improperly, and SMES were not properly precharged, resulting in power failure earlier than intended.
+ - various rogue turfs and wirings.
+ - security office APC being hooked to maintenance for some reason.
+ - TEG is now directly wired to the SMES.
+ - adds a subtype of mass drivers that is triggered by things being on it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully functional.
+
+
lolman360 updated:
+
+ - glaives now work again
+
+
zeroisthebiggay updated:
+
+ - Revolver is now poplocked down to fifteen people.
+
+
+
11 September 2020
+
Putnam3145 updated:
+
+ - Superconducting turfs now can't go below 0 celsius.
+
+
09 September 2020
Putnam3145 updated:
@@ -1313,135 +1407,6 @@
- fixes a small pickle related issue
- recent culinary and scientific advancements have brought forth new pickle related technologies
-
-
16 July 2020
-
DeltaFire15 updated:
-
- - Fixes a zeolite runtime caused by a missing check.
-
-
Sneakyrat6 updated:
-
- - Fixes being able to meta people real name with OOC Notes
-
-
timothyteakettle updated:
-
- - travelling traders from another dimension can now visit the station in search of something specific, and reward you for giving it to them
- - small error with pet carrier logic fixed and also making sure simple mobs are catered for properly inside bluespace jars
- - fixes coin related issue
-
-
-
15 July 2020
-
Sonic121x updated:
-
-
-
14 July 2020
-
silicons updated:
-
- - chemical reactions now are sorted by priority first and temperature second.
- - sec and medical records have been added to character setup.
- - circuit reagent heaters are now sanitized for temperature from 2.7 to 1000.
-
-
timothyteakettle updated:
-
- - ports a money bag exploit
-
-
-
13 July 2020
-
Linzolle updated:
-
- - you can no longer vore and digest people regardless of vore preferences
-
-
Owai-Seek updated:
-
- - Trashbags can now hold most shoes, and organs.
- - You can no longer nest nuke disks or hold brains in the trash.
-
-
-
12 July 2020
-
DeltaFire15 updated:
-
- - Sentinels compromise now heals augmented bodyparts.
-
-
EmeraldSundisk updated:
-
- - Adds turnstiles to CogStation's security wing
- - Readds robotics to the Corpse Disposal Network
- - Readds chemistry's ability to send items directly to the experimentation lab
- - Visual renovation and slight adjustments to CogStation's robotics lab
- - Slight visual adjustments elsewhere (the library)
- - CogStation's mail and disposal pipes are once again complete
- - CogStation's robotics lab now has spawners, lights, and other room essentials
-
-
HeroWithYay updated:
-
- - Added Telecrystal Dust
- - Telecrystals can be sold at cargo
-
-
LetterN updated:
-
- - Added d[thing] emojis
- - bye xss
-
-
MrJWhit updated:
-
- - Removes northern tunnel to the monastery on Pubby
-
-
Yakumo Chen updated:
-
- - Adds a wedding crate to cargo full of wedding attire.
-
-
kappa-sama updated:
-
- - wisdom cow is half as common and is wise enough to lag the server 66% less
-
-
silicons updated:
-
- - policy configuration added, plus support hooks for assisting enforcement of clone memory disorder. logging: added logging of revival by defib, cloning, strangereagent, and revival surgery
- - You can now "audibly emote" by having ! at the start of a sentence.
-
-
timothyteakettle updated:
-
- - due to recent biological advancements, you can now make eye contact with people.
-
-
zeroisthebiggay updated:
-
- - a singular stray pixel
-
-
-
11 July 2020
-
Putnam3145 updated:
-
- - Gas mixtures now live entirely in a DLL.
-
-
-
10 July 2020
-
Chiirno updated:
-
- - Gave jellypeople a unique brain object /obj/item/organ/brain/jelly
- - added an icon for jellypeople brains.
-
-
EmeraldSundisk updated:
-
- - Adds a pool to PubbyStation
- - Slight adjustments to the surrounding area as to fit said pool
-
-
Sneakyrat6 updated:
-
- - Fixes hair falling out of hoodies.
-
-
TheObserver-sys updated:
-
- - Actually adds the juice reagent to make laugh peas donuts.
-
-
-
09 July 2020
-
timothyteakettle updated:
-
- - bluespace tray added, allowing twice as many items as the regular tray, printable at the service lathe, researched through science
- - bluespace jar added, a kind of pet carrier that allows human sized mobs inside, and smashes when thrown, researched and printed through science
-