diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 87178c32f3..bb372563cf 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -4821,7 +4821,7 @@
pixel_x = -32
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"aiQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -5088,7 +5088,7 @@
pixel_x = -32
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"ajw" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -9400,7 +9400,7 @@
/obj/item/storage/box/masks,
/obj/structure/table,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"asM" = (
/obj/structure/table,
/obj/item/crowbar,
@@ -9409,8 +9409,11 @@
/obj/structure/sign/warning/nosmoking{
pixel_y = 30
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"asN" = (
/obj/machinery/airalarm{
dir = 4;
@@ -15795,7 +15798,7 @@
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aJL" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
@@ -16090,7 +16093,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aKD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -16214,7 +16217,7 @@
"aKT" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aKU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
@@ -16229,7 +16232,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aKW" = (
/obj/machinery/light_switch{
pixel_y = 28
@@ -16697,13 +16700,13 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aMl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aMm" = (
/obj/machinery/firealarm{
pixel_y = 24
@@ -16811,7 +16814,7 @@
"aMD" = (
/obj/machinery/icecream_vat,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aME" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -16823,7 +16826,7 @@
/area/hydroponics)
"aMF" = (
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aMG" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
@@ -17117,7 +17120,7 @@
name = "Pete"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aNL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
@@ -17128,7 +17131,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aNN" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -17149,7 +17152,7 @@
},
/obj/machinery/vending/wardrobe/chef_wardrobe,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aNP" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
@@ -17537,7 +17540,7 @@
"aOI" = (
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aOJ" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -17559,14 +17562,14 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aON" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aOO" = (
/obj/machinery/door/airlock{
name = "Bar Storage";
@@ -17603,7 +17606,7 @@
"aOT" = (
/obj/machinery/gibber,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"aOU" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -19221,11 +19224,11 @@
"aTs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aTt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aTu" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -19536,11 +19539,11 @@
dir = 8
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -19641,7 +19644,7 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUz" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/airalarm{
@@ -19654,7 +19657,7 @@
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUB" = (
/obj/structure/bookcase/random/adult,
/turf/open/floor/wood,
@@ -19732,19 +19735,19 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUO" = (
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUQ" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUR" = (
/obj/structure/table/wood,
/obj/item/pen/red,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUS" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -19770,7 +19773,7 @@
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUX" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -20322,7 +20325,7 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -20339,7 +20342,7 @@
dir = 8
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWj" = (
/obj/structure/grille,
/obj/structure/window{
@@ -20370,7 +20373,7 @@
pixel_x = -28
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWn" = (
/obj/structure/closet/wardrobe/black,
/obj/item/clothing/shoes/jackboots,
@@ -20405,19 +20408,19 @@
dir = 8
},
/turf/open/floor/carpet,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWs" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/carpet,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWt" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -21112,7 +21115,7 @@
/area/security/detectives_office)
"aXL" = (
/turf/open/floor/carpet,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aXM" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21132,7 +21135,7 @@
},
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aXP" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -21196,7 +21199,7 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aXY" = (
/obj/structure/chair/office/dark,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -21204,13 +21207,13 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aXZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/carpet,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aYb" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -21249,7 +21252,7 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aYe" = (
/obj/machinery/light_switch{
pixel_y = 28
@@ -21715,7 +21718,7 @@
/obj/item/folder/blue,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aZo" = (
/obj/structure/sink{
dir = 4;
@@ -22238,7 +22241,7 @@
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"baI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -22251,7 +22254,7 @@
pixel_y = -29
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"baK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -22597,7 +22600,7 @@
/area/hallway/secondary/exit)
"bbI" = (
/obj/machinery/power/apc{
- areastring = "/area/security/vacantoffice";
+ areastring = "/area/vacant_room/office";
dir = 8;
name = "Vacant Office APC";
pixel_x = -24
@@ -23041,14 +23044,10 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bdb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white/side,
/area/hallway/primary/starboard)
"bdc" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard)
"bdd" = (
@@ -23117,13 +23116,13 @@
/area/crew_quarters/heads/captain)
"bdl" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bdm" = (
@@ -23164,11 +23163,20 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bdr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
"bds" = (
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway 4";
@@ -23346,13 +23354,9 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/locker)
"bdN" = (
-/obj/machinery/door/airlock/medical{
- name = "Morgue";
- req_access_txt = "6"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/medical/surgery)
"bdO" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -23665,8 +23669,13 @@
},
/area/hallway/primary/starboard)
"bez" = (
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/starboard";
+ name = "Starboard Primary Hallway APC";
+ pixel_y = -24
+ },
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "0-4"
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
@@ -23881,7 +23890,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"beY" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -24107,11 +24116,11 @@
"bfG" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bfH" = (
/obj/structure/sign/departments/medbay/alt,
/turf/closed/wall,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bfI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -24141,18 +24150,9 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bfO" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"bfP" = (
-/obj/machinery/power/apc{
- areastring = "/area/hallway/primary/starboard";
- name = "Starboard Primary Hallway APC";
- pixel_y = -24
- },
-/obj/structure/cable,
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/medical/paramedic)
"bfQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -24337,22 +24337,22 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/obj/machinery/power/apc{
areastring = "/area/science/robotics/mechbay";
dir = 4;
name = "Mech Bay APC";
pixel_x = 26
},
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"bgp" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bgq" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -24528,7 +24528,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bgS" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -24641,7 +24641,7 @@
"bhe" = (
/obj/structure/chair,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bhg" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -24715,25 +24715,9 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bhm" = (
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
-"bhn" = (
-/obj/structure/table,
-/obj/item/storage/box/bodybags,
-/obj/item/pen,
-/obj/machinery/light/small{
- dir = 8
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
-"bho" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/bodycontainer/morgue{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
-"bhp" = (
/obj/machinery/power/apc{
areastring = "/area/medical/morgue";
dir = 1;
@@ -24745,18 +24729,50 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
-"bhq" = (
+"bhn" = (
/obj/machinery/light/small{
- dir = 4
+ dir = 8
+ },
+/obj/structure/bodycontainer/morgue,
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
+"bho" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
-"bhr" = (
-/obj/machinery/door/airlock{
- name = "Starboard Emergency Storage"
+"bhp" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/turf/open/floor/plating,
-/area/storage/emergency/starboard)
+/obj/machinery/power/apc{
+ areastring = "/area/medical/paramedic";
+ dir = 8;
+ name = "Paramedic's Office APC";
+ pixel_x = -26
+ },
+/obj/machinery/computer/crew{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
+"bhq" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/obj/effect/landmark/start/paramedic,
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
+"bhr" = (
+/turf/closed/wall,
+/area/crew_quarters/kitchen/backroom)
"bhs" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel,
@@ -24847,7 +24863,7 @@
/area/science/robotics/lab)
"bhA" = (
/turf/closed/wall,
-/area/science/research)
+/area/science)
"bhB" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/research{
@@ -24855,7 +24871,7 @@
req_access_txt = "47"
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bhC" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "rnd";
@@ -24863,7 +24879,7 @@
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/science/lab)
+/area/science/research)
"bhD" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/southright{
@@ -24875,7 +24891,7 @@
name = "research lab shutters"
},
/turf/open/floor/plating,
-/area/science/lab)
+/area/science/research)
"bhE" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty{
@@ -24885,7 +24901,7 @@
/obj/item/stack/sheet/metal/fifty,
/obj/item/clothing/glasses/welding,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bhF" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
@@ -24900,7 +24916,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bhG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
@@ -25014,13 +25030,13 @@
"bhU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bhV" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bhW" = (
/obj/machinery/door/poddoor/shutters{
id = "qm_warehouse";
@@ -25067,7 +25083,7 @@
pixel_x = 29
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bic" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -25228,7 +25244,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"biu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -25283,22 +25299,32 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"biB" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/item/cigbutt{
+ pixel_x = 10;
+ pixel_y = 17
+ },
+/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
+/area/medical/paramedic)
"biC" = (
-/turf/open/floor/plating,
-/area/storage/emergency/starboard)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/kitchen/backroom)
"biD" = (
-/obj/item/storage/box/lights/mixed,
+/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/storage/emergency/starboard)
"biE" = (
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/structure/reagent_dispensers/watertank,
/obj/item/extinguisher,
/turf/open/floor/plating,
/area/storage/emergency/starboard)
@@ -25424,7 +25450,7 @@
dir = 9
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"biS" = (
/obj/machinery/camera{
c_tag = "Research Division Access"
@@ -25437,7 +25463,7 @@
dir = 5
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"biT" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -25455,7 +25481,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"biV" = (
/obj/structure/chair/stool,
/obj/effect/landmark/start/scientist,
@@ -25466,10 +25492,10 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"biW" = (
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"biX" = (
/obj/machinery/camera{
c_tag = "Research and Development";
@@ -25487,7 +25513,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"biY" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -25860,7 +25886,7 @@
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bjT" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/blue,
@@ -25868,14 +25894,14 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bjU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bjV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -25885,7 +25911,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bjX" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -25919,38 +25945,36 @@
dir = 10
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bka" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bkb" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/structure/table/glass,
+/obj/item/flashlight/lamp{
+ pixel_x = -2;
+ pixel_y = 11
+ },
+/obj/item/folder/white,
+/obj/item/pen,
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
+"bkd" = (
/obj/machinery/camera{
c_tag = "Medbay Morgue";
dir = 8;
network = list("ss13","medbay")
},
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
- },
+/obj/machinery/suit_storage_unit/paramedic,
/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
-"bkc" = (
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
-/area/storage/emergency/starboard)
-"bkd" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/storage/emergency/starboard)
-"bkf" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
-/area/storage/emergency/starboard)
+/area/medical/paramedic)
"bkh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/circuit,
@@ -25971,7 +25995,7 @@
pixel_x = 24
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bkj" = (
/obj/structure/closet/emcloset,
/obj/machinery/airalarm{
@@ -26036,7 +26060,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bkr" = (
/obj/machinery/shower{
dir = 8
@@ -26048,7 +26072,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bks" = (
/obj/machinery/requests_console{
department = "Science";
@@ -26058,7 +26082,7 @@
receive_ore_updates = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bkt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -26076,7 +26100,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bkw" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light{
@@ -26229,8 +26253,14 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -24
+ },
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"bkR" = (
@@ -26243,8 +26273,9 @@
/obj/machinery/light_switch{
pixel_y = -25
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
@@ -26267,21 +26298,11 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bkU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/closet/emcloset,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
+/area/hallway/primary/starboard)
"bkV" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -26345,6 +26366,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/door/airlock/maintenance{
+ name = "Morgue Maintenance";
+ req_access_txt = "6"
+ },
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"blb" = (
@@ -26394,21 +26419,11 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"blg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
},
-/obj/machinery/door/airlock/maintenance{
- name = "Morgue Maintenance";
- req_access_txt = "6"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"blh" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastright{
@@ -26440,7 +26455,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bll" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
@@ -26466,26 +26481,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"blo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/power/apc{
- areastring = "/area/storage/emergency/starboard";
- dir = 1;
- name = "Starboard Emergency Storage APC";
- pixel_y = 24
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"blp" = (
/obj/machinery/power/apc{
areastring = "/area/security/checkpoint/medical";
@@ -26520,8 +26521,13 @@
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"blr" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
+/obj/structure/bodycontainer/morgue{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay Morgue";
+ dir = 6;
+ network = list("ss13","medbay")
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
@@ -26674,31 +26680,31 @@
dir = 6
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"blI" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"blJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/rnd/production/protolathe/department/science,
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"blK" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"blL" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"blM" = (
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
@@ -26765,7 +26771,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"blY" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/stripes/line{
@@ -26780,7 +26786,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bma" = (
/obj/structure/table/glass,
/obj/item/stock_parts/manipulator,
@@ -26799,7 +26805,7 @@
pixel_x = 24
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bmb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -27065,7 +27071,7 @@
pixel_x = -24
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bmK" = (
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
@@ -27136,13 +27142,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bmR" = (
-/obj/structure/table,
-/obj/item/paper/guides/jobs/medical/morgue{
- pixel_x = 5;
- pixel_y = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
},
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bmS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
@@ -27170,15 +27174,15 @@
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"bmW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
},
/turf/closed/wall,
/area/medical/morgue)
"bmX" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/medical/genetics)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bmY" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -27221,7 +27225,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bng" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -27230,13 +27234,13 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bnh" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bni" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -27284,7 +27288,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bnl" = (
/obj/item/stack/sheet/glass,
/obj/structure/table/glass,
@@ -27301,7 +27305,7 @@
},
/obj/item/stock_parts/scanning_module,
/obj/machinery/power/apc{
- areastring = "/area/science/lab";
+ areastring = "/area/science/research";
dir = 4;
name = "Research Lab APC";
pixel_x = 26
@@ -27310,38 +27314,38 @@
icon_state = "0-8"
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bnm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
-/area/science/research)
+/area/science)
"bnn" = (
/obj/machinery/computer/rdconsole/core{
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"bno" = (
/obj/item/reagent_containers/glass/beaker/sulphuric,
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"bnp" = (
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"bnq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/closed/wall,
-/area/science/lab)
+/area/science/research)
"bnr" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/structure/plasticflaps/opaque,
/turf/open/floor/plating,
-/area/science/lab)
+/area/science/research)
"bns" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -27855,7 +27859,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/research)
+/area/science)
"box" = (
/turf/closed/wall,
/area/science/robotics/lab)
@@ -27868,7 +27872,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/research)
+/area/science)
"boz" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/poddoor/preopen{
@@ -27877,16 +27881,16 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/research)
+/area/science)
"boA" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"boB" = (
/turf/closed/wall,
-/area/science/lab)
+/area/science/research)
"boC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
@@ -27969,7 +27973,7 @@
/area/science/robotics/lab)
"boM" = (
/turf/open/floor/plasteel/white/corner,
-/area/science/research)
+/area/science)
"boN" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -27979,18 +27983,18 @@
"boO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white/side,
-/area/science/research)
+/area/science)
"boP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"boQ" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
/obj/item/stock_parts/cell/high/plus,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"boR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -28173,7 +28177,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bpp" = (
/obj/machinery/door/window/eastright{
base_state = "left";
@@ -28184,7 +28188,7 @@
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"bpq" = (
/obj/machinery/light_switch{
pixel_y = -23
@@ -28193,7 +28197,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bpr" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=8";
@@ -28203,7 +28207,7 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/lab)
+/area/science/research)
"bps" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -28462,7 +28466,7 @@
/turf/open/floor/plasteel/white/corner{
dir = 8
},
-/area/science/research)
+/area/science)
"bpY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -28477,7 +28481,7 @@
/obj/item/disk/design_disk,
/obj/item/disk/design_disk,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bqa" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -28511,7 +28515,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bqg" = (
/obj/machinery/atmospherics/components/binary/valve{
dir = 1
@@ -28556,7 +28560,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bql" = (
/obj/machinery/conveyor{
dir = 4;
@@ -28849,6 +28853,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bqY" = (
@@ -28961,7 +28968,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"brn" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28971,7 +28978,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bro" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28982,7 +28989,7 @@
/turf/open/floor/plasteel/white/side{
dir = 10
},
-/area/science/research)
+/area/science)
"brp" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -28992,7 +28999,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"brq" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/button/door{
@@ -29033,7 +29040,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bru" = (
/obj/machinery/firealarm{
pixel_y = 24
@@ -29080,7 +29087,7 @@
},
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
-/area/science/lab)
+/area/science/research)
"bry" = (
/obj/machinery/door/airlock/maintenance{
name = "Experimentation Lab Maintenance";
@@ -29500,17 +29507,17 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bsA" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bsC" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bsD" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -29519,7 +29526,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bsE" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -29666,7 +29673,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bsY" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -29682,7 +29689,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bta" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29694,7 +29701,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29706,7 +29713,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -29727,7 +29734,7 @@
/turf/open/floor/plasteel/white/side{
dir = 6
},
-/area/science/research)
+/area/science)
"btf" = (
/obj/machinery/requests_console{
department = "Medbay";
@@ -29738,10 +29745,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
-"btg" = (
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
"bth" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -29750,7 +29753,7 @@
icon_state = "plant-16"
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bti" = (
/obj/structure/closet/wardrobe/grey,
/obj/item/clothing/head/beret/black,
@@ -29796,7 +29799,7 @@
dir = 4
},
/turf/closed/wall/r_wall,
-/area/science/research)
+/area/science)
"bto" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -29896,7 +29899,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btx" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/poddoor/preopen{
@@ -29908,7 +29911,7 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/research)
+/area/science)
"bty" = (
/obj/structure/chair{
dir = 8
@@ -29931,7 +29934,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btB" = (
/obj/machinery/computer/bounty{
dir = 4
@@ -30064,7 +30067,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -30072,7 +30075,7 @@
/turf/open/floor/plasteel/white/side{
dir = 10
},
-/area/science/research)
+/area/science)
"btR" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -30086,7 +30089,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30101,7 +30104,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30115,7 +30118,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"btX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30240,7 +30243,7 @@
/turf/open/floor/plasteel/white/side{
dir = 8
},
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bul" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -30266,7 +30269,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bup" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -30276,7 +30279,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"buq" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -30304,7 +30307,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"but" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30457,7 +30460,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"buI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -30544,7 +30547,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"buU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30562,7 +30565,7 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/research)
+/area/science)
"buV" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -30620,7 +30623,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bvc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30633,13 +30636,13 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bvd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall,
-/area/medical/sleeper)
+/area/medical/surgery)
"bve" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30654,7 +30657,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bvf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -30663,7 +30666,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bvg" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -30673,23 +30676,16 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
-"bvh" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/area/science)
"bvi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
-/area/medical/sleeper)
-"bvj" = (
-/turf/closed/wall,
-/area/medical/sleeper)
+/area/medical/surgery)
"bvk" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bvl" = (
/obj/machinery/door/airlock/medical/glass{
name = "Surgery Observation"
@@ -30697,11 +30693,11 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bvm" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bvn" = (
/obj/machinery/button/door{
desc = "A remote control switch for the genetics doors.";
@@ -30789,7 +30785,7 @@
/area/medical/genetics)
"bvx" = (
/turf/closed/wall/r_wall,
-/area/science/research)
+/area/science)
"bvy" = (
/obj/machinery/camera{
c_tag = "Genetics Research";
@@ -30850,7 +30846,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bvE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -30858,7 +30854,7 @@
/turf/open/floor/plasteel/white/side{
dir = 6
},
-/area/science/research)
+/area/science)
"bvF" = (
/obj/machinery/requests_console{
department = "Cargo Bay";
@@ -30895,7 +30891,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bvI" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -31194,11 +31190,11 @@
c_tag = "Surgery Observation";
network = list("ss13","medbay")
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
},
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bwx" = (
/obj/machinery/door/window/eastleft{
name = "Medical Delivery";
@@ -31217,18 +31213,20 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bwD" = (
/obj/machinery/sleeper{
dir = 8
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bwE" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bwF" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/glass/beaker/cryoxadone{
@@ -31240,20 +31238,20 @@
pixel_y = 1
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bwG" = (
/obj/structure/sign/warning/nosmoking,
/turf/closed/wall,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bwH" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bwI" = (
/obj/machinery/atmospherics/components/unary/cryo_cell,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bwJ" = (
/obj/structure/table/glass,
/obj/machinery/camera{
@@ -31263,7 +31261,7 @@
/obj/item/reagent_containers/glass/beaker/cryoxadone,
/obj/item/reagent_containers/glass/beaker/cryoxadone,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bwK" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
@@ -31331,7 +31329,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bwQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -31444,31 +31442,27 @@
/area/security/checkpoint/supply)
"bwZ" = (
/obj/structure/chair,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bxa" = (
/obj/structure/chair,
/obj/structure/sign/warning/nosmoking{
pixel_x = -28
},
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bxb" = (
/obj/structure/chair,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+ dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bxc" = (
/obj/machinery/holopad,
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bxd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -31480,7 +31474,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bxe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -31493,7 +31487,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bxf" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -31507,7 +31501,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bxg" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -31728,7 +31722,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bxG" = (
/obj/machinery/door/airlock/command{
name = "Head of Personnel";
@@ -31797,13 +31791,13 @@
pixel_x = -28
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxP" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -31818,34 +31812,34 @@
/area/crew_quarters/heads/hor)
"bxQ" = (
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxR" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxS" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxT" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxU" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxV" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bxW" = (
/obj/machinery/door/airlock/command/glass{
name = "Research Director";
@@ -32374,37 +32368,41 @@
dir = 4
},
/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
-/area/medical/sleeper)
+/area/medical/surgery)
"byZ" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
-/area/medical/sleeper)
+/area/medical/surgery)
"bza" = (
/obj/structure/chair,
/obj/machinery/airalarm{
pixel_y = 23
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bzb" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/surgery)
"bzc" = (
/obj/machinery/door/airlock/medical/glass{
name = "Recovery Room"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzd" = (
/obj/structure/table,
/obj/item/stack/packageWrap,
@@ -32427,14 +32425,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
-"bzf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/landmark/start/paramedic,
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -32446,19 +32437,19 @@
dir = 6
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzi" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzj" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzk" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -32614,14 +32605,14 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bzB" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bzC" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -32652,7 +32643,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bzF" = (
/obj/machinery/firealarm{
dir = 8;
@@ -32670,17 +32661,19 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bzH" = (
-/obj/structure/table,
-/obj/item/hemostat,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white/side,
-/area/medical/sleeper)
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/medical/surgery)
"bzI" = (
/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small{
+ dir = 8
+ },
/obj/structure/table,
-/obj/item/surgicaldrill,
+/obj/item/storage/backpack/duffelbag/med/surgery,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/surgery)
"bzJ" = (
/obj/machinery/computer/mecha{
dir = 8
@@ -32691,14 +32684,9 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor)
"bzK" = (
-/obj/structure/table,
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/item/circular_saw,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/closed/wall,
+/area/medical/surgery)
"bzL" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
@@ -32756,12 +32744,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"bzS" = (
-/obj/structure/table,
-/obj/item/cautery{
- pixel_x = 4
+/obj/machinery/light/small{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/computer/operating,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/surgery)
"bzT" = (
/obj/structure/chair/office/dark,
/obj/effect/landmark/start/quartermaster,
@@ -32774,15 +32763,15 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzV" = (
/obj/machinery/vending/wardrobe/medi_wardrobe,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzW" = (
/obj/structure/closet/l3closet,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bzX" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -32800,7 +32789,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bAa" = (
/obj/machinery/door/firedoor/heavy,
/obj/structure/cable{
@@ -32808,7 +32797,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bAb" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -32899,8 +32888,11 @@
/area/hallway/primary/central)
"bAl" = (
/obj/structure/chair,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/area/medical/surgery)
"bAm" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -32961,11 +32953,11 @@
network = list("ss13","medbay")
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bAr" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bAs" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1;
@@ -32978,18 +32970,18 @@
},
/obj/machinery/light,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bAt" = (
/obj/structure/table/reinforced,
/obj/item/wrench/medical,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bAu" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bAv" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1;
@@ -32997,7 +32989,7 @@
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bAw" = (
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -33221,29 +33213,21 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/janitor)
-"bAW" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
"bAX" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
+/obj/structure/curtain{
+ pixel_y = -32
},
/turf/open/floor/plasteel/white/side{
dir = 4
},
-/area/medical/sleeper)
+/area/medical/surgery)
"bAY" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
+/obj/structure/curtain{
+ pixel_y = -32
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bAZ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -33255,24 +33239,19 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bBb" = (
-/obj/effect/landmark/start/medical_doctor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/atmos)
"bBc" = (
-/obj/structure/table,
-/obj/item/surgical_drapes,
-/obj/item/razor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/curtain{
+ pixel_y = -32
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/table/optable,
/turf/open/floor/plasteel/white/side{
dir = 8
},
-/area/medical/sleeper)
+/area/medical/surgery)
"bBd" = (
/obj/structure/table,
/obj/structure/bedsheetbin{
@@ -33280,22 +33259,19 @@
},
/obj/item/clothing/suit/straight_jacket,
/obj/item/clothing/mask/muzzle,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bBe" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bBf" = (
/obj/structure/filingcabinet,
/obj/structure/reagent_dispensers/peppertank{
@@ -33552,7 +33528,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bBE" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -33562,7 +33538,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bBF" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/item/storage/firstaid/toxin,
@@ -34000,44 +33976,45 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/maintenance{
- name = "Surgery Maintenance";
- req_access_txt = "45"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/closed/wall,
+/area/medical/surgery)
"bCC" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
+/obj/machinery/bloodbankgen,
+/obj/machinery/camera{
+ c_tag = "Medbay Recovery Room";
+ dir = 6;
+ network = list("ss13","medbay")
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"bCD" = (
-/obj/structure/table,
-/obj/item/retractor,
+/obj/machinery/computer/operating,
/turf/open/floor/plasteel/white/side,
-/area/medical/sleeper)
+/area/medical/surgery)
"bCE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bCF" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
+/obj/machinery/power/apc{
+ areastring = "/area/medical/surgery";
+ dir = 8;
+ name = "Treatment Center APC";
+ pixel_x = -24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bCG" = (
/obj/structure/table,
/obj/item/folder/white,
@@ -34045,28 +34022,30 @@
/obj/item/soap/nanotrasen,
/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bCJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/light_switch{
+ pixel_y = 26
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bCK" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCL" = (
/obj/structure/closet/secure_closet/medical3,
/obj/machinery/camera{
@@ -34074,19 +34053,19 @@
network = list("ss13","medbay")
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCM" = (
/obj/structure/closet/secure_closet/medical3,
/obj/machinery/airalarm{
pixel_y = 24
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCN" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCO" = (
/obj/structure/table,
/obj/item/storage/box/bodybags{
@@ -34096,17 +34075,7 @@
/obj/item/storage/box/rxglasses,
/obj/item/hand_labeler,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
-"bCP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/medical/sleeper)
-"bCQ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -34121,19 +34090,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/iv_drip,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
-"bCT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/vehicle/ridden/wheelchair{
+ dir = 8
},
-/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bCU" = (
/obj/item/radio/intercom{
frequency = 1485;
@@ -34221,7 +34186,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bDe" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
@@ -34293,7 +34258,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bDm" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -34303,13 +34268,13 @@
dir = 10
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bDn" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bDo" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -34357,16 +34322,6 @@
},
/turf/closed/wall,
/area/maintenance/port/aft)
-"bDu" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
"bDv" = (
/obj/structure/table,
/obj/item/flashlight{
@@ -34412,43 +34367,41 @@
/area/storage/tech)
"bDA" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/power/apc{
- areastring = "/area/medical/sleeper";
- dir = 4;
- name = "Treatment Center APC";
- pixel_x = 26
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"bDB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/white/side{
dir = 4
},
-/area/medical/sleeper)
+/area/medical/surgery)
"bDC" = (
-/obj/machinery/computer/operating{
- dir = 1
+/obj/effect/landmark/start/medical_doctor,
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bDD" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bDE" = (
/obj/machinery/vending/wallmed{
pixel_x = 28
@@ -34458,9 +34411,14 @@
dir = 8;
network = list("ss13","medbay")
},
-/obj/machinery/iv_drip,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/vehicle/ridden/wheelchair{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bDF" = (
/obj/machinery/door/poddoor/preopen{
id = "medpriv4";
@@ -34555,9 +34513,6 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
-"bDR" = (
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
"bDS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -34573,7 +34528,7 @@
"bDT" = (
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bDU" = (
/obj/machinery/door/airlock/command/glass{
name = "Chief Medical Officer";
@@ -34609,7 +34564,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bDY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34618,18 +34573,12 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
-"bDZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
"bEa" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bEb" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34656,7 +34605,7 @@
req_access_txt = "5"
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bEe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34676,7 +34625,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bEg" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34781,7 +34730,7 @@
/area/science/storage)
"bEq" = (
/obj/machinery/power/apc{
- areastring = "/area/science/research";
+ areastring = "/area/science";
dir = 8;
name = "Misc Research APC";
pixel_x = -25
@@ -34792,7 +34741,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bEr" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -34800,14 +34749,14 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bEs" = (
/turf/closed/wall,
/area/science/mixing)
"bEt" = (
/obj/machinery/vending/coffee,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bEu" = (
/obj/structure/closet/bombcloset,
/obj/machinery/light{
@@ -34860,7 +34809,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bEA" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/light{
@@ -34973,7 +34922,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bEO" = (
/obj/structure/sign/warning/securearea{
pixel_x = -32
@@ -34985,7 +34934,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bEP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -35178,13 +35127,11 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bFm" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- sortType = 6
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/closed/wall,
+/area/medical/medbay/central)
"bFn" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -35196,15 +35143,40 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
-"bFp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"bFp" = (
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/blood/APlus,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/blood/OPlus{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/blood/OMinus,
+/obj/item/reagent_containers/blood/BPlus{
+ pixel_x = 1;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/blood/BMinus{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/blood/AMinus,
+/obj/item/reagent_containers/blood,
+/obj/item/reagent_containers/blood,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ sortType = 6
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"bFq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -35226,27 +35198,25 @@
/area/maintenance/aft)
"bFt" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/obj/item/reagent_containers/glass/beaker/synthflesh,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"bFu" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
- name = "Operating Theatre";
- req_access_txt = "45"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/surgery)
"bFv" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bFw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -35257,20 +35227,28 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = -28
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bFx" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/limbgrower,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"bFy" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bFz" = (
/obj/machinery/airalarm{
dir = 1;
@@ -35279,10 +35257,13 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/machinery/iv_drip,
/turf/open/floor/plasteel/white/side{
dir = 1
},
-/area/medical/sleeper)
+/area/medical/surgery)
"bFA" = (
/obj/structure/sink{
dir = 4;
@@ -35295,11 +35276,11 @@
pixel_x = 30
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bFB" = (
/obj/structure/closet/secure_closet/medical2,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/surgery)
"bFC" = (
/obj/structure/table/wood/poker,
/obj/item/clothing/mask/cigarette/cigar{
@@ -35338,8 +35319,11 @@
/area/crew_quarters/heads/cmo)
"bFF" = (
/obj/machinery/light,
+/obj/structure/chair{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bFG" = (
/obj/structure/chair{
dir = 1
@@ -35379,17 +35363,15 @@
/turf/open/floor/engine,
/area/science/storage)
"bFJ" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/structure/sign/warning/nosmoking{
- pixel_x = -28
+/obj/structure/chair{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bFK" = (
/obj/structure/closet/wardrobe/pjs,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bFL" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -35462,18 +35444,18 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bFR" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bFS" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bFT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -35753,26 +35735,20 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/mixing)
-"bGH" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/area/science)
"bGI" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Surgery Maintenance";
+ req_access_txt = "45"
},
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/aft)
"bGJ" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
},
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -35787,14 +35763,14 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bGL" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bGM" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -35845,9 +35821,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/closed/wall,
+/area/medical/medbay/central)
"bGR" = (
/obj/structure/table,
/obj/item/storage/belt/medical{
@@ -35862,7 +35837,7 @@
/obj/item/clothing/neck/stethoscope,
/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bGT" = (
/obj/structure/table,
/obj/item/folder/white,
@@ -35898,9 +35873,11 @@
/area/medical/medbay/central)
"bGW" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/turf/closed/wall,
+/area/medical/medbay/central)
"bGX" = (
/obj/machinery/light{
dir = 8
@@ -35951,7 +35928,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bHd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35982,7 +35959,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bHh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -36047,7 +36024,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/maintenance/aft)
"bHq" = (
@@ -36076,7 +36055,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bHt" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
@@ -36192,7 +36171,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bHL" = (
/obj/machinery/camera{
c_tag = "Research Division South";
@@ -36202,13 +36181,13 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bHM" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bHN" = (
/obj/machinery/requests_console{
department = "Tech storage";
@@ -36266,6 +36245,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/landmark/event_spawn,
/obj/structure/grille/broken,
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -36281,11 +36261,6 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
-"bHW" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/maintenance/aft)
"bHX" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -36317,19 +36292,15 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bIc" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/machinery/iv_drip,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/firealarm{
dir = 1;
- pixel_y = -24
- },
-/turf/open/floor/plasteel/white/side{
- dir = 1
- },
-/area/medical/sleeper)
-"bId" = (
-/obj/machinery/vending/wallmed{
- pixel_y = -28
+ pixel_y = -23
},
/obj/machinery/camera{
c_tag = "Surgery Operating";
@@ -36337,9 +36308,20 @@
network = list("ss13","medbay");
pixel_x = 22
},
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/medical/surgery)
+"bId" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/machinery/iv_drip,
/obj/machinery/light,
+/obj/machinery/vending/wallmed{
+ pixel_y = -28
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"bIe" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/status_display/evac{
@@ -36424,7 +36406,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIj" = (
/obj/structure/table,
/obj/machinery/light,
@@ -36436,7 +36418,7 @@
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIk" = (
/obj/structure/table,
/obj/item/storage/firstaid/fire{
@@ -36454,7 +36436,7 @@
req_access_txt = "5"
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIl" = (
/obj/structure/table,
/obj/item/storage/firstaid/toxin{
@@ -36472,12 +36454,12 @@
req_access_txt = "5"
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIm" = (
/obj/machinery/light,
/obj/machinery/rnd/production/techfab/department/medical,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIn" = (
/obj/structure/table,
/obj/item/storage/firstaid/brute{
@@ -36496,7 +36478,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIo" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -36630,7 +36612,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bIE" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -36640,7 +36622,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bIF" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -36908,7 +36890,7 @@
/turf/open/floor/plasteel/white/side{
dir = 1
},
-/area/science/research)
+/area/science)
"bJp" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -36941,7 +36923,7 @@
/turf/open/floor/plasteel/white/side{
dir = 1
},
-/area/science/research)
+/area/science)
"bJs" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -36980,8 +36962,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
},
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -37014,8 +36996,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -37035,12 +37018,14 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bJA" = (
-/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/closed/wall,
+/area/medical/medbay/central)
"bJB" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel,
@@ -37050,13 +37035,13 @@
dir = 4
},
/turf/closed/wall/r_wall,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bJD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/turf/closed/wall/r_wall,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bJE" = (
/turf/closed/wall/r_wall,
/area/medical/medbay/central)
@@ -37163,7 +37148,7 @@
"bJT" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bJU" = (
/obj/machinery/vending/wardrobe/science_wardrobe,
/turf/open/floor/plasteel/white,
@@ -37257,13 +37242,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bKc" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bKd" = (
/obj/machinery/camera{
c_tag = "Toxins Launch Room Access";
@@ -37274,7 +37259,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bKe" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -37315,8 +37300,9 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bKk" = (
-/obj/item/stack/ore/silver,
-/obj/item/stack/ore/silver,
+/obj/item/stack/ore/silver{
+ amount = 2
+ },
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -37760,7 +37746,7 @@
"bLh" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall,
-/area/science/research)
+/area/science)
"bLi" = (
/obj/structure/sign/warning/nosmoking{
pixel_x = -32
@@ -37991,10 +37977,6 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
-"bLP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/atmos)
"bLQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/closed/wall/r_wall,
@@ -38216,7 +38198,7 @@
"bMs" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/science/research)
+/area/science)
"bMt" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
@@ -38359,7 +38341,9 @@
/obj/machinery/firealarm{
pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"bMQ" = (
@@ -38968,7 +38952,7 @@
/turf/open/floor/plasteel/white/side{
dir = 1
},
-/area/science/research)
+/area/science)
"bOB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -41716,6 +41700,9 @@
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"bVX" = (
@@ -44808,7 +44795,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"cdZ" = (
/obj/machinery/telecomms/processor/preset_two,
/turf/open/floor/plasteel/dark/telecomms,
@@ -45157,7 +45144,7 @@
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"ceY" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -46308,7 +46295,7 @@
"chY" = (
/obj/machinery/shieldgen,
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"cia" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -46658,7 +46645,7 @@
"ciW" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"ciX" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal/fifty,
@@ -46673,14 +46660,14 @@
/obj/item/lightreplacer,
/obj/item/lightreplacer,
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"ciY" = (
/obj/machinery/door/poddoor{
id = "Secure Storage";
name = "secure storage"
},
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"ciZ" = (
/turf/open/floor/plating,
/area/engine/engineering)
@@ -46988,7 +46975,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"cjN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -47275,11 +47262,11 @@
"ckB" = (
/obj/machinery/field/generator,
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"ckC" = (
/obj/machinery/power/emitter,
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/engine/storage)
"ckD" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -48825,10 +48812,16 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"cpG" = (
-/obj/structure/table/optable,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/table,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/suit/apron/surgical,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/surgery)
"cpI" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -50579,7 +50572,7 @@
start_active = 1
},
/turf/open/space,
-/area/space/nearstation)
+/area/ai_monitored/turret_protected/aisat)
"cvG" = (
/obj/machinery/porta_turret/ai{
dir = 4;
@@ -50626,7 +50619,7 @@
start_active = 1
},
/turf/open/space,
-/area/space/nearstation)
+/area/ai_monitored/turret_protected/aisat)
"cvL" = (
/obj/structure/sign/warning/securearea{
pixel_x = 32
@@ -51315,7 +51308,7 @@
/area/maintenance/disposal/incinerator)
"czK" = (
/turf/closed/wall,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"czN" = (
/obj/docking_port/stationary/random{
dir = 4;
@@ -51638,7 +51631,7 @@
start_active = 1
},
/turf/open/space,
-/area/space/nearstation)
+/area/ai_monitored/turret_protected/aisat)
"cAV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -51673,7 +51666,7 @@
start_active = 1
},
/turf/open/space,
-/area/space/nearstation)
+/area/ai_monitored/turret_protected/aisat)
"cAY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -51733,7 +51726,7 @@
start_active = 1
},
/turf/open/space,
-/area/space/nearstation)
+/area/ai_monitored/turret_protected/aisat)
"cBg" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/landmark/event_spawn,
@@ -51776,6 +51769,10 @@
/area/hallway/secondary/exit)
"cBm" = (
/obj/effect/landmark/event_spawn,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/obj/machinery/light,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"cBn" = (
@@ -51847,7 +51844,7 @@
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"cBy" = (
/obj/machinery/door/airlock{
name = "Custodial Closet";
@@ -51890,13 +51887,12 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark/event_spawn,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/maintenance/aft)
"cBE" = (
@@ -52060,29 +52056,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"cCp" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/blood,
-/obj/item/reagent_containers/blood,
-/obj/item/reagent_containers/blood/AMinus,
-/obj/item/reagent_containers/blood/BMinus{
- pixel_x = -4;
- pixel_y = 4
+/obj/machinery/light_switch{
+ pixel_y = -25
},
-/obj/item/reagent_containers/blood/BPlus{
- pixel_x = 1;
- pixel_y = 2
- },
-/obj/item/reagent_containers/blood/OMinus,
-/obj/item/reagent_containers/blood/OPlus{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/blood/APlus,
-/obj/item/reagent_containers/blood/random,
/turf/open/floor/plasteel,
-/area/medical/sleeper)
+/area/medical/surgery)
"cCq" = (
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
@@ -53371,6 +53349,18 @@
/obj/machinery/meter,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"dcX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"ddI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -53457,6 +53447,12 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"dkM" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"dly" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53467,6 +53463,18 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"dnW" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
"dqb" = (
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/pool)
@@ -53723,6 +53731,13 @@
dir = 4
},
/area/crew_quarters/fitness/pool)
+"ecp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/bodycontainer/morgue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"edj" = (
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
@@ -53767,6 +53782,18 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"eiB" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/bodycontainer/morgue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"eiZ" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/purple/visible{
@@ -54052,6 +54079,10 @@
"eQb" = (
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
+"eRr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"eRz" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -54061,6 +54092,12 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
+"eUy" = (
+/obj/machinery/door/airlock{
+ name = "Starboard Emergency Storage"
+ },
+/turf/open/floor/plating,
+/area/storage/emergency/starboard)
"eUW" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -54111,6 +54148,10 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"eZa" = (
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"fbp" = (
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/bot,
@@ -54361,6 +54402,9 @@
},
/turf/open/floor/plasteel,
/area/security/range)
+"fsQ" = (
+/turf/open/floor/plating,
+/area/engine/storage)
"fty" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/orange/visible,
@@ -54379,6 +54423,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"fvk" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/medical/medbay/central)
"fvY" = (
/obj/machinery/computer/cryopod{
pixel_y = 26
@@ -54534,6 +54582,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
+"fNN" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"fOA" = (
/obj/machinery/door/airlock{
name = "Theatre Backstage";
@@ -54604,6 +54660,11 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
+"gaF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/medical/paramedic)
"gbd" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -54636,9 +54697,16 @@
/turf/open/floor/plating,
/area/security/prison)
"gbT" = (
-/obj/structure/table,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
+/obj/item/storage/box/lights/mixed,
+/obj/machinery/power/apc{
+ areastring = "/area/storage/emergency/starboard";
+ dir = 1;
+ name = "Starboard Emergency Storage APC";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"gcF" = (
@@ -54672,6 +54740,15 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopod)
+"gfQ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"ghD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -55014,12 +55091,16 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"gZG" = (
-/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white/side{
dir = 8
},
-/area/medical/sleeper)
+/area/medical/surgery)
"haM" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -55216,6 +55297,12 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"hMs" = (
+/obj/structure/table,
+/obj/item/storage/box/bodybags,
+/obj/item/pen,
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"hOv" = (
/obj/structure/table/wood/fancy,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -55311,6 +55398,15 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
+"hYd" = (
+/obj/machinery/door/airlock/medical{
+ name = "Morgue";
+ req_access_txt = "6"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"ibK" = (
/turf/open/floor/plasteel,
/area/security/processing)
@@ -55338,6 +55434,9 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"ihR" = (
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"iiW" = (
/turf/open/floor/wood,
/area/maintenance/bar)
@@ -55355,6 +55454,10 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
+"ijO" = (
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"ikk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -55428,9 +55531,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/pool)
-"ipA" = (
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
"iql" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -55487,6 +55587,13 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"ivJ" = (
+/obj/structure/curtain{
+ pixel_y = -32
+ },
+/obj/structure/table/optable,
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"ixd" = (
/obj/structure/table,
/obj/item/reagent_containers/food/drinks/beer,
@@ -55601,7 +55708,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
"iPX" = (
/obj/structure/table,
/obj/machinery/reagentgrinder{
@@ -55626,6 +55733,11 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"iRV" = (
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/turf/open/floor/plasteel/white/side,
+/area/medical/surgery)
"iTq" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -55641,6 +55753,21 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
+"iUp" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/aft)
+"iVH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/medical{
+ name = "Operating Theatre";
+ req_access_txt = "45"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/medical/surgery)
"iVJ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -55731,6 +55858,16 @@
},
/turf/closed/wall,
/area/maintenance/port/fore)
+"jbK" = (
+/obj/item/stack/sheet/glass{
+ amount = 20;
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/metal/fifty,
+/obj/structure/rack,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
"jdj" = (
/obj/docking_port/stationary/random{
dir = 4;
@@ -55739,10 +55876,33 @@
},
/turf/open/space,
/area/space)
+"jdE" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/machinery/vending/wallmed{
+ pixel_y = -28
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
"jex" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/sleeper)
+/obj/machinery/door/airlock/medical{
+ name = "Operating Theatre";
+ req_access_txt = "45"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/medical/surgery)
"jez" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -55771,6 +55931,10 @@
/obj/structure/sign/warning/securearea,
/turf/closed/wall,
/area/engine/engineering)
+"jiT" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"jjC" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck,
@@ -55857,6 +56021,10 @@
/obj/structure/closet/athletic_mixed,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
+"jwH" = (
+/obj/machinery/holopad,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"jxF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -56598,6 +56766,14 @@
/obj/structure/disposalpipe/junction/flip,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"kQa" = (
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = "MedbayFoyer";
+ name = "Paramedic's Office";
+ req_access_txt = "5;6;12;64"
+ },
+/turf/open/floor/plating,
+/area/medical/paramedic)
"kQe" = (
/obj/structure/table/wood/poker,
/obj/item/storage/fancy/cigarettes/dromedaryco,
@@ -56608,13 +56784,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"kQk" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/obj/item/storage/toolbox/electrical,
-/turf/open/floor/plating,
+/turf/closed/wall,
/area/maintenance/department/medical/morgue)
"kQz" = (
/obj/structure/cable{
@@ -56650,6 +56820,25 @@
/obj/machinery/chem_master/condimaster,
/turf/open/floor/plating,
/area/maintenance/fore)
+"kVj" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/medical{
+ name = "Paramedic's Office";
+ req_access_txt = "5;6;12;64"
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"kWp" = (
/obj/structure/shuttle/engine/heater{
dir = 1
@@ -56689,6 +56878,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/range)
+"laN" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/storage/emergency/starboard)
"leE" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -57223,6 +57416,14 @@
/obj/effect/decal/cleanable/blood/gibs/slime/limb,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
+"mFo" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"mGw" = (
/obj/machinery/door/airlock/security{
name = "Labor Shuttle";
@@ -57584,6 +57785,9 @@
},
/turf/open/floor/plating,
/area/construction)
+"nyi" = (
+/turf/closed/wall,
+/area/medical/paramedic)
"nzB" = (
/obj/machinery/hydroponics/soil{
pixel_y = 8
@@ -57611,6 +57815,9 @@
},
/turf/open/floor/plating,
/area/security/processing)
+"nEu" = (
+/turf/closed/wall,
+/area/medical/surgery)
"nFj" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -57835,6 +58042,10 @@
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/bar)
+"ofj" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/surgery)
"ofU" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -57967,6 +58178,13 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
+"ouf" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/structure/closet/secure_closet/paramedic,
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
"ouQ" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -58110,6 +58328,13 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
+"oJV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"oKh" = (
/obj/structure/chair/wood/normal{
dir = 8
@@ -58139,6 +58364,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/grimy,
/area/maintenance/starboard/aft)
+"oQY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/medical/medbay/central)
"oSl" = (
/obj/machinery/door/airlock/security{
name = "Firing Range";
@@ -58204,6 +58435,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"pbC" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"pcK" = (
/mob/living/simple_animal/bot/cleanbot{
name = "C.L.E.A.N."
@@ -58250,6 +58485,9 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/fore)
+"pkg" = (
+/turf/open/floor/plating,
+/area/storage/emergency/starboard)
"pkq" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -58507,7 +58745,7 @@
pixel_x = 30
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"pHO" = (
/obj/effect/turf_decal/tile/blue,
/obj/structure/sign/poster/contraband/fun_police{
@@ -58533,6 +58771,9 @@
},
/turf/open/floor/wood,
/area/library)
+"pKV" = (
+/turf/closed/wall/r_wall,
+/area/science/research)
"pLn" = (
/obj/machinery/conveyor/inverted{
dir = 5;
@@ -58726,6 +58967,13 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"qkC" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"qll" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -58743,6 +58991,10 @@
/obj/structure/table,
/turf/open/floor/plasteel,
/area/security/prison)
+"qnC" = (
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"qqs" = (
/obj/structure/mirror{
pixel_y = 32
@@ -58908,6 +59160,16 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
+"qSf" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"qSF" = (
/obj/item/seeds/bee_balm/honey_balm,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -58926,7 +59188,7 @@
icon_state = "plant-22"
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"qVP" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -59380,6 +59642,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"rUe" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/medical/medbay/central)
"rVy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -59407,6 +59673,22 @@
dir = 1
},
/area/engine/atmos)
+"rWg" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
"rWw" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
@@ -59738,6 +60020,11 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
+"sKL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"sLa" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -59986,6 +60273,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"ttd" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"ttL" = (
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
@@ -60009,6 +60302,13 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
+"twE" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"tyX" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -60058,7 +60358,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"tEK" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -60072,6 +60372,15 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
+"tEL" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
"tHh" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/red,
@@ -60098,6 +60407,19 @@
dir = 1
},
/area/hallway/secondary/entry)
+"tIE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/paramedic)
"tJi" = (
/obj/machinery/airalarm{
dir = 4;
@@ -60162,7 +60484,13 @@
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
+/area/crew_quarters/kitchen/backroom)
+"tNl" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"tNF" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -60542,6 +60870,13 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"uBr" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"uCo" = (
/obj/structure/chair{
dir = 1
@@ -60587,6 +60922,13 @@
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
+"uFV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"uFZ" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/stripes/line{
@@ -60812,7 +61154,7 @@
pixel_y = -22
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"veS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -60968,6 +61310,13 @@
icon_state = "platingdmg1"
},
/area/maintenance/starboard/aft)
+"vxz" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/item/storage/box/lights/mixed,
+/turf/open/floor/plating,
+/area/storage/emergency/starboard)
"vxX" = (
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock"
@@ -61284,7 +61633,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"wcB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -61506,6 +61855,16 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"wJA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"wKe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -61928,6 +62287,9 @@
/obj/machinery/vending/wardrobe/curator_wardrobe,
/turf/open/floor/carpet,
/area/library)
+"xES" = (
+/turf/closed/wall/r_wall,
+/area/engine/storage)
"xFM" = (
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/head/soft/rainbow,
@@ -87579,14 +87941,14 @@ cdc
cdZ
bVI
cay
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
+xES
+xES
+xES
+xES
+xES
+xES
+xES
+xES
cfL
coH
cBO
@@ -87836,14 +88198,14 @@ bWB
cec
bVI
kNv
-ccw
+xES
chY
ciX
cjM
ckB
ckB
ckB
-ccw
+xES
cnY
coH
cgR
@@ -88093,14 +88455,14 @@ cde
ceb
bVI
cay
-ccw
+xES
chY
-ciZ
+fsQ
ciW
ckB
ckB
ckC
-ccw
+xES
cnX
coH
cps
@@ -88350,14 +88712,14 @@ cdf
ced
bVI
cay
-ccw
-ciZ
-ciZ
-ciZ
+xES
+fsQ
+fsQ
+fsQ
ckC
ckC
ckC
-ccw
+xES
coa
coJ
clJ
@@ -88607,14 +88969,14 @@ bWB
bWB
bVI
cay
-ccw
-ccw
+xES
+xES
ciY
ciY
-ccw
-ccw
-ccw
-ccw
+xES
+xES
+xES
+xES
cnZ
coH
cgI
@@ -93979,7 +94341,7 @@ aXf
bCv
bDP
bCv
-bAw
+pbC
bHV
bJw
bKC
@@ -94236,11 +94598,11 @@ bBy
bzs
bDO
bFl
-bGH
+bWe
bHU
bJv
-bKB
-bLK
+mFo
+bBb
bVW
bOd
iql
@@ -94494,10 +94856,10 @@ bCz
bDQ
bFn
bGJ
-bHX
+sKL
bJy
-bKE
-bLP
+iUp
+bLK
bMP
bIG
bJB
@@ -94748,10 +95110,10 @@ aJq
bHt
bBz
bzs
-bzs
+bof
bFm
bGI
-bHW
+bof
cBD
bKD
bLO
@@ -95005,10 +95367,10 @@ bwu
kPj
bBB
eBX
-bzs
+bof
bFp
-bGJ
-bHX
+uFV
+fvk
bJA
bKG
bLK
@@ -95262,9 +95624,9 @@ aJq
bAj
aJq
aKG
-bzs
+bof
bFo
-bDu
+bDA
bFt
bGQ
bHp
@@ -95519,7 +95881,7 @@ byX
aXh
bmE
bCA
-bzs
+bof
bCC
bDA
bFx
@@ -95771,15 +96133,15 @@ asT
asV
bof
bwv
-bvj
-bvj
-bvj
-bvj
-bvj
-bvj
+nEu
+nEu
+nEu
+nEu
+nEu
+nEu
bCB
-bCP
-bvj
+iVH
+nEu
bvd
bKH
bLK
@@ -96028,7 +96390,7 @@ asU
asX
bof
bwx
-bvj
+nEu
bwB
bxa
byZ
@@ -96289,8 +96651,8 @@ bvi
bww
bwZ
byY
-bzH
-bAW
+bCD
+ivJ
bCE
bFv
bFz
@@ -96546,8 +96908,8 @@ bvl
bwE
bxc
bzb
-bzK
-bBb
+nEu
+nEu
cpG
bDC
bId
@@ -96799,16 +97161,16 @@ bqS
brY
bwz
asG
-bvj
+nEu
bza
bxb
-bvh
-bCD
+bdN
+iRV
bAY
bCH
-bDR
+gfQ
bIc
-bvd
+bzK
bKH
bLK
bMW
@@ -97056,10 +97418,10 @@ bqV
bEe
bhh
bBL
-bvj
+nEu
asM
bAl
-bvh
+bzH
bzS
bBc
bCJ
@@ -97311,17 +97673,17 @@ bfF
bfF
bqU
bsq
-bvj
-bvj
-bvj
-bvj
-bvj
-bvj
-bvj
-bvd
+bof
+bof
+nEu
+nEu
+nEu
+nEu
+nEu
+nEu
bFu
jex
-bvj
+ofj
bvd
bKH
bLK
@@ -97560,7 +97922,7 @@ bet
bfH
aiP
wbE
-bhh
+ihR
wbE
bmJ
bof
@@ -97568,18 +97930,18 @@ bpu
bqP
bsy
bEe
-bvh
+rUe
ajv
bxN
bze
asL
-bvh
+rUe
bCG
bBd
bFw
bDD
bFJ
-bvd
+oQY
bKH
bzs
bRK
@@ -97819,24 +98181,24 @@ bhe
bit
bjS
tCd
-bli
+eRr
boe
bli
bpN
bqX
-bEe
-btg
-bDR
-bDR
-bDR
-bDR
+dcX
+fNN
+twE
+twE
+twE
+twE
bzc
-bDR
-bDZ
+twE
+bpP
bCK
bFy
bFF
-bvd
+oQY
bKH
bzs
fjU
@@ -98073,7 +98435,7 @@ aYV
bet
bfG
bhe
-bhh
+ihR
bjU
blk
blk
@@ -98082,18 +98444,18 @@ biu
bpO
bqY
bss
-btg
+bfJ
buk
bvm
bDT
buk
-bvh
+rUe
bzU
bBe
bCS
bDE
bFK
-bvd
+oQY
bKH
bzs
fjU
@@ -98330,7 +98692,7 @@ aYV
bet
bfG
bhe
-bhh
+ihR
bjV
blj
bmK
@@ -98339,17 +98701,17 @@ bog
bhh
bsx
bsr
-bvh
+rUe
bwD
-bDR
-bDR
+bhh
+bhh
bAq
-bvj
-bCQ
+bof
+bog
bDW
-bCP
-bvj
-bvj
+bKR
+bof
+bof
bJC
bKH
bzs
@@ -98586,8 +98948,8 @@ aYV
bdo
beu
bvk
-biu
-biu
+jiT
+jiT
bjT
blm
bmL
@@ -98596,15 +98958,15 @@ bpw
ium
bsx
btX
-bvj
+bof
bwG
bxR
bxR
-bvj
-bvj
+bof
+bof
bzW
-bDZ
-bCT
+bqQ
+bCR
bGR
bIj
bJC
@@ -98842,9 +99204,9 @@ aJC
aYV
aYV
bet
-bfJ
-bhh
-bhh
+qnC
+ihR
+ihR
bgQ
bll
bhh
@@ -98853,16 +99215,16 @@ bpv
bhh
bsx
btV
-bvh
+rUe
bwF
bxQ
bxQ
bAr
-bvj
+bof
bzV
-bDZ
-bzf
-bDR
+bqQ
+boo
+bhh
bIi
bJC
bKH
@@ -99101,25 +99463,25 @@ aYV
bet
bfH
qTV
-bhh
-bhg
+ihR
+uBr
bln
bmM
boj
bof
bhh
-bsx
+qkC
btV
-bvj
+bof
bwI
bxT
bxQ
bAt
-bvj
+bof
bCM
-bDZ
-bDR
-bDR
+bqQ
+eZa
+bhh
bIl
bJC
bKH
@@ -99367,16 +99729,16 @@ bof
bKL
brf
btV
-bvh
+rUe
bwH
bxS
bzh
bAs
-bvj
+bof
bCL
bxO
-bDR
-bDR
+bhh
+bhh
bIk
bJC
bKH
@@ -99624,16 +99986,16 @@ apI
bwz
brg
btZ
-bvj
+bof
bwI
bxV
bzj
bAv
-bvj
+bof
bCO
-bDR
-bDR
-bDR
+bhh
+bhh
+bhh
bIn
bJC
bUZ
@@ -99881,12 +100243,12 @@ bpx
bpP
brf
bhh
-bvh
+rUe
bwJ
bxU
bzi
bAu
-bvj
+bof
bCN
bEa
pHl
@@ -100110,16 +100472,16 @@ aaf
alP
aGL
aIe
-aJI
-aJI
-aJI
-aJI
-aJI
+bhr
+bhr
+bhr
+bhr
+bhr
aJI
aRC
aSK
aVz
-aVz
+ijO
aVz
aYL
aJI
@@ -100138,13 +100500,13 @@ bnH
bqQ
bsx
bhh
-bvj
-bvj
+bof
+bof
bxR
bxR
-bvj
-bvj
-bCQ
+bof
+bof
+bog
bEd
bof
bof
@@ -100367,7 +100729,7 @@ aaa
alP
aGN
aIh
-aJI
+bhr
aKT
aMD
aNM
@@ -100646,7 +101008,7 @@ bhn
biz
biz
biz
-bmR
+hMs
bfL
bol
bqQ
@@ -100881,7 +101243,7 @@ aaa
alP
aGL
aHY
-aQj
+biC
iNn
aMk
aNK
@@ -100900,9 +101262,9 @@ bdp
cBm
bfL
bhm
-bhm
-bhm
-bhm
+tNl
+ttd
+dkM
bkP
bmV
boc
@@ -101153,13 +101515,13 @@ aVz
qus
bbz
aYV
-bdp
+blg
bdc
-bfL
+hYd
beY
-bhm
-bhm
-bhm
+oJV
+qSf
+wJA
bkR
bfL
boo
@@ -101395,9 +101757,9 @@ vpY
alP
aGJ
avI
-aJI
-aJI
-aJI
+bhr
+bhr
+bhr
aNO
aOT
aJI
@@ -101410,13 +101772,13 @@ aYM
aJI
bbA
aYV
-bdr
+bdp
bdb
-bdN
+bfL
blr
bho
-bho
-bho
+ecp
+eiB
bkQ
bmW
bom
@@ -101654,9 +102016,9 @@ aGJ
avI
aJL
aKX
-aJI
-aJI
-aJI
+bhr
+bhr
+bhr
aJI
aRH
aVz
@@ -101665,15 +102027,15 @@ aVH
aXn
aYN
aJI
-bbz
-aYV
+bkU
aYV
+bdp
bey
bfL
-bhm
-biz
-biz
-biz
+bfL
+kVj
+bfL
+bfL
bla
bmY
boq
@@ -101924,15 +102286,15 @@ aJI
aJI
aJI
bcq
+blo
bcq
-bcq
-bfL
+bfO
bhp
biB
-biB
-biB
-bkU
-bmX
+ouf
+nyi
+cTO
+bmZ
bpE
bpE
bpE
@@ -102181,14 +102543,14 @@ aiJ
bal
bam
aYV
-aYV
-aYV
-bfL
+bmR
+bmX
+gaF
bhq
-bhm
+rWg
bkb
-bhm
-bla
+nyi
+cTO
bmZ
bpH
bra
@@ -102440,12 +102802,12 @@ bbB
aYV
aYV
aYV
-bfL
-bfL
-bfL
-bfL
-bfL
-blg
+kQa
+tIE
+dnW
+jdE
+nyi
+cTO
bmZ
bpG
bqZ
@@ -102690,18 +103052,18 @@ fzd
fFA
fFA
aVK
-aRJ
+jwH
aRJ
aRJ
bbB
aYV
aYV
aYV
-bfO
-bfS
-biD
+nyi
+nyi
+nyi
bkd
-bfS
+nyi
cTO
bmZ
bpJ
@@ -102953,13 +103315,13 @@ cBg
bam
aYV
aYV
-aYV
-aYV
-bhr
-biC
-bkc
+beE
bfS
-blo
+biD
+bfS
+kQk
+kQk
+cTO
bmZ
bpI
brb
@@ -103211,11 +103573,11 @@ ssB
aYV
aYV
aYV
-beE
-bfS
+eUy
+pkg
biE
-bkf
-bfS
+kQk
+tEL
cTO
bmZ
bpL
@@ -103468,11 +103830,11 @@ ikm
aYV
aYV
bez
-bfP
-bfS
-bfS
-bfS
bfS
+vxz
+laN
+kQk
+jbK
cTO
bmZ
bpK
@@ -103725,12 +104087,12 @@ ikm
aYV
bci
beB
-bfS
-bfS
kQk
-ipA
+kQk
+kQk
+kQk
gbT
-cTO
+bdr
bmZ
bon
bon
@@ -108866,11 +109228,11 @@ aYV
aXq
aYV
bga
-bgc
-bgc
-bgc
-bgc
-bgc
+pKV
+pKV
+pKV
+pKV
+pKV
boB
boB
boB
@@ -109893,8 +110255,8 @@ aCR
kYk
bdx
vHT
-bgc
-bgc
+pKV
+pKV
biX
bhV
bka
@@ -110150,7 +110512,7 @@ aCR
bcy
bdw
beG
-bgc
+pKV
bhE
biW
bkv
@@ -110407,7 +110769,7 @@ bbG
aTk
bdy
beI
-bgc
+pKV
bhF
biW
bib
@@ -110664,15 +111026,15 @@ aPq
aPq
bdy
beH
-bgc
-bgc
-bgc
-bgc
-bgc
-bgc
-bgc
+pKV
+pKV
+pKV
+pKV
+pKV
+pKV
+pKV
bpp
-bgc
+pKV
brr
bsE
bvK
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index a4d34264ae..a62dfcf0a2 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -3,8 +3,17 @@
/turf/open/space/basic,
/area/space)
"aab" = (
-/turf/closed/wall,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/arcade";
+ name = "Arcade APC";
+ pixel_y = -26
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore)
"aac" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
@@ -660,9 +669,8 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"abF" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/closed/wall,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"abG" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -701,9 +709,9 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/clown)
"abJ" = (
-/obj/machinery/computer/arcade/orion_trail,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/closed/wall,
+/area/crew_quarters/arcade)
"abK" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -808,9 +816,9 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"abZ" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"aca" = (
/obj/machinery/conveyor/auto{
dir = 5;
@@ -850,9 +858,9 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"acf" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade/minesweeper,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"acg" = (
/obj/machinery/light{
dir = 8;
@@ -874,8 +882,9 @@
},
/area/hallway/secondary/entry)
"aci" = (
-/turf/closed/wall,
-/area/medical/medbay)
+/obj/machinery/computer/arcade,
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"acj" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -1042,10 +1051,10 @@
dir = 1
},
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"acA" = (
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"acB" = (
/obj/machinery/conveyor{
dir = 6;
@@ -1127,9 +1136,11 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"acK" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/medical/medbay)
+/obj/structure/sign/poster/official/foam_force_ad{
+ pixel_y = 32
+ },
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"acL" = (
/obj/machinery/door/poddoor{
id = "executionspaceblast"
@@ -1275,11 +1286,9 @@
/turf/closed/wall/r_wall,
/area/security/brig)
"adc" = (
-/obj/structure/sign/poster/official/foam_force_ad{
- pixel_y = 32
- },
+/obj/structure/chair/stool,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"add" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 6
@@ -1511,8 +1520,9 @@
/area/security/brig)
"adL" = (
/obj/structure/chair/stool,
+/obj/effect/landmark/start/assistant,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"adM" = (
/turf/closed/wall,
/area/crew_quarters/observatory)
@@ -1546,34 +1556,13 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"adR" = (
-/obj/structure/window/reinforced{
- dir = 1;
- pixel_y = 1
+/obj/structure/chair/stool,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/storage/box/beakers,
-/obj/item/hand_labeler,
-/obj/item/folder/white{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/item/stamp/denied{
- pixel_x = 8;
- pixel_y = 8
- },
-/obj/item/stamp,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"adS" = (
/turf/closed/wall,
/area/construction)
@@ -1696,10 +1685,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aej" = (
-/obj/structure/chair/stool,
-/obj/effect/landmark/start/assistant,
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"aek" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -1912,13 +1902,9 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aeI" = (
-/obj/structure/chair/stool,
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
+/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"aeJ" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
@@ -2488,10 +2474,10 @@
/area/crew_quarters/observatory)
"agc" = (
/obj/machinery/vr_sleeper{
- dir = 4
+ dir = 8
},
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"agd" = (
/obj/structure/fans/tiny/invisible,
/obj/docking_port/stationary{
@@ -2675,9 +2661,18 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"agC" = (
-/obj/effect/landmark/event_spawn,
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/structure/sign/poster/official/soft_cap_pop_art{
+ pixel_x = -32
+ },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"agD" = (
/obj/machinery/seed_extractor,
/obj/effect/decal/cleanable/dirt,
@@ -2796,8 +2791,12 @@
/obj/machinery/vr_sleeper{
dir = 8
},
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"agU" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/yellow{
@@ -4429,8 +4428,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"akN" = (
-/turf/open/space/basic,
-/area/router/aux)
+/obj/structure/chair/stool,
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"akO" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -4881,18 +4883,15 @@
/turf/open/floor/plating,
/area/construction/secondary)
"alZ" = (
-/obj/machinery/vr_sleeper{
+/obj/machinery/light_switch{
+ pixel_x = -24
+ },
+/obj/machinery/camera{
+ c_tag = "Arcade";
dir = 4
},
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/obj/structure/sign/poster/official/soft_cap_pop_art{
- pixel_x = -32
- },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"ama" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -5383,32 +5382,15 @@
/turf/open/floor/plating,
/area/construction/secondary)
"ang" = (
-/turf/closed/wall/r_wall,
-/area/engine/storage_shared)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"anh" = (
-/obj/structure/window/reinforced{
- dir = 4
+/obj/structure/sign/poster/official/nanomichi_ad{
+ pixel_x = 32
},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/clothing/glasses/regular,
-/obj/machinery/door/window/northright{
- name = "Medical Booth Desk";
- req_access_txt = "5"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"ani" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/red,
@@ -5479,15 +5461,9 @@
},
/area/chapel/main)
"anq" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
+/obj/machinery/vending/snack/random,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anr" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
@@ -5608,11 +5584,9 @@
/turf/open/floor/plasteel/dark/corner,
/area/hallway/secondary/entry)
"anE" = (
-/obj/structure/chair/stool,
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/vending/games,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anF" = (
/obj/machinery/smartfridge,
/turf/closed/wall,
@@ -5638,15 +5612,20 @@
/turf/open/floor/plating,
/area/security/checkpoint)
"anI" = (
-/obj/machinery/light_switch{
- pixel_x = -24
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/machinery/camera{
- c_tag = "Arcade";
- dir = 4
+/obj/machinery/power/apc{
+ areastring = "/area/storage/emergency";
+ dir = 1;
+ name = "Emergency Storage APC";
+ pixel_y = 24
},
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/open/floor/plasteel,
+/area/storage/emergency)
"anJ" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red,
@@ -5687,9 +5666,9 @@
/turf/closed/wall/r_wall,
/area/security/detectives_office)
"anL" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/crew_quarters/arcade)
"anM" = (
/obj/machinery/recharge_station,
/obj/effect/turf_decal/tile/yellow{
@@ -5732,11 +5711,12 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"anP" = (
-/obj/structure/sign/poster/official/nanomichi_ad{
- pixel_x = 32
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Arcade"
},
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anQ" = (
/obj/structure/chair{
dir = 4
@@ -5781,9 +5761,13 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"anT" = (
-/obj/machinery/vending/snack/random,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Arcade"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anU" = (
/turf/closed/wall/r_wall,
/area/security/brig)
@@ -5865,13 +5849,11 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"aof" = (
-/obj/machinery/vending/games,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aog" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/closed/wall,
+/area/crew_quarters/fitness/cogpool)
"aoh" = (
/obj/machinery/light_switch{
pixel_y = -24
@@ -6158,12 +6140,9 @@
/turf/closed/wall/r_wall,
/area/router/service)
"aoL" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Arcade"
- },
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aoM" = (
/obj/structure/closet/crate,
/obj/item/stock_parts/matter_bin,
@@ -6267,11 +6246,15 @@
"aoU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
- name = "Arcade"
+ name = "Pool"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/open/floor/plasteel/white/side,
+/area/crew_quarters/fitness/cogpool)
"aoV" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -6355,11 +6338,16 @@
/turf/open/floor/plasteel,
/area/security/brig)
"apd" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Pool"
},
-/turf/closed/wall/r_wall,
-/area/engine/storage_shared)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/side,
+/area/crew_quarters/fitness/cogpool)
"ape" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -6409,8 +6397,9 @@
/turf/open/floor/wood,
/area/crew_quarters/fitness)
"apm" = (
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apn" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6491,28 +6480,27 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/fitness)
"apy" = (
-/turf/closed/wall,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/pool/controller,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apz" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/structure/table,
+/obj/item/toy/beach_ball{
+ pixel_y = 12
+ },
+/obj/item/clothing/glasses/sunglasses{
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apA" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall,
/area/crew_quarters/dorms/purple)
"apB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Pool"
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/white/side,
-/area/crew_quarters/fitness/pool)
+/obj/structure/chair/comfy/teal,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apC" = (
/turf/closed/wall/r_wall,
/area/hydroponics)
@@ -6541,16 +6529,15 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"apG" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Pool"
+/obj/structure/table,
+/obj/item/clothing/glasses/sunglasses{
+ pixel_y = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
},
-/turf/open/floor/plasteel/white/side,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -6732,15 +6719,16 @@
/turf/open/floor/plating,
/area/construction/secondary)
"aqc" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
- name = "Medical Booth";
- req_access_txt = "5"
+/obj/structure/chair/comfy/teal,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/medical/medbay)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aqd" = (
/obj/structure/chair/sofa/right,
/obj/machinery/camera{
@@ -6820,9 +6808,17 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"aqn" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/r_wall,
-/area/medical/medbay)
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/kirbyplants{
+ icon_state = "plant-02"
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aqo" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -7008,13 +7004,26 @@
/turf/open/floor/plating,
/area/hallway/secondary/service)
"aqO" = (
-/obj/machinery/holopad,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aqP" = (
-/obj/machinery/pool/controller,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aqQ" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/kitchen/backroom)
@@ -7027,22 +7036,32 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/clown)
"aqS" = (
-/obj/structure/table,
-/obj/item/toy/beach_ball{
- pixel_y = 12
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/item/clothing/glasses/sunglasses{
- pixel_y = 4
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aqT" = (
-/obj/structure/chair/comfy/teal,
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/crew_quarters/fitness/cogpool)
"aqU" = (
-/turf/closed/wall/r_wall,
-/area/medical/medbay)
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aqV" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -7336,15 +7355,9 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms/blue)
"arB" = (
-/obj/structure/table,
-/obj/item/clothing/glasses/sunglasses{
- pixel_y = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"arC" = (
/obj/structure/sign/warning/fire{
desc = "A sign that states the labeled room's number.";
@@ -7378,16 +7391,11 @@
/turf/closed/wall/r_wall,
/area/maintenance/starboard/central)
"arF" = (
-/obj/structure/chair/comfy/teal,
-/obj/machinery/light{
- dir = 1;
- light_color = "#cee5d2"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"arG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -7453,48 +7461,48 @@
/turf/open/floor/plating,
/area/router/service)
"arN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/kirbyplants{
- icon_state = "plant-02"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"arO" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 9
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall,
+/area/medical/clinic)
"arP" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/medical/clinic)
"arQ" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ pixel_y = 1
+ },
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
+/obj/item/storage/box/beakers,
+/obj/item/hand_labeler,
+/obj/item/folder/white{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/stamp/denied{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/stamp,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"arR" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -7543,11 +7551,29 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"arV" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/window/reinforced{
dir = 4
},
-/turf/closed/wall,
-/area/crew_quarters/fitness/pool)
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/clothing/glasses/regular,
+/obj/machinery/door/window/northright{
+ name = "Medical Booth Desk";
+ req_access_txt = "5"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"arW" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/bot,
@@ -7558,37 +7584,19 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"arX" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medical Booth";
+ req_access_txt = "5"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/item/stack/medical/gauze,
-/obj/item/reagent_containers/blood,
-/obj/item/stack/medical/suture,
-/obj/item/stack/medical/mesh,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -26
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/medical/clinic)
"arY" = (
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/r_wall,
+/area/medical/clinic)
"arZ" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -7597,9 +7605,17 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"asa" = (
-/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"asb" = (
/obj/machinery/airalarm{
dir = 1;
@@ -7675,11 +7691,11 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms/blue)
"asi" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
+/obj/machinery/pool/filter{
+ pixel_y = 16
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"asj" = (
/obj/effect/turf_decal/tile/red,
/obj/structure/disposalpipe/segment{
@@ -7806,17 +7822,8 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ast" = (
-/obj/machinery/computer/med_data{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"asu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7824,30 +7831,25 @@
/turf/closed/wall/rust,
/area/maintenance/disposal)
"asv" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"asw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"asx" = (
-/obj/machinery/pool/filter{
- pixel_y = 16
+/obj/structure/pool/ladder{
+ dir = 2;
+ pixel_y = 24
},
/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"asw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
+"asx" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"asy" = (
/obj/effect/landmark/start/assistant,
/obj/machinery/holopad,
@@ -7872,21 +7874,41 @@
/turf/open/floor/plating,
/area/router/service)
"asB" = (
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall/r_wall,
+/area/medical/clinic)
"asC" = (
-/obj/structure/pool/ladder{
- dir = 2;
- pixel_y = 24
+/obj/structure/table,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
-"asD" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/item/stack/medical/gauze,
+/obj/item/reagent_containers/blood,
+/obj/item/stack/medical/suture,
+/obj/item/stack/medical/mesh,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -26
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
+"asD" = (
+/obj/machinery/computer/med_data{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asE" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -7921,7 +7943,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"asH" = (
/obj/machinery/camera{
c_tag = "Port Bow Solar Maintenance";
@@ -7948,33 +7970,11 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"asJ" = (
/turf/closed/wall,
/area/crew_quarters/toilet)
"asK" = (
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"asL" = (
-/turf/closed/wall,
-/area/security/brig)
-"asM" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
-"asN" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
},
@@ -7985,7 +7985,28 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"asL" = (
+/turf/closed/wall,
+/area/security/brig)
+"asM" = (
+/obj/machinery/light_switch{
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
+"asN" = (
+/obj/structure/bed/roller,
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asO" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -8012,15 +8033,17 @@
/turf/open/floor/plasteel,
/area/router/service)
"asR" = (
-/obj/machinery/light_switch{
- pixel_x = 24
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"asS" = (
-/obj/machinery/pool/drain,
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asT" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -8032,9 +8055,19 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"asU" = (
-/obj/structure/pool/Lboard,
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asV" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
/turf/open/floor/plasteel,
@@ -8085,12 +8118,9 @@
/turf/open/floor/plasteel,
/area/security/main)
"atb" = (
-/obj/structure/pool/Rboard,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/pool/drain,
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"atc" = (
/turf/closed/wall,
/area/security/main)
@@ -8716,24 +8746,16 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"auC" = (
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/structure/pool/Lboard,
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"auD" = (
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/pool/Rboard,
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"auE" = (
/obj/structure/bed,
/obj/item/clothing/glasses/sunglasses/blindfold,
@@ -8801,16 +8823,8 @@
/turf/open/floor/plasteel,
/area/crew_quarters/lounge)
"auN" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Pool Maintenance";
- req_one_access_txt = "12"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"auO" = (
/obj/structure/closet/crate/freezer,
/turf/open/floor/plating,
@@ -8833,11 +8847,23 @@
/turf/open/floor/plasteel,
/area/crew_quarters/lounge)
"auR" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 6
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ pixel_y = 24
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"auS" = (
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/turf/open/floor/plasteel,
@@ -8888,20 +8914,24 @@
/turf/open/floor/plasteel/stairs/right,
/area/router/service)
"auY" = (
+/obj/machinery/light{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = 26
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/sleep_console{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"auZ" = (
/obj/structure/disposalpipe/junction/flip,
/obj/structure/cable{
@@ -8924,20 +8954,13 @@
/turf/closed/wall,
/area/hallway/secondary/civilian)
"avc" = (
+/obj/vehicle/ridden/wheelchair,
/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avd" = (
/obj/structure/sign/warning{
name = "\improper COLD TEMPERATURES";
@@ -9019,17 +9042,11 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"avl" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avm" = (
/turf/closed/wall/r_wall,
/area/hallway/secondary/civilian)
@@ -9122,11 +9139,8 @@
/turf/open/floor/plating,
/area/space/nearstation)
"avw" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"avx" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -9162,17 +9176,17 @@
/turf/open/floor/plasteel,
/area/router/service)
"avA" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/table/optable,
+/obj/machinery/light_switch{
+ pixel_x = 24
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/item/reagent_containers/blood/random,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avB" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/stripes/line{
@@ -9181,14 +9195,21 @@
/turf/open/floor/plasteel,
/area/router/service)
"avC" = (
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 4
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"avD" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/fragile,
@@ -9201,11 +9222,14 @@
/turf/open/floor/plasteel,
/area/router/service)
"avE" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avF" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -9220,20 +9244,13 @@
/turf/closed/wall,
/area/security/prison)
"avH" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avI" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avJ" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -9243,18 +9260,20 @@
/turf/open/floor/plasteel,
/area/security/main)
"avK" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_x = 26
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avL" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -9294,14 +9313,19 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"avQ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/machinery/power/apc{
+ areastring = "/area/medical/clinic";
+ dir = 8;
+ name = "Medical Booth APC";
+ pixel_x = -24
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/civilian)
"avR" = (
/obj/machinery/washing_machine,
/obj/machinery/light/small{
@@ -9323,17 +9347,31 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"avU" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Pool Maintenance";
+ req_one_access_txt = "12"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
+"avV" = (
/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"avV" = (
-/obj/item/kirbyplants{
- icon_state = "plant-14"
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"avW" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -9366,19 +9404,19 @@
/area/hallway/secondary/service)
"awa" = (
/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Pool";
- dir = 1
- },
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/item/toy/poolnoodle/red,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"awb" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -9408,15 +9446,16 @@
/area/maintenance/solars/port)
"awe" = (
/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/item/toy/poolnoodle/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"awf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -9531,19 +9570,17 @@
/turf/open/floor/plating,
/area/maintenance/solars/port)
"aws" = (
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 28
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 9
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"awt" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red,
@@ -9608,23 +9645,14 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/barbershop)
"awA" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/sleeper{
- dir = 8
- },
-/obj/machinery/airalarm{
- pixel_y = 24
- },
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"awB" = (
/obj/machinery/microwave,
/obj/effect/turf_decal/tile/bar{
@@ -9839,24 +9867,17 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"awW" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
+"awX" = (
+/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/structure/closet/athletic_mixed,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/item/toy/poolnoodle/yellow,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"awX" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Pool External Maintenance";
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"awY" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -9953,8 +9974,16 @@
/turf/open/floor/plating,
/area/maintenance/solars/port)
"axg" = (
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/vending/medical,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axh" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
@@ -10072,11 +10101,16 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"axt" = (
-/obj/structure/mineral_door/woodrustic{
- name = "Sauna"
+/obj/structure/closet/secure_closet/medical1,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/item/clothing/mask/surgical,
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/gloves/color/latex,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axu" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -10265,9 +10299,14 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"axM" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/obj/structure/closet/secure_closet/medical2,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axN" = (
/obj/machinery/light_switch{
pixel_y = 24
@@ -10311,8 +10350,25 @@
/turf/closed/wall/r_wall,
/area/hydroponics/garden)
"axR" = (
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/item/surgical_drapes,
+/obj/item/scalpel,
+/obj/item/circular_saw{
+ pixel_y = 16
+ },
+/obj/item/hemostat,
+/obj/item/retractor,
+/obj/item/surgicaldrill,
+/obj/item/cautery,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axS" = (
/obj/structure/closet/crate,
/obj/item/storage/box/lights/mixed,
@@ -10341,13 +10397,18 @@
/turf/open/floor/plasteel,
/area/hydroponics/lobby)
"axV" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/machinery/disposal/bin{
+ name = "Corpse Delivery"
},
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/disposalpipe/trunk,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axW" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -10389,12 +10450,19 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"ayb" = (
-/obj/machinery/space_heater,
-/obj/structure/sign/poster/official/no_erp{
- pixel_y = 32
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"ayc" = (
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/freezer,
@@ -10463,16 +10531,20 @@
/turf/open/floor/plasteel,
/area/security/prison)
"ayn" = (
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
-"ayo" = (
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#d8b1b1"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/bedsheetbin/towel,
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall,
+/area/medical/clinic)
+"ayo" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"ayp" = (
/obj/machinery/firealarm{
dir = 4;
@@ -10879,24 +10951,18 @@
/turf/open/floor/plasteel,
/area/security/brig)
"azg" = (
-/obj/machinery/light{
- dir = 1
- },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = 26
- },
-/obj/machinery/sleep_console{
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"azh" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/grass,
@@ -10981,13 +11047,14 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"azo" = (
-/obj/vehicle/ridden/wheelchair,
/obj/effect/turf_decal/tile/blue{
- dir = 1
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"azp" = (
/obj/machinery/light_switch{
pixel_y = -24
@@ -11135,12 +11202,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"azE" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"azF" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -11545,12 +11611,11 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aAy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/item/kirbyplants{
+ icon_state = "plant-14"
},
-/obj/machinery/meter,
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aAz" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -12202,17 +12267,20 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aBM" = (
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/abandoned_gambling_den";
- name = "Arcade APC";
- pixel_y = -26
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/fore)
+/obj/machinery/camera{
+ c_tag = "Pool";
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/item/toy/poolnoodle/red,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aBN" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -12453,12 +12521,16 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/fitness)
"aCq" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/item/toy/poolnoodle/blue,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aCr" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -12823,12 +12895,16 @@
/turf/open/floor/plasteel,
/area/hydroponics/lobby)
"aCZ" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/structure/closet/athletic_mixed,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/item/toy/poolnoodle/yellow,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aDa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -13052,17 +13128,13 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aDx" = (
-/obj/structure/chair/stool,
-/obj/machinery/camera{
- c_tag = "Pool - Sauna";
- dir = 8;
- pixel_y = -22
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Pool External Maintenance";
+ req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aDy" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -13721,7 +13793,7 @@
pixel_x = -32
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aES" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -13775,7 +13847,7 @@
pixel_y = 32
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aEY" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/bot,
@@ -13784,22 +13856,10 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aEZ" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/central";
- dir = 1;
- name = "Emergency Storage APC";
- pixel_y = 24
- },
-/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aFa" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
@@ -13819,7 +13879,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -13832,18 +13892,18 @@
icon_state = "1-8"
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/structure/mineral_door/woodrustic{
+ name = "Sauna"
},
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aFd" = (
/obj/machinery/space_heater,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFe" = (
/obj/machinery/photocopier,
/turf/open/floor/plasteel{
@@ -14207,7 +14267,7 @@
pixel_x = -24
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFP" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -14226,14 +14286,14 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFR" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 10
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFS" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -14241,7 +14301,7 @@
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFT" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -14274,7 +14334,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFX" = (
/obj/machinery/computer/security/hos{
dir = 4
@@ -14328,7 +14388,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGg" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -14376,7 +14436,7 @@
},
/obj/item/extinguisher,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGk" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -14596,7 +14656,7 @@
/obj/effect/turf_decal/bot,
/obj/item/clothing/glasses/meson,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGG" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -14612,11 +14672,9 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aGH" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aGI" = (
/obj/structure/table,
/obj/effect/turf_decal/bot,
@@ -14683,7 +14741,7 @@
pixel_y = -1
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGJ" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -14798,7 +14856,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGV" = (
/obj/machinery/light{
dir = 4;
@@ -14918,7 +14976,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHe" = (
/obj/structure/sign/poster/official/bless_this_spess{
pixel_y = -32
@@ -15003,7 +15061,7 @@
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHn" = (
/obj/machinery/firealarm{
dir = 8;
@@ -15084,7 +15142,7 @@
/obj/effect/turf_decal/bot,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHx" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -15125,7 +15183,7 @@
},
/obj/item/extinguisher,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHC" = (
/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/bot,
@@ -15197,8 +15255,8 @@
},
/area/chapel/main)
"aHL" = (
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aHM" = (
/turf/open/floor/plasteel,
/area/bridge)
@@ -15270,20 +15328,13 @@
/turf/open/floor/plasteel,
/area/security/prison)
"aHU" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/space/fragile,
-/obj/item/clothing/head/helmet/space/fragile,
-/obj/item/tank/internals/air,
-/obj/item/flashlight,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/machinery/camera{
- c_tag = "Pool Maintenance";
- dir = 8;
- pixel_y = -22
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aHV" = (
/obj/structure/table,
/obj/item/clothing/suit/toggle/owlwings,
@@ -15389,17 +15440,12 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aIf" = (
-/obj/structure/table/optable,
-/obj/machinery/light_switch{
- pixel_x = 24
+/obj/machinery/space_heater,
+/obj/structure/sign/poster/official/no_erp{
+ pixel_y = 32
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/reagent_containers/blood/random,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aIg" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -15726,14 +15772,8 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"aIN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aIO" = (
/obj/structure/sign/directions/medical{
dir = 8;
@@ -16443,7 +16483,7 @@
"aKf" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKg" = (
/turf/open/floor/plasteel/stairs/right,
/area/hallway/secondary/entry)
@@ -16474,9 +16514,13 @@
/turf/open/floor/plasteel,
/area/security/main)
"aKj" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/obj/structure/bedsheetbin/towel,
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aKk" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -16499,7 +16543,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKn" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -16526,9 +16570,12 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aKp" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/portable_atmospherics/pump,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aKq" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -16560,7 +16607,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKs" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
@@ -16587,7 +16634,7 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKv" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -16630,7 +16677,7 @@
/area/security/brig)
"aKz" = (
/turf/closed/wall,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKA" = (
/obj/structure/table/wood,
/obj/machinery/button/door{
@@ -17040,20 +17087,12 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aLs" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_x = 26
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/meter,
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aLt" = (
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -17162,14 +17201,12 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"aLF" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
- name = "Pool Exterior Access";
- req_access_txt = "13"
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aLG" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -17245,9 +17282,12 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"aLO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aLP" = (
/obj/structure/window/reinforced{
dir = 1;
@@ -17361,8 +17401,17 @@
/turf/open/floor/carpet,
/area/security/courtroom)
"aMa" = (
-/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
+/obj/structure/chair/stool,
+/obj/machinery/camera{
+ c_tag = "Pool - Sauna";
+ dir = 8;
+ pixel_y = -22
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aMb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -17595,16 +17644,11 @@
},
/area/crew_quarters/bar)
"aMz" = (
-/obj/machinery/vending/medical,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aMA" = (
/turf/closed/wall,
/area/janitor)
@@ -17692,16 +17736,20 @@
},
/area/chapel/main)
"aMK" = (
-/obj/structure/closet/secure_closet/medical1,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/rack,
+/obj/item/clothing/suit/space/fragile,
+/obj/item/clothing/head/helmet/space/fragile,
+/obj/item/tank/internals/air,
+/obj/item/flashlight,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/machinery/camera{
+ c_tag = "Pool Maintenance";
+ dir = 8;
+ pixel_y = -22
},
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aML" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
@@ -18075,14 +18123,14 @@
/turf/open/floor/plating,
/area/maintenance/department/chapel)
"aNx" = (
-/obj/structure/closet/secure_closet/medical2,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external{
+ name = "Pool Exterior Access";
+ req_access_txt = "13"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aNy" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -18150,25 +18198,9 @@
/turf/open/floor/plasteel,
/area/tcommsat/server)
"aND" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/surgical_drapes,
-/obj/item/scalpel,
-/obj/item/circular_saw{
- pixel_y = 16
- },
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/surgicaldrill,
-/obj/item/cautery,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aNE" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 9
@@ -18260,18 +18292,8 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aNQ" = (
-/obj/machinery/disposal/bin{
- name = "Corpse Delivery"
- },
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/delivery/red,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aNR" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/hop)
@@ -18364,20 +18386,6 @@
/turf/open/floor/plating,
/area/maintenance/department/eva)
"aOc" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
-"aOd" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
@@ -18385,7 +18393,19 @@
icon_state = "0-4"
},
/turf/closed/wall,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOd" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aOe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -18438,21 +18458,22 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOl" = (
+/obj/structure/grille,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aOm" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -18498,18 +18519,17 @@
/turf/open/floor/plasteel,
/area/bridge)
"aOq" = (
-/obj/structure/grille,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOr" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -18581,17 +18601,17 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aOx" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 8
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aOy" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -18621,9 +18641,6 @@
/turf/closed/wall/r_wall,
/area/security/courtroom)
"aOC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -18631,7 +18648,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aOD" = (
/obj/machinery/door/airlock{
name = "Catering";
@@ -18643,14 +18660,9 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"aOE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOF" = (
/obj/item/toy/talking/owl,
/turf/open/floor/plating/asteroid,
@@ -18737,15 +18749,17 @@
/turf/open/floor/engine,
/area/engine/gravity_generator)
"aOQ" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
-"aOR" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOS" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -18755,22 +18769,22 @@
/area/hallway/primary/central)
"aOT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
+ dir = 8
},
/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aOU" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 8
- },
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
-"aOV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 8
},
/turf/closed/wall/r_wall/rust,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aOW" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/bot,
@@ -18783,12 +18797,6 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aOX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
-"aOY" = (
/obj/structure/cable{
icon_state = "1-2"
},
@@ -18800,16 +18808,19 @@
dir = 1
},
/turf/open/space/basic,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOY" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/bridge)
"aPa" = (
-/obj/structure/lattice,
/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/area/engine/substation)
"aPb" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -19776,11 +19787,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aRj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/closed/wall,
-/area/medical/medbay)
+/turf/closed/wall/r_wall,
+/area/engine/substation)
"aRk" = (
/obj/structure/disposalpipe/junction/yjunction,
/obj/structure/cable{
@@ -19955,7 +19966,7 @@
"aRF" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall/r_wall,
-/area/engine/storage_shared)
+/area/engine/substation)
"aRG" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/visible,
@@ -20668,9 +20679,11 @@
/turf/open/space/basic,
/area/space/nearstation)
"aTm" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
-/area/engine/supermatter)
+/area/engine/substation)
"aTn" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -20761,23 +20774,30 @@
/turf/open/floor/plasteel,
/area/bridge)
"aTv" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"aTw" = (
-/obj/machinery/door/airlock/engineering{
- name = "Thermo-Electric Generator";
- req_one_access_txt = "10;24"
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/power/smes{
+ charge = 5e+006
},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plasteel,
-/area/engine/supermatter)
+/turf/open/floor/plating,
+/area/engine/substation)
+"aTw" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/highcap/fifteen_k{
+ areastring = "/area/engine/substation";
+ dir = 1;
+ name = "Electrical Substation APC";
+ pixel_y = 26
+ },
+/turf/open/floor/plating,
+/area/engine/substation)
"aTx" = (
/obj/structure/lattice,
/obj/structure/sign/warning{
@@ -20795,15 +20815,12 @@
/turf/open/space/basic,
/area/space/nearstation)
"aTz" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 5
+/obj/machinery/camera{
+ c_tag = "Electrical Substation";
+ dir = 1
},
/turf/open/floor/plating,
-/area/engine/supermatter)
+/area/engine/substation)
"aTA" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -21014,12 +21031,17 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aTZ" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/engine/substation)
"aUa" = (
/obj/machinery/light_switch{
pixel_x = 24
@@ -21029,11 +21051,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aUb" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plating,
+/area/engine/substation)
"aUc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21047,32 +21069,24 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"aUd" = (
-/obj/machinery/light_switch{
- pixel_y = 24
- },
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/door/airlock/engineering{
+ name = "Electrical Substation";
+ req_access_txt = "10"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/engine/substation)
"aUe" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/engine/teg)
"aUf" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/camera{
- c_tag = "Thermo-Electric Generator"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"aUg" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -21155,25 +21169,34 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/lounge/jazz)
"aUr" = (
-/obj/machinery/firealarm{
- pixel_y = 26
+/obj/machinery/door/airlock/engineering{
+ name = "Thermo-Electric Generator";
+ req_one_access_txt = "10;24"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel,
+/area/engine/teg)
"aUs" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aUt" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-4"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/engine/teg)
"aUu" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -21452,11 +21475,12 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aVb" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 8
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aVc" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -21486,12 +21510,11 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"aVf" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "generator to hot loop"
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"aVg" = (
/obj/machinery/computer/cryopod{
pixel_y = 28
@@ -21676,13 +21699,14 @@
/turf/open/floor/circuit/green,
/area/crew_quarters/cryopod)
"aVB" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
-/obj/machinery/meter,
+/obj/machinery/light_switch{
+ pixel_y = 24
+ },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"aVC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -22050,14 +22074,14 @@
/turf/open/floor/plating,
/area/hallway/primary/port/fore)
"aWs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aWt" = (
/obj/machinery/light/small{
dir = 4
@@ -22319,14 +22343,14 @@
},
/area/crew_quarters/lounge/jazz)
"aWV" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 10
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/camera{
+ c_tag = "Thermo-Electric Generator"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aWW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -22340,19 +22364,14 @@
/turf/open/floor/plating,
/area/maintenance/central)
"aWX" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/delivery,
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/obj/machinery/power/apc{
- areastring = "/area/medical";
- dir = 8;
- name = "Medical Booth APC";
- pixel_x = -24
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/civilian)
+/turf/open/floor/engine,
+/area/engine/teg)
"aWY" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -22424,11 +22443,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aXi" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
@@ -22611,7 +22631,7 @@
name = "gas to hot loop"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"aXG" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/blue,
@@ -22683,14 +22703,11 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aXP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 6
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"aXQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/transit_tube/horizontal,
@@ -22793,14 +22810,12 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"aYb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 4
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "generator to hot loop"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aYc" = (
/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
@@ -22838,20 +22853,22 @@
/turf/open/floor/plasteel,
/area/bridge)
"aYi" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/visible,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/obj/machinery/meter,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"aYj" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "cold loop to generator"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"aYk" = (
/turf/open/floor/circuit/green,
/area/ai_monitored/nuke_storage)
@@ -23240,8 +23257,14 @@
},
/area/maintenance/department/eva)
"aZc" = (
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"aZd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -23271,11 +23294,11 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aZg" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"aZh" = (
/obj/structure/closet/crate,
/obj/machinery/light,
@@ -23424,12 +23447,14 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aZt" = (
-/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 6
+ },
/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/area/engine/teg)
"aZu" = (
/obj/machinery/blackbox_recorder,
/obj/effect/turf_decal/bot_white,
@@ -23878,10 +23903,14 @@
/turf/open/space/basic,
/area/space/nearstation)
"ban" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bao" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/white/full,
@@ -24150,15 +24179,20 @@
},
/area/lawoffice)
"baT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electricshock,
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/manifold/supply/visible,
+/obj/machinery/meter,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"baU" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "cold loop to generator"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"baV" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -24282,12 +24316,8 @@
/turf/closed/wall,
/area/hallway/primary/aft)
"bbi" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"bbj" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall/r_wall,
@@ -24368,11 +24398,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bbu" = (
/obj/structure/grille,
/obj/structure/cable,
@@ -24401,16 +24428,12 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bbx" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/window/reinforced/spawner/east,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/item/radio/intercom{
- dir = 8;
- name = "Station Intercom (Common)";
- pixel_x = 28
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bby" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -24422,11 +24445,10 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bbz" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/floor/plating,
+/area/engine/teg)
"bbA" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -24464,15 +24486,10 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bbE" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/electricshock,
+/turf/open/floor/plating,
+/area/engine/teg)
"bbF" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
@@ -24489,15 +24506,10 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bbH" = (
-/obj/machinery/atmospherics/components/binary/circulator{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/turf/open/floor/plating,
+/area/engine/teg)
"bbI" = (
/obj/machinery/light,
/turf/open/floor/plasteel,
@@ -24630,16 +24642,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bbZ" = (
-/obj/machinery/power/generator,
+/obj/structure/window/reinforced/spawner/west,
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 4
},
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bca" = (
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -24657,15 +24665,14 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/lounge/jazz)
"bcd" = (
-/obj/machinery/atmospherics/components/binary/circulator/cold{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bce" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor/auto{
@@ -24802,24 +24809,22 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom/jury)
"bcu" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
-"bcv" = (
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/item/radio/intercom{
+ dir = 8;
+ name = "Station Intercom (Common)";
+ pixel_x = 28
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
+"bcv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bcw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -24869,20 +24874,15 @@
/turf/open/floor/plasteel,
/area/gateway)
"bcD" = (
-/obj/structure/table/reinforced,
-/obj/item/analyzer,
-/obj/item/t_scanner,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/light{
+ dir = 4
},
-/obj/machinery/power/apc{
- areastring = "/area/engine/supermatter";
- dir = 4;
- name = "Thermo-Electric Generator APC";
- pixel_x = 24
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bcE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -24971,11 +24971,15 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"bcO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/effect/turf_decal/delivery,
-/obj/structure/window/reinforced/spawner,
+/obj/machinery/atmospherics/components/binary/circulator{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bcP" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -25081,12 +25085,16 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bdd" = (
-/obj/effect/turf_decal/delivery,
+/obj/machinery/power/generator,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "0-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bde" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
@@ -25102,12 +25110,15 @@
/turf/open/floor/plating,
/area/hallway/primary/central)
"bdh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/effect/turf_decal/delivery,
-/obj/item/extinguisher,
-/obj/structure/window/reinforced/spawner,
+/obj/machinery/atmospherics/components/binary/circulator/cold{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bdi" = (
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/r_wall,
@@ -25135,13 +25146,15 @@
/turf/open/floor/plasteel,
/area/engine/storage)
"bdl" = (
-/obj/structure/table/reinforced,
-/obj/item/grenade/chem_grenade/smart_metal_foam{
- pixel_x = 4
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/light{
+ dir = 8
},
-/obj/item/radio,
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bdm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25418,11 +25431,14 @@
/turf/open/floor/plating,
/area/engine/engineering)
"bdP" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bdQ" = (
/obj/machinery/door/airlock/command{
name = "Bridge";
@@ -25467,11 +25483,20 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bdW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/structure/window/reinforced/spawner/east,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/structure/table/reinforced,
+/obj/item/analyzer,
+/obj/item/t_scanner,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/engine/teg";
+ dir = 4;
+ name = "Thermo-Electric Generator APC";
+ pixel_x = 24
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bdX" = (
/obj/structure/table/wood,
/obj/item/storage/box/donkpockets,
@@ -25481,11 +25506,11 @@
},
/area/chapel/main)
"bdY" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/stairs,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/effect/turf_decal/delivery,
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/engine,
+/area/engine/teg)
"bdZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25542,11 +25567,12 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bei" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/structure/window/reinforced/spawner/west,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bej" = (
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
@@ -25567,11 +25593,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bem" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/effect/turf_decal/delivery,
+/obj/item/extinguisher,
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/engine,
+/area/engine/teg)
"ben" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -25601,23 +25628,24 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
"beq" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/grenade/chem_grenade/smart_metal_foam{
+ pixel_x = 4
},
+/obj/item/radio,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"ber" = (
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bes" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bet" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -25985,11 +26013,11 @@
/turf/open/floor/plating,
/area/maintenance/department/security)
"bfn" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/structure/window/reinforced/spawner/east,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bfo" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -26069,12 +26097,11 @@
},
/area/gateway)
"bfv" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "hot loop to generator"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/stairs,
+/area/engine/teg)
"bfw" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -26095,15 +26122,11 @@
/turf/open/floor/plasteel/white,
/area/gateway)
"bfy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
- },
-/obj/machinery/meter,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/structure/window/reinforced/spawner/west,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bfz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/event_spawn,
@@ -26161,11 +26184,11 @@
/turf/open/floor/plating,
/area/quartermaster/sorting)
"bfF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bfG" = (
/obj/machinery/conveyor{
dir = 4;
@@ -26188,17 +26211,18 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"bfI" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plating,
-/area/engine/storage_shared)
-"bfJ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
+"bfJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bfK" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/candle_box{
@@ -26231,11 +26255,23 @@
},
/area/chapel/office)
"bfM" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/structure/table,
+/obj/machinery/light_switch{
+ pixel_x = 24
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/item/clothing/ears/earmuffs,
+/obj/item/extinguisher{
+ pixel_x = -12;
+ pixel_y = -2
+ },
+/obj/machinery/camera{
+ c_tag = "Engineering - Hot Loop";
+ dir = 8;
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel,
+/area/engine/teg/hotloop)
"bfN" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
@@ -26704,11 +26740,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bgJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/visible{
- dir = 8
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 4
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bgK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -26764,11 +26800,12 @@
/turf/closed/wall,
/area/quartermaster/qm)
"bgR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 4
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "hot loop to generator"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bgS" = (
/obj/machinery/computer/bounty,
/obj/effect/turf_decal/tile/brown{
@@ -26820,7 +26857,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bha" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/machinery/meter,
@@ -26828,7 +26865,7 @@
icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bhb" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 1
@@ -26836,12 +26873,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bhc" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "generator to cold loop"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bhd" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -27922,12 +27958,11 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"bjx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+ dir = 4
},
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"bjy" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -28070,14 +28105,11 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bjL" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bjM" = (
/obj/machinery/door/airlock/public/glass{
name = "Atmospherics Storage";
@@ -28265,11 +28297,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkf" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/visible{
+ dir = 8
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bkg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/mineral/stacking_unit_console{
@@ -28342,35 +28374,28 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"bkp" = (
-/obj/machinery/light/small,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"bkq" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
-/obj/machinery/atmospherics/components/binary/valve/digital{
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/turf/open/floor/engine,
-/area/engine/supermatter)
-"bkr" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
+/area/engine/teg)
+"bkq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
},
+/obj/machinery/meter,
/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = -29
+ icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
+"bkr" = (
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "generator to cold loop"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bks" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -28818,8 +28843,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"blp" = (
-/turf/closed/wall/r_wall,
-/area/hallway/secondary/exit)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/engine/teg)
"blq" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -29232,13 +29261,20 @@
},
/area/crew_quarters/heads/hor)
"bme" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bmf" = (
-/obj/structure/sign/departments/evac,
-/turf/closed/wall/r_wall,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bmg" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -29641,16 +29677,12 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bmT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Thermo-Electric Generator";
- req_one_access_txt = "10;24"
+/obj/machinery/light/small,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plasteel,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"bmU" = (
/obj/structure/table/wood,
/obj/machinery/light{
@@ -29852,12 +29884,15 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bni" = (
-/obj/structure/sign/warning/fire,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bnj" = (
/obj/structure/sign/warning/securearea{
desc = "A warning sign which reads 'BOMB RANGE";
@@ -29892,16 +29927,18 @@
/turf/closed/wall/r_wall,
/area/science/mixing)
"bnn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Thermo-Electric Generator";
- req_one_access_txt = "10;24"
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plasteel,
-/area/engine/supermatter)
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = -29
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bno" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -29949,17 +29986,21 @@
/turf/closed/wall/r_wall,
/area/maintenance/department/eva)
"bnt" = (
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/power/smes{
- charge = 5e+006
+/obj/machinery/power/apc{
+ areastring = "/area/engine/teg/coldloop";
+ dir = 4;
+ name = "Cold Loop APC";
+ pixel_x = 24
},
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/engine/teg/coldloop)
"bnu" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -30119,9 +30160,16 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bnO" = (
-/obj/machinery/status_display,
-/turf/closed/wall/r_wall,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Thermo-Electric Generator";
+ req_one_access_txt = "10;24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel,
+/area/engine/teg)
"bnP" = (
/obj/effect/turf_decal/plaque{
icon_state = "L11"
@@ -30224,9 +30272,12 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"bnY" = (
-/obj/structure/flora/ausbushes/sunnybush,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/structure/sign/warning/fire,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bnZ" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -30302,11 +30353,16 @@
/turf/open/floor/plasteel,
/area/science/server)
"bog" = (
-/obj/machinery/light{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Thermo-Electric Generator";
+ req_one_access_txt = "10;24"
},
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel,
+/area/engine/teg)
"boh" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -30364,16 +30420,17 @@
/turf/open/floor/plasteel/dark,
/area/teleporter)
"bom" = (
-/obj/structure/flora/ausbushes/leafybush,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
-"bon" = (
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/tile/green{
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
+"bon" = (
+/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+ dir = 1
+ },
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"boo" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -30467,25 +30524,18 @@
/turf/open/floor/plating,
/area/engine/engineering)
"box" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 10
+ },
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"boy" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"boz" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"boA" = (
/turf/closed/wall,
/area/security/detectives_office)
@@ -30811,13 +30861,19 @@
/turf/open/floor/plasteel,
/area/science/server)
"bpi" = (
-/obj/structure/flora/junglebush/b,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital/on,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpj" = (
-/obj/structure/flora/junglebush,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/camera{
+ c_tag = "Aft Maintenance - Air Hookup"
+ },
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpk" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -31093,18 +31149,14 @@
/turf/open/floor/carpet/red,
/area/security/brig)
"bpT" = (
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/binary/valve/digital/on,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpU" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpV" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -31258,16 +31310,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bqp" = (
-/obj/structure/chair{
- dir = 8
+/obj/machinery/atmospherics/components/binary/valve/digital/on{
+ dir = 4
},
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"bqq" = (
/obj/machinery/chem_master,
/obj/effect/turf_decal/stripes/line,
@@ -31466,33 +31513,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bqL" = (
-/obj/structure/chair{
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
-/obj/machinery/light_switch{
- pixel_x = -24
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bqM" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+ dir = 5
},
-/obj/item/storage/dice,
-/obj/item/toy/cards/deck,
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bqN" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/yellow{
@@ -31550,16 +31581,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"bqU" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bqV" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -31803,20 +31830,19 @@
/turf/open/floor/plating,
/area/engine/engineering)
"brv" = (
-/obj/machinery/disposal/bin,
-/obj/machinery/light{
- dir = 1
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/machinery/power/apc{
+ areastring = "/area/engine/atmos/airaft";
+ dir = 8;
+ name = "Aft Air Hookup APC";
+ pixel_x = -24
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"brw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -31986,16 +32012,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"brN" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"brO" = (
/obj/machinery/firealarm{
dir = 1;
@@ -32876,28 +32897,15 @@
/turf/closed/wall/r_wall,
/area/hallway/secondary/civilian)
"btK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Aft Maintenance";
- req_access_txt = "12"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
+/obj/machinery/light/small,
+/obj/machinery/space_heater,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/area/engine/atmos/aftair)
"btL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"btM" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -32925,15 +32933,10 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"btO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"btP" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
@@ -33056,8 +33059,8 @@
/turf/closed/wall,
/area/maintenance/disposal)
"bui" = (
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
"buj" = (
/obj/structure/closet/crate,
/turf/open/floor/plating,
@@ -33094,11 +33097,9 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai)
"buo" = (
-/obj/structure/chair{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"bup" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -33417,18 +33418,9 @@
/turf/closed/wall,
/area/janitor)
"bvb" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc/highcap/fifteen_k{
- areastring = "/area/engine/storage_shared";
- dir = 1;
- name = "Electrical Substation APC";
- pixel_y = 26
- },
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/obj/structure/sign/departments/evac,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
"bvc" = (
/obj/machinery/computer/cargo/request,
/obj/machinery/airalarm{
@@ -35374,14 +35366,14 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bzq" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/sign/warning/pods{
- pixel_x = -32
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departures"
},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bzr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -36158,9 +36150,14 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bAW" = (
-/obj/structure/sign/poster/official/get_your_legs,
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departures"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bAX" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -36179,9 +36176,14 @@
},
/area/crew_quarters/heads/captain)
"bAY" = (
-/obj/machinery/status_display,
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departures"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bAZ" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 1
@@ -36190,9 +36192,9 @@
/turf/open/floor/carpet,
/area/chapel/main)
"bBa" = (
-/obj/structure/sign/poster/official/help_others,
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
"bBb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -36205,16 +36207,9 @@
},
/area/maintenance/department/chapel)
"bBc" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 8
- },
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/binary/valve/digital/on,
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"bBd" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/popcorn,
@@ -36224,15 +36219,16 @@
/turf/open/floor/wood,
/area/crew_quarters/fitness)
"bBe" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/atmos{
+ name = "Aft Air Hookup";
+ req_access_txt = "12;24"
},
-/obj/structure/sign/warning/pods{
- pixel_x = 32
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bBf" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -36295,14 +36291,9 @@
/turf/open/floor/plating,
/area/hallway/primary/aft)
"bBm" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 4
- },
-/area/hallway/secondary/exit)
+/obj/structure/sign/warning/nosmoking,
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"bBn" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Thermo-Electric Generator Room";
@@ -36371,15 +36362,9 @@
/turf/closed/wall,
/area/router)
"bBw" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/white/corner{
- dir = 4
- },
-/area/hallway/secondary/exit)
+/obj/structure/flora/ausbushes/sunnybush,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bBx" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
@@ -36515,11 +36500,11 @@
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"bBM" = (
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bBN" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
dir = 1
@@ -36623,8 +36608,9 @@
/turf/open/floor/plasteel,
/area/router/eva)
"bBZ" = (
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/structure/flora/ausbushes/leafybush,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bCa" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -36850,11 +36836,12 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bCA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/vending/coffee,
+/obj/effect/turf_decal/tile/green{
dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bCB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposaloutlet,
@@ -39216,11 +39203,14 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bHt" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bHu" = (
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
@@ -40074,8 +40064,9 @@
/turf/closed/wall/r_wall,
/area/science/server)
"bJo" = (
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bJp" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -40083,14 +40074,12 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bJq" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/effect/turf_decal/tile/green{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bJr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 1
@@ -40318,11 +40307,14 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"bJR" = (
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bJS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -42166,32 +42158,17 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bNH" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/structure/flora/junglebush/b,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bNI" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/departments/evac,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/structure/flora/junglebush,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bNJ" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/hallway/secondary/exit)
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bNK" = (
/obj/machinery/power/solar{
id = "aftstarboard";
@@ -42237,19 +42214,19 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"bNQ" = (
-/obj/effect/turf_decal/tile/red{
+/obj/structure/window/reinforced/spawner,
+/obj/item/storage/backpack/snail,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
+"bNR" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
dir = 4
},
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
-"bNR" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bNS" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42283,33 +42260,75 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bNW" = (
-/turf/open/floor/plasteel/stairs/left,
-/area/hallway/secondary/exit)
-"bNX" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/plasteel/stairs/right,
-/area/hallway/secondary/exit)
-"bNY" = (
-/obj/machinery/light{
+/obj/structure/chair{
dir = 8
},
-/turf/open/floor/plasteel/stairs/left,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
+"bNX" = (
+/obj/structure/window/reinforced/spawner,
+/mob/living/simple_animal/kiwi,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
+"bNY" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bNZ" = (
-/turf/open/floor/plasteel/stairs/right,
-/area/hallway/secondary/exit)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/item/storage/dice,
+/obj/item/toy/cards/deck,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOa" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOb" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/vacuum/external,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/machinery/disposal/bin,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42328,12 +42347,16 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"bOe" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external/glass{
- name = "Departures Shuttle Dock"
+/obj/effect/turf_decal/tile/green{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOf" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42342,32 +42365,46 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"bOg" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bOh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bOi" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"bOi" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bOj" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
-/obj/machinery/light{
- dir = 8
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bOk" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42376,17 +42413,34 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"bOl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/machinery/computer/arcade,
+/obj/machinery/light{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOm" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/structure/chair{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOn" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -42399,10 +42453,18 @@
/turf/open/floor/plating,
/area/crew_quarters/toilet/restrooms)
"bOo" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/docking,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/item/paicard,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOp" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -42994,75 +43056,73 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPD" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/camera{
- c_tag = "Escape Hall - Fore";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bPE" = (
-/obj/structure/table/glass,
-/obj/item/clipboard,
-/obj/item/storage/crayons,
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bPF" = (
-/obj/structure/table/glass,
-/obj/item/storage/fancy/cigarettes,
-/obj/item/lighter{
- pixel_x = 6
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bPG" = (
/obj/structure/chair{
dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/light_switch{
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/hallway/secondary/exit/departure_lounge)
+"bPE" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Aft Maintenance";
+ req_access_txt = "12"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
+"bPF" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"bPG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bPH" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
+/obj/machinery/holopad,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bPI" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bPJ" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 1
@@ -43110,18 +43170,19 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bPO" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Starboard Quarter Maintenance";
+ req_one_access_txt = "12;48"
},
-/obj/effect/turf_decal/tile/red,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/white/corner{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"bPP" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -43160,13 +43221,19 @@
/turf/open/floor/plasteel/showroomfloor,
/area/medical/morgue)
"bPT" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Aft Maintenance";
+ req_access_txt = "12"
+ },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/white/corner{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"bPU" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -43268,10 +43335,13 @@
/area/medical/morgue)
"bQd" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bQe" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -43396,16 +43466,25 @@
/area/engine/break_room)
"bQr" = (
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bQs" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bQt" = (
/obj/machinery/conveyor/auto{
dir = 5;
@@ -45371,9 +45450,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bUx" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bUy" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -49393,11 +49480,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"ccx" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
+/obj/structure/table/glass,
+/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/pen/blue,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"ccy" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor/auto{
@@ -49533,11 +49626,16 @@
/turf/open/floor/plating,
/area/science/research)
"ccK" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/structure/table/glass,
+/obj/item/storage/toolbox/emergency,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 9
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"ccL" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/light{
@@ -49703,9 +49801,21 @@
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"cdd" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/structure/table/glass,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/camera{
+ c_tag = "Escape Hall - Fore";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cde" = (
/obj/machinery/light{
dir = 1
@@ -49798,11 +49908,15 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cdn" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/structure/table/glass,
+/obj/item/clipboard,
+/obj/item/storage/crayons,
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cdo" = (
/obj/structure/grille,
/obj/structure/disposalpipe/segment{
@@ -50122,7 +50236,7 @@
/area/router/eng)
"cdV" = (
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cdW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -50320,7 +50434,7 @@
icon_state = "1-2"
},
/turf/closed/wall/r_wall/rust,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cer" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/mass_driver{
@@ -50344,19 +50458,33 @@
icon_state = "1-2"
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ceu" = (
-/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
- dir = 1
+/obj/structure/table/glass,
+/obj/item/storage/fancy/cigarettes,
+/obj/item/lighter{
+ pixel_x = 6
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cev" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 10
+/obj/structure/chair{
+ dir = 8
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cew" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/conveyor/auto{
@@ -50367,8 +50495,14 @@
/turf/open/floor/plating,
/area/router/eng)
"cex" = (
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cey" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -50571,7 +50705,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ceS" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
@@ -50657,7 +50791,7 @@
dir = 6
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfb" = (
/obj/machinery/light{
dir = 8
@@ -50708,7 +50842,7 @@
dir = 10
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfg" = (
/obj/structure/chair{
dir = 8
@@ -50746,32 +50880,53 @@
/turf/open/floor/plasteel,
/area/science/research)
"cfi" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfj" = (
-/obj/machinery/firealarm{
- pixel_y = 26
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/binary/valve/digital/on,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfk" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/camera{
- c_tag = "Aft Maintenance - Air Hookup"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Starboard Quarter Maintenance";
+ req_one_access_txt = "12;48"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/area/hallway/secondary/exit/departure_lounge)
"cfl" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/sign/warning/pods{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfm" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50784,13 +50939,13 @@
"cfo" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfp" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 1
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfq" = (
/obj/structure/lattice/catwalk,
/turf/open/floor/plating/airless,
@@ -50808,7 +50963,7 @@
},
/obj/machinery/door/firedoor/heavy,
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfs" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -50828,13 +50983,13 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfv" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -50869,12 +51024,8 @@
/turf/open/floor/plasteel,
/area/engine/storage)
"cfy" = (
-/obj/machinery/camera{
- c_tag = "Electrical Substation";
- dir = 1
- },
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -50889,19 +51040,19 @@
dir = 5
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfB" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfD" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
@@ -50915,13 +51066,13 @@
dir = 9
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfF" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfG" = (
/obj/machinery/door/airlock/highsecurity{
name = "Secure Tech Storage";
@@ -50938,7 +51089,7 @@
},
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -50950,13 +51101,13 @@
/obj/effect/decal/cleanable/ash,
/obj/effect/decal/remains/human,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -50965,7 +51116,7 @@
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51091,7 +51242,7 @@
/obj/structure/window/plasma/reinforced/spawner,
/obj/structure/lattice,
/turf/open/space/basic,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfX" = (
/obj/item/pipe,
/obj/structure/cable{
@@ -51139,7 +51290,7 @@
},
/obj/machinery/door/firedoor/heavy,
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgc" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -51222,7 +51373,7 @@
},
/obj/machinery/meter,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgj" = (
/obj/machinery/conveyor/auto{
id = "cargo"
@@ -51250,7 +51401,7 @@
name = "atmos mix to burn"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgm" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -51276,7 +51427,7 @@
"cgo" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -51287,7 +51438,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgq" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -51337,7 +51488,7 @@
light_color = "#ffc1c1"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgv" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -51358,7 +51509,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgx" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -51418,7 +51569,7 @@
"cgD" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgE" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/light{
@@ -51435,30 +51586,30 @@
/turf/open/floor/plasteel,
/area/science/research)
"cgG" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on{
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/corner{
dir = 4
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/area/hallway/secondary/exit/departure_lounge)
"cgH" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/sign/poster/official/get_your_legs,
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cgI" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/status_display,
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cgJ" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 4
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/sign/poster/official/help_others,
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cgK" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -51502,41 +51653,44 @@
/turf/open/floor/plasteel,
/area/science/research)
"cgN" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/light{
+ dir = 8
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/aft/secondary";
- dir = 8;
- name = "Aft Air Hookup APC";
- pixel_x = -24
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/turf/open/floor/plasteel/white/corner{
+ dir = 8
+ },
+/area/hallway/secondary/exit/departure_lounge)
"cgO" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgP" = (
-/obj/machinery/light/small,
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/structure/sign/warning/pods{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgQ" = (
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 6
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgS" = (
/obj/machinery/atmospherics/components/trinary/mixer{
dir = 4;
@@ -51546,7 +51700,7 @@
target_pressure = 4500
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgT" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -51559,12 +51713,15 @@
name = "manual mix to burn"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgV" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgW" = (
/obj/docking_port/stationary{
dir = 4;
@@ -51618,7 +51775,7 @@
icon_state = "2-4"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chc" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51662,7 +51819,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chh" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plating,
@@ -51680,13 +51837,13 @@
icon_state = "1-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chl" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51744,22 +51901,22 @@
"chr" = (
/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chs" = (
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cht" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chv" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51800,7 +51957,7 @@
dir = 10
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chz" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -51811,20 +51968,20 @@
pixel_x = -28
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chA" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chB" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chC" = (
/turf/closed/wall/r_wall/rust,
/area/space/nearstation)
@@ -51836,13 +51993,13 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chE" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 5
},
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chF" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -51852,7 +52009,7 @@
/obj/item/pipe_dispenser,
/obj/item/wrench,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chG" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -51862,7 +52019,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chH" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
@@ -51876,7 +52033,7 @@
/obj/machinery/meter,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -51898,7 +52055,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -51923,7 +52080,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chO" = (
/obj/structure/table,
/obj/machinery/requests_console{
@@ -52049,7 +52206,7 @@
"chX" = (
/obj/structure/sign/warning/nosmoking,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chY" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52063,14 +52220,14 @@
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/wrench,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cia" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52079,13 +52236,13 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cib" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cic" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -52113,13 +52270,13 @@
},
/obj/item/analyzer,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cie" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cif" = (
/obj/machinery/light/small{
brightness = 3;
@@ -52247,7 +52404,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cis" = (
/obj/structure/sign/warning/vacuum{
pixel_y = -32
@@ -52332,7 +52489,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ciE" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -52376,7 +52533,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ciI" = (
/turf/closed/wall/r_wall/rust,
/area/quartermaster/warehouse)
@@ -52536,17 +52693,17 @@
pixel_y = 1
},
/obj/machinery/power/apc{
- areastring = "/area/engine/teg_hot";
+ areastring = "/area/engine/teg/hotloop";
dir = 8;
name = "Hot Loop APC";
pixel_x = -24
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ciZ" = (
/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cja" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52612,7 +52769,7 @@
dir = 6
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cji" = (
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
@@ -52683,7 +52840,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cjt" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -52700,23 +52857,10 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cju" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/structure/table,
-/obj/machinery/light_switch{
- pixel_x = 24
- },
-/obj/item/clothing/ears/earmuffs,
-/obj/item/extinguisher{
- pixel_x = -12;
- pixel_y = -2
- },
-/obj/machinery/camera{
- c_tag = "Engineering - Hot Loop";
- dir = 8;
- pixel_y = -22
- },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/hallway/secondary/exit/departure_lounge)
"cjv" = (
/obj/structure/chair{
dir = 1
@@ -52843,7 +52987,7 @@
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjL" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -52851,7 +52995,7 @@
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjM" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -52979,7 +53123,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjV" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -53026,7 +53170,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjY" = (
/obj/machinery/computer/station_alert{
dir = 4
@@ -53083,9 +53227,17 @@
},
/area/science/robotics/lab)
"ckc" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on,
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"ckd" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/white,
@@ -53098,16 +53250,9 @@
/turf/open/floor/wood,
/area/library)
"ckf" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/atmos{
- name = "Aft Air Hookup";
- req_access_txt = "12;24"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"ckg" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -53161,7 +53306,7 @@
/area/space/station_ruins)
"ckm" = (
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ckn" = (
/obj/machinery/door/airlock/external/glass{
name = "External Solar Access";
@@ -53173,9 +53318,13 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"cko" = (
-/obj/structure/sign/warning/nosmoking,
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/hallway/secondary/exit/departure_lounge)
"ckp" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -53232,13 +53381,13 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cku" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -53255,7 +53404,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckx" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -53276,17 +53425,17 @@
"cky" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/table,
/obj/item/pipe_dispenser,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckA" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckB" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53307,7 +53456,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ckC" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53322,7 +53471,7 @@
name = "gas to cold loop"
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ckD" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -53342,21 +53491,14 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"ckF" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/chair,
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "0-8"
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
},
-/obj/machinery/power/apc{
- areastring = "/area/engine/teg_cold";
- dir = 4;
- name = "Cold Loop APC";
- pixel_x = 24
- },
-/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/hallway/secondary/exit/departure_lounge)
"ckG" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 1
@@ -53391,7 +53533,7 @@
dir = 8
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckK" = (
/obj/structure/closet/secure_closet/miner,
/obj/effect/turf_decal/tile/brown{
@@ -53925,17 +54067,15 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"clH" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/terminal{
+/obj/structure/chair,
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/hallway/secondary/exit/departure_lounge)
"clI" = (
/obj/machinery/telecomms/bus/preset_four,
/turf/open/floor/circuit/telecomms/mainframe,
@@ -54052,36 +54192,17 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"clZ" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
- },
-/obj/structure/chair{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Escape Hall - Port";
- dir = 4
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cma" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 26
- },
-/obj/structure/chair{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Escape Hall - Starboard";
- dir = 8;
- pixel_y = -22
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cmb" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -54135,7 +54256,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmg" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -54153,7 +54274,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmh" = (
/obj/structure/sign/warning/radiation,
/turf/closed/wall/r_wall,
@@ -54277,33 +54398,17 @@
/turf/open/floor/engine,
/area/engine/gravity_generator)
"cmy" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Starboard Quarter Maintenance";
- req_one_access_txt = "12;48"
+/obj/effect/turf_decal/stripes/line,
+/obj/item/crowbar,
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = 32
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cmz" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Starboard Quarter Maintenance";
- req_one_access_txt = "12;48"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cmA" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -54348,7 +54453,7 @@
dir = 5
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmF" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/mineral/titanium/blue,
@@ -54365,7 +54470,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmH" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
@@ -54540,10 +54645,8 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"cmV" = (
-/obj/structure/window/reinforced/spawner,
-/obj/item/storage/backpack/snail,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cmW" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -54563,10 +54666,19 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"cmX" = (
-/obj/structure/window/reinforced/spawner,
-/mob/living/simple_animal/kiwi,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Escape Hall - Port";
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cmY" = (
/obj/machinery/door/airlock/engineering{
name = "Hot Loop";
@@ -54584,7 +54696,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -54613,31 +54725,29 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cnc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"cne" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"cne" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnf" = (
-/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cng" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
@@ -54656,7 +54766,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cni" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Port to Fuel Pipe"
@@ -54722,7 +54832,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cnp" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
@@ -54744,7 +54854,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cns" = (
/obj/machinery/firealarm{
dir = 8;
@@ -54756,7 +54866,7 @@
dir = 10
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cnt" = (
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
@@ -54801,7 +54911,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cny" = (
/obj/machinery/light{
dir = 4;
@@ -54885,19 +54995,26 @@
},
/area/maintenance/port/fore)
"cnG" = (
-/obj/machinery/door/airlock/external/glass{
- name = "Shuttle Maintenance Access"
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Escape Hall - Starboard";
+ dir = 8;
+ pixel_y = -22
},
-/obj/structure/fans/tiny,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnH" = (
-/obj/machinery/door/airlock/external/glass{
- name = "Departures Shuttle Dock"
+/obj/structure/chair{
+ dir = 4
},
-/obj/structure/fans/tiny,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnI" = (
/turf/open/floor/plating{
icon_state = "platingdmg3"
@@ -54915,7 +55032,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cnL" = (
/obj/structure/closet/crate/science,
/obj/item/stack/sheet/metal/ten,
@@ -55110,25 +55227,20 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cog" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=eng2";
+ location = "evac"
},
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"coh" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/chair{
+ dir = 8
},
-/obj/machinery/door/airlock/engineering{
- name = "Electrical Substation";
- req_access_txt = "10"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"coi" = (
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -55162,7 +55274,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"col" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/yellow{
@@ -55206,23 +55318,17 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
"coq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Departures"
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cor" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Departures"
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cos" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -55295,13 +55401,22 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"coy" = (
-/obj/structure/sign/poster/official/safety_internals{
- pixel_x = -32
+/obj/structure/chair{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/secondary/exit/departure_lounge";
+ name = "Escape Shuttle Hallway APC";
+ pixel_y = -28
+ },
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"coz" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -55540,7 +55655,7 @@
},
/obj/machinery/meter,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"coU" = (
/obj/machinery/computer/secure_data{
dir = 1
@@ -55623,7 +55738,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpb" = (
/obj/structure/sink{
dir = 4;
@@ -55738,7 +55853,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpl" = (
/obj/machinery/newscaster{
pixel_x = 30
@@ -55783,7 +55898,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpp" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor/auto{
@@ -55865,15 +55980,14 @@
/turf/open/floor/mineral/titanium/blue,
/area/hallway/primary/central)
"cpy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/chair{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/machinery/holopad,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cpz" = (
/turf/closed/wall/r_wall,
/area/medical/virology)
@@ -55888,7 +56002,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpB" = (
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
@@ -55931,7 +56045,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpG" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -55994,7 +56108,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cpL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
@@ -56004,7 +56118,7 @@
light_color = "#c1caff"
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cpM" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/bot,
@@ -56064,14 +56178,14 @@
/obj/item/electronics/airlock,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpS" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpT" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8
@@ -56079,7 +56193,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpU" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -56088,7 +56202,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpV" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -56108,7 +56222,7 @@
light_color = "#c1caff"
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpW" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -56129,13 +56243,13 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cpZ" = (
/obj/structure/table,
/obj/item/tank/internals/air,
/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cqa" = (
/obj/machinery/autolathe,
/obj/effect/turf_decal/delivery,
@@ -56144,7 +56258,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqb" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/white,
@@ -56155,7 +56269,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqd" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -56252,12 +56366,18 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"cql" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=eng2";
- location = "evac"
+/obj/structure/chair{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = -29
+ },
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cqm" = (
/obj/structure/closet/secure_closet/medical1,
/obj/effect/turf_decal/tile/red{
@@ -56278,7 +56398,7 @@
dir = 5
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqo" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -56291,7 +56411,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqp" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -56303,7 +56423,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -56319,7 +56439,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqr" = (
/obj/machinery/power/apc{
areastring = "/area/maintenance/starboard/central";
@@ -56452,7 +56572,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqB" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/bottle/absinthe,
@@ -56467,11 +56587,11 @@
"cqC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqD" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqE" = (
/obj/machinery/conveyor_switch{
id = "EngiCargoConveyer"
@@ -56483,7 +56603,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqF" = (
/obj/effect/turf_decal/delivery,
/obj/effect/landmark/event_spawn,
@@ -56556,12 +56676,12 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqN" = (
/turf/closed/wall/rust,
/area/maintenance/department/security)
@@ -56570,7 +56690,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqP" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red,
@@ -56621,22 +56741,14 @@
/turf/open/floor/plasteel,
/area/science/explab)
"cqT" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"cqU" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Pod"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"cqU" = (
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cqV" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -56724,7 +56836,7 @@
id = "EngiCargoConveyer"
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"crc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56810,18 +56922,18 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"crj" = (
-/obj/structure/chair{
- dir = 1
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = -29
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"crk" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -56857,7 +56969,7 @@
name = "Engineering Delivery Door"
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"crn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -57197,13 +57309,10 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"crU" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/item/crowbar,
-/obj/structure/sign/poster/official/safety_internals{
- pixel_x = 32
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/departments/evac,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"crV" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -57465,7 +57574,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"csr" = (
/obj/structure/table,
/obj/machinery/computer/libraryconsole/bookmanagement,
@@ -57487,7 +57596,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cst" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/decal/cleanable/dirt,
@@ -57495,7 +57604,7 @@
dir = 9
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"csu" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -58121,13 +58230,14 @@
/turf/closed/wall,
/area/engine/workshop)
"ctH" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ffc1c1"
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/hallway/secondary/exit/departure_lounge)
"ctI" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -58280,22 +58390,11 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"ctV" = (
-/obj/structure/chair{
- dir = 1
- },
/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/hallway/secondary/exit";
- name = "Escape Shuttle Hallway APC";
- pixel_y = -28
+ dir = 4
},
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"ctW" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -59525,13 +59624,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"cwd" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"cwe" = (
/obj/structure/closet/secure_closet/exile,
/turf/open/floor/plasteel/white,
@@ -59663,10 +59762,8 @@
/turf/open/floor/plating,
/area/medical/virology)
"cwq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/turf/open/floor/plasteel/stairs/left,
+/area/hallway/secondary/exit/departure_lounge)
"cwr" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -59894,9 +59991,12 @@
/turf/open/floor/mineral/titanium/blue,
/area/hallway/primary/central)
"cwV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/science/misc_lab)
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/turf/open/floor/plasteel/stairs/right,
+/area/hallway/secondary/exit/departure_lounge)
"cwW" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -60739,14 +60839,11 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cyD" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Departures"
+/obj/machinery/light{
+ dir = 8
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/stairs/left,
+/area/hallway/secondary/exit/departure_lounge)
"cyE" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
@@ -60779,14 +60876,8 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cyJ" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/stairs/right,
+/area/hallway/secondary/exit/departure_lounge)
"cyK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -60889,103 +60980,53 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cyV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
"cyW" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
"cyX" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/science/observatory)
+"cyY" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"cyZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/vacuum/external,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
+"cza" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czb" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czc" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external/glass{
+ name = "Departures Shuttle Dock"
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"cyY" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"cyZ" = (
-/obj/machinery/computer/arcade,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"cza" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"czb" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/item/paicard,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"czc" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/machinery/light_switch{
- pixel_x = 24
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"czd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60997,15 +61038,8 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cze" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/science/observatory)
"czf" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -61080,94 +61114,72 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"czl" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Aft Maintenance";
- req_access_txt = "12"
- },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
-"czm" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czn" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czo" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czp" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -28
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czm" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czq" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/pen/blue,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czr" = (
-/obj/structure/table/glass,
-/obj/item/storage/toolbox/emergency,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czn" = (
+/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czs" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/area/hallway/secondary/exit/departure_lounge)
+"czo" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"czp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"czq" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czr" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "Shuttle Maintenance Access"
+ },
+/obj/structure/fans/tiny,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"czs" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"czt" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -61219,11 +61231,15 @@
/turf/open/floor/plasteel/showroomfloor,
/area/medical/morgue)
"czy" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"czz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -62183,13 +62199,14 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cBl" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cBm" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -62242,12 +62259,11 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"cBr" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cBs" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
@@ -63931,24 +63947,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cEj" = (
-/turf/closed/wall/r_wall,
-/area/science/misc_lab)
-"cEk" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/firealarm{
+/obj/machinery/light{
dir = 4;
- pixel_x = -28
+ light_color = "#e8eaff"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
-"cEl" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -63957,7 +63959,19 @@
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
+"cEk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"cEl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cEm" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -64330,16 +64344,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cEN" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/docking,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"cEO" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -64629,19 +64637,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cFl" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
+/obj/machinery/door/airlock/external/glass{
+ name = "Departures Shuttle Dock"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cFm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -64651,7 +64652,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFn" = (
/obj/structure/closet/l3closet,
/obj/structure/disposalpipe/segment,
@@ -64680,7 +64681,7 @@
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFq" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -64692,7 +64693,7 @@
req_access_txt = "47"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFr" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -64785,19 +64786,19 @@
req_access_txt = "47"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFx" = (
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/power/apc{
- areastring = "/area/science/misc_lab";
+ areastring = "/area/science/observatory";
dir = 1;
name = "Research Observatory APC";
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFy" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -64807,11 +64808,11 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFz" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFA" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -65230,7 +65231,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGj" = (
/obj/machinery/camera{
c_tag = "Research - Observatory";
@@ -65241,11 +65242,11 @@
pixel_x = -28
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGk" = (
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGl" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -65256,7 +65257,7 @@
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGm" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -65264,20 +65265,20 @@
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGn" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGo" = (
/obj/machinery/light/small{
dir = 4;
light_color = "#d8b1b1"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGp" = (
/obj/structure/sign/departments/xenobio{
pixel_x = -32;
@@ -65294,7 +65295,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGq" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -65350,7 +65351,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGv" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
@@ -65997,20 +65998,20 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHL" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHM" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHN" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -66020,7 +66021,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHO" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -66880,7 +66881,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJm" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -66903,7 +66904,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJp" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -66912,7 +66913,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJq" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/obj/structure/cable{
@@ -66964,7 +66965,7 @@
/area/engine/atmos)
"cJv" = (
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -66983,7 +66984,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJx" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/manifold/supplymain/visible{
@@ -67018,7 +67019,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJB" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -67031,7 +67032,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJC" = (
/obj/machinery/door/airlock/engineering{
name = "Gravity Generator";
@@ -67125,14 +67126,14 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJL" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJM" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -67144,7 +67145,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJO" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -67154,7 +67155,7 @@
},
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJP" = (
/obj/structure/chair/comfy/black,
/obj/structure/cable{
@@ -67164,12 +67165,12 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJQ" = (
/obj/structure/chair/comfy/black,
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJR" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -67418,7 +67419,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKs" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -67427,17 +67428,17 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKt" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKu" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -68866,7 +68867,7 @@
/turf/open/floor/plating{
icon_state = "panelscorched"
},
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cNL" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 8
@@ -68874,7 +68875,7 @@
/turf/open/floor/plating{
icon_state = "panelscorched"
},
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cNM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -69117,10 +69118,6 @@
/obj/structure/table,
/turf/open/floor/plating/airless,
/area/quartermaster/miningdock/airless/no_grav)
-"cOw" = (
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
"cOx" = (
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/segment{
@@ -91617,10 +91614,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGp
cJw
-cwV
+cyX
aaU
aaU
aaU
@@ -91874,10 +91871,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92131,10 +92128,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJB
-cwV
+cyX
aaU
aaa
aaU
@@ -92388,10 +92385,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92645,10 +92642,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92902,10 +92899,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cHK
cJK
-cwV
+cyX
aaU
aaa
aaU
@@ -93158,12 +93155,12 @@ cav
aaa
aaa
aaU
-cwV
-cEj
+cyX
+cze
cHL
cJL
-cEj
-cwV
+cze
+cyX
aaU
aaU
aaa
@@ -93414,14 +93411,14 @@ cav
aaU
aaU
aaU
-cwV
-cwV
+cyX
+cyX
cGj
cHM
cJN
cJv
-cwV
-cwV
+cyX
+cyX
aaU
aaa
aaa
@@ -93666,19 +93663,19 @@ cHA
cHG
cav
cav
-cEj
-cEj
-cEj
-cEj
-cEj
-cEj
+cze
+cze
+cze
+cze
+cze
+cze
cFx
cGk
cHN
cJO
cKr
cKu
-cEj
+cze
aaU
aaa
aaa
@@ -93921,12 +93918,12 @@ cHu
cHw
cHB
cHH
-cwd
-cBl
-cEk
-cEN
-cEN
-cEN
+cyV
+cza
+czl
+czq
+czq
+czq
cFm
cFq
cFy
@@ -93935,7 +93932,7 @@ cJl
cJP
cKs
cJv
-cwV
+cyX
aaU
aaa
aaa
@@ -94178,12 +94175,12 @@ cHv
caG
cHC
cHI
-cwq
-cBr
-cEl
-cEl
-cFl
-cEl
+cyW
+czb
+czm
+czm
+cEj
+czm
cFp
cFw
cFz
@@ -94192,7 +94189,7 @@ cJo
cJQ
cKs
cJv
-cwV
+cyX
aaU
aaa
aaa
@@ -94435,21 +94432,21 @@ bsM
cuY
bIk
bIk
-cwV
-cwV
-cwV
-cwV
-cwV
-cwV
-cwV
-cEj
+cyX
+cyX
+cyX
+cyX
+cyX
+cyX
+cyX
+cze
cGi
cGn
cJp
cJp
cKt
cKu
-cEj
+cze
aaU
aaa
aaa
@@ -94699,14 +94696,14 @@ aaU
aaU
aaU
aaU
-cwV
-cwV
+cyX
+cyX
cGo
cJv
cJv
cGo
-cwV
-cwV
+cyX
+cyX
aaU
aaa
aaa
@@ -94957,12 +94954,12 @@ aaa
aaa
aaa
aaU
-cwV
-cEj
-cwV
-cwV
-cEj
-cwV
+cyX
+cze
+cyX
+cyX
+cze
+cyX
aaU
aaU
aaa
@@ -101239,7 +101236,7 @@ aaa
aaa
aaa
abp
-akN
+aaa
aTd
aaa
abp
@@ -103584,28 +103581,28 @@ auZ
aBL
bnH
axh
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abF
+abF
+abF
+abF
+abF
+abF
+abF
+abF
bID
aHu
aGr
-apm
-apy
-apy
-apy
-apz
-apz
-apy
-auN
-apy
-apy
-apm
+aof
+aog
+aog
+aog
+aoL
+aoL
+aog
+avU
+aog
+aog
+aof
ayK
aFU
aJV
@@ -103840,29 +103837,29 @@ awc
axx
ayN
aAA
-aBM
-abF
-acz
-agc
-alZ
-agc
-anI
-anT
aab
+abJ
+acz
+aej
+agC
+aej
+alZ
+anq
+abF
bID
aHu
aGr
-apy
-aqO
-arY
-asw
-asN
-asw
-auD
-auY
-avI
-awa
+aog
apm
+aqU
+asa
+asK
+asa
+avC
+avV
+ayo
+aBM
+aof
ayK
aGp
aKZ
@@ -104098,28 +104095,28 @@ aeY
aBN
awN
awN
-aab
+abF
acA
acA
acA
acA
acA
acA
-aog
+anL
bNp
aFC
aFF
-apz
-aqP
-asa
-asx
-asB
-asB
-asB
-avc
-avK
-awe
-apm
+aoL
+apy
+arB
+asi
+ast
+ast
+ast
+awa
+azg
+aCq
+aof
azh
ayK
aFU
@@ -104355,28 +104352,28 @@ aeY
aCk
aeY
aeY
-aab
+abF
+acK
+aeI
+aci
adc
-agC
-acf
-adL
acA
acA
-aoL
+anP
bRF
aFC
aFF
+aoL
apz
-aqS
-asa
-asB
-asB
-asB
-asB
-avl
-avI
-awW
-apm
+arB
+ast
+ast
+ast
+ast
+awe
+ayo
+aCZ
+aof
axQ
ayY
ayK
@@ -104612,34 +104609,34 @@ akS
aCo
aor
aeY
-abJ
-adL
+abZ
+adc
acA
-acf
-anE
-anL
-anL
-aoU
+aci
+akN
+ang
+ang
+anT
ccg
aFC
ago
-apy
-aqT
-asa
-asC
-asB
-asB
-asB
-avA
-avQ
-apy
-apy
-apm
-apm
-apm
-aOd
-aOQ
-aOQ
+aog
+apB
+arB
+asv
+ast
+ast
+ast
+aws
+azo
+aog
+aog
+aof
+aof
+aof
+aOc
+aOE
+aOE
aPd
aPd
aPN
@@ -104869,34 +104866,34 @@ akU
aCp
aor
aeY
-abZ
-aej
+acf
+adL
acA
acA
acA
acA
acA
-aog
+anL
bRF
aFC
aFF
-apz
+aoL
+apG
arB
-asa
-asB
-asB
-asS
-asB
-avl
-avI
-awX
-axR
-axR
-axR
-aLF
-aOk
-aOR
-aOY
+ast
+ast
+atb
+ast
+awe
+ayo
+aDx
+aHL
+aHL
+aHL
+aNx
+aOd
+aOQ
+aOX
aQJ
aQJ
aQJ
@@ -105126,34 +105123,34 @@ akV
aqv
aor
aeY
-acf
-aeI
+aci
+adR
+agc
agT
-anq
-agT
-anP
-aof
-aab
+agc
+anh
+anE
+abF
ccq
aFC
aFF
-apz
-arF
-asa
-asB
-asB
-asB
-asB
-avC
-avQ
-apy
-axV
-azE
+aoL
+aqc
+arB
+ast
+ast
+ast
+ast
+awA
+azo
+aog
aHU
-aLO
-aOl
-aOT
-aPa
+aKp
+aMK
+aND
+aOk
+aOR
+aOY
aaU
aaU
aaU
@@ -105383,33 +105380,33 @@ aeY
aeY
aeY
aeY
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abF
+abF
+abF
+abF
+abF
+abF
+abF
+abF
ccz
aHv
aFF
-apy
-arN
-asa
-asB
-asB
-asB
-asB
-avE
-avU
-axg
-axg
-aAy
-axg
-apm
-aOq
-aOU
+aog
+aqn
+arB
+ast
+ast
+ast
+ast
+awW
+azE
+aEZ
+aEZ
+aLs
+aEZ
+aof
+aOl
+aOT
aaU
bQe
aye
@@ -105651,22 +105648,22 @@ aff
cfe
aIk
aIU
-apB
-arO
-asa
-asB
-asB
-asU
-asB
-avE
+aoU
+aqO
+arB
+ast
+ast
auC
-axg
-ayb
-aCq
-axg
-apm
-aOq
-aOU
+ast
+awW
+auN
+aEZ
+aIf
+aLF
+aEZ
+aof
+aOl
+aOT
aaU
aye
aaU
@@ -105908,22 +105905,22 @@ ahz
bRF
aEu
aJc
-apG
-arP
-asi
-asD
-asD
-atb
-asD
-avH
-auC
-axt
-ayn
-aCZ
-axg
-apm
-aOq
-aOU
+apd
+aqP
+arF
+asw
+asw
+auD
+asw
+awX
+auN
+aFc
+aIN
+aLO
+aEZ
+aof
+aOl
+aOT
aaU
aye
aaU
@@ -106165,22 +106162,22 @@ bGw
chQ
cAV
aJc
-apy
-arQ
-asv
-asK
-asR
-auC
-auC
-asv
-avV
-axM
-ayo
-aDx
-axg
-apm
-aOq
-aOV
+aog
+aqS
+arN
+asx
+asM
+auN
+auN
+arN
+aAy
+aGH
+aKj
+aMa
+aEZ
+aof
+aOl
+aOU
aaU
aye
aaU
@@ -106247,9 +106244,9 @@ bum
cyU
czd
czj
-blp
-blp
-bme
+bui
+bui
+buo
bxj
bxj
bxj
@@ -106422,22 +106419,22 @@ ahz
aAj
cAW
aJC
-apy
-arV
-apy
-apy
-apy
-apz
-apz
-apy
-apy
-axg
-axg
-aFc
-axg
-apm
-aOq
-aOU
+aog
+aqT
+aog
+aog
+aog
+aoL
+aoL
+aog
+aog
+aEZ
+aEZ
+aMz
+aEZ
+aof
+aOl
+aOT
aaU
bQe
aye
@@ -106504,9 +106501,9 @@ bsZ
bxj
byU
czk
-blp
-coy
-cdd
+bui
+cgQ
+cmz
aYp
aaa
aaa
@@ -106692,9 +106689,9 @@ aaU
aaU
cuA
cuy
-aLO
-aOx
-aOU
+aND
+aOq
+aOT
aaU
aaa
aaa
@@ -106761,9 +106758,9 @@ aaU
bxj
byU
czk
-blp
-ctH
-cdd
+bui
+cgV
+cmz
csc
aaa
aaa
@@ -106949,9 +106946,9 @@ aaa
aaa
aaa
aaU
-aMa
-aOC
-aOX
+aNQ
+aOx
+aOV
aaU
aaa
aaa
@@ -107018,9 +107015,9 @@ aaU
bxj
byU
czk
-blp
-cqT
-cdd
+bui
+cju
+cmz
aYp
aaa
aaa
@@ -107206,9 +107203,9 @@ aaa
aaa
aaa
aaU
-aMa
-aOE
-aOX
+aNQ
+aOC
+aOV
aaU
aaa
aaa
@@ -107244,7 +107241,7 @@ chj
aXF
chD
cid
-cju
+bfM
ckz
cmG
coT
@@ -107272,15 +107269,15 @@ aaa
aaU
aaU
aaU
-blp
-btK
-czl
-blp
-cqU
-bBZ
-bme
-bme
-bme
+bui
+bPE
+bPT
+bui
+ckc
+cmV
+buo
+buo
+buo
aaa
aaa
aaa
@@ -107526,19 +107523,19 @@ bzY
aaU
aaa
aaa
-blp
-bme
-bme
-blp
-btL
-czm
-bzq
bui
-clZ
buo
buo
-bme
-bme
+bui
+bPF
+bQd
+cfl
+cfy
+cmX
+cnH
+cnH
+buo
+buo
aaa
aaa
aaa
@@ -107783,28 +107780,28 @@ bBl
aaU
aaa
aaa
-bme
-bnY
-bpT
-bqL
-btL
-czn
-czy
-bui
-bui
-bui
-bui
-bui
-bme
-bme
-bme
-bme
-bme
-bme
-bme
-cnG
-bme
-bOo
+buo
+bBw
+bNJ
+bNY
+bPF
+bQr
+cfm
+cfy
+cfy
+cfy
+cfy
+cfy
+buo
+buo
+buo
+buo
+buo
+buo
+buo
+czr
+buo
+cEN
aaa
aaa
aaa
@@ -108009,14 +108006,14 @@ aQB
aQT
aSf
aTj
-aTm
-aVb
-aTv
-aTv
-aTv
-aTv
-bfn
-bjx
+aUe
+aXP
+aUf
+aUf
+aUf
+aUf
+bgJ
+blp
bmK
bov
bqR
@@ -108040,28 +108037,28 @@ bBl
aaU
aaU
aaU
-bme
-bog
-cmV
-bqM
-btL
-czm
-bui
-cOw
-bui
-bui
-bui
-bui
-bui
-bui
-bui
-bNW
-bOa
-bOe
-bOi
-cnd
-bOl
-cnH
+buo
+bBM
+bNQ
+bNZ
+bPF
+bQd
+cfy
+ckf
+cfy
+cfy
+cfy
+cfy
+cfy
+cfy
+cfy
+cwq
+cyY
+czc
+czn
+czs
+cEk
+cFl
aaa
aaa
aaa
@@ -108265,16 +108262,16 @@ ceX
aQC
aQX
aSr
-aTm
-aTm
-aVf
-aZc
-aZc
-aZc
-aZc
-bfv
-bjx
-aTm
+aUe
+aUe
+aYb
+bbi
+bbi
+bbi
+bbi
+bgR
+blp
+aUe
bow
bqS
aQC
@@ -108297,28 +108294,28 @@ bIo
aaU
cNK
aaU
-bme
-bom
-bpT
-bqU
-btL
-czo
-bPO
-bPT
-bQd
-bQd
-bQr
-bJo
-bNQ
-bNQ
-bNQ
-bNX
+buo
+bBZ
+bNJ
bOa
-bOe
-bOg
-bui
-cnf
-bme
+bPF
+bQs
+cgG
+cko
+cnc
+cnc
+coq
+cqU
+ctV
+ctV
+ctV
+cwV
+cyY
+czc
+czo
+cfy
+cma
+buo
aaa
aaa
aaa
@@ -108522,16 +108519,16 @@ ceK
aQC
aRc
aSz
-aTv
-aTZ
-aVB
-aZg
-aZg
-aZg
-aZg
-bfy
-bjL
-aTv
+aUf
+aVb
+aYi
+bbt
+bbt
+bbt
+bbt
+bha
+bme
+aUf
bow
brb
bAR
@@ -108554,28 +108551,28 @@ bBl
aaU
bIm
aaU
-blp
-bme
-bme
-brv
-btL
-czp
-bAW
-bBm
bui
-bui
-bQs
-bNH
-bme
-bme
-bme
-bme
+buo
+buo
bOb
-bme
-bOh
-cne
-bOm
-cnH
+bPF
+bUx
+cgH
+ckF
+cfy
+cfy
+cor
+crj
+buo
+buo
+buo
+buo
+cyZ
+buo
+czp
+czy
+cEl
+cFl
aaa
aaa
aaa
@@ -108752,10 +108749,10 @@ bka
bmV
bka
bps
-ang
-ang
-ang
-ang
+aPa
+aPa
+aPa
+aPa
cuB
aWj
aaU
@@ -108779,16 +108776,16 @@ aPP
aPP
aRp
aSE
-aTv
-aUb
-aWs
-aZt
-bbE
-aZt
-bdP
-bfF
-bkf
-aTv
+aUf
+aVf
+aYj
+bbx
+bcD
+bbx
+bes
+bhc
+bmf
+aUf
boB
bru
bAT
@@ -108811,28 +108808,28 @@ bzr
byT
cfc
bcT
-bmf
-bon
-bpU
-brN
-btL
-czq
-bme
-bBm
+bvb
+bCA
+bNR
+bOe
+bPF
+ccx
+buo
+ckF
+cfy
+cfy
+coy
bui
-bui
-ctV
-blp
-bme
+buo
aaU
aaU
aaU
aaU
-bme
-bme
-bme
-bme
-bme
+buo
+buo
+buo
+buo
+buo
aaa
aaa
aaa
@@ -109009,10 +109006,10 @@ bka
bnb
boV
bpt
-apd
-bfI
-cfy
-ang
+aRj
+aTm
+aTz
+aPa
cuC
cuD
cuD
@@ -109036,16 +109033,16 @@ aQu
aQI
aRr
aSG
-aTv
-aUd
-aWV
-ban
-bbH
+aUf
+aVB
+aZc
+bbz
bcO
-bdW
-bfJ
-bfJ
-bmT
+bdY
+bfn
+bjx
+bjx
+bnO
boD
brz
bBn
@@ -109068,18 +109065,18 @@ cyr
cyx
cyr
cyr
-cyD
-cyJ
-cyJ
-cyV
-cze
-czr
-bme
-bBm
-bui
-bui
-bJq
-bme
+bzq
+bHt
+bHt
+bOg
+bPG
+ccK
+buo
+ckF
+cfy
+cfy
+cpy
+buo
aaa
aaa
aaa
@@ -109266,10 +109263,10 @@ bms
bnd
boX
bpH
-ang
-bnt
-clH
-coh
+aPa
+aTv
+aTZ
+aUd
aRu
aSv
aSy
@@ -109293,16 +109290,16 @@ aQx
aQP
aQP
aQP
-aTw
-aUe
-aXh
-baT
-bbZ
+aUr
+aWs
+aZg
+bbE
bdd
-bdY
-bfM
-bkp
-bni
+bei
+bfv
+bjL
+bmT
+bnY
boE
brO
bBo
@@ -109325,18 +109322,18 @@ cys
baN
baN
baN
-coq
-box
-box
-cyW
+bAW
+bJo
+bJo
+bOh
+bPH
+cdd
+cgI
+clH
+cnd
+cog
cpy
-bPD
-bAY
-bBw
-bCA
-cql
-bJq
-bNI
+crU
aaa
aaa
aaa
@@ -109524,9 +109521,9 @@ bno
boZ
bpJ
aRF
-bvb
-cog
-ang
+aTw
+aUb
+aPa
aRX
aSw
aSM
@@ -109550,16 +109547,16 @@ aQu
aQQ
aRG
aSH
-aTv
aUf
-aXP
-baU
-bcd
+aWV
+aZt
+bbH
bdh
-bei
-bgJ
-bgJ
-bnn
+bem
+bfy
+bkf
+bkf
+bog
boF
bsx
bBn
@@ -109582,18 +109579,18 @@ bzI
bHn
bzI
bzI
-cor
-boy
-boy
-cyX
-btO
-bPE
-bme
-bBm
-ccx
-bui
+bAY
bJq
-bme
+bJq
+bOi
+bPI
+cdn
+buo
+ckF
+cne
+cfy
+cpy
+buo
aaa
aaa
aaa
@@ -109780,10 +109777,10 @@ bka
bnw
bka
brA
-ang
-ang
-ang
-ang
+aPa
+aPa
+aPa
+aPa
aaU
aaU
aaU
@@ -109807,16 +109804,16 @@ atF
atF
aRJ
aSK
-aTv
-aUr
-aYb
-bbi
-bcu
-bbi
-bem
-bgR
-bkq
-aTv
+aUf
+aWX
+ban
+bbZ
+bdl
+bbZ
+bfF
+bkp
+bni
+aUf
bpa
btk
bBE
@@ -109839,28 +109836,28 @@ bzU
bzV
cuo
bcT
-bnO
-boz
-bqp
-cyY
-btL
+bBa
+bJR
+bNW
+bOj
bPF
-bme
-bBm
-ccx
+ceu
+buo
+ckF
+cne
+cfy
+cql
bui
-crj
-blp
-bme
+buo
aaU
aaU
aaU
aaU
-bme
-bme
-bme
-bme
-bme
+buo
+buo
+buo
+buo
+buo
aaa
aaa
aaa
@@ -110064,16 +110061,16 @@ cmu
atF
aRL
aSL
-aTv
-aUt
-aYi
+aUf
+aXh
+baT
+bcd
+bdP
bbt
-bcv
-aZg
-aZg
-bha
-bkr
-aTv
+bbt
+bkq
+bnn
+aUf
bpb
bvv
bBO
@@ -110096,28 +110093,28 @@ bIp
aaU
bIx
aaU
-blp
-bme
-bme
-cyZ
-btL
-bPG
-bBa
-bBm
-ccx
bui
-bJR
-bNJ
-bme
-bme
-bme
-bme
-bOb
-bme
-bOi
-bOj
+buo
+buo
bOl
-cnH
+bPF
+cev
+cgJ
+ckF
+cne
+cfy
+cqT
+ctH
+buo
+buo
+buo
+buo
+cyZ
+buo
+czn
+cBl
+cEk
+cFl
cnE
aaa
aaa
@@ -110281,11 +110278,11 @@ aRT
cBS
cBU
cBY
-aqU
-acK
-acK
-acK
-aqU
+asB
+arP
+arP
+arP
+asB
aaa
aaa
aVs
@@ -110321,16 +110318,16 @@ cJG
cJI
aRR
aST
-aTz
-aTm
-aYj
-bbx
-bcD
-bdl
+aUt
+aUe
+baU
+bcu
+bdW
beq
-bhc
-bjx
-aTm
+bfI
+bkr
+blp
+aUe
bpe
bvY
bBR
@@ -110353,28 +110350,28 @@ bQR
aaU
cNL
aaU
-bme
-bpi
-cmX
-cza
-btL
-bPH
-bBc
-bBM
-ccx
-bui
-bui
-bJR
-bNR
-bNR
-bNR
-bNY
-bOa
-bOe
-bOg
-bui
-cnf
-bme
+buo
+bNH
+bNX
+bOm
+bPF
+cex
+cgN
+clZ
+cne
+cfy
+cfy
+cqT
+cwd
+cwd
+cwd
+cyD
+cyY
+czc
+czo
+cfy
+cma
+buo
aaa
aaa
aaa
@@ -110538,11 +110535,11 @@ aXn
cBM
bDY
bEd
-aqU
-awA
-aIN
-aMz
-acK
+asB
+auR
+avE
+axg
+arP
aaa
aaa
aaa
@@ -110579,14 +110576,14 @@ atF
aRV
aRV
aTC
-aTm
-aVb
-bbz
-aTv
-aTv
-bes
-bfn
-bjx
+aUe
+aXP
+bcv
+aUf
+aUf
+bfJ
+bgJ
+blp
bny
bpb
bqS
@@ -110610,28 +110607,28 @@ bIp
aaU
aaU
aaU
-bme
-bog
-bpT
-czb
-btL
-bPI
-bUx
-bUx
-ccK
-cOw
-bui
-bui
-bui
-bui
-bui
-bNZ
-bOa
-bOe
-bOh
-cnc
-bOm
-cnH
+buo
+bBM
+bNJ
+bOo
+bPF
+cfi
+cgO
+cgO
+cnf
+ckf
+cfy
+cfy
+cfy
+cfy
+cfy
+cyJ
+cyY
+czc
+czp
+cBr
+cEl
+cFl
aaa
aaa
aaa
@@ -110793,12 +110790,12 @@ aql
aCe
aYK
aDr
-aci
-aqU
-aqU
-azg
-aHL
-aMK
+arO
+asB
+asB
+auY
+avw
+axt
anK
anK
aHA
@@ -110867,28 +110864,28 @@ bIp
aaU
aaa
aaa
-bme
-bpj
-bpT
-czc
-cze
-czs
-czy
-bui
-bui
-bui
-bui
-bui
-bme
-bme
-bme
-bme
-bme
-bme
-bme
-cnG
-bme
-bOo
+buo
+bNI
+bNJ
+bPD
+bPG
+cfj
+cfm
+cfy
+cfy
+cfy
+cfy
+cfy
+buo
+buo
+buo
+buo
+buo
+buo
+buo
+czr
+buo
+cEN
aaa
aaa
aaa
@@ -111050,12 +111047,12 @@ aka
aLU
aNE
aRd
-acK
-arX
-asM
-azo
-aKj
-aNx
+arP
+asC
+asN
+avc
+avH
+axM
aTo
aTt
aTJ
@@ -111124,19 +111121,19 @@ bUn
aaU
aaa
aaa
-blp
-bme
-bme
-blp
-btL
-bPH
-bBe
bui
-cma
-bHt
-bHt
-bme
-bme
+buo
+buo
+bui
+bPF
+cex
+cgP
+cfy
+cnG
+coh
+coh
+buo
+buo
aaa
aaa
aaa
@@ -111307,12 +111304,12 @@ aKf
aMb
aPl
aRf
-adR
-ast
-auR
-aGH
-aKp
-aND
+arQ
+asD
+asR
+avl
+avI
+axR
aTr
arH
aVa
@@ -111384,15 +111381,15 @@ aaa
aaU
aaU
aaU
-blp
-cmy
-cmz
-blp
-cqU
-blp
-bme
-bme
-bme
+bui
+bPO
+cfk
+bui
+ckc
+bui
+buo
+buo
+buo
aaa
aaa
aaa
@@ -111564,12 +111561,12 @@ aKf
aMb
aPx
aLj
-anh
+arV
asG
+asS
avw
-aHL
-aHL
-aNQ
+avw
+axV
aHx
asc
aWn
@@ -111644,9 +111641,9 @@ aaU
bxw
bza
bMQ
-blp
-cnf
-cdd
+bui
+cma
+cmz
aYp
aaa
aaa
@@ -111821,12 +111818,12 @@ aKm
aMc
aPx
aRg
-aqc
+arX
asI
-aws
-aIf
-aLs
-aOc
+asU
+avA
+avK
+ayb
aHz
btb
aWn
@@ -111871,7 +111868,7 @@ cLZ
chI
ciH
cjX
-ckF
+bnt
cns
cpo
cpT
@@ -111901,9 +111898,9 @@ bpP
cro
bza
bMQ
-blp
-ctH
-cdd
+bui
+cgV
+cmz
csc
aaa
aaa
@@ -112071,19 +112068,19 @@ arv
aub
azS
aBG
-aEZ
+anI
aFS
aHd
aKr
aMf
aPy
aRi
-aqn
-aqU
-aci
-aci
-aci
-aRj
+arY
+asB
+arO
+arO
+arO
+ayn
aHy
bDc
aWw
@@ -112158,9 +112155,9 @@ bYe
bHL
bYt
bYD
-blp
-crU
-cdd
+bui
+cmy
+cmz
aYp
aaa
aaa
@@ -112339,7 +112336,7 @@ aPx
aTN
avm
aVH
-aWX
+avQ
aZF
anK
aHz
@@ -112405,20 +112402,20 @@ bie
bZl
cqQ
bqD
-cdn
-cex
-cgG
-cex
-cex
+bom
+boy
+bqp
+boy
+boy
btz
cOe
btB
btB
btA
-blp
-blp
-blp
-blp
+bui
+bui
+bui
+bui
aaU
aaU
aaU
@@ -112662,11 +112659,11 @@ bdH
bWO
cqR
bqE
-cdn
-cfi
-cgH
-cgN
-ckc
+bom
+boz
+bqL
+brv
+bBc
btA
bMQ
bta
@@ -112919,11 +112916,11 @@ cvN
bjm
bXX
bqD
-ceu
-cfj
-cgI
-cgO
-ckf
+bon
+bpi
+bqM
+brN
+bBe
bLZ
bNt
bta
@@ -113176,11 +113173,11 @@ bdI
cNx
bXX
bqD
-cdn
-cfk
-cgJ
-cgP
-ckc
+bom
+bpj
+bqU
+btK
+bBc
btB
bNV
bta
@@ -113433,11 +113430,11 @@ cIC
bjm
bXX
bqD
-cev
-cfl
-cgI
-cgQ
-cko
+box
+bpT
+bqM
+btL
+bBm
btC
bPm
bta
@@ -113690,11 +113687,11 @@ bBU
bnN
crc
buw
-cex
-cfm
-cgH
-cgV
-ckc
+boy
+bpU
+bqL
+btO
+bBc
btD
bPm
bxH
@@ -113947,11 +113944,11 @@ bgf
bez
cxB
bhf
-cex
-cex
-cex
-cex
-cex
+boy
+boy
+boy
+boy
+boy
btz
bPn
btE
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 071a9b4fef..e907602d59 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -32964,6 +32964,10 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/bot,
+/obj/item/stack/ore/silver{
+ amount = 2
+ },
+/obj/item/stack/ore/iron,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"biu" = (
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index 71f3ed6b1a..50e08dfae4 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -19827,6 +19827,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/item/stack/ore/silver{
+ amount = 2
+ },
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aJC" = (
@@ -20222,6 +20225,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/item/stack/ore/iron,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aKq" = (
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index b053c5176c..0356dd1d07 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -807,6 +807,11 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/fitness/pool)
+"abU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/landmark/xmastree,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar)
"abV" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/white,
@@ -824,6 +829,13 @@
"abY" = (
/turf/open/floor/plasteel/white,
/area/ai_monitored/turret_protected/ai)
+"abZ" = (
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/effect/landmark/xmastree,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"acc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -47489,12 +47501,6 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
-"cgj" = (
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/structure/flora/ausbushes/ppflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/open/floor/grass,
-/area/hydroponics/garden/monastery)
"cgk" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/sparsegrass,
@@ -61209,6 +61215,14 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"vzp" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/item/stack/ore/iron,
+/obj/item/stack/ore/silver{
+ amount = 2
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
"vzz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -79792,7 +79806,7 @@ cuE
cgK
cgJ
cgH
-cgj
+abZ
cvj
bWV
cfn
@@ -94890,7 +94904,7 @@ aYg
aZd
beB
bbq
-beB
+abU
bdx
beB
bft
@@ -103631,7 +103645,7 @@ bbI
bcG
bdM
beP
-bfH
+vzp
bfH
bhv
bbI
@@ -110827,7 +110841,7 @@ bcQ
aaa
aaa
aaa
-abN
+bBW
aaa
aEj
aEj
@@ -111084,7 +111098,7 @@ bcQ
aaa
aaa
aaa
-aaa
+cFB
aaa
aEl
bnl
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index 3ac1d18ac4..c892bab447 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -1560,6 +1560,7 @@
/area/shuttle/abandoned/bridge)
"cc" = (
/obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 97f07acc05..143063b4e9 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -35,8 +35,9 @@
#define R_SPAWN (1<<12)
#define R_AUTOLOGIN (1<<13)
#define R_DBRANKS (1<<14)
+#define R_SENSITIVE (1<<15)
-#define R_DEFAULT R_AUTOLOGIN
+#define R_DEFAULT R_AUTOLOGIN | R_SENSITIVE
#define R_EVERYTHING ALL //the sum of all other rank permissions, used for +EVERYTHING
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index dad2a38afd..7bb124fe0f 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -115,7 +115,7 @@
#define MAX_HIGH_PRESSURE_DAMAGE 16 // CITADEL CHANGES Max to 16, low to 8.
#define LOW_PRESSURE_DAMAGE 8 //The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
-#define COLD_SLOWDOWN_FACTOR 20 //Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this
+#define COLD_SLOWDOWN_FACTOR 35 //Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this
//PIPES
//Atmos pipe limits
diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index d7487eb54b..605b3f6485 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -40,6 +40,7 @@
//#define ROLE_MONSTERHUNTER "monster hunter" Disabled for now
#define ROLE_GHOSTCAFE "ghostcafe"
#define ROLE_MINOR_ANTAG "minorantag"
+#define ROLE_RESPAWN "respawnsystem"
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
//The gamemode specific ones are just so the gamemodes can query whether a player is old enough
//(in game days played) to play that role
diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
index 2562bfe4d3..3225f14d8c 100644
--- a/code/__DEFINES/tgs.dm
+++ b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
// tgstation-server DMAPI
-#define TGS_DMAPI_VERSION "5.2.9"
+#define TGS_DMAPI_VERSION "5.2.10"
// All functions and datums outside this document are subject to change with any version and should not be relied on.
@@ -67,7 +67,7 @@
#define TGS_EVENT_REPO_CHECKOUT 1
/// When the repository performs a fetch operation. No parameters
#define TGS_EVENT_REPO_FETCH 2
-/// When the repository merges a pull request. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
+/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
#define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3
/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path
#define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4
@@ -190,21 +190,21 @@
/// Represents a merge of a GitHub pull request.
/datum/tgs_revision_information/test_merge
- /// The pull request number.
+ /// The test merge number.
var/number
- /// The pull request title when it was merged.
+ /// The test merge source's title when it was merged.
var/title
- /// The pull request body when it was merged.
+ /// The test merge source's body when it was merged.
var/body
- /// The GitHub username of the pull request's author.
+ /// The Username of the test merge source's author.
var/author
- /// An http URL to the pull request.
+ /// An http URL to the test merge source.
var/url
- /// The SHA of the pull request when that was merged.
+ /// The SHA of the test merge when that was merged.
var/pull_request_commit
- /// ISO 8601 timestamp of when the pull request was merged.
+ /// ISO 8601 timestamp of when the test merge was created on TGS.
var/time_merged
- /// (Nullable) Comment left by the TGS user who initiated the merge..
+ /// Optional comment left by the TGS user who initiated the merge.
var/comment
/// Represents a connected chat channel.
diff --git a/code/__HELPERS/custom_holoforms.dm b/code/__HELPERS/custom_holoforms.dm
index 34b31cc1c7..2733a97e14 100644
--- a/code/__HELPERS/custom_holoforms.dm
+++ b/code/__HELPERS/custom_holoforms.dm
@@ -72,3 +72,11 @@
ASSERT(target_prefs)
//In the future, maybe add custom path allowances a la admin create outfit but for now..
return generate_custom_holoform_from_prefs(target_prefs, null, null, TRUE, TRUE)
+
+//Errors go to user.
+/proc/generate_custom_holoform_from_prefs_safe(datum/preferences/prefs, mob/user)
+ if(user)
+ if(user.client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+ to_chat(user, "You are attempting to set your custom holoform too fast!")
+ return
+ return generate_custom_holoform_from_prefs(prefs, null, null, TRUE, TRUE)
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index bbbf99c9de..0987e95dc9 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -225,6 +225,8 @@
. += "[seperator]AUTOLOGIN"
if(rights & R_DBRANKS)
. += "[seperator]DBRANKS"
+ if(rights & R_SENSITIVE)
+ . += "[seperator]SENSITIVE"
if(!.)
. = "NONE"
return .
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index b558b28cf2..3fc275d436 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -67,7 +67,8 @@ GLOBAL_LIST_INIT(bitfields, list(
"SOUNDS" = R_SOUNDS,
"SPAWN" = R_SPAWN,
"AUTOLOGIN" = R_AUTOLOGIN,
- "DBRANKS" = R_DBRANKS
+ "DBRANKS" = R_DBRANKS,
+ "SENSITIVE" = R_SENSITIVE
),
"interaction_flags_atom" = list(
"INTERACT_ATOM_REQUIRES_ANCHORED" = INTERACT_ATOM_REQUIRES_ANCHORED,
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index 90ec3bc289..3c93952b65 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -172,8 +172,6 @@
/datum/config_entry/string/hostedby
-/datum/config_entry/flag/norespawn
-
/datum/config_entry/flag/guest_jobban
/datum/config_entry/flag/usewhitelist
diff --git a/code/controllers/configuration/entries/respawns.dm b/code/controllers/configuration/entries/respawns.dm
new file mode 100644
index 0000000000..40c7d248a4
--- /dev/null
+++ b/code/controllers/configuration/entries/respawns.dm
@@ -0,0 +1,47 @@
+/// Allows usage of respawn system
+/datum/config_entry/flag/respawns_enabled
+ config_entry_value = FALSE
+
+/// Minutes before allowing respawns.
+/datum/config_entry/number/respawn_delay
+ config_entry_value = 15.0
+ integer = FALSE
+
+/// Minutes before allowing respawn, if user cryo'd.
+/datum/config_entry/number/respawn_delay_cryo
+ config_entry_value = 5.0
+ integer = FALSE
+
+/// Allows respawning as non-assistant. Overrides all others of this type.
+/datum/config_entry/flag/allow_non_assistant_respawn
+ config_entry_value = FALSE
+
+/// Allows respawning as a combat role, defined as security/head.
+/datum/config_entry/flag/allow_combat_role_respawn
+ config_entry_value = FALSE
+
+/// Allows respawning as the same character as a previous life
+/datum/config_entry/flag/allow_same_character_respawn
+ config_entry_value = FALSE
+
+/// Observing penalizes for respawns, not just joining.
+/datum/config_entry/flag/respawn_penalty_includes_observe
+ config_entry_value = FALSE
+
+/// Minutes from roundstart before someone can respawn
+/datum/config_entry/number/respawn_minimum_delay_roundstart
+ config_entry_value = 30.0
+ integer = FALSE
+
+/// Gamemode config tags that are banned from respawning
+/datum/config_entry/keyed_list/respawn_chaos_gamemodes
+ key_mode = KEY_MODE_TEXT
+ value_mode = VALUE_MODE_FLAG
+
+/datum/config_entry/keyed_list/respawn_chaos_gamemodes/ValidateListEntry(key_name, key_value)
+ . = ..()
+ return . && (key_name in config.modes)
+
+/datum/config_entry/keyed_list/respawn_chaos_gamemodes/preprocess_key(key)
+ . = ..()
+ return lowertext(key)
diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index 9b292a219d..28505c70f8 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -93,6 +93,7 @@ SUBSYSTEM_DEF(input)
user.full_macro_assert()
/datum/controller/subsystem/input/fire()
+ set waitfor = FALSE
var/list/clients = GLOB.clients // Let's sing the list cache song
for(var/i in 1 to clients.len)
var/client/C = clients[i]
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 95d8928368..198c380f41 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -371,6 +371,11 @@ SUBSYSTEM_DEF(ticker)
if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
GLOB.joined_player_list += player.ckey
player.create_character(FALSE)
+ if(player.new_character && player.client && player.client.prefs) // we cannot afford a runtime, ever
+ LAZYOR(player.client.prefs.slots_joined_as, player.client.prefs.default_slot)
+ LAZYOR(player.client.prefs.characters_joined_as, player.new_character.real_name)
+ else
+ stack_trace("WARNING: Either a player did not have a new_character, did not have a client, or did not have preferences. This is VERY bad.")
else
player.new_player_panel()
CHECK_TICK
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index a5f9271f4b..c69df4f5e3 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -89,6 +89,11 @@
to_chat(user, "You can't tackle while tased!")
return
+ var/left_paralysis = HAS_TRAIT(user, TRAIT_PARALYSIS_L_ARM)
+ var/right_paralysis = HAS_TRAIT(user, TRAIT_PARALYSIS_R_ARM)
+ if(left_paralysis && right_paralysis)
+ to_chat(user, "You can't tackle without the use of your arms!")
+
user.face_atom(A)
var/list/modifiers = params2list(params)
@@ -280,6 +285,10 @@
attack_mod -= 2
if(HAS_TRAIT(sacker, TRAIT_GIANT))
attack_mod += 2
+ var/left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
+ var/right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
+ if(left_paralysis || right_paralysis)
+ attack_mod -= 2
if(ishuman(target))
var/mob/living/carbon/human/S = sacker
diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm
index 44030b0417..b5b55c1e14 100644
--- a/code/datums/diseases/advance/symptoms/flesh_eating.dm
+++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm
@@ -31,9 +31,8 @@ Bonus
var/bleed = FALSE
var/pain = FALSE
threshold_desc = list(
- "Resistance 9" = "Doubles the intensity of the immolation effect, but reduces the frequency of all of this symptom's effects.",
- "Stage Speed 8" = "Increases explosion radius and explosion damage to the host when the host is wet.",
- "Transmission 8" = "Additionally synthesizes chlorine trifluoride and napalm inside the host. More chemicals are synthesized if the resistance 9 threshold has been met."
+ "Resistance 7" = "Erodes the host's skin, causing them to bleed profusely.",
+ "Transmission 8" = "Eat's away at the host's musclemass, causing increased fatigue."
)
/datum/symptom/flesh_eating/Start(datum/disease/advance/A)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index 2fc853500d..c19f23ed2a 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -263,18 +263,18 @@
/datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
var/mob/living/M = A.affected_mob
+ if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
+ to_chat(M, "You feel yourself slip into a regenerative coma...")
+ active_coma = TRUE
+ addtimer(CALLBACK(src, .proc/coma, M), 60)
if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
return power
- else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
- return power * 0.9
else if(M.stat == SOFT_CRIT)
return power * 0.5
else if(M.IsSleeping())
return power * 0.25
- else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
- to_chat(M, "You feel yourself slip into a regenerative coma...")
- active_coma = TRUE
- addtimer(CALLBACK(src, .proc/coma, M), 60)
+ else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
+ return power * 0.9
/datum/symptom/heal/coma/proc/coma(mob/living/M)
if(deathgasp)
diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm
index ae139104f0..6217665157 100644
--- a/code/datums/elements/flavor_text.dm
+++ b/code/datums/elements/flavor_text.dm
@@ -13,6 +13,8 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
var/save_key
/// Do not attempt to render a preview on examine. If this is on, it will display as \[flavor_name\]
var/examine_no_preview = FALSE
+ /// Examine FULLY views. Overrides examine_no_preview
+ var/examine_full_view = FALSE
/datum/element/flavor_text/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE, _save_key, _examine_no_preview = FALSE)
. = ..()
@@ -37,7 +39,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
if(can_edit && ismob(target)) //but only mobs receive the proc/verb for the time being
var/mob/M = target
LAZYOR(GLOB.mobs_with_editable_flavor_text[M], src)
- M.verbs |= /mob/proc/manage_flavor_tests
+ add_verb(M, /mob/proc/manage_flavor_tests)
if(save_key && ishuman(target))
RegisterSignal(target, COMSIG_HUMAN_PREFS_COPIED_TO, .proc/update_prefs_flavor_text)
@@ -71,6 +73,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
examine_list += "\[[flavor_name]\]"
return
var/msg = replacetext(text, "\n", " ")
+ if(examine_full_view)
+ examine_list += "[msg]"
+ return
if(length_char(msg) <= 40)
examine_list += "[msg]"
else
@@ -113,6 +118,21 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
var/datum/element/flavor_text/F = choices[chosen]
F.set_flavor(src)
+/mob/proc/set_pose()
+ set name = "Set Pose"
+ set desc = "Sets your temporary flavor text"
+ set category = "IC"
+
+ var/list/L = GLOB.mobs_with_editable_flavor_text[src]
+ var/datum/element/flavor_text/carbon/temporary/T
+ for(var/i in L)
+ if(istype(i, /datum/element/flavor_text/carbon/temporary))
+ T = i
+ if(!T)
+ to_chat(src, "Your mob type does not support temporary flavor text.")
+ return
+ T.set_flavor(src)
+
/datum/element/flavor_text/proc/set_flavor(mob/user)
if(!(user in texts_by_atom))
return FALSE
@@ -135,7 +155,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
var/static/list/i_dont_even_know_who_you_are = typecacheof(list(/datum/antagonist/abductor, /datum/antagonist/ert,
/datum/antagonist/nukeop, /datum/antagonist/wizard))
-/datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE, _save_key = "flavor_text", _examine_no_preview = FALSE)
+/datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE, _save_key, _examine_no_preview = FALSE)
if(!iscarbon(target))
return ELEMENT_INCOMPATIBLE
. = ..()
@@ -167,3 +187,19 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
texts_by_atom[user] = ""
if(user.dna)
user.dna.features[save_key] = ""
+
+/datum/element/flavor_text/carbon/temporary
+ examine_full_view = TRUE
+ max_len = 1024
+
+/datum/element/flavor_text/carbon/temporary/Attach(datum/target, text, _name, _addendum, _max_len, _always_show, _edit, _save_key, _examine_no_preview)
+ . = ..()
+ if(. & ELEMENT_INCOMPATIBLE)
+ return
+ if(ismob(target))
+ add_verb(target, /mob/proc/set_pose)
+
+/datum/element/flavor_Text/carbon/temporary/Detach(datum/source, force)
+ . = ..()
+ if(ismob(source))
+ remove_verb(source, /mob/proc/set_pose)
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 8af80dc6b8..5881c76827 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -7,6 +7,7 @@
id = MARTIALART_SLEEPINGCARP
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/sleeping_carp_help
+ block_parry_data = /datum/block_parry_data/sleeping_carp
pugilist = TRUE
/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index ef3979d822..f4a53d5c72 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -438,12 +438,19 @@
return
else
linked_alert.icon_state = "fleshmend"
- owner.adjustBruteLoss(-10, FALSE)
- owner.adjustFireLoss(-5, FALSE)
owner.adjustOxyLoss(-10)
if(!iscarbon(owner))
+ owner.adjustBruteLoss(-10, FALSE)
+ owner.adjustFireLoss(-5, FALSE)
return
var/mob/living/carbon/C = owner
+ var/list/damaged_parts = C.get_damaged_bodyparts(TRUE,TRUE, status = list(BODYPART_ORGANIC, BODYPART_HYBRID, BODYPART_NANITES))
+ if(damaged_parts.len)
+ for(var/obj/item/bodypart/part in damaged_parts)
+ part.heal_damage(10/damaged_parts.len, 5/damaged_parts.len, only_organic = FALSE, updating_health = FALSE)
+ C.updatehealth()
+ C.update_damage_overlays()
+
QDEL_LIST(C.all_scars)
/obj/screen/alert/status_effect/fleshmend
@@ -599,7 +606,7 @@
//Heal brain damage and toxyloss, alongside trauma
owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, -8)
- owner.adjustToxLoss(-6, forced = TRUE)
+ owner.adjustToxLoss(-6, forced = TRUE, toxins_type = TOX_OMNI)
M.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
//Purges 50 rads per tick
if(owner.radiation > 0)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index fe27cc2baf..3cbf4b3cd2 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -137,12 +137,18 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
var/lums = T.get_lumcount()
if(lums <= 0.2)
if(quirk_holder.m_intent == MOVE_INTENT_RUN)
- to_chat(quirk_holder, "Easy, easy, take it slow... you're in the dark...")
- quirk_holder.toggle_move_intent()
+ addtimer(CALLBACK(src, .proc/recheck),2) //0.2 seconds of being in the dark
SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
else
SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")
+/datum/quirk/nyctophobia/proc/recheck()
+ var/turf/T = get_turf(quirk_holder)
+ var/lums = T.get_lumcount()
+ if(lums <= 0.2) //check again, did they remain in the dark for 0.2 seconds?
+ to_chat(quirk_holder, "Easy, easy, take it slow... you're in the dark...")
+ quirk_holder.toggle_move_intent()
+
/datum/quirk/lightless
name = "Light Sensitivity"
desc = "Bright lights irritate you. Your eyes start to water, your skin feels itchy against the photon radiation, and your hair gets dry and frizzy. Maybe it's a medical condition. If only Nanotrasen was more considerate of your needs..."
diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index 261e423640..7a1f0f6980 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -164,7 +164,7 @@
. = list()
.["version"] = GLOB.game_version
.["mode"] = "hidden" //CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode
- .["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
+ .["respawn"] = config ? CONFIG_GET(flag/respawns_enabled) : FALSE
.["enter"] = GLOB.enter_allowed
.["vote"] = CONFIG_GET(flag/allow_vote_mode)
.["ai"] = CONFIG_GET(flag/allow_ai)
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 5310b24202..1eec1ba7fd 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -325,10 +325,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Service Hallway"
icon_state = "hall_service"
-/area/hallway/secondary/civilian
- name = "Civilian Wing"
- icon_state = "hallFS"
-
//Command
@@ -469,6 +465,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "yellow"
nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+/area/crew_quarters/arcade
+ name = "Arcade"
+ icon_state = "abandoned_g_den"
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
/area/crew_quarters/fitness
name = "Fitness Room"
icon_state = "fitness"
@@ -479,6 +480,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "fitness"
nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+/area/crew_quarters/fitness/pool
+ name = "Pool Area"
+ icon_state = "pool"
+
/area/crew_quarters/cafeteria
name = "Cafeteria"
icon_state = "cafeteria"
@@ -765,6 +770,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "medbay3"
ambientsounds = MEDICAL
+/area/medical/clinic
+ name = "Clinic"
+ icon_state = "medbay3"
+ ambientsounds = MEDICAL
+
/area/medical/abandoned
name = "Abandoned Medbay"
icon_state = "medbay3"
@@ -1036,10 +1046,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "janitor"
flags_1 = NONE
+/area/janitor/aux
+ name = "Auxiliary Custodial Closet"
+ icon_state = "janitor"
+ flags_1 = NONE
+
/area/hydroponics
name = "Hydroponics"
icon_state = "hydro"
+/area/hydroponics/lobby
+ name = "Hydroponics Lobby"
+ icon_state = "hydro"
+
/area/hydroponics/garden
name = "Garden"
icon_state = "garden"
@@ -1058,6 +1077,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Science Division"
icon_state = "toxlab"
+/area/science/observatory
+ name = "Research Observatory"
+ icon_state = "toxmisc"
+
/area/science/lab
name = "Research and Development"
icon_state = "toxlab"
@@ -1186,6 +1209,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "storage"
clockwork_warp_allowed = FALSE
+/area/storage/emergency
+ name = "Emergency Storage"
+ icon_state = "emergencystorage"
+
/area/storage/emergency/starboard
name = "Starboard Emergency Storage"
icon_state = "emergencystorage"
@@ -1395,100 +1422,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Telecommunications Satellite Lounge"
icon_state = "tcomsatlounge"
-/area/crew_quarters/fitness/pool
- name = "Pool Area"
- icon_state = "pool"
-
-/area/crew_quarters/dorms/blue
- name = "Blue Dorms"
- icon_state = "Sleep"
- nightshift_public_area = NIGHTSHIFT_AREA_NONE
-
-/area/crew_quarters/dorms/purple
- name = "Purple Dorms"
- icon_state = "Sleep"
- nightshift_public_area = NIGHTSHIFT_AREA_NONE
-
-/area/crew_quarters/lounge/jazz
- name = "Jazz Lounge"
- icon_state = "yellow"
- ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-
-/area/crew_quarters/fitness/recreation
- name = "Recreation Area"
- icon_state = "fitness"
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-/area/crew_quarters/fitness/cogpool
- name = "Pool"
- icon_state = "fitness"
- clockwork_warp_fail = "Pool's closed."
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-/area/crew_quarters/barbershop
- name = "Barbershop"
- icon_state = "blue"
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-/area/crew_quarters/observatory
- name = "Observatory"
- icon_state = "Sleep"
-
-//Engineering
-
-/area/engine/teg_hot
- name = "Hot Loop"
- icon_state = "red"
-
-/area/engine/teg_cold
- name = "Cold Loop"
- icon_state = "blue"
-
-/area/engine/workshop
- name = "Engineering Workshop"
- icon_state = "engine"
-
-/area/security/courtroom/jury
- name = "Jury Room"
- icon_state = "courtroom"
-
-/area/quartermaster/miningdock/airless
- name = "Mining Dock"
- icon_state = "mining"
- has_gravity = STANDARD_GRAVITY
- valid_territory = FALSE
- outdoors = TRUE
- ambientsounds = SPACE
- blob_allowed = FALSE //While part of the station, what good will it do you?
-
-/area/quartermaster/miningdock/airless/no_grav
- name = "Mining Dock"
- icon_state = "mining"
- dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
- power_light = FALSE
- power_equip = FALSE
- power_environ = FALSE
- valid_territory = FALSE
- outdoors = TRUE
- ambientsounds = SPACE
- blob_allowed = FALSE //While part of the station, what good will it do you?
-
-/area/janitor/aux
- name = "Auxiliary Custodial Closet"
- icon_state = "janitor"
- flags_1 = NONE
-
-/area/hydroponics/lobby
- name = "Hydroponics Lobby"
- icon_state = "hydro"
-
-//Storage
-
-/area/storage/emergency/generic
- name = "Emergency Storage"
- icon_state = "emergencystorage"
//Construction
@@ -1545,10 +1478,99 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Storage Wing"
icon_state = "storage_wing"
-//Routers
+//Areas that predominantly only apply to CogStation
+
+/area/crew_quarters/dorms/blue
+ name = "Blue Dorms"
+ icon_state = "Sleep"
+ nightshift_public_area = NIGHTSHIFT_AREA_NONE
+
+/area/crew_quarters/dorms/purple
+ name = "Purple Dorms"
+ icon_state = "Sleep"
+ nightshift_public_area = NIGHTSHIFT_AREA_NONE
+
+/area/crew_quarters/lounge/jazz
+ name = "Jazz Lounge"
+ icon_state = "yellow"
+ ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
+/area/crew_quarters/fitness/cogpool
+ name = "Pool"
+ icon_state = "fitness"
+ clockwork_warp_fail = "Pool's closed."
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
+/area/crew_quarters/barbershop
+ name = "Barbershop"
+ icon_state = "blue"
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
+/area/crew_quarters/observatory
+ name = "Observatory"
+ icon_state = "Sleep"
+
+/area/hallway/secondary/civilian
+ name = "Civilian Wing"
+ icon_state = "hallFS"
+
+/area/engine/atmos/aftair
+ name = "Aft Air Hookup"
+ icon_state = "atmos"
+ flags_1 = NONE
+
+/area/engine/teg
+ name = "Thermo-Electric Generator"
+ icon_state = "engine"
+
+/area/engine/teg/hotloop
+ name = "Hot Loop"
+ icon_state = "red"
+
+/area/engine/teg/coldloop
+ name = "Cold Loop"
+ icon_state = "blue"
+
+/area/engine/workshop
+ name = "Engineering Workshop"
+ icon_state = "engine"
+
+/area/engine/substation
+ name = "Electrical Substation"
+ icon_state = "engine"
+
+/area/security/courtroom/jury
+ name = "Jury Room"
+ icon_state = "courtroom"
+
+/area/quartermaster/miningdock/airless
+ name = "Mining Dock"
+ icon_state = "mining"
+ has_gravity = STANDARD_GRAVITY
+ valid_territory = FALSE
+ outdoors = TRUE
+ ambientsounds = SPACE
+ blob_allowed = FALSE //While part of the station, what good will it do you?
+
+/area/quartermaster/miningdock/airless/no_grav
+ name = "Mining Dock"
+ icon_state = "mining"
+ dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
+ power_light = FALSE
+ power_equip = FALSE
+ power_environ = FALSE
+ valid_territory = FALSE
+ outdoors = TRUE
+ ambientsounds = SPACE
+ blob_allowed = FALSE //While part of the station, what good will it do you?
+
+
+
+//Routers (currently exclusive to CogStation)
/area/router
- name = "Router"
+ name = "Routing Depot"
icon_state = "yellow"
ambientsounds = ENGINEERING
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 9607dc4dce..7fbfe48f4e 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1143,21 +1143,3 @@
*/
/atom/proc/setClosed()
return
-
-///Passes Stat Browser Panel clicks to the game and calls client click on an atom
-/atom/Topic(href, list/href_list)
- . = ..()
- if(!usr?.client)
- return
- var/client/usr_client = usr.client
- var/list/paramslist = list()
- if(href_list["statpanel_item_shiftclick"])
- paramslist["shift"] = "1"
- if(href_list["statpanel_item_ctrlclick"])
- paramslist["ctrl"] = "1"
- if(href_list["statpanel_item_altclick"])
- paramslist["alt"] = "1"
- if(href_list["statpanel_item_click"])
- // first of all make sure we valid
- var/mouseparams = list2params(paramslist)
- usr_client.Click(src, loc, null, mouseparams)
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index be8dee5bf8..29455afe56 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -150,14 +150,14 @@ Credit where due:
var/datum/team/clockcult/main_clockcult
/datum/game_mode/clockwork_cult/pre_setup() //Gamemode and job code is pain. Have fun codediving all of that stuff, whoever works on this next - Delta
- var/list/errorList = list()
+ /*var/list/errorList = list()
var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE)
if(errorList.len) // reebe failed to load
message_admins("Reebe failed to load!")
log_game("Reebe failed to load!")
return FALSE
- for(var/datum/parsed_map/PM in reebes)
- PM.initTemplateBounds()
+ for(var/datum/parsed_map/PM in reebes) //Temporarily commented because of z-level loading reliably segfaulting the server.
+ PM.initTemplateBounds()*/
if(CONFIG_GET(flag/protect_roles_from_antagonist))
restricted_jobs += protected_jobs
if(CONFIG_GET(flag/protect_assistant_from_antagonist))
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 5bc0ed20b0..ea41d77e2a 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -22,17 +22,16 @@
//Used for logging people entering cryosleep and important items they are carrying.
var/list/frozen_crew = list()
- var/list/frozen_items = list()
-
- // Used for containing rare items traitors need to steal, so it's not
- // game-over if they get iced
- var/list/objective_items = list()
- // A cache of theft datums so you don't have to re-create them for
- // each item check
- var/list/theft_cache = list()
+ var/list/obj/stored_packages = list()
var/allow_items = TRUE
+/obj/machinery/computer/cryopod/deconstruct()
+ . = ..()
+ for(var/i in stored_packages)
+ var/obj/O = i
+ O.forceMove(drop_location())
+
/obj/machinery/computer/cryopod/attack_ai()
attack_hand()
@@ -67,11 +66,11 @@
if(3)
dat += "<< Back
"
dat += "Recently stored objects
"
- if(!frozen_items.len)
+ if(!stored_packages.len)
dat += "There has been no storage usage at this terminal.
"
else
- for(var/obj/item/I in frozen_items)
- dat += "[I.name]
"
+ for(var/obj/O in stored_packages)
+ dat += "[O.name]
"
dat += "
"
var/datum/browser/popup = new(user, "cryopod_console", "Cryogenic System Control")
@@ -87,25 +86,27 @@
add_fingerprint(user)
if(href_list["item"])
- if(!allowed(user))
+ if(!allowed(user) && !(obj_flags & EMAGGED))
to_chat(user, "Access Denied.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
updateUsrDialog()
return
- if(!allow_items) return
- if(frozen_items.len == 0)
+ if(!allow_items)
+ return
+
+ if(stored_packages.len == 0)
to_chat(user, "There is nothing to recover from storage.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
updateUsrDialog()
return
- var/obj/item/I = input(user, "Please choose which object to retrieve.","Object recovery",null) as null|anything in frozen_items
+ var/obj/I = input(user, "Please choose which object to retrieve.","Object recovery",null) as null|anything in stored_packages
playsound(src, "terminal_type", 25, 0)
if(!I)
return
- if(!(I in frozen_items))
+ if(!(I in stored_packages))
to_chat(user, "\The [I] is no longer in storage.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
updateUsrDialog()
@@ -117,20 +118,21 @@
I.forceMove(drop_location())
if(user && Adjacent(user) && user.can_hold_items())
user.put_in_hands(I)
- frozen_items -= I
+ stored_packages -= I
updateUsrDialog()
else if(href_list["allitems"])
playsound(src, "terminal_type", 25, 0)
- if(!allowed(user))
+ if(!allowed(user) && !(obj_flags & EMAGGED))
to_chat(user, "Access Denied.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
updateUsrDialog()
return
+
if(!allow_items)
return
- if(frozen_items.len == 0)
+ if(stored_packages.len == 0)
to_chat(user, "There is nothing to recover from storage.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
@@ -138,10 +140,10 @@
visible_message("The console beeps happily as it disgorges the desired objects.")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
- for(var/obj/item/I in frozen_items)
- I.forceMove(drop_location())
- frozen_items -= I
- updateUsrDialog()
+ for(var/obj/O in stored_packages)
+ O.forceMove(get_turf(src))
+ stored_packages.Cut()
+ updateUsrDialog()
else if (href_list["menu"])
src.menu = text2num(href_list["menu"])
@@ -159,6 +161,13 @@
/obj/machinery/computer/cryopod/contents_explosion()
return
+/obj/machinery/computer/cryopod/contents_explosion()
+ return //don't blow everyone's shit up.
+
+/// The box
+/obj/item/storage/box/blue/cryostorage_items
+ w_class = WEIGHT_CLASS_HUGE
+
//Cryopods themselves.
/obj/machinery/cryopod
name = "cryogenic freezer"
@@ -177,44 +186,9 @@
var/despawn_world_time = null // Used to keep track of the safe period.
var/obj/machinery/computer/cryopod/control_computer
+ var/item_storage_type = /obj/item/storage/box/blue/cryostorage_items //with how storage components work this can be anything the player can open or anything with a storage component.
var/last_no_computer_message = 0
- // These items are preserved when the process() despawn proc occurs.
- var/static/list/preserve_items = typecacheof(list(
- /obj/item/hand_tele,
- /obj/item/card/id/captains_spare,
- /obj/item/aicard,
- /obj/item/mmi,
- /obj/item/paicard,
- /obj/item/gun,
- /obj/item/pinpointer,
- /obj/item/clothing/shoes/magboots,
- /obj/item/areaeditor/blueprints,
- /obj/item/clothing/head/helmet/space,
- /obj/item/clothing/suit/space,
- /obj/item/clothing/suit/armor,
- /obj/item/defibrillator/compact,
- /obj/item/reagent_containers/hypospray/CMO,
- /obj/item/clothing/accessory/medal/gold/captain,
- /obj/item/clothing/gloves/krav_maga,
- /obj/item/nullrod,
- /obj/item/tank/jetpack,
- /obj/item/documents,
- /obj/item/nuke_core_container
- ))
- // These items will NOT be preserved
- var/static/list/do_not_preserve_items = typecacheof(list(
- /obj/item/mmi/posibrain,
- /obj/item/gun/energy/laser/mounted,
- /obj/item/gun/energy/e_gun/advtaser/mounted,
- /obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
- /obj/item/gun/energy/disabler/cyborg,
- /obj/item/gun/energy/e_gun/advtaser/cyborg,
- /obj/item/gun/energy/printer,
- /obj/item/gun/energy/kinetic_accelerator/cyborg,
- /obj/item/gun/energy/laser/cyborg
- ))
-
/obj/machinery/cryopod/Initialize(mapload)
. = ..()
update_icon()
@@ -286,73 +260,89 @@
despawn_occupant()
-#define CRYO_DESTROY 0
-#define CRYO_PRESERVE 1
-#define CRYO_OBJECTIVE 2
-#define CRYO_IGNORE 3
-#define CRYO_DESTROY_LATER 4
-
-/obj/machinery/cryopod/proc/should_preserve_item(obj/item/I)
- for(var/datum/objective_item/steal/T in control_computer.theft_cache)
- if(istype(I, T.targetitem) && T.check_special_completion(I))
- return CRYO_OBJECTIVE
- if(preserve_items[I] && !do_not_preserve_items[I])
- return CRYO_PRESERVE
- return CRYO_DESTROY
-
// This function can not be undone; do not call this unless you are sure
/obj/machinery/cryopod/proc/despawn_occupant()
if(!control_computer)
find_control_computer()
var/mob/living/mob_occupant = occupant
- var/list/obj/item/cryo_items = list()
+
+ var/list/obj/item/storing = list()
+ var/list/obj/item/destroying = list()
+ var/list/obj/item/destroy_later = list()
investigate_log("Despawning [key_name(mob_occupant)].", INVESTIGATE_CRYOGENICS)
- //Handle Borg stuff first
+ var/atom/target_store = (control_computer?.allow_items && control_computer) || src //the double control computer check makes it return the control computer.
+ var/drop_to_ground = !istype(target_store, /obj/machinery/computer/cryopod)
+
+ var/mind_identity = mob_occupant.mind?.name
+ var/occupant_identity = mob_occupant.real_name
+
if(iscyborg(mob_occupant))
var/mob/living/silicon/robot/R = mob_occupant
if(R.mmi?.brain)
- cryo_items[R.mmi] = CRYO_DESTROY_LATER
- cryo_items[R.mmi.brain] = CRYO_DESTROY_LATER
- for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
- for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
- cryo_items[O] = should_preserve_item(O)
- O.forceMove(src)
- R.module.remove_module(I, TRUE) //delete the module itself so it doesn't transfer over.
-
- //Drop all items into the pod.
- for(var/obj/item/I in mob_occupant)
- if(cryo_items[I] == CRYO_IGNORE || cryo_items[I] ==CRYO_DESTROY_LATER)
- continue
- cryo_items[I] = should_preserve_item(I)
- mob_occupant.transferItemToLoc(I, src, TRUE)
- if(I.contents.len) //Make sure we catch anything not handled by qdel() on the items.
- if(cryo_items[I] != CRYO_DESTROY) // Don't remove the contents of things that need preservation
+ destroy_later += R.mmi
+ destroy_later += R.mmi.brain
+ for(var/i in R.module)
+ if(!isitem(i))
+ destroying += i
continue
- for(var/obj/item/O in I.contents)
- cryo_items[O] = should_preserve_item(O)
- O.forceMove(src)
-
- for(var/A in cryo_items)
- var/obj/item/I = A
- if(QDELETED(I)) //edge cases and DROPDEL.
- continue
- var/preserve = cryo_items[I]
- if(preserve == CRYO_DESTROY_LATER)
- continue
- if(preserve != CRYO_IGNORE)
- if(preserve == CRYO_DESTROY)
- qdel(I)
- else if(control_computer?.allow_items)
- control_computer.frozen_items += I
- if(preserve == CRYO_OBJECTIVE)
- control_computer.objective_items += I
- I.moveToNullspace()
+ var/obj/item/I = i
+ // let's be honest we only care about the trash bag don't beat around the bush
+ if(SEND_SIGNAL(I, COMSIG_CONTAINS_STORAGE))
+ storing += I.contents
+ for(var/atom/movable/AM in I.contents)
+ AM.forceMove(src)
+ R.module.remove_module(I, TRUE)
+ else
+ var/list/gear = list()
+ if(iscarbon(mob_occupant)) // sorry simp-le-mobs deserve no mercy
+ var/mob/living/carbon/C = mob_occupant
+ gear = C.get_all_gear()
+ for(var/i in gear)
+ var/obj/item/I = i
+ I.forceMove(src)
+ if(!istype(I))
+ destroying += I
+ continue
+ if(I.item_flags & (DROPDEL | ABSTRACT))
+ destroying += I
+ continue
+ if(HAS_TRAIT(I, TRAIT_NODROP))
+ destroying += I
+ continue
+ // WEE WOO SNOWFLAKE TIME
+ if(istype(I, /obj/item/pda))
+ var/obj/item/pda/P = I
+ if((P.owner == mind_identity) || (P.owner == occupant_identity))
+ destroying += P
+ else
+ storing += P
+ else if(istype(I, /obj/item/card/id))
+ var/obj/item/card/id/idcard = I
+ if((idcard.registered_name == mind_identity) || (idcard.registered_name == occupant_identity))
+ destroying += idcard
+ else
+ storing += idcard
else
- I.forceMove(loc)
- cryo_items -= I
+ storing += I
+
+ // get rid of mobs
+ for(var/mob/living/L in mob_occupant.GetAllContents() - mob_occupant)
+ L.forceMove(drop_location())
+
+ if(storing.len)
+ var/obj/O = new item_storage_type
+ O.name = "cryogenic retrieval package: [mob_occupant.real_name]"
+ for(var/i in storing)
+ var/obj/item/I = i
+ I.forceMove(O)
+ O.forceMove(drop_to_ground? target_store.drop_location() : target_store)
+ if((target_store == control_computer) && !drop_to_ground)
+ control_computer.stored_packages += O
+
+ QDEL_LIST(destroying)
//Update any existing objectives involving this mob.
for(var/i in GLOB.objectives)
@@ -414,22 +404,13 @@
// Ghost and delete the mob.
if(!mob_occupant.get_ghost(1))
- mob_occupant.ghostize(FALSE, penalize = TRUE, voluntary = TRUE)
+ mob_occupant.ghostize(FALSE, penalize = TRUE, voluntary = TRUE, cryo = TRUE)
QDEL_NULL(occupant)
- for(var/I in cryo_items) //only "CRYO_DESTROY_LATER" atoms are left)
- var/atom/A = I
- if(!QDELETED(A))
- qdel(A)
+ QDEL_LIST(destroy_later)
open_machine()
name = initial(name)
-#undef CRYO_DESTROY
-#undef CRYO_PRESERVE
-#undef CRYO_OBJECTIVE
-#undef CRYO_IGNORE
-#undef CRYO_DESTROY_LATER
-
/obj/machinery/cryopod/MouseDrop_T(mob/living/target, mob/user)
if(!istype(target) || user.incapacitated() || !target.Adjacent(user) || !Adjacent(user) || !ismob(target) || (!ishuman(user) && !iscyborg(user)) || !istype(user.loc, /turf) || target.buckled)
return
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index bed006d0b5..7847c3757e 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -67,9 +67,9 @@
/obj/machinery/door/window/proc/open_and_close()
open()
if(src.check_access(null))
- sleep(50)
+ sleep(60)
else //secure doors close faster
- sleep(20)
+ sleep(40)
close()
/obj/machinery/door/window/Bumped(atom/movable/AM)
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index c6484b051c..056902801f 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -18,7 +18,7 @@
var/mode = HEATER_MODE_STANDBY
var/setMode = "auto" // Anything other than "heat" or "cool" is considered auto.
var/targetTemperature = T20C
- var/heatingPower = 40000
+ var/heatingPower = 10000
var/efficiency = 20000
var/temperatureTolerance = 1
var/settableTemperatureMedian = 30 + T0C
@@ -74,46 +74,55 @@
if(cell && cell.charge > 0)
var/turf/L = loc
- if(!istype(L))
- if(mode != HEATER_MODE_STANDBY)
- mode = HEATER_MODE_STANDBY
- update_icon()
- return
+ PerformHeating(L)
- var/datum/gas_mixture/env = L.return_air()
+ for(var/direction in GLOB.alldirs)
+ L=get_step(src,direction)
+ if(!locate(/turf/closed) in L) // we don't want to heat walls and cause jank
+ PerformHeating(L)
- var/newMode = HEATER_MODE_STANDBY
- if(setMode != HEATER_MODE_COOL && env.return_temperature() < targetTemperature - temperatureTolerance)
- newMode = HEATER_MODE_HEAT
- else if(setMode != HEATER_MODE_HEAT && env.return_temperature() > targetTemperature + temperatureTolerance)
- newMode = HEATER_MODE_COOL
-
- if(mode != newMode)
- mode = newMode
- update_icon()
-
- if(mode == HEATER_MODE_STANDBY)
- return
-
- var/heat_capacity = env.heat_capacity()
- var/requiredPower = abs(env.return_temperature() - targetTemperature) * heat_capacity
- requiredPower = min(requiredPower, heatingPower)
-
- if(requiredPower < 1)
- return
-
- var/deltaTemperature = requiredPower / heat_capacity
- if(mode == HEATER_MODE_COOL)
- deltaTemperature *= -1
- if(deltaTemperature)
- env.set_temperature(env.return_temperature() + deltaTemperature)
- air_update_turf()
- cell.use(requiredPower / efficiency)
else
on = FALSE
update_icon()
return PROCESS_KILL
+/obj/machinery/space_heater/proc/PerformHeating(turf/L)
+ if(!istype(L))
+ if(mode != HEATER_MODE_STANDBY)
+ mode = HEATER_MODE_STANDBY
+ update_icon()
+ return
+
+ var/datum/gas_mixture/env = L.return_air()
+
+ var/newMode = HEATER_MODE_STANDBY
+ if(setMode != HEATER_MODE_COOL && env.return_temperature() < targetTemperature - temperatureTolerance)
+ newMode = HEATER_MODE_HEAT
+ else if(setMode != HEATER_MODE_HEAT && env.return_temperature() > targetTemperature + temperatureTolerance)
+ newMode = HEATER_MODE_COOL
+
+ if(mode != newMode)
+ mode = newMode
+ update_icon()
+
+ if(mode == HEATER_MODE_STANDBY)
+ return
+
+ var/heat_capacity = env.heat_capacity()
+ var/requiredPower = abs(env.return_temperature() - targetTemperature) * heat_capacity
+ requiredPower = min(requiredPower, heatingPower)
+
+ if(requiredPower < 1)
+ return
+
+ var/deltaTemperature = requiredPower / heat_capacity
+ if(mode == HEATER_MODE_COOL)
+ deltaTemperature *= -1
+ if(deltaTemperature)
+ env.set_temperature(env.return_temperature() + deltaTemperature)
+ air_update_turf()
+ cell.use(requiredPower / efficiency)
+
/obj/machinery/space_heater/RefreshParts()
var/laser = 2
var/cap = 1
@@ -122,7 +131,7 @@
for(var/obj/item/stock_parts/capacitor/M in component_parts)
cap += M.rating
- heatingPower = laser * 40000
+ heatingPower = laser * 10000
settableTemperatureRange = cap * 30
efficiency = (cap + 1) * 10000
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 4c9ea06620..296b46bf85 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -377,10 +377,3 @@
hitsound = 'sound/weapons/taserhit.ogg'
w_class = WEIGHT_CLASS_SMALL
breakouttime = 60
-
-/obj/item/restraints/legcuffs/bola/energy/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(iscarbon(hit_atom))
- var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom))
- B.Crossed(hit_atom)
- qdel(src)
- ..()
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index f15a4d00e1..7f2fe6a01d 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -175,7 +175,7 @@
/obj/item/kitchen/knife/combat/survival/knuckledagger/Initialize()
. = ..()
- AddComponent(/datum/component/butchering, 50, 120, 5) // it's good for butchering stuff
+ AddComponent(/datum/component/butchering, 30, 130, 20) // it's good for butchering stuff
/obj/item/kitchen/knife/combat/survival/knuckledagger/ui_action_click(mob/user, actiontype)
light_on = !light_on
@@ -189,6 +189,11 @@
else
set_light(0)
+/obj/item/kitchen/knife/combat/survival/knuckledagger/update_overlays()
+ . = ..()
+ if(light_on)
+ . += "[icon_state]_lit"
+
/obj/item/kitchen/knife/combat/bone
name = "bone dagger"
item_state = "bone_dagger"
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 9bc20565a6..3588b7be63 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -33,6 +33,8 @@
//--end of love :'(--
var/snowflake_id //if we set from a config snowflake plushie.
+ /// wrapper, do not use, read only
+ var/__ADMIN_SET_TO_ID
var/can_random_spawn = TRUE //if this is FALSE, don't spawn this for random plushies.
/obj/item/toy/plush/random_snowflake/Initialize(mapload, set_snowflake_id)
@@ -112,10 +114,21 @@
return ..()
+/obj/item/toy/plush/vv_get_var(var_name)
+ if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID))
+ return debug_variable("__ADMIN: SET SNOWFLAKE ID", snowflake_id, 0, src)
+ return ..()
+
+/obj/item/toy/plush/vv_edit_var(var_name, var_value)
+ if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID))
+ return set_snowflake_from_config(var_value)
+ return ..()
+
/obj/item/toy/plush/proc/set_snowflake_from_config(id)
var/list/configlist = CONFIG_GET(keyed_list/snowflake_plushies)
var/list/jsonlist = configlist[id]
- ASSERT(jsonlist)
+ if(!jsonlist)
+ return FALSE
jsonlist = json_decode(jsonlist)
if(jsonlist["inherit_from"])
var/path = text2path(jsonlist["inherit_from"])
@@ -151,6 +164,7 @@
var/datum/component/squeak/S = GetComponent(/datum/component/squeak)
S?.override_squeak_sounds = squeak_override
snowflake_id = id
+ return TRUE
/obj/item/toy/plush/handle_atom_del(atom/A)
if(A == grenade)
diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm
index 648ba27897..d0fd4dc3f6 100644
--- a/code/game/objects/items/puzzle_pieces.dm
+++ b/code/game/objects/items/puzzle_pieces.dm
@@ -137,8 +137,7 @@
AM.anchored = TRUE
flick("laserbox_burn", AM)
trigger()
- sleep(15)
- qdel(AM)
+ QDEL_IN(src, 15)
// snowflake code until undertile elements
/obj/item/pressure_plate/hologrid/hide()
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index c8eb96005c..92b222aed7 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -23,14 +23,15 @@
resistance_flags = FIRE_PROOF
var/self_fueling = FALSE //Do we refill ourselves or not
- var/nextrefueltick = 0 // How long it takes before we get a new fuel unit
+ var/nextrefueltick = 0 //When is the next tick we refuel?
+ var/refueling_interval = 10 //Every how many processing ticks does this refuel? (1 = every processing tick)
custom_materials = list(/datum/material/iron=70, /datum/material/glass=30)
var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
var/max_fuel = 20 //The max amount of fuel the welder can hold
var/change_icons = 1
- var/can_off_process = 0
+ var/can_off_process = FALSE
var/light_intensity = 2 //how powerful the emitted light is when used.
var/progress_flash_divisor = 10
var/burned_fuel_for = 0 //when fuel was last removed
@@ -66,6 +67,14 @@
. += "[initial(icon_state)]-on"
/obj/item/weldingtool/process()
+ //This handles refueling. Its looking at how much fuel the tool has and comparing that to how much it holds
+ //This then looks if the refuel tick has come based on world time.
+ //Then looks if we refuel ourselves or not.
+
+ if(self_fueling && get_fuel() < max_fuel && nextrefueltick <= world.time)
+ nextrefueltick = world.time + refueling_interval
+ reagents.add_reagent(/datum/reagent/fuel, 1)
+
switch(welding)
if(0)
force = 3
@@ -86,14 +95,6 @@
//This is to start fires. process() is only called if the welder is on.
open_flame()
- //This handles refueling. Its looking at how much fuel the tool has and comparing that to how much it holds
- //This then looks if the refuel tick has come based on world time.
- //Then looks if we refuel ourselves or not.
-
- if(get_fuel() < max_fuel && nextrefueltick < world.time && self_fueling)
- nextrefueltick = world.time + 10
- reagents.add_reagent(/datum/reagent/fuel, 1)
-
/obj/item/weldingtool/suicide_act(mob/user)
user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
@@ -367,7 +368,7 @@
custom_materials = list(/datum/material/iron=70, /datum/material/glass=120)
change_icons = 0
self_fueling = TRUE
- can_off_process = 1
+ can_off_process = TRUE
light_intensity = 1
toolspeed = 0.5
@@ -375,6 +376,7 @@
name = "brass welding tool"
desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
resistance_flags = FIRE_PROOF | ACID_PROOF
+ refueling_interval = 5
icon_state = "clockwelder"
item_state = "brasswelder"
@@ -384,16 +386,20 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "welder"
self_fueling = TRUE
+ can_off_process = TRUE
+ refueling_interval = 1
toolspeed = 0.1
light_intensity = 0
change_icons = 0
/obj/item/weldingtool/advanced
name = "advanced welding tool"
- desc = "A modern welding tool combined with an alien welding tool, it never runs out of fuel and works almost as fast."
+ desc = "A modern welding tool combined with an alien welding tool, it almost never runs out of fuel and works nearly as fast."
icon = 'icons/obj/advancedtools.dmi'
icon_state = "welder"
self_fueling = TRUE
+ can_off_process = TRUE
+ refueling_interval = 2
toolspeed = 0.2
light_intensity = 0
change_icons = 0
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 46eb82342a..52082637a3 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -446,8 +446,11 @@
var/mob/living/L = O
if(!issilicon(L))
L.DefaultCombatKnockdown(40)
- O.forceMove(T)
- close()
+ if(istype(src, /obj/structure/closet/supplypod/extractionpod))
+ O.forceMove(src)
+ else
+ O.forceMove(T)
+ close()
else
O.forceMove(T)
return 1
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index a7ffef1a0c..babb047c8d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -47,6 +47,25 @@
new /obj/item/clothing/glasses/hud/health(src)
return
+/obj/structure/closet/secure_closet/paramedic
+ name = "paramedic's locker"
+ req_access = list(ACCESS_MEDICAL)
+ icon_state = "paramed_secure"
+
+/obj/structure/closet/secure_closet/paramedic/PopulateContents()
+ ..()
+ new /obj/item/clothing/suit/toggle/labcoat/paramedic(src)
+ new /obj/item/clothing/under/rank/medical/paramedic(src)
+ new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+ new /obj/item/radio/headset/headset_med(src)
+ new /obj/item/defibrillator/loaded(src)
+ new /obj/item/clothing/gloves/color/latex/nitrile(src)
+ new /obj/item/storage/belt/medical(src)
+ new /obj/item/clothing/glasses/hud/health(src)
+ new /obj/item/pinpointer/crew(src)
+ new /obj/item/sensor_device(src)
+ return
+
/obj/structure/closet/secure_closet/CMO
name = "\proper chief medical officer's locker"
req_access = list(ACCESS_CMO)
diff --git a/code/game/say.dm b/code/game/say.dm
index 61dd9c0879..3bc14ed245 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -98,11 +98,11 @@ GLOBAL_LIST_INIT(freqtospan, list(
/// Converts specific characters, like +, |, and _ to formatted output.
/atom/movable/proc/say_emphasis(input)
- var/static/regex/italics = regex(@"\|(\S[\w\W]*?\S)\|", "g")
+ var/static/regex/italics = regex(@"\|((?=\S)[\w\W]*?(?<=\S))\|", "g")
input = italics.Replace_char(input, "$1")
- var/static/regex/bold = regex(@"\+(\S[\w\W]*?\S)\+", "g")
+ var/static/regex/bold = regex(@"\+((?=\S)[\w\W]*?(?<=\S))\+", "g")
input = bold.Replace_char(input, "$1")
- var/static/regex/underline = regex(@"_(\S[\w\W]*?\S)_", "g")
+ var/static/regex/underline = regex(@"_((?=\S)[\w\W]*?(?<=\S))_", "g")
input = underline.Replace_char(input, "$1")
return input
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index b150d4930e..765c88842e 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -163,6 +163,8 @@
while (pulling != null)
var/next_pulling = pulling.pulling
+ if(next_pulling == pulling)
+ break // no loops
var/turf/T = get_step(puller.loc, turn(puller.dir, 180))
pulling.can_be_z_moved = FALSE
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d4b2d03428..d4afc3dbb4 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -679,8 +679,8 @@
set category = "Server"
set desc="Respawn basically"
set name="Toggle Respawn"
- var/new_nores = !CONFIG_GET(flag/norespawn)
- CONFIG_SET(flag/norespawn, new_nores)
+ var/new_nores = CONFIG_GET(flag/respawns_enabled)
+ CONFIG_SET(flag/respawns_enabled, !new_nores)
if (!new_nores)
to_chat(world, "You may now respawn.", confidential = TRUE)
else
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index ef4abeb0ad..39053b8e15 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -44,6 +44,11 @@ GLOBAL_PROTECT(protected_ranks)
/datum/admin_rank/vv_edit_var(var_name, var_value)
return FALSE
+/datum/admin_rank/CanProcCall(procname)
+ . = ..()
+ if(!check_rights(R_SENSITIVE))
+ return FALSE
+
/proc/admin_keyword_to_flag(word, previous_rights=0)
var/flag = 0
switch(ckey(word))
@@ -79,6 +84,8 @@ GLOBAL_PROTECT(protected_ranks)
flag = R_AUTOLOGIN
if("dbranks")
flag = R_DBRANKS
+ if("sensitive")
+ flag = R_SENSITIVE
if("@","prev")
flag = previous_rights
return flag
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 52b4fa05b1..e2c12353f7 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -78,8 +78,11 @@ GLOBAL_PROTECT(admin_verbs_admin)
/client/proc/mark_datum_mapview,
/client/proc/hide_verbs, /*hides all our adminverbs*/
/client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/
- /datum/admins/proc/open_borgopanel
+ /datum/admins/proc/open_borgopanel,
+ /client/proc/admin_cmd_respawn_return_to_lobby,
+ /client/proc/admin_cmd_remove_ghost_respawn_timer
)
+
GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/DB_ban_panel, /client/proc/stickybanpanel))
GLOBAL_PROTECT(admin_verbs_ban)
GLOBAL_LIST_INIT(admin_verbs_sounds, list(/client/proc/play_local_sound, /client/proc/play_sound, /client/proc/manual_play_web_sound, /client/proc/set_round_end_sound))
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 09f9664295..8f4a9742ea 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -28,6 +28,11 @@ GLOBAL_PROTECT(href_token)
var/deadmined
+/datum/admins/CanProcCall(procname)
+ . = ..()
+ if(!check_rights(R_SENSITIVE))
+ return FALSE
+
/datum/admins/New(datum/admin_rank/R, ckey, force_active = FALSE, protected)
if(IsAdminAdvancedProcCall())
var/msg = " has tried to elevate permissions!"
@@ -147,6 +152,8 @@ GLOBAL_PROTECT(href_token)
return 0
/datum/admins/vv_edit_var(var_name, var_value)
+ if(var_name == NAMEOF(src, fakekey))
+ return ..()
return FALSE //nice try trialmin
/*
diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm
index 356746ddbc..4218d4238f 100644
--- a/code/modules/admin/sql_message_system.dm
+++ b/code/modules/admin/sql_message_system.dm
@@ -298,7 +298,9 @@
browse_messages(target_ckey = ckey(target_key), agegate = TRUE)
qdel(query_find_message_secret)
-/proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE)
+/proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE, override = FALSE)
+ if((!override || IsAdminAdvancedProcCall()) && !check_rights(R_SENSITIVE))
+ return
if(!SSdbcore.Connect())
to_chat(usr, "Failed to establish database connection.")
return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index ad8dd168eb..e0434a6fea 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -936,6 +936,12 @@
else
dat += "Mind Transfer Potion | "
+ //Respawns
+ if(jobban_isbanned(M, ROLE_RESPAWN))
+ dat += "Respawns | "
+ else
+ dat += "Respawns | "
+
dat += ""
usr << browse(dat, "window=jobban2;size=800x450")
return
@@ -1799,12 +1805,15 @@
if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes")
return
- log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby.")
- message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby.")
+ log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby, removing their respawn restrictions if they existed.")
+ message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby, removing their respawn restrictions if they existed.")
var/mob/dead/new_player/NP = new()
NP.ckey = M.ckey
qdel(M)
+ if(GLOB.preferences_datums[NP.ckey])
+ var/datum/preferences/P = GLOB.preferences_datums[NP.ckey]
+ P.respawn_restrictions_active = FALSE
else if(href_list["tdome1"])
if(!check_rights(R_FUN))
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index e3937e19b6..1cddbe9509 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -23,13 +23,6 @@
var/rendered = "DEAD: [uppertext(holder.rank)]([src.holder.fakekey ? pick(nicknames) : src.key]) says, \"[emoji_parse(msg)]\""
- // var/rank_name = holder.rank
- // var/admin_name = key
- // if(holder.fakekey)
- // rank_name = pick(strings("admin_nicknames.json", "ranks", "config")) please use this soon.
- // admin_name = pick(strings("admin_nicknames.json", "names", "config"))
- // var/rendered = "DEAD: [rank_name]([admin_name]) says, \"[emoji_parse(msg)]\""
-
for (var/mob/M in GLOB.player_list)
if(isnewplayer(M))
continue
diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm
index 4cbb0214f7..446dbcc69a 100644
--- a/code/modules/admin/verbs/getlogs.dm
+++ b/code/modules/admin/verbs/getlogs.dm
@@ -14,6 +14,8 @@
browseserverlogs("[GLOB.log_directory]/")
/client/proc/browseserverlogs(path = "data/logs/")
+ if(!check_rights(R_SENSITIVE))
+ return
path = browse_files(path)
if(!path)
return
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index af412a6caa..d7e893ec03 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -98,7 +98,7 @@
L.adjustFireLoss(amount)
newamt = L.getFireLoss()
if("toxin")
- L.adjustToxLoss(amount, toxins_type = TOX_OMNI)
+ L.adjustToxLoss(amount, toxins_type = TOX_OMNI, forced = TRUE)
newamt = L.getToxLoss()
if("oxygen")
L.adjustOxyLoss(amount)
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
index 4117fc2b36..3e358cd795 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
@@ -120,9 +120,14 @@
if(bruteheal + fireheal + toxinheal > 0) // Just a check? Don't heal/spend, and return.
if(mult == 0)
return TRUE
+
// We have damage. Let's heal (one time)
- C.adjustBruteLoss(-bruteheal * mult, forced = TRUE)// Heal BRUTE / BURN in random portions throughout the body.
- C.adjustFireLoss(-fireheal * mult, forced = TRUE)
+ var/list/damaged_parts = C.get_damaged_bodyparts(TRUE,TRUE, status = list(BODYPART_ORGANIC, BODYPART_HYBRID, BODYPART_NANITES))
+ if(damaged_parts.len)
+ for(var/obj/item/bodypart/part in damaged_parts) // Heal BRUTE / BURN equally distibuted over all damaged bodyparts.
+ part.heal_damage((bruteheal * mult)/damaged_parts.len, (fireheal * mult)/damaged_parts.len, only_organic = FALSE, updating_health = FALSE)
+ C.updatehealth()
+ C.update_damage_overlays()
C.adjustToxLoss(-toxinheal * mult * 2, forced = TRUE) //Toxin healing because vamps arent immune
//C.heal_overall_damage(bruteheal * mult, fireheal * mult) // REMOVED: We need to FORCE this, because otherwise, vamps won't heal EVER. Swapped to above.
AddBloodVolume((bruteheal * -0.5 + fireheal * -1 + toxinheal * -0.2) / mult * costMult) // Costs blood to heal
@@ -276,7 +281,7 @@
/datum/antagonist/bloodsucker/proc/FinalDeath()
//Dont bother if we are already supposed to be dead
if(FinalDeath)
- return
+ return
FinalDeath = TRUE //We are now supposed to die. Lets not spam it.
if(!iscarbon(owner.current)) //Check for non carbons.
owner.current.gib()
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm b/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm
index 26c8bd5949..2fb7a2ccca 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm
@@ -30,6 +30,7 @@
var/can_be_staked = FALSE // Only Feed can happen with a stake in you.
var/cooldown_static = FALSE // Feed, Masquerade, and One-Shot powers don't improve their cooldown.
//var/not_bloodsucker = FALSE // This goes to Vassals or Hunters, but NOT bloodsuckers.
+ var/must_be_concious = TRUE //Can't use this ability while unconcious.
/datum/action/bloodsucker/New()
if(bloodcost > 0)
@@ -101,6 +102,11 @@
if(display_error)
to_chat(owner, "Garlic in your blood is interfering with your powers!")
return FALSE
+ if(must_be_concious)
+ if(owner.stat != CONSCIOUS)
+ if(display_error)
+ to_chat(owner, "You can't do this while you are unconcious!")
+ return FALSE
// Incap?
if(must_be_capacitated)
var/mob/living/L = owner
diff --git a/code/modules/antagonists/bloodsucker/powers/go_home.dm b/code/modules/antagonists/bloodsucker/powers/go_home.dm
index c46a7fce6c..a8060ad07e 100644
--- a/code/modules/antagonists/bloodsucker/powers/go_home.dm
+++ b/code/modules/antagonists/bloodsucker/powers/go_home.dm
@@ -16,6 +16,7 @@
can_use_in_torpor = TRUE
must_be_capacitated = TRUE
can_be_immobilized = TRUE
+ must_be_concious = FALSE
/datum/action/bloodsucker/gohome/CheckCanUse(display_error)
. = ..()
diff --git a/code/modules/antagonists/bloodsucker/powers/masquerade.dm b/code/modules/antagonists/bloodsucker/powers/masquerade.dm
index d83f938e3f..f4ce531ef0 100644
--- a/code/modules/antagonists/bloodsucker/powers/masquerade.dm
+++ b/code/modules/antagonists/bloodsucker/powers/masquerade.dm
@@ -27,6 +27,7 @@
warn_constant_cost = TRUE
can_use_in_torpor = TRUE // Masquerade is maybe the only one that can do this. It stops your healing.
cooldown_static = TRUE
+ must_be_concious = FALSE
// NOTE: Firing off vulgar powers disables your Masquerade!
diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm
index da626bcf1c..08dc85efbf 100644
--- a/code/modules/antagonists/changeling/powers/fakedeath.dm
+++ b/code/modules/antagonists/changeling/powers/fakedeath.dm
@@ -16,7 +16,7 @@
if(user.stat != DEAD)
user.emote("deathgasp")
user.tod = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
- user.fakedeath("changeling") //play dead
+ user.fakedeath("changeling", TRUE) //play dead
user.update_stat()
addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE)
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 90eaeb57ac..5b6a7648c8 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -21,6 +21,7 @@
chemical_cost = 1000
dna_cost = -1
+ var/recharge_slowdown = 0
var/silent = FALSE
var/weapon_type
var/weapon_name_simple
@@ -37,6 +38,8 @@
if(!silent)
playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
user.visible_message("With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]")
+ to_chat(user, "In an brilliant flash of red, [L] [is_servant_of_ratvar(L) ? "writhes in pain!" : "falls to the ground!"]")
uses--
..()
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
index 25602c8588..d54f008108 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
@@ -98,7 +98,7 @@
var/pck = pick("assasinate","protect")
switch(pck)
if("assasinate")
- var/datum/objective/assassinate/A = new
+ var/datum/objective/assassinate/once/A = new
A.owner = owner
var/list/owners = A.get_owners()
A.find_target(owners,protection)
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_book.dm b/code/modules/antagonists/eldritch_cult/eldritch_book.dm
index 7f23922432..33485927ca 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_book.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_book.dm
@@ -2,8 +2,10 @@
name = "Codex Cicatrix"
desc = "Book describing the secrets of the veil."
icon = 'icons/obj/eldritch.dmi'
- icon_state = "book"
- item_state = "book"
+ icon_state = "codex"
+ item_state = "codex"
+ lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
///Last person that touched this
var/mob/living/last_user
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
index f5c54dd7bf..9d65396c63 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
@@ -69,7 +69,7 @@
var/mob/living/living_user = user
living_user.adjustBruteLoss(-3, FALSE)
living_user.adjustFireLoss(-3, FALSE)
- living_user.adjustToxLoss(-3, FALSE)
+ living_user.adjustToxLoss(-3, FALSE, TRUE)
living_user.adjustOxyLoss(-1, FALSE)
living_user.adjustStaminaLoss(-6)
diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm
index 4503bba0e8..99683f1688 100644
--- a/code/modules/arousal/arousal.dm
+++ b/code/modules/arousal/arousal.dm
@@ -68,10 +68,6 @@
R.reaction(turfing ? target : target.loc, TOUCH, 1, 0)
if(!turfing)
R.trans_to(target, R.total_volume * (spill ? G.fluid_transfer_factor : 1))
-
- overlay_fullscreen("flash", /obj/screen/fullscreen/flash) // To be more true to the hentai
- clear_fullscreen("flash", 20)
-
G.last_orgasmed = world.time
R.clear_reagents()
diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm
index ebfb96ec23..a0f11c2f3e 100644
--- a/code/modules/cargo/packs/livestock.dm
+++ b/code/modules/cargo/packs/livestock.dm
@@ -34,10 +34,57 @@
/datum/supply_pack/critter/parrot/generate()
. = ..()
- for(var/i in 1 to 4)
- new /mob/living/simple_animal/parrot(.)
- if(prob(1))
- new /mob/living/simple_animal/parrot/clock_hawk(.)
+ for(var/i in 1 to 5)
+ switch(rand(1, 24))
+ if(1)
+ new /mob/living/simple_animal/parrot(.)
+ if(2)
+ new /mob/living/simple_animal/parrot/clock_hawk(.)
+ if(3)
+ new /mob/living/simple_animal/parrot/kea(.)
+ if(4)
+ new /mob/living/simple_animal/parrot/eclectus(.)
+ if(5)
+ new /mob/living/simple_animal/parrot/eclectusf(.)
+ if(6)
+ new /mob/living/simple_animal/parrot/greybird(.)
+ if(7)
+ new /mob/living/simple_animal/parrot/blue_caique(.)
+ if(8)
+ new /mob/living/simple_animal/parrot/white_caique(.)
+ if(9)
+ new /mob/living/simple_animal/parrot/green_budgerigar(.)
+ if(10)
+ new /mob/living/simple_animal/parrot/blue_Budgerigar(.)
+ if(11)
+ new /mob/living/simple_animal/parrot/bluegreen_Budgerigar(.)
+ if(12)
+ new /mob/living/simple_animal/parrot/commonblackbird(.)
+ if(13)
+ new /mob/living/simple_animal/parrot/azuretit(.)
+ if(14)
+ new /mob/living/simple_animal/parrot/europeanrobin(.)
+ if(15)
+ new /mob/living/simple_animal/parrot/goldcrest(.)
+ if(16)
+ new /mob/living/simple_animal/parrot/ringneckdove(.)
+ if(17)
+ new /mob/living/simple_animal/parrot/cockatiel(.)
+ if(18)
+ new /mob/living/simple_animal/parrot/white_cockatiel(.)
+ if(19)
+ new /mob/living/simple_animal/parrot/yellowish_cockatiel(.)
+ if(20)
+ new /mob/living/simple_animal/parrot/grey_cockatiel(.)
+ if(21)
+ new /mob/living/simple_animal/parrot/too(.)
+ if(22)
+ new /mob/living/simple_animal/parrot/hooded_too(.)
+ if(23)
+ new /mob/living/simple_animal/parrot/pink_too(.)
+ if(24)
+ new /mob/living/simple_animal/parrot/eclectusr(.)
+
/datum/supply_pack/critter/butterfly
name = "Butterflies Crate"
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 694821bec4..1540092be8 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -101,6 +101,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
keyUp(keycode)
return
+ if(href_list["statpanel_item_target"])
+ handle_statpanel_click(href_list)
+ return
+
// Tgui Topic middleware
if(tgui_Topic(href_list))
return
@@ -141,6 +145,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
..() //redirect to hsrc.Topic()
+/client/proc/handle_statpanel_click(list/href_list)
+ var/atom/target = locate(href_list["statpanel_item_target"])
+ Click(target, target.loc, null, "[href_list["statpanel_item_shiftclick"]?"shift=1;":null][href_list["statpanel_item_ctrlclick"]?"ctrl=1;":null]&alt=[href_list["statpanel_item_altclick"]?"alt=1;":null]", FALSE, "statpanel")
+
/client/proc/is_content_unlocked()
if(!prefs.unlock_content)
to_chat(src, "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Only 10 bucks for 3 months! Click Here to find out more.")
@@ -798,7 +806,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.")
ip_intel = res.intel
-/client/Click(atom/object, atom/location, control, params, ignore_spam = FALSE)
+/client/Click(atom/object, atom/location, control, params, ignore_spam = FALSE, extra_info)
if(last_click > world.time - world.tick_lag)
return
last_click = world.time
@@ -851,7 +859,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
return
if(prefs.log_clicks)
- log_click(object, location, control, params, src)
+ log_click(object, location, control, params, src, extra_info? "clicked ([extra_info])" : null)
if (prefs.hotkeys)
// If hotkey mode is enabled, then clicking the map will automatically
@@ -921,8 +929,22 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if (NAMEOF(src, view))
view_size.setDefault(var_value)
return TRUE
+ if(NAMEOF(src, computer_id))
+ return FALSE
+ if(NAMEOF(src, address))
+ return FALSE
. = ..()
+/client/vv_get_var(var_name)
+ . = ..()
+ switch(var_name)
+ if(NAMEOF(src, computer_id))
+ if(!check_rights(R_SENSITIVE, FALSE))
+ return "SENSITIVE"
+ if(NAMEOF(src, address))
+ if(!check_rights(R_SENSITIVE, FALSE))
+ return "SENSITIVE"
+
/client/proc/rescale_view(change, min, max)
var/viewscale = getviewsize(view)
var/x = viewscale[1]
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index a6974687cf..7c6ba30b80 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -12,11 +12,29 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
var/max_save_slots = 24
- //non-preference stuff
- var/muted = 0
+ // Intra-round persistence begin
+ /// Flags for admin mutes
+ var/muted = NONE
+ /// Last IP the person was seen on
var/last_ip
+ /// Last CID the person was seen on
var/last_id
+ /// Do we log their clicks to disk?
var/log_clicks = FALSE
+ /// Characters they have joined the round under - Lazylist of names
+ var/list/characters_joined_as
+ /// Slots they have joined the round under - Lazylist of numbers
+ var/list/slots_joined_as
+ /// Are we currently subject to respawn restrictions? Usually set by us using the "respawn" verb, but can be lifted by admins.
+ var/respawn_restrictions_active = FALSE
+ /// time of death we consider for respawns
+ var/respawn_time_of_death = -INFINITY
+ /// did they DNR? used to prevent respawns.
+ var/dnr_triggered = FALSE
+ /// did they cryo on their last ghost?
+ var/respawn_did_cryo = FALSE
+
+ // Intra-round persistence end
var/icon/custom_holoform_icon
var/list/cached_holoform_icons
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 5a8325fd64..c242509344 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -179,7 +179,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
to_chat(usr, "Sorry, that function is not enabled on this server.")
return
- browse_messages(null, usr.ckey, null, TRUE)
+ browse_messages(null, usr.ckey, null, TRUE, override = TRUE)
/client/proc/self_playtime()
set name = "View tracked playtime"
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index f9f587ae5b..af55c6b9d7 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -20,6 +20,7 @@
body_parts_covered = ARMS
cold_protection = ARMS
strip_delay = 300 //you can't just yank them off
+ obj_flags = UNIQUE_RENAME
/// did you ever get around to wearing these or no
var/wornonce = FALSE
///Extra damage through the punch.
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 12829ed0e7..40ad6dddd1 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -873,9 +873,9 @@
/obj/item/clothing/head/helmet/space/hardsuit/lavaknight
name = "cydonian helmet"
desc = "A helmet designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
- icon_state = "knight_cydonia"
+ icon_state = "hardsuit0-knight_cydonia"
item_state = "knight_yellow"
- hardsuit_type = null
+ hardsuit_type = "knight_cydonia"
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | LAVA_PROOF
heat_protection = HEAD
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index dd46d7a5bb..2ffe85b6c4 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -256,7 +256,7 @@ Contains:
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert
armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wound" = 50)
resistance_flags = FIRE_PROOF | ACID_PROOF
- mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC
+ mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
//ERT Security
/obj/item/clothing/head/helmet/space/hardsuit/ert/alert/sec
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index c6c97f7cba..e3f5264568 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -554,7 +554,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
/datum/holiday/xmas
name = CHRISTMAS
- begin_day = 10
+ begin_day = 18
begin_month = DECEMBER
end_day = 27
drone_hat = /obj/item/clothing/head/santa
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index b0ac5248c1..64ab4791d3 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -73,6 +73,12 @@
/// Starting skill modifiers.
var/list/starting_modifiers
+ // These can be flags but I don't care because they're never changed
+ /// Can you always join as this job even while respawning (should probably only be on for assistant)
+ var/always_can_respawn_as = FALSE
+ /// Is this job considered a combat role for respawning? (usually sec/command)
+ var/considered_combat_role = FALSE
+
/**
* Checks if we should be created on a certain map
*/
@@ -118,15 +124,21 @@
//Used for a special check of whether to allow a client to latejoin as this job.
/datum/job/proc/special_check_latejoin(client/C)
+ var/joined = LAZYLEN(C.prefs?.characters_joined_as)
+ if(C.prefs?.respawn_restrictions_active && (joined || CONFIG_GET(flag/respawn_penalty_includes_observe)))
+ if(!CONFIG_GET(flag/allow_non_assistant_respawn) && !always_can_respawn_as)
+ return FALSE
+ if(!CONFIG_GET(flag/allow_combat_role_respawn) && considered_combat_role)
+ return FALSE
return TRUE
/datum/job/proc/GetAntagRep()
- . = CONFIG_GET(keyed_list/antag_rep)[lowertext(title)]
+ . = CONFIG_GET(keyed_list/antag_rep)[ckey(title)]
if(. == null)
return antag_rep
/datum/job/proc/GetThreat()
- . = CONFIG_GET(keyed_list/job_threat)[lowertext(title)]
+ . = CONFIG_GET(keyed_list/job_threat)[ckey(title)]
if(. == null)
return threat
diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm
index a7401791ab..d0eb690e94 100644
--- a/code/modules/jobs/job_types/ai.dm
+++ b/code/modules/jobs/job_types/ai.dm
@@ -16,6 +16,7 @@
display_order = JOB_DISPLAY_ORDER_AI
var/do_special_check = TRUE
threat = 5
+ considered_combat_role = TRUE
starting_modifiers = list(/datum/skill_modifier/job/level/wiring/basic)
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index b8fc963989..db5390f323 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -18,6 +18,7 @@ Assistant
paycheck_department = ACCOUNT_CIV
display_order = JOB_DISPLAY_ORDER_ASSISTANT
dresscodecompliant = FALSE
+ always_can_respawn_as = TRUE
threat = 0.2
/datum/job/assistant/get_access()
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 047a07062d..4806bf5546 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -14,6 +14,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_COMMAND
exp_type_department = EXP_TYPE_COMMAND
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/captain
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 18be8c9835..902be0bdc8 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -15,6 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_ENGINEERING
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/ce
plasma_outfit = /datum/outfit/plasmaman/ce
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index 627a7a2ca1..bb5fc68809 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -15,6 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_MEDICAL
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/cmo
plasma_outfit = /datum/outfit/plasmaman/cmo
diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm
index 4f74542b2a..761882894f 100644
--- a/code/modules/jobs/job_types/cyborg.dm
+++ b/code/modules/jobs/job_types/cyborg.dm
@@ -11,6 +11,7 @@
minimal_player_age = 21
exp_requirements = 120
exp_type = EXP_TYPE_CREW
+ considered_combat_role = TRUE
starting_modifiers = list(/datum/skill_modifier/job/level/wiring/basic)
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index 65724765e1..c704326879 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -15,6 +15,7 @@
outfit = /datum/outfit/job/detective
plasma_outfit = /datum/outfit/plasmaman/detective
+ considered_combat_role = TRUE
access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index 41fb4b99da..f1b7d3e8c4 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -15,7 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SERVICE
-
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/hop
plasma_outfit = /datum/outfit/plasmaman/hop
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index cfd8d7f6c0..c772a8acae 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -14,6 +14,7 @@
minimal_player_age = 10
exp_requirements = 300
exp_type = EXP_TYPE_CREW
+ considered_combat_role = TRUE
exp_type_department = EXP_TYPE_SECURITY
outfit = /datum/outfit/job/hos
diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm
index 4c6b8e064f..301acff5c4 100644
--- a/code/modules/jobs/job_types/quartermaster.dm
+++ b/code/modules/jobs/job_types/quartermaster.dm
@@ -15,6 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SUPPLY
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/quartermaster
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index 33f7df8260..6c2cb94d13 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -15,6 +15,7 @@
exp_type_department = EXP_TYPE_SCIENCE
exp_requirements = 180
exp_type = EXP_TYPE_CREW
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/rd
plasma_outfit = /datum/outfit/plasmaman/rd
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index bc83eb752d..bdae7fe028 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -12,6 +12,7 @@
minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/security
plasma_outfit = /datum/outfit/plasmaman/security
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index c909342d6f..dae3094ebe 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -12,6 +12,7 @@
minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
+ considered_combat_role = TRUE
outfit = /datum/outfit/job/warden
plasma_outfit = /datum/outfit/plasmaman/warden
diff --git a/code/modules/keybindings/keybind/movement.dm b/code/modules/keybindings/keybind/movement.dm
index d3a0e98def..296b127cb4 100644
--- a/code/modules/keybindings/keybind/movement.dm
+++ b/code/modules/keybindings/keybind/movement.dm
@@ -124,7 +124,8 @@
return TRUE
/datum/keybinding/living/hold_sprint
- hotkey_keys = list("Shift")
+ hotkey_keys = list()
+ classic_keys = list()
name = "hold_sprint"
full_name = "Sprint (hold down)"
description = "Hold down to sprint"
@@ -144,7 +145,8 @@
return TRUE
/datum/keybinding/living/toggle_sprint
- hotkey_keys = list()
+ hotkey_keys = list("Shift")
+ classic_keys = list("Shift")
name = "toggle_sprint"
full_name = "Sprint (toggle)"
description = "Press to toggle sprint"
diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
index 81c59d481e..b5f09c65ca 100644
--- a/code/modules/keybindings/setup.dm
+++ b/code/modules/keybindings/setup.dm
@@ -5,7 +5,7 @@
SHOULD_NOT_SLEEP(TRUE)
/datum/proc/keyLoop(client/user) // Called once every frame
- //SHOULD_NOT_SLEEP(TRUE)
+ SHOULD_NOT_SLEEP(TRUE)
/client/verb/fix_macros()
set name = "Fix Keybindings"
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index 57a79553c3..2a8e0f2516 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -81,11 +81,10 @@
STOP_PROCESSING(SSmachines, src)
icon_state = "coinpress0"
-/obj/machinery/mineral/mint/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/mineral/mint/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Mint", name, ui_x, ui_y, master_ui, state)
+ ui = new(user, src, "Mint", name)
ui.open()
/obj/machinery/mineral/mint/ui_data()
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 35cf9f9440..00c22ad96d 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -375,7 +375,9 @@
ready = PLAYER_NOT_READY
return FALSE
- var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
+ var/mintime = max(CONFIG_GET(number/respawn_delay), (SSticker.round_start_time + (CONFIG_GET(number/respawn_minimum_delay_roundstart) * 600)) - world.time, 0)
+
+ var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to respawn for [round(mintime / 600, 0.1)] minutes!!","Player Setup","Yes","No")
if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes")
ready = PLAYER_NOT_READY
@@ -397,6 +399,7 @@
stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised")
transfer_ckey(observer, FALSE)
observer.client = client
+ observer.client.prefs?.respawn_time_of_death = world.time
observer.set_ghost_appearance()
if(observer.client && observer.client.prefs)
observer.real_name = observer.client.prefs.real_name
@@ -463,6 +466,9 @@
alert(src, "An administrator has disabled late join spawning.")
return FALSE
+ if(!respawn_latejoin_check(notify = TRUE))
+ return FALSE
+
var/arrivals_docked = TRUE
if(SSshuttle.arrivals)
close_spawn_windows() //In case we get held up
@@ -526,6 +532,8 @@
GLOB.joined_player_list += character.ckey
GLOB.latejoiners += character
+ LAZYOR(character.client.prefs.slots_joined_as, character.client.prefs.default_slot)
+ LAZYOR(character.client.prefs.characters_joined_as, character.real_name)
if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc) //Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais.
if(SSshuttle.emergency)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 0c57c13e3f..9493d11792 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -264,7 +264,7 @@ Transfer_mind is there to check if mob is being deleted/not going to have a body
Works together with spawning an observer, noted above.
*/
-/mob/proc/ghostize(can_reenter_corpse = TRUE, special = FALSE, penalize = FALSE, voluntary = FALSE)
+/mob/proc/ghostize(can_reenter_corpse = TRUE, special = FALSE, penalize = FALSE, voluntary = FALSE, cryo = FALSE)
var/sig_flags = SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse, special, penalize)
penalize = !(sig_flags & COMPONENT_DO_NOT_PENALIZE_GHOSTING) && (suiciding || penalize) // suicide squad.
voluntary_ghosted = voluntary
@@ -277,6 +277,12 @@ Works together with spawning an observer, noted above.
if (client && client.prefs && client.prefs.auto_ooc)
if (!(client.prefs.chat_toggles & CHAT_OOC))
client.prefs.chat_toggles ^= CHAT_OOC
+ if(ckey && penalize)
+ var/datum/preferences/P = GLOB.preferences_datums[ckey]
+ if(P)
+ P.respawn_restrictions_active = TRUE
+ P.respawn_time_of_death = world.time
+ P.respawn_did_cryo = cryo
transfer_ckey(ghost, FALSE)
ghost.client.init_verbs()
if(penalize)
@@ -423,12 +429,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(usr, "You're already stuck out of your body!")
return FALSE
- var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. ","Are you sure you want to stay dead?","Yes","No")
+ var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. THIS WILL ALSO STOP YOU FROM RESPAWNING!!!","Are you sure you want to stay dead and never respawn?","Yes","No")
+
if(response != "Yes")
return
can_reenter_corpse = FALSE
- to_chat(src, "You can no longer be brought back into your body.")
+ client.prefs?.dnr_triggered = TRUE
+ to_chat(src, "You can no longer be brought back into your body or respawn.")
return TRUE
/mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source, flashwindow = TRUE)
diff --git a/code/modules/mob/dead/observer/respawn.dm b/code/modules/mob/dead/observer/respawn.dm
new file mode 100644
index 0000000000..94ebf42a2a
--- /dev/null
+++ b/code/modules/mob/dead/observer/respawn.dm
@@ -0,0 +1,184 @@
+// ADMIN VERBS BEGIN
+/**
+ * Fully returns a player to lobby, allowing them to bypass all respawn restrictions
+ * Works on ghosts or new players (lobby players)
+ * If a lobby player is selected, their restrictions are removed.
+ */
+/client/proc/admin_cmd_respawn_return_to_lobby()
+ set name = "Respawn Player (Unrestricted)"
+ set desc = "Gives a player an unrestricted respawn, resetting all respawn restrictions for them."
+ set category = "Admin"
+
+ var/list/mob/valid = list()
+ for(var/mob/dead/observer/I in GLOB.dead_mob_list)
+ if(!I.client)
+ continue
+ valid["[I.ckey] - Observing: [I]"] = I.ckey
+ for(var/mob/dead/new_player/I in GLOB.dead_mob_list)
+ if(!I.client || !I.client.prefs.respawn_restrictions_active)
+ continue
+ valid["[I.ckey] - IN LOBBY"] = I.ckey
+ if(!valid.len)
+ to_chat(src, "No player found that is either a ghost or is in lobby with restrictions active.")
+ return
+ var/ckey = valid[input(src, "Choose a player (only showing logged in players who have restrictions)", "Unrestricted Respawn") as null|anything in valid]
+ var/client/player = GLOB.directory[ckey]
+ if(!player)
+ to_chat(src, "Client not found.")
+ return
+ var/mob/M = player.mob
+ if(istype(M, /mob/dead/observer))
+ var/mob/dead/observer/O = M
+ var/confirm = alert(src, "Send [O]([ckey]) back to the lobby without respawn restrictions?", "Send to Lobby", "Yes", "No")
+ if(confirm != "Yes")
+ return
+ message_admins("[key_name_admin(src)] gave [key_name_admin(O)] a full respawn and sent them back to the lobby.")
+ log_admin("[key_name(src)] gave [key_name(O)] a full respawn and sent them back to the lobby.")
+ to_chat(O, "You have been given a full respawn.")
+ O.do_respawn(FALSE)
+ O.client.prefs.dnr_triggered = FALSE
+ else if(istype(M, /mob/dead/new_player))
+ var/mob/dead/new_player/NP = M
+ var/confirm = alert(src, "Remove [NP]'s respawn restrictions?", "Remove Restrictions", "Yes", "No")
+ if(confirm != "Yes")
+ return
+ message_admins("[key_name_admin(src)] removed [ckey]'s respawn restrictions.")
+ log_admin("[key_name(src)] removed [ckey]'s respawn restrictions")
+ NP.client.prefs.respawn_restrictions_active = FALSE
+ NP.client.prefs.dnr_triggered = FALSE
+ to_chat(NP, "Your respawn restrictions have been removed.")
+ else
+ CRASH("Invalid mobtype")
+
+/**
+ * Allows a ghost to bypass respawn delay without lifting respawn restrictions
+ */
+/client/proc/admin_cmd_remove_ghost_respawn_timer()
+ set name = "Remove Respawn Timer for Player"
+ set desc = "Removes a player's respawn timer without removing their respawning restrictions."
+ set category = "Admin"
+
+ var/list/mob/dead/observer/valid = list()
+ for(var/mob/dead/observer/I in GLOB.dead_mob_list)
+ if(!I.client)
+ continue
+ valid["[I.ckey] - [I.name]"] = I
+
+ if(!valid.len)
+ to_chat(src, "No logged in ghosts found.")
+ return
+ var/mob/dead/observer/O = valid[input(src, "Choose a player (only showing logged in)", "Remove Respawn Timer") as null|anything in valid]
+
+ if(!O.client)
+ to_chat(src, "[O] has no client.")
+ return
+ var/timeleft = O.time_left_to_respawn()
+ if(!timeleft)
+ to_chat(src, "[O] can already respawn.")
+ return
+ message_admins("[key_name_admin(src)] removed [key_name_admin(O)]'s respawn timer.")
+ log_admin("[key_name(src)] removed [key_name(O)]'s respawn timer.")
+ O.client.prefs.respawn_time_of_death = -INFINITY
+ to_chat(O, "Your respawn timer has been removed.")
+
+// ADMIN VERBS END
+
+/**
+ * Checks if we can latejoin on the currently selected slot, taking into account respawn status.
+ */
+/mob/dead/new_player/proc/respawn_latejoin_check(notify = FALSE)
+ if(!client.prefs.respawn_restrictions_active)
+ return TRUE
+ var/can_same_person = CONFIG_GET(flag/allow_same_character_respawn)
+ if(can_same_person)
+ return TRUE
+ var/nameless = client.prefs.nameless
+ var/randomname = client.prefs.be_random_name
+ var/randombody = client.prefs.be_random_body
+ if(randombody && (nameless || randomname))
+ return TRUE // somewhat unrecognizable
+ if(client.prefs.slots_joined_as && (client.prefs.default_slot in client.prefs.slots_joined_as))
+ if(notify)
+ to_chat(src, "You cannot respawn on the same slot. Joined slots: [english_list(client.prefs.slots_joined_as)].")
+ return FALSE
+ if((!nameless && !randomname) && (client.prefs.characters_joined_as && (client.prefs.real_name in client.prefs.characters_joined_as)))
+ if(notify)
+ to_chat(src, "You cannot respawn on the same character. Joined slots: [english_list(client.prefs.characters_joined_as)].")
+ return FALSE
+ return TRUE
+
+/**
+ * Attempts to respawn.
+ */
+/mob/dead/observer/verb/respawn()
+ set name = "Respawn"
+ set category = "OOC"
+
+ if(!CONFIG_GET(flag/respawns_enabled))
+ to_chat(src, "Respawns are disabled in configuration.")
+ return
+
+ if(client.prefs.dnr_triggered)
+ to_chat(src, "You cannot respawn as you have enabled DNR.")
+ return
+
+ var/roundstart_timeleft = (SSticker.round_start_time + (CONFIG_GET(number/respawn_minimum_delay_roundstart) * 600)) - world.time
+ if(roundstart_timeleft > 0)
+ to_chat(src, "It's been too short of a time since the round started! Please wait [CEILING(roundstart_timeleft / 600, 0.1)] more minutes.")
+ return
+
+ var/list/banned_modes = CONFIG_GET(keyed_list/respawn_chaos_gamemodes)
+ if(SSticker.mode && banned_modes[lowertext(SSticker.mode.config_tag)])
+ to_chat(src, "The current mode tag, [SSticker.mode.config_tag], is not eligible for respawn.")
+ return
+
+ var/timeleft = time_left_to_respawn()
+ if(timeleft)
+ to_chat(src, "It's been too short of a time since you died/observed! Please wait [round(timeleft / 600, 0.1)] more minutes.")
+ return
+ do_respawn(TRUE)
+
+/**
+ * Gets time left until we can respawn. Returns 0 if we can respawn now.
+ */
+/mob/dead/observer/verb/time_left_to_respawn()
+ ASSERT(client)
+ return max(0, ((client.prefs.respawn_did_cryo? CONFIG_GET(number/respawn_delay_cryo) : CONFIG_GET(number/respawn_delay)) MINUTES + client.prefs.respawn_time_of_death) - world.time)
+
+/**
+ * Handles respawning
+ */
+/mob/dead/observer/proc/do_respawn(penalize)
+ if(!client)
+ return
+ if(isnull(penalize))
+ penalize = client.prefs.respawn_restrictions_active
+ client.prefs.respawn_restrictions_active = penalize
+
+ message_admins("[key_name_admin(src)] was respawned to lobby [penalize? "with" : "without"] restrictions.")
+ log_game("[key_name(src)] was respawned to lobby [penalize? "with" : "without"] restrictions.")
+ var/mob/dead/new_player/N = transfer_to_lobby()
+
+ to_chat(N, "You have been respawned to the lobby. \
+ Remember to take heed of rules regarding round knowledge - notably, that ALL past lives are forgotten. \
+ Any character you join as has NO knowledge of round events unless specified otherwise by an admin.")
+
+/**
+ * Actual proc that removes us and puts us back on lobby
+ *
+ * Returns the new mob.
+ */
+/mob/dead/observer/proc/transfer_to_lobby()
+ if(!client) // if no one's in us we can just be deleted
+ qdel(src)
+ return
+ client.screen.Cut()
+ client.view_size.resetToDefault()
+ client.generate_clickcatcher()
+ client.apply_clickcatcher()
+ client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))
+ client.view_size.resetToDefault()
+
+ var/mob/dead/new_player/M = new /mob/dead/new_player
+ M.ckey = ckey
+ return M
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index c3e849efa6..ee2f945b65 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -5,7 +5,7 @@
silent = FALSE
losebreath = 0
- if(!gibbed)
+ if(!gibbed && !HAS_TRAIT(src, TRAIT_DEATHCOMA))
emote("deathgasp")
. = ..()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 837b4f73cf..3015d1edc3 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -190,6 +190,11 @@
message = "chimes."
sound = 'sound/machines/chime.ogg'
+/datum/emote/sound/human/squeak
+ key = "squeak"
+ message = "squeaks."
+ sound = 'sound/effects/mousesqueek.ogg'
+
//rock paper scissors emote handling
/mob/living/carbon/human/proc/beginRockPaperScissors(var/chosen_move)
GLOB.rockpaperscissors_players[src] = list(chosen_move, ROCKPAPERSCISSORS_NOT_DECIDED)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3aa26de5cf..03816555b3 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -43,7 +43,7 @@
AddComponent(/datum/component/mood)
AddComponent(/datum/component/combat_mode)
AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text")
- AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!")
+ AddElement(/datum/element/flavor_text/carbon/temporary, "", "Set Pose (Temporary Flavor Text)", "This should be used only for things pertaining to the current round!", _save_key = null)
AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE)
/mob/living/carbon/human/Destroy()
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 89a4570e8d..341aa6a30f 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -14,6 +14,7 @@
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
block_parry_data = /datum/block_parry_data/unarmed/human
+ default_block_parry_data = /datum/block_parry_data/unarmed/human
//Hair colour and style
var/hair_color = "000"
@@ -98,20 +99,54 @@
parry_failed_clickcd_duration = 0.4
parry_data = list( // yeah it's snowflake
- "HUMAN_PARRY_STAGGER" = 3 SECONDS,
- "HUMAN_PARRY_PUNCH" = TRUE,
- "HUMAN_PARRY_MININUM_EFFICIENCY" = 0.9
+ "UNARMED_PARRY_STAGGER" = 3 SECONDS,
+ "UNARMED_PARRY_PUNCH" = TRUE,
+ "UNARMED_PARRY_MININUM_EFFICIENCY" = 90
)
-/mob/living/carbon/human/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time)
+/mob/living/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time)
var/datum/block_parry_data/D = return_block_parry_datum(block_parry_data)
+ . = ..()
if(!owner.Adjacent(attacker))
- return ..()
- if(parry_efficiency < D.parry_data["HUMAN_PARRY_MINIMUM_EFFICIENCY"])
- return ..()
+ return
+ if(parry_efficiency < D.parry_data["UNARMED_PARRY_MINIMUM_EFFICIENCY"])
+ return
visible_message("[src] strikes back perfectly at [attacker], staggering them!")
- if(D.parry_data["HUMAN_PARRY_PUNCH"])
+ if(D.parry_data["UNARMED_PARRY_PUNCH"])
UnarmedAttack(attacker, TRUE, INTENT_HARM, ATTACK_IS_PARRY_COUNTERATTACK | ATTACK_IGNORE_ACTION | ATTACK_IGNORE_CLICKDELAY | NO_AUTO_CLICKDELAY_HANDLING)
var/mob/living/L = attacker
if(istype(L))
- L.Stagger(D.parry_data["HUMAN_PARRY_STAGGER"])
+ L.Stagger(D.parry_data["UNARMED_PARRY_STAGGER"])
+
+/// Unarmed parry data for pugilists
+/datum/block_parry_data/unarmed/pugilist
+ parry_respect_clickdelay = FALSE
+ parry_stamina_cost = 4
+ parry_attack_types = ATTACK_TYPE_UNARMED | ATTACK_TYPE_PROJECTILE | ATTACK_TYPE_TACKLE | ATTACK_TYPE_THROWN | ATTACK_TYPE_MELEE
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING
+
+ parry_time_windup = 0
+ parry_time_spindown = 0
+ parry_time_active = 5
+
+ parry_time_perfect = 1.5
+ parry_time_perfect_leeway = 1.5
+ parry_imperfect_falloff_percent = 20
+ parry_efficiency_perfect = 100
+ parry_efficiency_perfect_override = list(
+ ATTACK_TYPE_PROJECTILE_TEXT = 60,
+ )
+
+ parry_efficiency_considered_successful = 0.01
+ parry_efficiency_to_counterattack = 0.01
+ parry_max_attacks = INFINITY
+ parry_failed_cooldown_duration = 1.5 SECONDS
+ parry_failed_stagger_duration = 0
+ parry_cooldown = 0
+ parry_failed_clickcd_duration = 0.8
+
+ parry_data = list( // yeah it's snowflake
+ "UNARMED_PARRY_STAGGER" = 3 SECONDS,
+ "UNARMED_PARRY_PUNCH" = TRUE,
+ "UNARMED_PARRY_MININUM_EFFICIENCY" = 90
+ )
diff --git a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
index 5d2693915d..ed3c7e21d4 100644
--- a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
+++ b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
@@ -62,7 +62,6 @@
H.add_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
- H.layer -= 1 //go one layer down so people go over you
ENABLE_BITFIELD(H.pass_flags, PASSMOB) //this actually lets people pass over you
squeak = H.AddComponent(/datum/component/squeak, custom_sounds = list('sound/effects/blobattack.ogg')) //blorble noise when people step on you
@@ -103,7 +102,6 @@
REMOVE_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT)
H.update_disabled_bodyparts(silent = TRUE)
H.remove_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
- H.layer += 1 //go one layer back above!
DISABLE_BITFIELD(H.pass_flags, PASSMOB)
is_puddle = FALSE
if(squeak)
diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
index 4a8c872400..a44177ced1 100644
--- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
@@ -139,6 +139,18 @@
if(E.web_ready == FALSE)
to_chat(H, "You need to wait awhile to regenerate web fluid.")
return
+ if(!H.Adjacent(A)) //No.
+ return
+ if(!isliving(A) && A.anchored)
+ to_chat(H, "[A] is bolted to the floor!")
+ return
+ if(istype(A, /obj/structure/arachnid))
+ to_chat(H, "No double wrapping.")
+ return
+ if(istype(A, /obj/effect))
+ to_chat(H, "You cannot wrap this.")
+ return
+ H.visible_message("[H] starts to wrap [A] into a cocoon!","You start to wrap [A] into a cocoon.")
if(!do_after(H, 10 SECONDS, 1, A))
to_chat(H, "Your web spinning was interrupted!")
return
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index 7faa08b52c..0418292fea 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -27,7 +27,7 @@
/datum/species/dullahan/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
- return FALSE
+ return ..()
/datum/species/dullahan/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
. = ..()
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 988bf81f57..803d3ec245 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -7,7 +7,7 @@
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH)
mutantlungs = /obj/item/organ/lungs/slime
mutant_heart = /obj/item/organ/heart/slime
- mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None")
+ mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None", "legs" = "Plantigrade")
inherent_traits = list(TRAIT_TOXINLOVER)
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless)
@@ -406,7 +406,7 @@
default_color = "00FFFF"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
inherent_traits = list(TRAIT_TOXINLOVER)
- mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
+ mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None", "legs" = "Plantigrade")
say_mod = "says"
hair_color = "mutcolor"
hair_alpha = 160 //a notch brighter so it blends better.
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index c605f91528..688b0cf63e 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -66,6 +66,10 @@
GLOB.alive_mob_list -= src
if(!gibbed)
GLOB.dead_mob_list += src
+ if(ckey)
+ var/datum/preferences/P = GLOB.preferences_datums[ckey]
+ if(P)
+ P.respawn_time_of_death = world.time
set_drugginess(0)
set_disgust(0)
SetSleeping(0, 0)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 0c7855ee16..fcc1d734a3 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -264,9 +264,9 @@
return FALSE
/mob/living/carbon/human/has_tail()
- if(!dna || !dna.features)
+ if(!dna || !dna.species)
return ..()
- var/list/L = dna.features // caches list because i refuse to type it out and because performance
+ var/list/L = dna.species.mutant_bodyparts // caches list because i refuse to type it out and because performance
return (L["mam_tail"] && (L["mam_tail"] != "None")) || (L["tail_human"] && (L["tail_human"] != "None")) || (L["tail_lizard"] && (L["tail_lizard"] != "None"))
/mob/living/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE)
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 7353add745..16855d6f22 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -127,7 +127,7 @@
handle_parry_ending_effects(data, effect_text)
parrying = NOT_PARRYING
parry_start_time = 0
- parry_end_time_last = world.time
+ parry_end_time_last = world.time + (successful? 0 : data.parry_failed_cooldown_duration)
successful_parries = null
/**
diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm
index 08ef674b33..e290956873 100644
--- a/code/modules/mob/living/living_blocking_parrying.dm
+++ b/code/modules/mob/living/living_blocking_parrying.dm
@@ -154,6 +154,8 @@ GLOBAL_LIST_EMPTY(block_parry_data)
var/parry_failed_stagger_duration = 3.5 SECONDS
/// Clickdelay duration post-parry if you fail to parry an attack
var/parry_failed_clickcd_duration = 2 SECONDS
+ /// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
+ var/parry_failed_cooldown_duration = 0 SECONDS
/**
* Quirky proc to get average of flags in list that are in attack_type because why is attack_type a flag.
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 5621fab9c1..d4ccc63b34 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -32,6 +32,10 @@
// Combat - Blocking/Parrying system
/// Our block_parry_data for unarmed blocks/parries. Currently only used for parrying, as unarmed block isn't implemented yet. YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
var/datum/block_parry_data/block_parry_data = /datum/block_parry_data // defaults to *something* because [combat_flags] dictates whether or not we can unarmed block/parry.
+ /// Default
+ var/datum/block_parry_data/default_block_parry_data = /datum/block_parry_data
+ /// If we're a pugilist
+ var/datum/block_parry_data/pugilist_block_parry_data = /datum/block_parry_data/unarmed/pugilist
// Blocking
/// The item the user is actively blocking with if any.
var/obj/item/active_block_item
diff --git a/code/modules/mob/living/living_mobility.dm b/code/modules/mob/living/living_mobility.dm
index 62c23cca9b..2256a93fa1 100644
--- a/code/modules/mob/living/living_mobility.dm
+++ b/code/modules/mob/living/living_mobility.dm
@@ -1,12 +1,3 @@
-/// IN THE FUTURE, WE WILL PROBABLY REFACTOR TO LESSEN THE NEED FOR UPDATE_MOBILITY, BUT FOR NOW.. WE CAN START DOING THIS.
-/// FOR BLOCKING MOVEMENT, USE TRAIT_MOBILITY_NOMOVE AS MUCH AS POSSIBLE. IT WILL MAKE REFACTORS IN THE FUTURE EASIER.
-/mob/living/ComponentInitialize()
- . = ..()
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOMOVE), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOPICKUP), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOUSE), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOREST), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_LIVING_NO_DENSITY), .proc/update_density)
//Stuff like mobility flag updates, resting updates, etc.
diff --git a/code/modules/mob/living/living_signals.dm b/code/modules/mob/living/living_signals.dm
new file mode 100644
index 0000000000..0eb83658d7
--- /dev/null
+++ b/code/modules/mob/living/living_signals.dm
@@ -0,0 +1,20 @@
+/// IN THE FUTURE, WE WILL PROBABLY REFACTOR TO LESSEN THE NEED FOR UPDATE_MOBILITY, BUT FOR NOW.. WE CAN START DOING THIS.
+/// FOR BLOCKING MOVEMENT, USE TRAIT_MOBILITY_NOMOVE AS MUCH AS POSSIBLE. IT WILL MAKE REFACTORS IN THE FUTURE EASIER.
+/mob/living/ComponentInitialize()
+ . = ..()
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOMOVE), .proc/update_mobility)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOPICKUP), .proc/update_mobility)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOUSE), .proc/update_mobility)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOREST), .proc/update_mobility)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_LIVING_NO_DENSITY), .proc/update_density)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_PUGILIST), .proc/update_pugilism)
+
+/mob/living/proc/update_pugilism()
+ if(HAS_TRAIT(src, TRAIT_PUGILIST))
+ combat_flags |= COMBAT_FLAG_UNARMED_PARRY
+ block_parry_data = pugilist_block_parry_data
+ else
+ var/initial_combat_flags = initial(combat_flags)
+ if(!(initial_combat_flags & COMBAT_FLAG_UNARMED_PARRY))
+ combat_flags &= ~COMBAT_FLAG_UNARMED_PARRY
+ block_parry_data = default_block_parry_data
diff --git a/code/modules/mob/living/silicon/custom_holoform.dm b/code/modules/mob/living/silicon/custom_holoform.dm
index e4f7f6780b..e7070e4576 100644
--- a/code/modules/mob/living/silicon/custom_holoform.dm
+++ b/code/modules/mob/living/silicon/custom_holoform.dm
@@ -1,3 +1,30 @@
+/mob/living/silicon/verb/clear_custom_holoform()
+ set name = "Clear Custom Holoform"
+ set desc = "Clear your current custom holoform"
+ set category = "OOC"
+ if(!client.prefs)
+ to_chat(src, "No preferences datum on your client, contact an admin/coder!")
+ return
+ client.prefs.custom_holoform_icon = null
+ client.prefs.cached_holoform_icons = null
+ to_chat(src, "Holoform removed.")
+
+/mob/living/silicon/verb/set_custom_holoform()
+ set name = "Set Custom Holoform"
+ set desc = "Set your custom holoform using your current preferences slot and a specified set of gear."
+ if(!client.prefs)
+ to_chat(src, "No preferences datum on your client, contact an admin/coder!")
+ return
+ if(client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+ to_chat(src, "You are attempting to change custom holoforms too fast!")
+
+ var/icon/new_holoform = user_interface_custom_holoform(client)
+ if(new_holoform)
+ client.prefs.custom_holoform_icon = new_holoform
+ client.prefs.cached_holoform_icons = null
+ client.prefs.last_custom_holoform = world.time
+ to_chat(src, "Holoform set.")
+
/mob/living/silicon/proc/attempt_set_custom_holoform()
if(!client.prefs)
to_chat(src, "No preferences datum on your client, contact an admin/coder!")
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index ae045dbd26..012515d0e9 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -9,6 +9,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
real_name = "Guardian Spirit"
desc = "A mysterious being that stands by its charge, ever vigilant."
speak_emote = list("hisses")
+ rad_flags = RAD_NO_CONTAMINATE | RAD_PROTECT_CONTENTS
gender = NEUTER
mob_biotypes = NONE
bubble_icon = "guardian"
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 1ff7e2f799..6e02944885 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -1034,3 +1034,159 @@
/mob/living/simple_animal/parrot/clock_hawk/ratvar_act()
return
+
+// Different Parrot Breeds
+
+/mob/living/simple_animal/parrot/kea
+ name = "Kea"
+ icon_state = "kea-flap"
+ icon_living = "kea-flap"
+ icon_dead = "kea-dead"
+ icon_sit = "kea_sit"
+
+/mob/living/simple_animal/parrot/eclectusr
+ name = "Eclectus"
+ icon_state = "eclectusr-flap"
+ icon_living = "eclectusr-flap"
+ icon_dead = "eclectusr-dead"
+ icon_sit = "electusr_sit"
+
+/mob/living/simple_animal/parrot/eclectus
+ name = "Eclectus"
+ icon_state = "eclectus-flap"
+ icon_living = "eclectus-flap"
+ icon_dead = "eclectus-dead"
+ icon_sit = "electus_sit"
+
+/mob/living/simple_animal/parrot/eclectusf
+ name = "Eclectus"
+ icon_state = "eclectusf-flap"
+ icon_living = "eclectusf-flap"
+ icon_dead = "eclectusf-dead"
+ icon_sit = "electusf_sit"
+
+/mob/living/simple_animal/parrot/greybird
+ name = "Grey Bird"
+ icon_state = "agrey-flap"
+ icon_living = "agrey-flap"
+ icon_dead = "agrey-dead"
+ icon_sit = "agrey_sit"
+
+/mob/living/simple_animal/parrot/blue_caique
+ name = "Blue Caique "
+ icon_state = "bcaique-flap"
+ icon_living = "bcaique-flap"
+ icon_dead = "bcaique-dead"
+ icon_sit = "bcaique_sit"
+
+/mob/living/simple_animal/parrot/white_caique
+ name = "White caique"
+ icon_state = "wcaique-flap"
+ icon_living = "wcaique-flap"
+ icon_dead = "wcaique-dead"
+ icon_sit = "wcaique_sit"
+
+/mob/living/simple_animal/parrot/green_budgerigar
+ name = "Green Budgerigar"
+ icon_state = "gbudge-flap"
+ icon_living = "gbudge-flap"
+ icon_dead = "gbudge-dead"
+ icon_sit = "gbudge_sit"
+
+/mob/living/simple_animal/parrot/blue_Budgerigar
+ name = "Blue Budgerigar"
+ icon_state = "bbudge-flap"
+ icon_living = "bbudge-flap"
+ icon_dead = "bbudge-dead"
+ icon_sit = "bbudge_sit"
+
+/mob/living/simple_animal/parrot/bluegreen_Budgerigar
+ name = "Bluegreen Budgerigar"
+ icon_state = "bgbudge-flap"
+ icon_living = "bgbudge-flap"
+ icon_dead = "bgbudge-dead"
+ icon_sit = "bgbudge_sit"
+
+/mob/living/simple_animal/parrot/commonblackbird
+ name = "Black Bird"
+ icon_state = "commonblackbird"
+ icon_living = "commonblackbird"
+ icon_dead = "commonblackbird-dead"
+ icon_sit = "commonblackbird_sit"
+
+/mob/living/simple_animal/parrot/azuretit
+ name = "Azure Tit"
+ icon_state = "azuretit"
+ icon_living = "azuretit"
+ icon_dead = "azuretit-dead"
+ icon_sit = "azuretit_sit"
+
+/mob/living/simple_animal/parrot/europeanrobin
+ name = "European Robin"
+ icon_state = "europeanrobin"
+ icon_living = "europeanrobin"
+ icon_dead = "europeanrobin-dead"
+ icon_sit = "europeanrobin_sit"
+
+/mob/living/simple_animal/parrot/goldcrest
+ name = "Goldcrest"
+ icon_state = "goldcrest"
+ icon_living = "goldcrest"
+ icon_dead = "goldcrest-dead"
+ icon_sit = "goldencrest_sit"
+
+/mob/living/simple_animal/parrot/ringneckdove
+ name = "Ringneck Dove"
+ icon_state = "ringneckdove"
+ icon_living = "ringneckdove"
+ icon_dead = "ringneckdove-dead"
+ icon_sit = "ringneckdove_sit"
+
+/mob/living/simple_animal/parrot/cockatiel
+ name = "Cockatiel"
+ icon_state = "tiel-flap"
+ icon_living = "tiel-flap"
+ icon_dead = "tiel-dead"
+ icon_sit = "tiel_sit"
+
+/mob/living/simple_animal/parrot/white_cockatiel
+ name = "White Cockatiel"
+ icon_state = "wtiel-flap"
+ icon_living = "wtiel-flap"
+ icon_dead = "wtiel-dead"
+ icon_sit = "wtiel_sit"
+
+/mob/living/simple_animal/parrot/yellowish_cockatiel
+ name = "Yellowish Cockatiel"
+ icon_state = "luttiel-flap"
+ icon_living = "luttiel-flap"
+ icon_dead = "luttiel-dead"
+ icon_sit = "luttiel_sit"
+
+/mob/living/simple_animal/parrot/grey_cockatiel
+ name = "Grey Cockatiel"
+ icon_state = "blutiel-flap"
+ icon_living = "blutiel-flap"
+ icon_dead = "blutiel-dead"
+ icon_sit = "blutiel_sit"
+
+/mob/living/simple_animal/parrot/too
+ name = "Too"
+ icon_state = "too-flap"
+ icon_living = "too-flap"
+ icon_dead = "too-dead"
+ icon_sit = "too_sit"
+
+/mob/living/simple_animal/parrot/hooded_too
+ name = "Utoo"
+ icon_state = "utoo-flap"
+ icon_living = "utoo-flap"
+ icon_dead = "utoo-dead"
+ icon_sit = "utoo_sit"
+
+/mob/living/simple_animal/parrot/pink_too
+ name = "Mtoo"
+ icon_state = "mtoo-flap"
+ icon_living = "mtoo-flap"
+ icon_dead = "mtoo-dead"
+ icon_sit = "mtoo_sit"
\ No newline at end of file
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3416a8b337..824e262ae1 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -457,39 +457,6 @@
else
to_chat(src, "You don't have a mind datum for some reason, so you can't add a note to it.")
-/mob/verb/abandon_mob()
- set name = "Respawn"
- set category = "OOC"
-
- if (CONFIG_GET(flag/norespawn))
- return
- if ((stat != DEAD || !( SSticker )))
- to_chat(usr, "You must be dead to use this!")
- return
-
- log_game("[key_name(usr)] used abandon mob.")
-
- to_chat(usr, "Please roleplay correctly!")
-
- if(!client)
- log_game("[key_name(usr)] AM failed due to disconnect.")
- return
- client.screen.Cut()
- client.screen += client.void
- if(!client)
- log_game("[key_name(usr)] AM failed due to disconnect.")
- return
-
- var/mob/dead/new_player/M = new /mob/dead/new_player()
- if(!client)
- log_game("[key_name(usr)] AM failed due to disconnect.")
- qdel(M)
- return
-
- M.key = key
-// M.Login() //wat
- return
-
/mob/proc/transfer_ckey(mob/new_mob, send_signal = TRUE)
if(!new_mob || (!ckey && new_mob.ckey))
CRASH("transfer_ckey() called [new_mob ? "on ckey-less mob with a player mob as target" : "without a valid mob target"]!")
@@ -1002,6 +969,12 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
switch(var_name)
if("logging")
return debug_variable(var_name, logging, 0, src, FALSE)
+ if(NAMEOF(src, lastKnownIP))
+ if(!check_rights(R_SENSITIVE, FALSE))
+ return "SENSITIVE"
+ if(NAMEOF(src, computer_id))
+ if(!check_rights(R_SENSITIVE, FALSE))
+ return "SENSITIVE"
. = ..()
/mob/vv_auto_rename(new_name)
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 471bd9939e..658d7e5874 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -86,15 +86,6 @@ proc/get_top_level_mob(var/mob/S)
else if(!params)
var/subtle_emote = stripped_multiline_input_or_reflect(user, "Choose an emote to display.", "Subtler" , null, MAX_MESSAGE_LEN)
if(subtle_emote && !check_invalid(user, subtle_emote))
- var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable")
- switch(type)
- if("Visible")
- emote_type = EMOTE_VISIBLE
- if("Hearable")
- emote_type = EMOTE_AUDIBLE
- else
- alert("Unable to use this emote, must be either hearable or visible.")
- return
message = subtle_emote
else
return FALSE
@@ -111,6 +102,80 @@ proc/get_top_level_mob(var/mob/S)
user.visible_message(message = message, self_message = message, vision_distance = 1, ignored_mobs = GLOB.dead_mob_list, omni = TRUE)
+///////////////// SUBTLE 3: DARE DICE
+
+/datum/emote/living/subtler_table
+ key = "subtler_table"
+ key_third_person = "subtler_table"
+ message = null
+ mob_type_blacklist_typecache = list(/mob/living/brain)
+
+/datum/emote/living/subtler_table/proc/check_invalid(mob/user, input)
+ if(stop_bad_mime.Find(input, 1, 1))
+ to_chat(user, "Invalid emote.")
+ return TRUE
+ return FALSE
+
+/datum/emote/living/subtler_table/run_emote(mob/user, params, type_override = null)
+ if(!locate(/obj/structure/table) in range(user, 1))
+ to_chat(user, "There are no tables around you.")
+ return FALSE
+ if(jobban_isbanned(user, "emote"))
+ to_chat(user, "You cannot send subtle emotes (banned).")
+ return FALSE
+ else if(user.client && user.client.prefs.muted & MUTE_IC)
+ to_chat(user, "You cannot send IC messages (muted).")
+ return FALSE
+ else if(!params)
+ var/subtle_emote = stripped_multiline_input_or_reflect(user, "Choose an emote to display.", "Subtler" , null, MAX_MESSAGE_LEN)
+ if(subtle_emote && !check_invalid(user, subtle_emote))
+ message = subtle_emote
+ else
+ return FALSE
+ else
+ message = params
+ if(type_override)
+ emote_type = type_override
+ . = TRUE
+ if(!can_run_emote(user))
+ return FALSE
+
+ user.log_message("[message] (TABLE-WRAPPING)", LOG_SUBTLER)
+ message = "[user] [user.say_emphasis(message)]"
+
+ var/list/show_to = list()
+ var/list/processing = list()
+ var/safety = 25
+ for(var/obj/structure/table/T in range(user, 1))
+ processing |= T
+ for(var/i in processing)
+ var/obj/structure/table/T = i
+ if(safety-- <= 0)
+ to_chat(user, "Table scan aborted early, some people might have not received the message (max 25)")
+ break
+ if(get_dist(T, user) > 7)
+ continue // nah
+ processing |= T
+ for(var/mob/living/M in range(T, 1)) // no ghosts/cameramobs
+ show_to |= M
+ var/obj/structure/table/other
+ other = locate() in get_step(T, NORTH)
+ if(other)
+ processing |= other
+ other = locate() in get_step(T, SOUTH)
+ if(other)
+ processing |= other
+ other = locate() in get_step(T, WEST)
+ if(other)
+ processing |= other
+ other = locate() in get_step(T, EAST)
+ if(other)
+ processing |= other
+
+ for(var/i in show_to)
+ var/mob/M = i
+ M.show_message(message)
+
///////////////// VERB CODE
/mob/living/verb/subtle()
set name = "Subtle"
@@ -128,3 +193,12 @@ proc/get_top_level_mob(var/mob/S)
to_chat(usr, "Speech is currently admin-disabled.")
return
usr.emote("subtler")
+
+///////////////// VERB CODE 3
+/mob/living/verb/subtler_table()
+ set name = "Subtler Around Table"
+ set category = "IC"
+ if(GLOB.say_disabled) //This is dumb but it's here because heehoo copypaste, who the FUCK uses this to identify lag?
+ to_chat(usr, "Speech is currently admin-disabled.")
+ return
+ usr.emote("subtler_table")
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index ca2c259bb5..762e9fe39c 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1082,11 +1082,12 @@
if("lockdown")
var/celluse = rand(20,35)
celluse = celluse /100
+ if(!cell.use(cell.maxcharge*celluse))
+ return
for (var/obj/machinery/door/D in GLOB.airlocks)
if (get_area(D) == area)
INVOKE_ASYNC(D,/obj/machinery/door.proc/hostile_lockdown,usr, FALSE)
addtimer(CALLBACK(D,/obj/machinery/door.proc/disable_lockdown, FALSE), 30 SECONDS)
- cell.charge -= cell.maxcharge*celluse
var/obj/item/implant/hijack/H = usr.getImplant(/obj/item/implant/hijack)
H.stealthcooldown = world.time + 3 MINUTES
if("occupy")
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index a4daeb6a33..a0509fbd41 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -86,6 +86,8 @@
// recharge the cell
/obj/item/stock_parts/cell/proc/give(amount)
+ if(amount < 0)
+ return
if(rigged && amount > 0)
explode()
return 0
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index fd442bb7a6..fb9e6ff6c6 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -100,6 +100,10 @@
var/impact_light_intensity = 3
var/impact_light_range = 2
var/impact_light_color_override
+ // Normal lighting effects
+ var/fired_light_intensity = 1
+ var/fired_light_range = 0
+ var/fired_light_color = rgb(255, 255, 255)
//Homing
var/homing = FALSE
@@ -506,6 +510,7 @@
transform = M
trajectory_ignore_forcemove = TRUE
forceMove(starting)
+ set_light(fired_light_range, fired_light_intensity, fired_light_color)
trajectory_ignore_forcemove = FALSE
if(isnull(pixel_increment_amount))
pixel_increment_amount = SSprojectiles.global_pixel_increment_amount
diff --git a/code/modules/projectiles/projectile/bullets/ferromagnetic.dm b/code/modules/projectiles/projectile/bullets/ferromagnetic.dm
index 78deff601f..03482e2a9d 100644
--- a/code/modules/projectiles/projectile/bullets/ferromagnetic.dm
+++ b/code/modules/projectiles/projectile/bullets/ferromagnetic.dm
@@ -2,22 +2,22 @@
icon_state = "magjectile"
damage = 20
armour_penetration = 20
- light_range = 3
+ fired_light_range = 3
pixels_per_second = TILES_TO_PIXELS(16.667)
range = 35
- light_color = LIGHT_COLOR_RED
+ fired_light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/magnetic/disabler
icon_state = "magjectile-nl" //nl stands for non-lethal
damage = 2
armour_penetration = 10
stamina = 20
- light_color = LIGHT_COLOR_BLUE
+ fired_light_color = LIGHT_COLOR_BLUE
/obj/item/projectile/bullet/magnetic/weak
damage = 15
armour_penetration = 10
- light_range = 2
+ fired_light_range = 2
range = 25
/obj/item/projectile/bullet/magnetic/weak/disabler
@@ -30,8 +30,8 @@
stamina = 10
movement_type = FLYING | UNSTOPPABLE
range = 6
- light_range = 1
- light_color = LIGHT_COLOR_RED
+ fired_light_range = 1
+ fired_light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/incendiary/mag_inferno
icon_state = "magjectile-large"
@@ -40,8 +40,8 @@
movement_type = FLYING | UNSTOPPABLE
range = 20
pixels_per_second = TILES_TO_PIXELS(12.5)
- light_range = 4
- light_color = LIGHT_COLOR_RED
+ fired_light_range = 4
+ fired_light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/incendiary/mag_inferno/on_hit(atom/target, blocked = FALSE)
..()
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 44b6e85f47..0b44c33926 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -171,11 +171,13 @@
/datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L)
..()
- L.ignore_slowdown(type)
+ ADD_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type)
+ L.update_movespeed()
ADD_TRAIT(L, TRAIT_TASED_RESISTANCE, type)
/datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L)
- L.unignore_slowdown(type)
+ REMOVE_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type)
+ L.update_movespeed()
REMOVE_TRAIT(L, TRAIT_TASED_RESISTANCE, type)
..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index ec6002f496..7ab50884e0 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -633,7 +633,7 @@
value = REAGENT_VALUE_RARE
/datum/reagent/medicine/sal_acid
- name = "Salicyclic Acid"
+ name = "Salicylic Acid"
description = "Stimulates the healing of severe bruises. Extremely rapidly heals severe bruising and slowly heals minor ones. Overdose will worsen existing bruising."
reagent_state = LIQUID
color = "#D2D2D2"
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index fca89a1c73..d4d66af240 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -155,7 +155,7 @@
required_reagents = list(/datum/reagent/medicine/pen_acid = 1, /datum/reagent/toxin/slimejelly = 1)
/datum/chemical_reaction/sal_acid
- name = "Salicyclic Acid"
+ name = "Salicylic Acid"
id = /datum/reagent/medicine/sal_acid
results = list(/datum/reagent/medicine/sal_acid = 5)
required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
@@ -305,12 +305,6 @@
results = list(/datum/reagent/medicine/regen_jelly = 2)
required_reagents = list(/datum/reagent/medicine/tricordrazine = 1, /datum/reagent/toxin/slimejelly = 1)
-/datum/chemical_reaction/jelly_convert
- name = "Blood Jelly Conversion"
- id = /datum/reagent/toxin/slimejelly
- results = list(/datum/reagent/toxin/slimejelly = 1)
- required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/blood/jellyblood = 1)
-
/datum/chemical_reaction/corazone
name = "Corazone"
id = /datum/reagent/medicine/corazone
diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm
index 2f3ed64655..91d75855a1 100644
--- a/code/modules/spells/spell_types/summonitem.dm
+++ b/code/modules/spells/spell_types/summonitem.dm
@@ -81,6 +81,12 @@
var/obj/machinery/portable_atmospherics/P = item_to_retrieve.loc
P.disconnect()
P.update_icon()
+ else if(istype(item_to_retrieve.loc, /obj/machinery/disposal) || istype(item_to_retrieve.loc, /obj/structure/disposalpipe)) //If it's in disposals, only recall the item.
+ break
+ else if(istype(item_to_retrieve.loc, /obj/machinery/nuclearbomb)) //I feel like yandev
+ break //Just to be sure.
+
+
item_to_retrieve = item_to_retrieve.loc
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index f706dd10d9..cd0ac28daf 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -699,6 +699,8 @@
else
if(species_id in GLOB.greyscale_limb_types) //should they have greyscales?
base_bp_icon = DEFAULT_BODYPART_ICON_ORGANIC
+ else
+ base_bp_icon = DEFAULT_BODYPART_ICON
if(base_bp_icon != DEFAULT_BODYPART_ICON)
color_src = mut_colors ? MUTCOLORS : ((H.dna.skin_tone_override && S.use_skintones == USE_SKINTONES_GRAYSCALE_CUSTOM) ? CUSTOM_SKINTONE : SKINTONE)
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 466a986237..7a2ff694e0 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -98,18 +98,19 @@
return json_encode(response)
/datum/tgs_api/v5/OnTopic(T)
- if(!initialized)
- return FALSE //continue world/Topic
-
var/list/params = params2list(T)
var/json = params[DMAPI5_TOPIC_DATA]
if(!json)
- return FALSE
+ return FALSE // continue to /world/Topic
var/list/topic_parameters = json_decode(json)
if(!topic_parameters)
return TopicResponse("Invalid topic parameters json!");
+ if(!initialized)
+ TGS_WARNING_LOG("Missed topic due to not being initialized: [T]")
+ return TRUE // too early to handle, but it's still our responsibility
+
var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER]
if(their_sCK != access_identifier)
return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER] from: [json]!");
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index 137242c547..a81dff37ad 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -10,6 +10,7 @@
canmove = TRUE
density = FALSE //Thought I couldn't fix this one easily, phew
arms_required = 1
+ var/override_movespeed = FALSE
/obj/vehicle/ridden/wheelchair/Initialize()
. = ..()
@@ -42,10 +43,11 @@
canmove = FALSE
addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20)
return FALSE
- var/datum/component/riding/D = GetComponent(/datum/component/riding)
- //1.5 (movespeed as of this change) multiplied by 6.7 gets ABOUT 10 (rounded), the old constant for the wheelchair that gets divided by how many arms they have
- //if that made no sense this simply makes the wheelchair speed change along with movement speed delay
- D.vehicle_move_delay = round((CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2), world.tick_lag)
+ if(!override_movespeed)
+ var/datum/component/riding/D = GetComponent(/datum/component/riding)
+ //1.5 (movespeed as of this change) multiplied by 6.7 gets ABOUT 10 (rounded), the old constant for the wheelchair that gets divided by how many arms they have
+ //if that made no sense this simply makes the wheelchair speed change along with movement speed delay
+ D.vehicle_move_delay = round((CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2), world.tick_lag)
return ..()
/obj/vehicle/ridden/wheelchair/Moved()
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index a367abb098..7f8aed83ef 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -14,6 +14,7 @@
/obj/belly
name = "belly" // Name of this location
desc = "It's a belly! You're in it!" // Flavor text description of inside sight/sound/smells/feels.
+ rad_flags = RAD_NO_CONTAMINATE | RAD_PROTECT_CONTENTS
var/vore_sound = "Gulp" // Sound when ingesting someone
var/vore_verb = "ingest" // Verb for eating with this in messages
var/release_sound = "Splatter" // Sound for letting someone out.
diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt
index fc1cb96c86..adbba1acb6 100644
--- a/config/admin_ranks.txt
+++ b/config/admin_ranks.txt
@@ -30,6 +30,7 @@
# +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
# +AUTOLOGIN = admin gains powers upon connect. This defaults to on, you can use -AUTOLOGIN to make a role require using the readmin verb to gain powers. (this does not effect the admin's ability to walk past bans or other on-connect limitations like panic bunker or pop limit.)
# +DBRANKS = when sql-based admin loading is enabled, allows for non-temporary changes in the permissions panel to be saved (requires DB)
+# +SENSITIVE = Defaults to on, use - to remove it. Allows reading IPs, CIDs, grabbing logs, and proccalls to certain things like admin holders/clients/subsystems considered "sensitive".
# +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
# END_KEYWORDS
diff --git a/config/config.txt b/config/config.txt
index 5be76972ab..72df74beb1 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -11,6 +11,7 @@ $include dynamic_config.txt
$include plushies/defines.txt
$include job_threats.txt
$include policy.txt
+$include respawns.txt
# You can use the @ character at the beginning of a config option to lock it from being edited in-game
# Example usage:
@@ -206,9 +207,6 @@ VOTE_AUTOTRANSFER_MAXIMUM 4
## players' votes default to "No vote" (otherwise, default to "No change")
# DEFAULT_NO_VOTE
-## disable abandon mob
-NORESPAWN
-
## disables calling del(src) on newmobs if they logout before spawnin in
# DONT_DEL_NEWMOB
diff --git a/config/respawns.txt b/config/respawns.txt
new file mode 100644
index 0000000000..337a691b07
--- /dev/null
+++ b/config/respawns.txt
@@ -0,0 +1,29 @@
+## Allow usage of the respawn system
+RESPAWNS_ENABLED
+
+## Minutes delay before allowing respawns, either from death or observing. Not an integer.
+RESPAWN_DELAY 15.0
+
+## Minutes delay before allowing respawns, if the user cryo'd. Not an integer.
+RESPAWN_DELAY_CRYO 5.0
+
+## Allow respawning as anything but an assistant.
+ALLOW_NON_ASSISTANT_RESPAWN
+
+## Allow respawning as security and command. Only works if ALLOW_NON_ASSISTANT_RESPAWN is on.
+# ALLOW_COMBAT_ROLE_RESPAWN
+
+## Allow respawning as the same character
+# ALLOW_SAME_CHARACTER_RESPAWN
+
+## Observing is considered a respawn for the purposes of role lockouts. Defaults to disabled. When disabled, only RESPAWNING rather than returning from observe locks you out.
+# RESPAWN_PENALTY_INCLUDES_OBSERVE
+
+## Time in minutes from round start before respawn is enabled
+RESPAWN_MINIMUM_DELAY_ROUNDSTART 30.0
+
+## Gamemode (config tags!) banlist for respawn
+RESPAWN_CHAOS_GAMEMODES WIZARD
+RESPAWN_CHAOS_GAMEMODES NUCLEAR
+RESPAWN_CHAOS_GAMEMODES CLONWOPS
+RESPAWN_CHOAS_GAMEMODES REVOLUTION
diff --git a/html/changelogs/AutoChangeLog-pr-13772.yml b/html/changelogs/AutoChangeLog-pr-13772.yml
new file mode 100644
index 0000000000..109360cace
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13772.yml
@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes:
+ - rscadd: "players can now respawn/return to lobby as a ghost after a 15 minute (default) delay and rejoin on another character with some/many restrictions"
+ - rscadd: "cryo now preserves everything"
diff --git a/html/changelogs/AutoChangeLog-pr-13773.yml b/html/changelogs/AutoChangeLog-pr-13773.yml
new file mode 100644
index 0000000000..498ac42561
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13773.yml
@@ -0,0 +1,6 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - tweak: "Zeolites now use gold rather then uranium for catalyst"
+ - tweak: "Zeolites are not as hard to make ph wise"
+ - tweak: "Making Zeolites heats up the beaker less allowing for better control"
diff --git a/html/changelogs/AutoChangeLog-pr-13815.yml b/html/changelogs/AutoChangeLog-pr-13815.yml
new file mode 100644
index 0000000000..630ca9d7f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13815.yml
@@ -0,0 +1,4 @@
+author: "Yakumo Chen"
+delete-after: True
+changes:
+ - balance: "Slime Jelly is no longer obtainable from slimepeople. Go ask Xenobio"
diff --git a/html/changelogs/AutoChangeLog-pr-13819.yml b/html/changelogs/AutoChangeLog-pr-13819.yml
new file mode 100644
index 0000000000..77b1ec9a3d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13819.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - bugfix: "The survival dagger light on the sprite now actually turns on and off."
+ - balance: "The survival dagger in the glaive kit that can also be bought by itself is now better at butchering things."
diff --git a/html/changelogs/AutoChangeLog-pr-13822.yml b/html/changelogs/AutoChangeLog-pr-13822.yml
new file mode 100644
index 0000000000..743bdb500b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13822.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "Bloodcult stunhands now work against clockies like they were supposed to instead of hardstunning."
diff --git a/html/changelogs/AutoChangeLog-pr-13823.yml b/html/changelogs/AutoChangeLog-pr-13823.yml
new file mode 100644
index 0000000000..35d70339f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13823.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Christmas starts on the 18th now"
diff --git a/html/changelogs/AutoChangeLog-pr-13825.yml b/html/changelogs/AutoChangeLog-pr-13825.yml
new file mode 100644
index 0000000000..ae82c1cd8e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13825.yml
@@ -0,0 +1,4 @@
+author: "raspy-on-osu"
+delete-after: True
+changes:
+ - tweak: "windoor open length"
diff --git a/html/changelogs/AutoChangeLog-pr-13828.yml b/html/changelogs/AutoChangeLog-pr-13828.yml
new file mode 100644
index 0000000000..282b8a01e0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13828.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - bugfix: "you can now only entwine tails with people who have a tail"
diff --git a/html/changelogs/AutoChangeLog-pr-13830.yml b/html/changelogs/AutoChangeLog-pr-13830.yml
new file mode 100644
index 0000000000..c126670246
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13830.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - bugfix: "apids render now"
diff --git a/html/changelogs/AutoChangeLog-pr-13832.yml b/html/changelogs/AutoChangeLog-pr-13832.yml
new file mode 100644
index 0000000000..756edb7657
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13832.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - bugfix: "Bloodsuckers tresspass ability can no longer work while they are not awake."
diff --git a/html/changelogs/AutoChangeLog-pr-13833.yml b/html/changelogs/AutoChangeLog-pr-13833.yml
new file mode 100644
index 0000000000..8312c7a5a3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13833.yml
@@ -0,0 +1,4 @@
+author: "kiwedespars"
+delete-after: True
+changes:
+ - balance: "balanced bone gauntlets."
diff --git a/html/changelogs/AutoChangeLog-pr-13835.yml b/html/changelogs/AutoChangeLog-pr-13835.yml
new file mode 100644
index 0000000000..0ac90921c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13835.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - rscadd: "pugilists can now parry"
diff --git a/html/changelogs/AutoChangeLog-pr-13837.yml b/html/changelogs/AutoChangeLog-pr-13837.yml
new file mode 100644
index 0000000000..eda0b77a83
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13837.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - tweak: "anyone new to the server is lucky enough to have their sprint default to toggle instead of hold"
diff --git a/html/changelogs/AutoChangeLog-pr-13838.yml b/html/changelogs/AutoChangeLog-pr-13838.yml
new file mode 100644
index 0000000000..deff5913b3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13838.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - bugfix: "things in DEATHCOMA do not deathgasp on death"
diff --git a/html/changelogs/AutoChangeLog-pr-13844.yml b/html/changelogs/AutoChangeLog-pr-13844.yml
new file mode 100644
index 0000000000..cd1f7a25d4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13844.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - bugfix: "Fixes the mint machine's UI"
diff --git a/html/changelogs/AutoChangeLog-pr-13845.yml b/html/changelogs/AutoChangeLog-pr-13845.yml
new file mode 100644
index 0000000000..d10485ae9f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13845.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - bugfix: "dullahans enabled"
diff --git a/html/changelogs/AutoChangeLog-pr-13846.yml b/html/changelogs/AutoChangeLog-pr-13846.yml
new file mode 100644
index 0000000000..68e013acf0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13846.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - balance: "Fleshmend, Anatomic Panacea and bloodsucker healing now work for Synths / IPCs."
diff --git a/html/changelogs/AutoChangeLog-pr-13850.yml b/html/changelogs/AutoChangeLog-pr-13850.yml
new file mode 100644
index 0000000000..64c47ade40
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13850.yml
@@ -0,0 +1,5 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "Self-fueling weldingtools recharge fuel properly again."
+ - bugfix: "Brass welders now actually recharge faster than experimental ones."
diff --git a/html/changelogs/AutoChangeLog-pr-13855.yml b/html/changelogs/AutoChangeLog-pr-13855.yml
new file mode 100644
index 0000000000..0eed195acd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13855.yml
@@ -0,0 +1,8 @@
+author: "Chiirno"
+delete-after: True
+changes:
+ - rscadd: "Paramedics office and Surgery Storage Room"
+ - tweak: "Remodeled the surgery room, as well as shrunk Morgue and Starboard Emergency Storage.
+Fiddled with some areas for better map edit clarity and fixed one runtime in Vacant Office A."
+ - imageadd: "Added the paramedic closet sprite, a paramedic colored medical3 closet."
+ - code_imp: "Added a paramedic closet, which is the standard medical3 closet with their suit, a pinpointer, and a crew monitor added."
diff --git a/html/changelogs/AutoChangeLog-pr-13867.yml b/html/changelogs/AutoChangeLog-pr-13867.yml
new file mode 100644
index 0000000000..dd1e44e64c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13867.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - balance: "Zeolites now only generate 1/5 the heat when reacting and don't require a catalyst."
diff --git a/html/changelogs/AutoChangeLog-pr-13869.yml b/html/changelogs/AutoChangeLog-pr-13869.yml
new file mode 100644
index 0000000000..5d4ca4817c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13869.yml
@@ -0,0 +1,6 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - tweak: "slime puddles are no longer layered down one layer"
+ - tweak: "you cannot tackle with two paralysed arms"
+ - tweak: "tackling with a single paralysed arm lowers your tackle roll by 2"
diff --git a/html/changelogs/AutoChangeLog-pr-13870.yml b/html/changelogs/AutoChangeLog-pr-13870.yml
new file mode 100644
index 0000000000..820c524224
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13870.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - bugfix: "Magrifle ammo no longer glows."
diff --git a/html/changelogs/AutoChangeLog-pr-13873.yml b/html/changelogs/AutoChangeLog-pr-13873.yml
new file mode 100644
index 0000000000..320a5b69a4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13873.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - tweak: "Nyctophobia quirk now has some light lag compensation."
diff --git a/html/changelogs/AutoChangeLog-pr-13881.yml b/html/changelogs/AutoChangeLog-pr-13881.yml
new file mode 100644
index 0000000000..0ad2d3afc8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13881.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - rscadd: "PubbyStation now has two Christmas Tree spawners."
diff --git a/html/changelogs/AutoChangeLog-pr-13882.yml b/html/changelogs/AutoChangeLog-pr-13882.yml
new file mode 100644
index 0000000000..fe545bdc23
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13882.yml
@@ -0,0 +1,4 @@
+author: "ERP mains"
+delete-after: True
+changes:
+ - rscadd: "Subtler Around Table is now a verb"
diff --git a/html/changelogs/AutoChangeLog-pr-13883.yml b/html/changelogs/AutoChangeLog-pr-13883.yml
new file mode 100644
index 0000000000..884adafffe
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13883.yml
@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes:
+ - rscadd: "set-pose has been added"
+ - tweak: "temporary flavor text renamed to set pose, fully visible in examine"
diff --git a/html/changelogs/AutoChangeLog-pr-13884.yml b/html/changelogs/AutoChangeLog-pr-13884.yml
new file mode 100644
index 0000000000..f2b9233690
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13884.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "The dock-silver standard set by Box and Meta has been enforced across maps in rotation (Delta, Pubby, Lambda)."
+ - bugfix: "The Box whiteship now has its missing tiny fan back."
diff --git a/html/changelogs/AutoChangeLog-pr-13885.yml b/html/changelogs/AutoChangeLog-pr-13885.yml
new file mode 100644
index 0000000000..88c23d30f1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13885.yml
@@ -0,0 +1,4 @@
+author: "raspy-on-osu"
+delete-after: True
+changes:
+ - tweak: "space heater heating range and power"
diff --git a/html/changelogs/AutoChangeLog-pr-13887.yml b/html/changelogs/AutoChangeLog-pr-13887.yml
new file mode 100644
index 0000000000..83069a4e64
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13887.yml
@@ -0,0 +1,4 @@
+author: "HeroWithYay"
+delete-after: True
+changes:
+ - bugfix: "Changed description of Necrotizing Fasciitis symptom."
diff --git a/html/changelogs/AutoChangeLog-pr-13892.yml b/html/changelogs/AutoChangeLog-pr-13892.yml
new file mode 100644
index 0000000000..976b395826
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13892.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - balance: "changeling combat mutations rebalanced. most of them take chemicals to upkeep now."
diff --git a/html/changelogs/AutoChangeLog-pr-13893.yml b/html/changelogs/AutoChangeLog-pr-13893.yml
new file mode 100644
index 0000000000..9eb7a3f79d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13893.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - tweak: "Meth and changeling adrenals no longer ignore all slowdowns, rather damage slowdowns."
diff --git a/html/changelogs/AutoChangeLog-pr-13894.yml b/html/changelogs/AutoChangeLog-pr-13894.yml
new file mode 100644
index 0000000000..31e1e66328
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13894.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - tweak: "temperature slowdown divisor nerfed to 35 from 20."
diff --git a/html/changelogs/AutoChangeLog-pr-13896.yml b/html/changelogs/AutoChangeLog-pr-13896.yml
new file mode 100644
index 0000000000..f733efa09d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13896.yml
@@ -0,0 +1,6 @@
+author: "Sonic121x"
+delete-after: True
+changes:
+ - rscadd: "alarm ert hardsuit sprite for naga and canine"
+ - tweak: "adjust the naga ert hardsuit to cover the hand"
+ - bugfix: "cydonia hardsuit helmet"
diff --git a/html/changelogs/AutoChangeLog-pr-13897.yml b/html/changelogs/AutoChangeLog-pr-13897.yml
new file mode 100644
index 0000000000..05637b0908
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13897.yml
@@ -0,0 +1,5 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - bugfix: "Allows Energy Bola to be caught"
+ - balance: "This also allows them to be dropped/picked up."
diff --git a/html/changelogs/AutoChangeLog-pr-13898.yml b/html/changelogs/AutoChangeLog-pr-13898.yml
new file mode 100644
index 0000000000..cb4e0fd52d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13898.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - balance: "Regen coma now puts into a coma even from crit or while unconscious."
+ - bugfix: "Regen coma now properly weakens while asleep."
diff --git a/html/changelogs/AutoChangeLog-pr-13900.yml b/html/changelogs/AutoChangeLog-pr-13900.yml
new file mode 100644
index 0000000000..a25c8af1ed
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13900.yml
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - rscadd: "New parrots from the RP server, can be found in Bird Crate in Cargo"
diff --git a/html/changelogs/AutoChangeLog-pr-13902.yml b/html/changelogs/AutoChangeLog-pr-13902.yml
new file mode 100644
index 0000000000..ca548d816f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13902.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "avian/digitigrade legs have been added for slimes"
diff --git a/html/changelogs/AutoChangeLog-pr-13903.yml b/html/changelogs/AutoChangeLog-pr-13903.yml
new file mode 100644
index 0000000000..fd66c4b0c6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13903.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "Changelings no longer double-deathgasp when activating the regen stasis ability while not dead."
diff --git a/html/changelogs/AutoChangeLog-pr-13904.yml b/html/changelogs/AutoChangeLog-pr-13904.yml
new file mode 100644
index 0000000000..90f7d77e17
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13904.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - tweak: "Instant summons can no longer do wacky stuff with disposals (and nukes)."
diff --git a/html/changelogs/AutoChangeLog-pr-13905.yml b/html/changelogs/AutoChangeLog-pr-13905.yml
new file mode 100644
index 0000000000..16b464bc20
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13905.yml
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - imageadd: "cool codex cicatrix inhands"
diff --git a/html/changelogs/AutoChangeLog-pr-13911.yml b/html/changelogs/AutoChangeLog-pr-13911.yml
new file mode 100644
index 0000000000..9e96103b2b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13911.yml
@@ -0,0 +1,4 @@
+author: "raspy-on-osu"
+delete-after: True
+changes:
+ - spellcheck: "salicylic acid"
diff --git a/html/changelogs/AutoChangeLog-pr-13913.yml b/html/changelogs/AutoChangeLog-pr-13913.yml
new file mode 100644
index 0000000000..a25e054a6f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13913.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - bugfix: "Fixes the parry data for scarp"
diff --git a/html/changelogs/AutoChangeLog-pr-13914.yml b/html/changelogs/AutoChangeLog-pr-13914.yml
new file mode 100644
index 0000000000..b9efe2a893
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13914.yml
@@ -0,0 +1,6 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - rscadd: "Adds a few new area designations primarily for CogStation, incorporates them into said map"
+ - tweak: "Reorganizes some area designations for ease of use, along with renaming the central \"Router\" to \"Routing Depot\""
+ - bugfix: "Fixes an incorrectly designated area in CogStation"
diff --git a/html/changelogs/AutoChangeLog-pr-13915.yml b/html/changelogs/AutoChangeLog-pr-13915.yml
new file mode 100644
index 0000000000..2853dcb9ad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13915.yml
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - bugfix: "Fixed new birds changing back to basic parrot when sitting"
diff --git a/html/changelogs/AutoChangeLog-pr-13916.yml b/html/changelogs/AutoChangeLog-pr-13916.yml
new file mode 100644
index 0000000000..0ec04707a5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13916.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "re-adds the holoform verb for people who want to use it over going through the char list"
diff --git a/html/changelogs/AutoChangeLog-pr-13917.yml b/html/changelogs/AutoChangeLog-pr-13917.yml
new file mode 100644
index 0000000000..5eabd640f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13917.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "*squeak"
diff --git a/html/changelogs/AutoChangeLog-pr-13926.yml b/html/changelogs/AutoChangeLog-pr-13926.yml
new file mode 100644
index 0000000000..4e92bacdb4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13926.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - rscdel: "Removes the screen flashing on climax."
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 346a198746..1cb089a189 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -875,7 +875,7 @@ function draw_listedturf() {
// rather than every onmousedown getting the "part" of the last entry.
return function(e) {
e.preventDefault();
- clickcatcher = "?src=" + part[1] + ";statpanel_item_click=1";
+ clickcatcher = "?src=_statpanel_;statpanel_item_target=" + part[1] + ";statpanel_item_click=1";
if(e.shiftKey){
clickcatcher += ";statpanel_item_shiftclick=1";
}
@@ -912,7 +912,7 @@ function draw_sdql2(){
var td2 = document.createElement("td");
if(part[2]) {
var a = document.createElement("a");
- a.href = "?src=" + part[2] + ";statpanel_item_click=1";
+ a.href = "?src=" + "_statpanel_" + ";statpanel_item_target=" + part[2] + ";statpanel_item_click=1";
a[textContentKey] = part[1];
td2.appendChild(a);
} else {
@@ -943,7 +943,7 @@ function draw_tickets() {
td2.appendChild(a);
} else if(part[3]){
var a = document.createElement("a");
- a.href = "?src=" + part[3] + ";statpanel_item_click=1";
+ a.href = "?src=_statpanel_" + ";statpanel_item_target=" + part[3] + ";statpanel_item_click=1";
a[textContentKey] = part[1];
td2.appendChild(a);
} else {
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 50bf65b27f..8db32b304b 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 889888ef0a..62d6644311 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head_muzzled.dmi b/icons/mob/clothing/head_muzzled.dmi
index 62c1ebea0a..0c72221833 100644
Binary files a/icons/mob/clothing/head_muzzled.dmi and b/icons/mob/clothing/head_muzzled.dmi differ
diff --git a/icons/mob/clothing/taur_canine.dmi b/icons/mob/clothing/taur_canine.dmi
index 24cf51d2e5..6155a274f2 100644
Binary files a/icons/mob/clothing/taur_canine.dmi and b/icons/mob/clothing/taur_canine.dmi differ
diff --git a/icons/mob/clothing/taur_naga.dmi b/icons/mob/clothing/taur_naga.dmi
index d178ba4a1c..3525333fb3 100644
Binary files a/icons/mob/clothing/taur_naga.dmi and b/icons/mob/clothing/taur_naga.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 3b97c3b38b..13f66fc2a4 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/inhands/misc/books_lefthand.dmi b/icons/mob/inhands/misc/books_lefthand.dmi
index 71d06d345a..df662a413b 100644
Binary files a/icons/mob/inhands/misc/books_lefthand.dmi and b/icons/mob/inhands/misc/books_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/books_righthand.dmi b/icons/mob/inhands/misc/books_righthand.dmi
index 906f47bfe9..afa4a7a5fb 100644
Binary files a/icons/mob/inhands/misc/books_righthand.dmi and b/icons/mob/inhands/misc/books_righthand.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index b71b021d80..3653635c56 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/eldritch.dmi b/icons/obj/eldritch.dmi
index 294deda628..646b12e734 100644
Binary files a/icons/obj/eldritch.dmi and b/icons/obj/eldritch.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 8cdff2214b..31312ac9a1 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index f4b8850f55..21f525088c 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -591,21 +591,20 @@
/datum/chemical_reaction/fermi/zeolites
name = "Zeolites"
id = /datum/reagent/fermi/zeolites
- results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot! - But it's now somewhat dangerous, and needs a bit of uranium to catalyze the reaction
+ results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot! - But it's now somewhat dangerous, and needs a bit of gold to catalyze the reaction
required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/aluminium = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
- required_catalysts = list(/datum/reagent/uranium = 5)
//FermiChem vars:
OptimalTempMin = 500
OptimalTempMax = 750
ExplodeTemp = 850
- OptimalpHMin = 2.8
- OptimalpHMax = 5 //2.2 ph levels of optimal ph zone - centered at 3.9 - ph of ingredients mixed at equal values is 9.55; ph of result is 8.
- ReactpHLim = 4
+ OptimalpHMin = 4.8
+ OptimalpHMax = 7
+ ReactpHLim = 5
//CatalystFact = 0
CurveSharpT = 1.5
CurveSharppH = 3
- ThermicConstant = 7
+ ThermicConstant = 1
HIonRelease = -0.15
RateUpLim = 4
- PurityMin = 0.5 //Good luck.
+ PurityMin = 0.5 //Good luck!
FermiChem = TRUE
diff --git a/strings/admin_nicknames.txt b/strings/admin_nicknames.txt
deleted file mode 100644
index 76198b6c05..0000000000
--- a/strings/admin_nicknames.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Badmin
-Spanmin
\ No newline at end of file
diff --git a/strings/sillytips.txt b/strings/sillytips.txt
index e6710de95e..8e28284534 100644
--- a/strings/sillytips.txt
+++ b/strings/sillytips.txt
@@ -23,7 +23,6 @@ Plenty of things that aren't traditionally considered weapons can still be used
DEATH IS IMMINENT!
This game is older than most of the people playing it.
Do not go gentle into that good night.
-Flashbangs can weaken blob tiles, allowing for you and the crew to easily destroy them.
Just the tip?
You can grab someone by clicking on them with the grab intent, then upgrade the grab by clicking on them once more. An aggressive grab will momentarily stun someone, allow you to place Mekhi on a table by clicking on it, or throw them by toggling on throwing.
Some people are unable to read text on a game where half of it is based on text.
@@ -42,8 +41,7 @@ Mhelp is basically useless, and never used correctly. Being a Mentor just means
Toxins Bombs are not the only way to get RnD points. However, nobody will ever do any other method to get sci points...
Plasma men are a powerful race with many perks! No really, I swear! So what if they need an "ERP Plasma room" to fuck, who cares!
As a Cargo Tech make sure to always buy a tesla to sell back to CC. They love those those. Trust me!
-Help.
-Maints.
+;HELP MAINT
Admins always regret meme options in their polls.
Putting cat ears on securitrons makes them table people and nya. Mekhi isn't a cat, but he still goes on the table, just roll with it.
As a Changeling, you can live without a head as they are merely vestigal to you, now, finally, you can be a Dullahan without it being Halloween.
diff --git a/strings/tips.txt b/strings/tips.txt
index 2039b30359..5336f767a5 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -237,7 +237,7 @@ As a Changeling, you can absorb someone by strangling them and using the Absorb
As a Changeling, absorbing someone will give you their full memory. This can include things such as a Traitor's uplink, thus absorbing one will allow you to access the Traitor uplink and buy toys for your Changeling self to abuse.
As a Changeling, absorbing another Changeling will permanently boost your chemical reserve, allow you to pick more abilities, and make the victim unable to revive. Be careful when exposing your identity to other Changelings, as they may be out of those wonderful benefits.
As a Changeling, BZ gas will dramatically slow down or even halt your natural chemical regeneration, be sure to avoid it at all costs as some lunatics may try and flood portions of the station to deal with you.
-As a Changeling, death is not the end for you! You can revive after two minutes from being dead by triggering your stasis ability, and then waiting for the prompt to resurrect yourself to show up.
+As a Changeling, death is not the end for you! You can revive after 40 seconds from being dead by triggering your stasis ability, and then waiting for the prompt to resurrect yourself to show up.
As a Changeling, your Regenerate Limbs power will quickly heal all of your wounds, but they'll still leave scars. Changelings can use Fleshmend to get rid of scars, or you can ingest Carpotoxin to get rid of them like a normal person.
As a Cultist, do not cause too much chaos before your objective is completed. If the shuttle gets called too soon, you may not have enough time to win.
As a Cultist, your team starts off very weak, but if necessary can quickly convert everything they have into raw power. Make sure you have the numbers and equipment to support going loud, or the cult will fall flat on its face.
@@ -300,4 +300,4 @@ Laser pointers can be upgraded by replacing its micro laser with a better one fr
Being out of combat mode makes makes you deal less damage to people and objects when attacking. This stacks with the penalty incurred by resting.
Resting makes you deal less damage to people and objects when attacking. This stacks with the penalty incurred by being out of combat mode.
You do not regenerate as much stamina while in combat mode. Resting (being on the ground) makes you regenerate stamina faster.
-Remember to be in combat mode while in combat, as otherwise you will be penalized by taking more incoming damage and dealing less damage to your adversary.
+Keybinds can be reassigned in character setup on the keybindings tab. This is extremely useful, especially if you know how to use independent binds.
diff --git a/tgstation.dme b/tgstation.dme
index d818fb6ea0..c9c82776ac 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -295,6 +295,7 @@
#include "code\controllers\configuration\entries\plushies.dm"
#include "code\controllers\configuration\entries\policy.dm"
#include "code\controllers\configuration\entries\resources.dm"
+#include "code\controllers\configuration\entries\respawns.dm"
#include "code\controllers\configuration\entries\stamina_combat.dm"
#include "code\controllers\subsystem\acid.dm"
#include "code\controllers\subsystem\adjacent_air.dm"
@@ -2454,6 +2455,7 @@
#include "code\modules\mob\dead\observer\observer.dm"
#include "code\modules\mob\dead\observer\observer_movement.dm"
#include "code\modules\mob\dead\observer\orbit.dm"
+#include "code\modules\mob\dead\observer\respawn.dm"
#include "code\modules\mob\dead\observer\say.dm"
#include "code\modules\mob\living\blood.dm"
#include "code\modules\mob\living\bloodcrawl.dm"
@@ -2471,6 +2473,7 @@
#include "code\modules\mob\living\living_defines.dm"
#include "code\modules\mob\living\living_mobility.dm"
#include "code\modules\mob\living\living_movement.dm"
+#include "code\modules\mob\living\living_signals.dm"
#include "code\modules\mob\living\living_sprint.dm"
#include "code\modules\mob\living\login.dm"
#include "code\modules\mob\living\logout.dm"