diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 63e6770e42..beb93b319e 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -2372,7 +2372,7 @@
},
/area/awaymission/BMPship/Midship)
"hh" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"hi" = (
diff --git a/_maps/RandomZLevels/away_mission/Academy.dmm b/_maps/RandomZLevels/away_mission/Academy.dmm
index 37b0098fd2..9b61f50600 100644
--- a/_maps/RandomZLevels/away_mission/Academy.dmm
+++ b/_maps/RandomZLevels/away_mission/Academy.dmm
@@ -2710,7 +2710,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
diff --git a/_maps/RandomZLevels/away_mission/SnowCabin.dmm b/_maps/RandomZLevels/away_mission/SnowCabin.dmm
index 844a134d27..fbb83899fd 100644
--- a/_maps/RandomZLevels/away_mission/SnowCabin.dmm
+++ b/_maps/RandomZLevels/away_mission/SnowCabin.dmm
@@ -312,7 +312,7 @@
/obj/structure/janitorialcart,
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/cabin)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 87178c32f3..cb257efeba 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -69,35 +69,18 @@
/turf/closed/wall/r_wall,
/area/security/prison)
"aaj" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/closed/wall/r_wall,
-/area/security/prison)
-"aak" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
-"aal" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/security/prison)
"aam" = (
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/prison)
@@ -115,11 +98,17 @@
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/grass,
/area/security/prison)
"aap" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/carrot,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/grass,
/area/security/prison)
"aaq" = (
@@ -140,17 +129,29 @@
/obj/structure/sink{
pixel_y = 20
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aar" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/glowshroom,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/grass,
/area/security/prison)
"aas" = (
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aat" = (
@@ -4821,7 +4822,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 +5089,7 @@
pixel_x = -32
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"ajw" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -5666,6 +5667,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"akw" = (
@@ -5845,10 +5849,13 @@
/area/science/xenobiology)
"akQ" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/turf/closed/wall,
-/area/security/brig)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"akR" = (
/obj/machinery/camera{
c_tag = "Security Office";
@@ -6108,7 +6115,7 @@
"alq" = (
/obj/machinery/door/airlock/security/glass{
name = "Evidence Storage";
- req_access_txt = "4"
+ req_one_access_txt = "4;1"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -6142,25 +6149,11 @@
/turf/open/floor/plasteel,
/area/security/brig)
"alt" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "innerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -6180,16 +6173,11 @@
/area/ai_monitored/nuke_storage)
"alv" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/security/brig)
"alw" = (
@@ -6272,6 +6260,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"alB" = (
@@ -6572,9 +6563,6 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"amm" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/structure/cable{
icon_state = "0-4"
},
@@ -6609,6 +6597,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"amq" = (
@@ -6661,9 +6652,6 @@
icon_state = "0-8"
},
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/security/brig)
@@ -6763,6 +6751,12 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"amJ" = (
@@ -6853,25 +6847,15 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
-"amR" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Gate";
- name = "brig shutters"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/brig)
"amS" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/closed/wall/r_wall,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
/area/security/brig)
"amT" = (
/obj/structure/cable{
@@ -7271,9 +7255,11 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
/area/security/brig)
"anQ" = (
@@ -7281,9 +7267,6 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel,
/area/security/brig)
"anR" = (
@@ -7514,14 +7497,13 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/security/brig)
@@ -7755,13 +7737,13 @@
/area/security/brig)
"aoZ" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Brig Control";
name = "brig shutters"
},
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/security/warden)
"apa" = (
@@ -7780,6 +7762,9 @@
/area/science/xenobiology)
"apc" = (
/obj/structure/chair/office/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"apd" = (
@@ -7933,6 +7918,12 @@
pixel_x = 6;
pixel_y = 3
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"apw" = (
@@ -8052,6 +8043,12 @@
pixel_y = -24;
req_access_txt = "2"
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"apI" = (
@@ -8133,9 +8130,6 @@
req_access_txt = "63"
},
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -8158,14 +8152,19 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"apT" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Cell Interior Shutters";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "0-4"
},
-/turf/closed/wall/r_wall,
-/area/security/warden)
+/turf/open/floor/plating,
+/area/security/brig)
"apU" = (
/turf/open/floor/plating,
/area/security/vacantoffice/b)
@@ -8181,20 +8180,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
-"apX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Brig Control";
- name = "brig shutters"
- },
-/turf/open/floor/plating,
-/area/security/warden)
"apY" = (
/obj/machinery/light/small{
dir = 1
@@ -8406,13 +8391,11 @@
/area/crew_quarters/fitness/pool)
"aqt" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Brig Control";
name = "brig shutters"
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/security/warden)
"aqu" = (
@@ -8858,6 +8841,9 @@
c_tag = "Brig Control";
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"arz" = (
@@ -9400,7 +9386,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 +9395,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;
@@ -11041,18 +11030,12 @@
/obj/structure/closet/crate/coffin,
/turf/open/floor/plating,
/area/maintenance/port/fore)
-"axo" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/fore)
"axp" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plating,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"axq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -11451,10 +11434,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
-"ayC" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/fore)
"ayD" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
@@ -14266,10 +14245,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/fore)
-"aGh" = (
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/maintenance/fore)
"aGi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
@@ -15795,7 +15770,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 +16065,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 +16189,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 +16204,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 +16672,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 +16786,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 +16798,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 +17092,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 +17103,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 +17124,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 +17512,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 +17534,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 +17578,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 +19196,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 +19511,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 +19616,7 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aUz" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/airalarm{
@@ -19654,7 +19629,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 +19707,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 +19745,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 +20297,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 +20314,7 @@
dir = 8
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aWj" = (
/obj/structure/grille,
/obj/structure/window{
@@ -20370,7 +20345,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 +20380,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 +21087,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 +21107,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 +21171,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 +21179,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 +21224,7 @@
dir = 4
},
/turf/open/floor/wood,
-/area/security/vacantoffice)
+/area/vacant_room/office)
"aYe" = (
/obj/machinery/light_switch{
pixel_y = 28
@@ -21715,7 +21690,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 +22213,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 +22226,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 +22572,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 +23016,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 +23088,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 +23135,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 +23326,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 +23641,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 +23862,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 +24088,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 +24122,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 +24309,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 +24500,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 +24613,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 +24687,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 +24701,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 +24835,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 +24843,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 +24851,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 +24863,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 +24873,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 +24888,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 +25002,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 +25055,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 +25216,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 +25271,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 +25422,7 @@
dir = 9
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"biS" = (
/obj/machinery/camera{
c_tag = "Research Division Access"
@@ -25437,7 +25435,7 @@
dir = 5
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"biT" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -25455,7 +25453,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 +25464,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 +25485,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"biY" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -25860,7 +25858,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 +25866,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 +25883,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 +25917,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 +25967,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 +26032,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bkr" = (
/obj/machinery/shower{
dir = 8
@@ -26048,7 +26044,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bks" = (
/obj/machinery/requests_console{
department = "Science";
@@ -26058,7 +26054,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 +26072,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/lab)
+/area/science/research)
"bkw" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light{
@@ -26229,8 +26225,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 +26245,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 +26270,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 +26338,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 +26391,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 +26427,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 +26453,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 +26493,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 +26652,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 +26743,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 +26758,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 +26777,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 +27043,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 +27114,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 +27146,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 +27197,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 +27206,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 +27260,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 +27277,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 +27286,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 +27831,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 +27844,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 +27853,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 +27945,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 +27955,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 +28149,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 +28160,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 +28169,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 +28179,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 +28438,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 +28453,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 +28487,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 +28532,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 +28825,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 +28940,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"brn" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28971,7 +28950,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bro" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28982,7 +28961,7 @@
/turf/open/floor/plasteel/white/side{
dir = 10
},
-/area/science/research)
+/area/science)
"brp" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -28992,7 +28971,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 +29012,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bru" = (
/obj/machinery/firealarm{
pixel_y = 24
@@ -29080,7 +29059,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 +29479,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 +29498,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bsE" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -29666,7 +29645,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bsY" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -29682,7 +29661,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bta" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29694,7 +29673,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29706,7 +29685,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 +29706,7 @@
/turf/open/floor/plasteel/white/side{
dir = 6
},
-/area/science/research)
+/area/science)
"btf" = (
/obj/machinery/requests_console{
department = "Medbay";
@@ -29738,10 +29717,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 +29725,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 +29771,7 @@
dir = 4
},
/turf/closed/wall/r_wall,
-/area/science/research)
+/area/science)
"bto" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -29896,7 +29871,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 +29883,7 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/science/research)
+/area/science)
"bty" = (
/obj/structure/chair{
dir = 8
@@ -29931,7 +29906,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btB" = (
/obj/machinery/computer/bounty{
dir = 4
@@ -30064,7 +30039,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 +30047,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 +30061,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30101,7 +30076,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"btV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30115,7 +30090,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"btX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30240,7 +30215,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 +30241,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bup" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -30276,7 +30251,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 +30279,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"but" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30457,7 +30432,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 +30519,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"buU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30562,7 +30537,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 +30595,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bvc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30633,13 +30608,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 +30629,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 +30638,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bvg" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -30673,23 +30648,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 +30665,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 +30757,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 +30818,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 +30826,7 @@
/turf/open/floor/plasteel/white/side{
dir = 6
},
-/area/science/research)
+/area/science)
"bvF" = (
/obj/machinery/requests_console{
department = "Cargo Bay";
@@ -30895,7 +30863,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bvI" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -31194,11 +31162,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 +31185,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 +31210,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 +31233,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 +31301,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 +31414,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 +31446,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bxe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -31493,7 +31459,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 +31473,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 +31694,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 +31763,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 +31784,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 +32340,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 +32397,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 +32409,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 +32577,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 +32615,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bzF" = (
/obj/machinery/firealarm{
dir = 8;
@@ -32670,17 +32633,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 +32656,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 +32716,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 +32735,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 +32761,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 +32769,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 +32860,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 +32925,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 +32942,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 +32961,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 +33185,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 +33211,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 +33231,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 +33500,7 @@
/turf/open/floor/plasteel/white/side{
dir = 9
},
-/area/science/research)
+/area/science)
"bBE" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -33562,7 +33510,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 +33948,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 +33994,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 +34025,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 +34047,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 +34062,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 +34158,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 +34230,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bDm" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -34303,13 +34240,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 +34294,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 +34339,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 +34383,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 +34485,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 +34500,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 +34536,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 +34545,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 +34577,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 +34597,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bEg" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34781,7 +34702,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 +34713,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bEr" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -34800,14 +34721,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 +34781,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 +34894,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 +34906,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bEP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -35178,13 +35099,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 +35115,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 +35170,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 +35199,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 +35229,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 +35248,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 +35291,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 +35335,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 +35416,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 +35707,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 +35735,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 +35793,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 +35809,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 +35845,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 +35900,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bHd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35982,7 +35931,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 +35996,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 +36027,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 +36143,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 +36153,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 +36217,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 +36233,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 +36264,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 +36280,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 +36378,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIj" = (
/obj/structure/table,
/obj/machinery/light,
@@ -36436,7 +36390,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 +36408,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 +36426,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 +36450,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 +36584,7 @@
/turf/open/floor/plasteel/white/side{
dir = 5
},
-/area/science/research)
+/area/science)
"bIE" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -36640,7 +36594,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"bIF" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -36908,7 +36862,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 +36895,7 @@
/turf/open/floor/plasteel/white/side{
dir = 1
},
-/area/science/research)
+/area/science)
"bJs" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -36980,8 +36934,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 +36968,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 +36990,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 +37007,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 +37120,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 +37214,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 +37231,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/science/mixing)
+/area/science)
"bKe" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -37315,8 +37272,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 +37718,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 +37949,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 +38170,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 +38313,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 +38924,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 +41672,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 +44767,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 +45116,7 @@
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
-/area/science/research)
+/area/science)
"ceY" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -45306,7 +45265,7 @@
/area/maintenance/aft)
"cfq" = (
/obj/structure/mopbucket,
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/aft)
"cfr" = (
@@ -46308,7 +46267,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 +46617,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 +46632,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 +46947,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 +47234,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 +48784,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 +50544,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 +50591,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 +51280,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 +51603,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 +51638,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 +51698,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 +51741,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 +51816,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 +51859,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 +52028,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,
@@ -52638,9 +52588,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel,
/area/security/brig)
"cLS" = (
@@ -53371,13 +53318,25 @@
/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
},
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"ddM" = (
/obj/structure/sign/poster/official/the_owl{
pixel_x = 32
@@ -53457,6 +53416,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 +53432,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)
@@ -53513,9 +53490,17 @@
/area/science/circuit)
"dyE" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-4"
},
-/turf/open/floor/plasteel,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "Secure Gate";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
/area/security/brig)
"dyS" = (
/obj/effect/turf_decal/tile/green{
@@ -53575,9 +53560,6 @@
/turf/open/space,
/area/space/nearstation)
"dCV" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -53723,6 +53705,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
@@ -53731,7 +53720,7 @@
dir = 1
},
/turf/open/floor/wood/wood_diagonal,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"edA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -53767,6 +53756,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 +54053,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 +54066,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 +54122,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 +54376,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 +54397,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 +54556,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 +54634,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 +54671,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 +54714,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,
@@ -54865,7 +54916,7 @@
"gKG" = (
/obj/structure/bedsheetbin/towel,
/turf/open/floor/wood/wood_diagonal,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"gLz" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -54917,11 +54968,11 @@
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plating,
/area/security/brig)
"gOZ" = (
@@ -55014,12 +55065,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 +55271,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 +55372,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 +55408,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 +55428,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 +55505,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 +55561,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 +55682,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 +55707,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 +55727,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 +55832,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 +55850,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 +55905,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 +55995,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
@@ -56052,7 +56194,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"jJF" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
@@ -56174,15 +56316,15 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"kcx" = (
@@ -56598,6 +56740,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 +56758,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 +56794,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
@@ -56680,15 +56843,16 @@
/turf/open/floor/plasteel,
/area/security/brig)
"laq" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
icon_state = "2-4"
},
/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
@@ -56820,7 +56984,7 @@
dir = 8
},
/turf/closed/wall,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"lzt" = (
/obj/machinery/portable_atmospherics/pump,
/obj/effect/turf_decal/stripes/line,
@@ -56967,7 +57131,7 @@
/area/maintenance/starboard/aft)
"lZn" = (
/obj/machinery/door/airlock/security/glass{
- id_tag = "innerbrig";
+ id_tag = null;
name = "Brig Infirmary";
req_access_txt = "2"
},
@@ -57223,6 +57387,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";
@@ -57404,7 +57576,7 @@
},
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"nbT" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -57584,6 +57756,9 @@
},
/turf/open/floor/plating,
/area/construction)
+"nyi" = (
+/turf/closed/wall,
+/area/medical/paramedic)
"nzB" = (
/obj/machinery/hydroponics/soil{
pixel_y = 8
@@ -57611,6 +57786,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 +58013,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 +58149,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{
@@ -57977,9 +58166,6 @@
/area/hallway/primary/central)
"ovv" = (
/obj/structure/table,
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -58110,6 +58296,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 +58332,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 +58403,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 +58453,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"
@@ -58302,9 +58508,6 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -58433,9 +58636,6 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -58443,7 +58643,10 @@
dir = 4
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -58507,7 +58710,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 +58736,9 @@
},
/turf/open/floor/wood,
/area/library)
+"pKV" = (
+/turf/closed/wall/r_wall,
+/area/science/research)
"pLn" = (
/obj/machinery/conveyor/inverted{
dir = 5;
@@ -58568,9 +58774,6 @@
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"pQr" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -58726,6 +58929,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 +58953,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
@@ -58829,7 +59043,7 @@
dir = 8
},
/turf/open/floor/wood/wood_diagonal,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"qIw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -58908,6 +59122,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 +59150,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{
@@ -59236,9 +59460,6 @@
/area/maintenance/bar)
"rCl" = (
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -59282,20 +59503,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
-"rJv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Gate";
- name = "brig shutters"
- },
-/turf/open/floor/plating,
-/area/security/brig)
"rJw" = (
/obj/structure/table/glass,
/obj/item/hemostat,
@@ -59380,6 +59587,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,12 +59618,22 @@
dir = 1
},
/area/engine/atmos)
-"rWw" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+"rWg" = (
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/wood/wood_diagonal,
-/area/maintenance/fore)
+/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)
"rXl" = (
/obj/structure/chair/office/light,
/obj/machinery/firealarm{
@@ -59482,9 +59703,6 @@
},
/area/crew_quarters/fitness)
"seP" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/structure/cable{
icon_state = "0-8"
},
@@ -59535,7 +59753,7 @@
dir = 8
},
/turf/open/floor/wood/wood_diagonal,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"sqg" = (
/obj/structure/table/wood,
/obj/item/clothing/under/misc/pj/red,
@@ -59738,6 +59956,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{
@@ -59967,7 +60190,7 @@
dir = 8
},
/turf/open/floor/wood/wood_diagonal,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"trb" = (
/obj/machinery/light{
dir = 4
@@ -59986,6 +60209,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 +60238,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 +60294,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 +60308,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 +60343,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 +60420,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
@@ -60344,7 +60608,7 @@
/obj/structure/girder,
/obj/structure/grille,
/turf/open/floor/plating,
-/area/maintenance/fore)
+/area/maintenance/port/fore)
"ugu" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -60542,6 +60806,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 +60858,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{
@@ -60750,6 +61028,9 @@
/area/maintenance/starboard/aft)
"uXt" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"vae" = (
@@ -60812,7 +61093,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 +61249,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"
@@ -60983,13 +61271,13 @@
/area/crew_quarters/dorms)
"vyK" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
},
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plating,
/area/security/brig)
"vzp" = (
@@ -61284,7 +61572,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 +61794,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 +62226,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,
@@ -82112,7 +82413,7 @@ lZN
amC
jIW
ddI
-arP
+alU
fgG
rqW
aGD
@@ -82363,13 +82664,13 @@ amC
htu
alU
edj
-rWw
+ygb
gKG
-arP
-aqR
-awb
+alU
+amC
+ntt
ugq
-arP
+alU
rPU
fne
aGr
@@ -82622,11 +82923,11 @@ alU
tqG
spR
qGw
-arP
-aGh
-awb
-axo
-arP
+alU
+aFJ
+ntt
+aAY
+alU
aCh
pIf
kCo
@@ -82876,14 +83177,14 @@ ali
ali
ali
alU
-arP
+alU
lzk
-arP
-arP
-arP
-avZ
+alU
+alU
+alU
+atO
axp
-ayC
+aue
azH
eEe
aGv
@@ -87579,14 +87880,14 @@ cdc
cdZ
bVI
cay
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
+xES
+xES
+xES
+xES
+xES
+xES
+xES
+xES
cfL
coH
cBO
@@ -87725,7 +88026,7 @@ aaa
aaa
aag
aaa
-aak
+aam
aap
saX
aaD
@@ -87836,14 +88137,14 @@ bWB
cec
bVI
kNv
-ccw
+xES
chY
ciX
cjM
ckB
ckB
ckB
-ccw
+xES
cnY
coH
cgR
@@ -87982,7 +88283,7 @@ aaa
aaa
aag
aaf
-aaj
+aai
aao
aax
aaC
@@ -88008,7 +88309,7 @@ alz
cZe
alg
plS
-dyE
+afM
pQr
aou
aqC
@@ -88093,14 +88394,14 @@ cde
ceb
bVI
cay
-ccw
+xES
chY
-ciZ
+fsQ
ciW
ckB
ckB
ckC
-ccw
+xES
cnX
coH
cps
@@ -88239,7 +88540,7 @@ aaa
aaa
aag
aaa
-aal
+aam
aar
uGI
aaF
@@ -88350,14 +88651,14 @@ cdf
ced
bVI
cay
-ccw
-ciZ
-ciZ
-ciZ
+xES
+fsQ
+fsQ
+fsQ
ckC
ckC
ckC
-ccw
+xES
coa
coJ
clJ
@@ -88496,7 +88797,7 @@ aaa
aaa
aag
aaf
-aaj
+aai
aaq
dyS
aaE
@@ -88521,10 +88822,10 @@ agj
agM
sAk
akp
-akQ
+agj
amB
amn
-amS
+aiX
anz
anz
aov
@@ -88607,14 +88908,14 @@ bWB
bWB
bVI
cay
-ccw
-ccw
+xES
+xES
ciY
ciY
-ccw
-ccw
-ccw
-ccw
+xES
+xES
+xES
+xES
cnZ
coH
cgI
@@ -88753,8 +89054,8 @@ aaa
aaa
aag
aaa
-aal
-aat
+aam
+aaj
aat
aat
aat
@@ -88781,7 +89082,7 @@ akM
amm
gyr
anM
-rJv
+xal
aqC
anz
aox
@@ -89010,7 +89311,7 @@ aaa
aaa
aag
aaf
-aaj
+aai
aas
aat
aat
@@ -89033,12 +89334,12 @@ akU
afM
lBz
alA
-ene
-alg
+alt
+amS
kbm
-dyE
+afM
cKC
-seP
+dyE
aqC
anR
aow
@@ -89268,7 +89569,7 @@ aaa
aag
aaa
aam
-aav
+akQ
aav
aav
aav
@@ -89295,7 +89596,7 @@ akT
gNE
gLz
anB
-amR
+seP
aqC
anz
aov
@@ -89549,10 +89850,10 @@ fxx
ako
ene
amj
-akQ
+agj
amB
amn
-amS
+aiX
anz
anz
aov
@@ -89809,7 +90110,7 @@ amk
amm
gyr
mos
-rJv
+xal
aqC
anz
aov
@@ -90062,11 +90363,11 @@ akF
aiy
akv
uXt
-alg
+amS
pAK
-dyE
+afM
anQ
-seP
+dyE
aqC
anz
aov
@@ -90323,7 +90624,7 @@ akT
amx
any
arD
-amR
+seP
aqC
anz
aov
@@ -90577,10 +90878,10 @@ ajc
akz
ene
als
-akQ
-amB
+agj
+apT
amn
-amS
+aiX
aqD
anz
aov
@@ -90834,7 +91135,7 @@ ajc
akz
ene
alg
-alt
+alw
amp
aot
apR
@@ -91093,7 +91394,7 @@ itD
alg
vyK
amI
-alg
+amS
alv
aqE
anS
@@ -91608,7 +91909,7 @@ agn
agn
amN
aoZ
-apT
+agn
anw
anz
cXU
@@ -91865,7 +92166,7 @@ akY
alE
amU
apH
-apX
+aqt
aqC
anz
gfC
@@ -93979,7 +94280,7 @@ aXf
bCv
bDP
bCv
-bAw
+pbC
bHV
bJw
bKC
@@ -94236,11 +94537,11 @@ bBy
bzs
bDO
bFl
-bGH
+bWe
bHU
bJv
-bKB
-bLK
+mFo
+bBb
bVW
bOd
iql
@@ -94494,10 +94795,10 @@ bCz
bDQ
bFn
bGJ
-bHX
+sKL
bJy
-bKE
-bLP
+iUp
+bLK
bMP
bIG
bJB
@@ -94748,10 +95049,10 @@ aJq
bHt
bBz
bzs
-bzs
+bof
bFm
bGI
-bHW
+bof
cBD
bKD
bLO
@@ -95005,10 +95306,10 @@ bwu
kPj
bBB
eBX
-bzs
+bof
bFp
-bGJ
-bHX
+uFV
+fvk
bJA
bKG
bLK
@@ -95262,9 +95563,9 @@ aJq
bAj
aJq
aKG
-bzs
+bof
bFo
-bDu
+bDA
bFt
bGQ
bHp
@@ -95519,7 +95820,7 @@ byX
aXh
bmE
bCA
-bzs
+bof
bCC
bDA
bFx
@@ -95771,15 +96072,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 +96329,7 @@ asU
asX
bof
bwx
-bvj
+nEu
bwB
bxa
byZ
@@ -96289,8 +96590,8 @@ bvi
bww
bwZ
byY
-bzH
-bAW
+bCD
+ivJ
bCE
bFv
bFz
@@ -96546,8 +96847,8 @@ bvl
bwE
bxc
bzb
-bzK
-bBb
+nEu
+nEu
cpG
bDC
bId
@@ -96799,16 +97100,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 +97357,10 @@ bqV
bEe
bhh
bBL
-bvj
+nEu
asM
bAl
-bvh
+bzH
bzS
bBc
bCJ
@@ -97311,17 +97612,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 +97861,7 @@ bet
bfH
aiP
wbE
-bhh
+ihR
wbE
bmJ
bof
@@ -97568,18 +97869,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 +98120,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 +98374,7 @@ aYV
bet
bfG
bhe
-bhh
+ihR
bjU
blk
blk
@@ -98082,18 +98383,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 +98631,7 @@ aYV
bet
bfG
bhe
-bhh
+ihR
bjV
blj
bmK
@@ -98339,17 +98640,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 +98887,8 @@ aYV
bdo
beu
bvk
-biu
-biu
+jiT
+jiT
bjT
blm
bmL
@@ -98596,15 +98897,15 @@ bpw
ium
bsx
btX
-bvj
+bof
bwG
bxR
bxR
-bvj
-bvj
+bof
+bof
bzW
-bDZ
-bCT
+bqQ
+bCR
bGR
bIj
bJC
@@ -98842,9 +99143,9 @@ aJC
aYV
aYV
bet
-bfJ
-bhh
-bhh
+qnC
+ihR
+ihR
bgQ
bll
bhh
@@ -98853,16 +99154,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 +99402,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 +99668,16 @@ bof
bKL
brf
btV
-bvh
+rUe
bwH
bxS
bzh
bAs
-bvj
+bof
bCL
bxO
-bDR
-bDR
+bhh
+bhh
bIk
bJC
bKH
@@ -99624,16 +99925,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 +100182,12 @@ bpx
bpP
brf
bhh
-bvh
+rUe
bwJ
bxU
bzi
bAu
-bvj
+bof
bCN
bEa
pHl
@@ -100110,16 +100411,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 +100439,13 @@ bnH
bqQ
bsx
bhh
-bvj
-bvj
+bof
+bof
bxR
bxR
-bvj
-bvj
-bCQ
+bof
+bof
+bog
bEd
bof
bof
@@ -100367,7 +100668,7 @@ aaa
alP
aGN
aIh
-aJI
+bhr
aKT
aMD
aNM
@@ -100646,7 +100947,7 @@ bhn
biz
biz
biz
-bmR
+hMs
bfL
bol
bqQ
@@ -100881,7 +101182,7 @@ aaa
alP
aGL
aHY
-aQj
+biC
iNn
aMk
aNK
@@ -100900,9 +101201,9 @@ bdp
cBm
bfL
bhm
-bhm
-bhm
-bhm
+tNl
+ttd
+dkM
bkP
bmV
boc
@@ -101153,13 +101454,13 @@ aVz
qus
bbz
aYV
-bdp
+blg
bdc
-bfL
+hYd
beY
-bhm
-bhm
-bhm
+oJV
+qSf
+wJA
bkR
bfL
boo
@@ -101395,9 +101696,9 @@ vpY
alP
aGJ
avI
-aJI
-aJI
-aJI
+bhr
+bhr
+bhr
aNO
aOT
aJI
@@ -101410,13 +101711,13 @@ aYM
aJI
bbA
aYV
-bdr
+bdp
bdb
-bdN
+bfL
blr
bho
-bho
-bho
+ecp
+eiB
bkQ
bmW
bom
@@ -101654,9 +101955,9 @@ aGJ
avI
aJL
aKX
-aJI
-aJI
-aJI
+bhr
+bhr
+bhr
aJI
aRH
aVz
@@ -101665,15 +101966,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 +102225,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 +102482,14 @@ aiJ
bal
bam
aYV
-aYV
-aYV
-bfL
+bmR
+bmX
+gaF
bhq
-bhm
+rWg
bkb
-bhm
-bla
+nyi
+cTO
bmZ
bpH
bra
@@ -102440,12 +102741,12 @@ bbB
aYV
aYV
aYV
-bfL
-bfL
-bfL
-bfL
-bfL
-blg
+kQa
+tIE
+dnW
+jdE
+nyi
+cTO
bmZ
bpG
bqZ
@@ -102690,18 +102991,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 +103254,13 @@ cBg
bam
aYV
aYV
-aYV
-aYV
-bhr
-biC
-bkc
+beE
bfS
-blo
+biD
+bfS
+kQk
+kQk
+cTO
bmZ
bpI
brb
@@ -103211,11 +103512,11 @@ ssB
aYV
aYV
aYV
-beE
-bfS
+eUy
+pkg
biE
-bkf
-bfS
+kQk
+tEL
cTO
bmZ
bpL
@@ -103468,11 +103769,11 @@ ikm
aYV
aYV
bez
-bfP
-bfS
-bfS
-bfS
bfS
+vxz
+laN
+kQk
+jbK
cTO
bmZ
bpK
@@ -103725,12 +104026,12 @@ ikm
aYV
bci
beB
-bfS
-bfS
kQk
-ipA
+kQk
+kQk
+kQk
gbT
-cTO
+bdr
bmZ
bon
bon
@@ -108866,11 +109167,11 @@ aYV
aXq
aYV
bga
-bgc
-bgc
-bgc
-bgc
-bgc
+pKV
+pKV
+pKV
+pKV
+pKV
boB
boB
boB
@@ -109893,8 +110194,8 @@ aCR
kYk
bdx
vHT
-bgc
-bgc
+pKV
+pKV
biX
bhV
bka
@@ -110150,7 +110451,7 @@ aCR
bcy
bdw
beG
-bgc
+pKV
bhE
biW
bkv
@@ -110407,7 +110708,7 @@ bbG
aTk
bdy
beI
-bgc
+pKV
bhF
biW
bib
@@ -110664,15 +110965,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..482ddc3f22 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{
@@ -3644,7 +3643,7 @@
lootcount = 2;
name = "2maintenance loot spawner"
},
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/construction)
"ajb" = (
@@ -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
@@ -4577,7 +4579,7 @@
/turf/open/floor/plasteel,
/area/security/processing)
"alk" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/construction/secondary)
"all" = (
@@ -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
@@ -6052,12 +6034,15 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/machinery/door/firedoor,
/obj/item/flashlight/lamp,
/obj/machinery/door/window/westright{
name = "Security Checkpoint";
req_access_txt = "1"
},
+/obj/machinery/door/firedoor/border_only{
+ dir = 8;
+ name = "west facing firelock"
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint)
"aoB" = (
@@ -6158,12 +6143,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 +6249,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 +6341,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 +6400,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 +6483,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 +6532,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 +6722,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 +6811,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 +7007,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 +7039,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 +7358,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 +7394,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 +7464,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 +7554,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 +7587,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 +7608,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 +7694,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 +7825,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 +7834,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 +7877,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 +7946,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 +7973,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 +7988,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 +8036,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 +8058,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 +8121,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 +8749,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 +8826,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 +8850,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 +8917,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 +8957,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 +9045,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 +9142,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 +9179,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 +9198,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 +9225,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 +9247,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 +9263,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 +9316,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 +9350,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 +9407,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 +9449,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 +9573,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,
@@ -9556,12 +9596,15 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/machinery/door/firedoor,
/obj/item/folder/red,
/obj/machinery/door/window/westleft{
name = "Security Checkpoint";
req_access_txt = "1"
},
+/obj/machinery/door/firedoor/border_only{
+ dir = 8;
+ name = "west facing firelock"
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint)
"awu" = (
@@ -9608,23 +9651,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 +9873,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 +9980,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 +10107,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 +10305,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 +10356,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 +10403,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 +10456,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 +10537,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 +10957,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 +11053,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 +11208,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 +11617,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 +12273,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 +12527,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 +12901,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 +13134,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 +13799,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 +13853,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 +13862,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 +13885,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 +13898,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 +14273,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 +14292,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 +14307,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 +14340,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFX" = (
/obj/machinery/computer/security/hos{
dir = 4
@@ -14328,7 +14394,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGg" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -14376,7 +14442,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 +14662,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 +14678,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 +14747,7 @@
pixel_y = -1
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGJ" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -14798,7 +14862,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 +14982,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 +15067,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 +15148,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 +15189,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 +15261,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 +15334,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 +15446,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 +15778,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 +16489,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 +16520,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 +16549,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 +16576,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 +16613,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 +16640,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 +16683,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 +17093,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 +17207,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 +17288,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 +17407,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 +17650,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 +17742,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 +18129,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 +18204,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 +18298,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 +18392,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 +18399,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 +18464,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 +18525,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 +18607,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 +18647,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 +18654,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 +18666,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 +18755,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 +18775,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 +18803,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 +18814,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 +19793,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 +19972,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 +20685,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 +20780,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 +20821,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 +21037,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 +21057,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 +21075,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 +21175,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 +21481,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 +21516,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 +21705,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 +22080,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 +22349,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 +22370,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 +22449,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 +22637,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 +22709,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 +22816,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 +22859,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)
@@ -23184,7 +23207,25 @@
/area/hallway/primary/port/fore)
"aYW" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
+/obj/item/pen/blue,
+/obj/machinery/camera{
+ c_tag = "Customs - Fore";
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "HoPFore";
+ name = "HoP Fore Desk Shutters"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/checkpoint/customs)
+"aYX" = (
+/obj/structure/table/reinforced,
/obj/machinery/door/window/northright{
name = "Customs Desk";
req_access_txt = "57"
@@ -23193,16 +23234,9 @@
id = "HoPFore";
name = "HoP Fore Desk Shutters"
},
-/turf/open/floor/plasteel/dark,
-/area/security/checkpoint/customs)
-"aYX" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/flashlight/lamp,
-/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "HoPFore";
- name = "HoP Fore Desk Shutters"
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
},
/turf/open/floor/plasteel/dark,
/area/security/checkpoint/customs)
@@ -23240,8 +23274,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 +23311,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,
@@ -23300,19 +23340,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/caution{
+/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
-/obj/item/caution{
+/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
-/obj/item/caution{
+/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
-/obj/item/caution{
+/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
@@ -23424,12 +23464,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 +23920,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 +24196,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 +24333,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 +24415,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 +24445,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 +24462,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 +24503,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 +24523,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 +24659,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 +24682,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 +24826,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 +24891,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 +24988,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"
@@ -25047,15 +25068,15 @@
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"bcZ" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "0-2"
},
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"bda" = (
@@ -25081,12 +25102,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 +25127,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 +25163,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
@@ -25397,7 +25427,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bdM" = (
/turf/open/floor/plasteel,
/area/quartermaster/office)
@@ -25418,11 +25448,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 +25500,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 +25523,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 +25584,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 +25610,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 +25645,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
@@ -25660,7 +25705,7 @@
/area/security/courtroom)
"bey" = (
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bez" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -25736,7 +25781,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"beI" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -25750,7 +25795,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"beJ" = (
/turf/open/floor/plasteel,
/area/hallway/primary/central)
@@ -25939,7 +25984,7 @@
icon_state = "0-4"
},
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"bfi" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 10
@@ -25957,13 +26002,13 @@
icon_state = "0-4"
},
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"bfk" = (
/obj/structure/cable{
icon_state = "2-8"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bfl" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -25985,11 +26030,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 +26114,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 +26139,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 +26201,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 +26228,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 +26272,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 +26757,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,
@@ -26757,18 +26810,19 @@
/area/quartermaster/sorting)
"bgP" = (
/obj/item/analyzer,
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/disposal)
"bgQ" = (
/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{
@@ -26804,9 +26858,6 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/hor)
"bgY" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/status_display,
/turf/closed/wall/r_wall,
/area/hallway/primary/central)
@@ -26820,7 +26871,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 +26879,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 +26887,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
@@ -26907,7 +26957,7 @@
icon_state = "2-4"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bhm" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
@@ -26981,11 +27031,12 @@
/turf/open/floor/plasteel,
/area/engine/secure_construction)
"bht" = (
-/obj/structure/grille,
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-4"
},
+/obj/machinery/power/terminal,
+/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
@@ -27277,7 +27328,7 @@
icon_state = "4-8"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bia" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -27363,7 +27414,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bik" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -27379,7 +27430,7 @@
"bil" = (
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plasteel/dark,
-/area/science/server)
+/area/science/server/compcore)
"bim" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -27477,7 +27528,7 @@
dir = 5
},
/turf/open/floor/plasteel/dark,
-/area/science/server)
+/area/science/server/compcore)
"bix" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -27540,7 +27591,7 @@
dir = 10
},
/turf/open/floor/plasteel/dark,
-/area/science/server)
+/area/science/server/compcore)
"biF" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -27579,7 +27630,7 @@
icon_state = "1-2"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"biI" = (
/obj/machinery/light{
dir = 4;
@@ -27602,6 +27653,9 @@
/area/quartermaster/office)
"biK" = (
/obj/structure/closet/firecloset,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"biL" = (
@@ -27922,12 +27976,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 +28123,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 +28315,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 +28392,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{
@@ -28391,7 +28434,7 @@
},
/obj/machinery/photocopier,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bku" = (
/obj/structure/closet,
/turf/open/floor/plasteel,
@@ -28430,7 +28473,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bkA" = (
/obj/machinery/light_switch{
pixel_y = -24
@@ -28541,7 +28584,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bkK" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -28649,7 +28692,7 @@
/area/maintenance/department/eva)
"bkW" = (
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bkX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -28818,8 +28861,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
@@ -28889,25 +28936,26 @@
"blv" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"blw" = (
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"blx" = (
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/server/compcore";
dir = 1;
name = "Computer Core APC";
pixel_y = 24
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bly" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28972,7 +29020,7 @@
light_color = "#e8eaff"
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"blE" = (
/obj/machinery/light{
dir = 8
@@ -29187,7 +29235,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bma" = (
/obj/structure/chair{
dir = 8
@@ -29232,13 +29280,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
@@ -29486,7 +29541,7 @@
icon_state = "1-2"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bmG" = (
/turf/open/floor/engine,
/area/gateway)
@@ -29557,13 +29612,14 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bmM" = (
-/obj/structure/grille,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/structure/cable{
icon_state = "0-8"
},
+/obj/machinery/power/terminal,
+/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
@@ -29641,16 +29697,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 +29904,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 +29947,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 +30006,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 +30180,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"
@@ -30167,7 +30235,7 @@
pixel_y = 1
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bnT" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -30180,7 +30248,7 @@
dir = 9
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bnU" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/fragile,
@@ -30224,23 +30292,24 @@
/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,
-/obj/item/pen/blue,
-/obj/machinery/camera{
- c_tag = "Customs - Fore";
- dir = 4
- },
+/obj/item/flashlight/lamp,
/obj/structure/window/reinforced/spawner/north,
/obj/machinery/door/poddoor/shutters/preopen{
id = "HoPFore";
name = "HoP Fore Desk Shutters"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
+ },
/turf/open/floor/plasteel/dark,
/area/security/checkpoint/customs)
"boa" = (
@@ -30263,24 +30332,22 @@
/area/crew_quarters/heads/chief)
"bod" = (
/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
+/obj/machinery/camera{
+ c_tag = "Customs - Aft";
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "HoPAft";
+ name = "HoP Aft Desk Shutters"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southleft{
- name = "Primary Tool Storage Desk";
- req_access_txt = "11"
- },
-/obj/item/folder/yellow,
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/turf/open/floor/plasteel/dark,
+/area/security/checkpoint/customs)
"boe" = (
/obj/machinery/door/airlock/vault{
name = "Vault Door";
@@ -30300,13 +30367,18 @@
req_access = list(16)
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"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{
@@ -30324,7 +30396,7 @@
dir = 5
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"boj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30364,16 +30436,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
@@ -30394,7 +30467,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"boq" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -30407,7 +30480,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bor" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
@@ -30446,7 +30519,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bou" = (
/obj/effect/turf_decal/plaque{
icon_state = "L2"
@@ -30467,25 +30540,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)
@@ -30587,8 +30653,11 @@
/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"boL" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
/area/science/mixing)
"boM" = (
/obj/machinery/mineral/ore_redemption{
@@ -30809,15 +30878,21 @@
},
/obj/item/book/manual/wiki/robotics_cyborgs,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"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
@@ -31039,7 +31114,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bpL" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -31049,7 +31124,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bpM" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
@@ -31060,7 +31135,7 @@
},
/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bpO" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -31093,18 +31168,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
@@ -31112,7 +31183,7 @@
/obj/effect/turf_decal/tile/green,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bpW" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -31258,16 +31329,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,
@@ -31303,7 +31369,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bqu" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -31466,33 +31532,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{
@@ -31515,7 +31565,7 @@
},
/obj/item/storage/box/disks,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bqP" = (
/obj/machinery/camera{
c_tag = "Engine Room - Port Quarter";
@@ -31550,16 +31600,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 +31849,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 +32031,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 +32916,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 +32952,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 +33078,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 +33116,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 +33437,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{
@@ -33786,7 +33797,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"bvU" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/biohazard{
pixel_x = -32
@@ -34890,7 +34901,7 @@
},
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plasteel/dark,
-/area/science/server)
+/area/science/server/compcore)
"byf" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Telecommunications Mainframe";
@@ -35374,14 +35385,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
@@ -35584,7 +35595,7 @@
"bzN" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"bzO" = (
/obj/machinery/conveyor_switch/oneway{
id = "recycler";
@@ -35613,7 +35624,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bzS" = (
/obj/structure/table,
/obj/machinery/light/small{
@@ -35659,7 +35670,9 @@
name = "Toxins Launch Room";
req_access_txt = "7;8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"bzY" = (
@@ -35793,7 +35806,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
"bAm" = (
@@ -35932,7 +35944,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bAz" = (
/obj/structure/disposalpipe/junction/flip{
dir = 1
@@ -36034,7 +36046,6 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
"bAH" = (
@@ -36045,7 +36056,7 @@
},
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plasteel/dark,
-/area/science/server)
+/area/science/server/compcore)
"bAI" = (
/obj/machinery/photocopier,
/obj/machinery/requests_console{
@@ -36124,6 +36135,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"bAQ" = (
@@ -36151,16 +36165,27 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"bAV" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
/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 +36204,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 +36220,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 +36235,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 +36247,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 +36319,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 +36390,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 +36528,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
@@ -36560,7 +36573,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/rnd/server,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bBT" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -36623,8 +36636,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
@@ -36637,10 +36651,10 @@
name = "RD Server Lockup"
},
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bCb" = (
/turf/open/floor/circuit/green,
-/area/science/server)
+/area/science/server/compcore)
"bCc" = (
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
@@ -36850,11 +36864,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,
@@ -37011,7 +37026,7 @@
"bCW" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/circuit/green,
-/area/science/server)
+/area/science/server/compcore)
"bCX" = (
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/obj/item/reagent_containers/glass/beaker/sulphuric,
@@ -37368,10 +37383,11 @@
/turf/open/floor/plating,
/area/hallway/secondary/service)
"bDL" = (
+/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
+ dir = 10
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
/area/science/mixing)
"bDM" = (
/obj/structure/table/reinforced,
@@ -38183,12 +38199,7 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bFp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
"bFq" = (
@@ -38784,9 +38795,9 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"bGv" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plasteel,
-/area/science/server)
+/area/science/server/compcore)
"bGw" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -38910,7 +38921,7 @@
/obj/item/circuitboard/machine/rdserver,
/obj/item/disk/tech_disk,
/turf/open/floor/circuit/green,
-/area/science/server)
+/area/science/server/compcore)
"bGL" = (
/obj/structure/chair{
dir = 1
@@ -38959,7 +38970,7 @@
/obj/machinery/light,
/obj/structure/disposalpipe/segment,
/turf/open/floor/circuit/green,
-/area/science/server)
+/area/science/server/compcore)
"bGQ" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment{
@@ -39216,11 +39227,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,
@@ -39532,7 +39546,7 @@
network = list("minisat")
},
/turf/open/floor/circuit/green,
-/area/science/server)
+/area/science/server/compcore)
"bIh" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/delivery/white,
@@ -40072,10 +40086,11 @@
icon_state = "1-4"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"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 +40098,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
@@ -40135,9 +40148,6 @@
/area/space/nearstation)
"bJw" = (
/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJx" = (
@@ -40244,7 +40254,7 @@
icon_state = "0-4"
},
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"bJG" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -32
@@ -40318,11 +40328,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
@@ -40336,9 +40349,7 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bJT" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJU" = (
@@ -40582,7 +40593,7 @@
icon_state = "1-8"
},
/turf/closed/wall/r_wall,
-/area/science/server)
+/area/science/server/compcore)
"bKt" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -40988,7 +40999,7 @@
dir = 1;
pixel_y = -26
},
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/item/shovel,
/obj/item/stack/tile/plasteel{
pixel_x = 10;
@@ -42166,32 +42177,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 +42233,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 +42279,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 +42366,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 +42384,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 +42432,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 +42472,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"
@@ -42535,7 +42616,7 @@
icon_state = "0-2"
},
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"bOA" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -42584,9 +42665,6 @@
light_color = "#e8eaff"
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/science/mixing)
"bOF" = (
@@ -42768,18 +42846,23 @@
/area/science/xenobiology)
"bOY" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/machinery/camera{
- c_tag = "Customs - Aft";
- dir = 4
+/obj/item/clipboard,
+/obj/item/stamp/denied{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/stamp,
+/obj/machinery/door/window/southright{
+ name = "Customs Desk";
+ req_access_txt = "57"
},
-/obj/structure/window/reinforced/spawner,
/obj/machinery/door/poddoor/shutters/preopen{
id = "HoPAft";
name = "HoP Aft Desk Shutters"
},
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
+ },
/turf/open/floor/plasteel/dark,
/area/security/checkpoint/customs)
"bOZ" = (
@@ -42994,75 +43077,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 +43191,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 +43242,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,
@@ -43233,9 +43321,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/machinery/camera/motion{
c_tag = "AI Foyer";
network = list("minisat");
@@ -43253,7 +43338,7 @@
dir = 6
},
/turf/open/floor/plasteel,
-/area/ai_monitored/turret_protected/ai)
+/area/ai_monitored/turret_protected/ai_upload_foyer)
"bQc" = (
/obj/structure/bodycontainer/morgue{
dir = 8
@@ -43268,10 +43353,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,
@@ -43313,9 +43401,6 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai_upload_foyer)
@@ -43396,16 +43481,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;
@@ -43677,9 +43771,7 @@
/turf/open/floor/plating,
/area/router)
"bQX" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bQY" = (
@@ -44175,9 +44267,6 @@
/area/science/robotics/lab)
"bRW" = (
/obj/effect/turf_decal/bot,
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/machinery/status_display/ai{
pixel_y = 32
},
@@ -44305,9 +44394,6 @@
/area/science/xenobiology)
"bSk" = (
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
@@ -44360,7 +44446,7 @@
},
/obj/structure/cable,
/turf/open/floor/plating,
-/area/science/server)
+/area/science/server/compcore)
"bSp" = (
/obj/machinery/conveyor_switch/oneway{
id = "cargoload"
@@ -44394,9 +44480,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"bSr" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
@@ -44404,18 +44487,12 @@
/turf/open/floor/mineral/titanium/blue,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"bSs" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"bSt" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/light{
dir = 1
},
@@ -44617,9 +44694,6 @@
/area/science/lab)
"bSO" = (
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -45140,9 +45214,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/status_display/ai{
pixel_y = 32
},
@@ -45240,9 +45311,6 @@
/obj/machinery/light_switch{
pixel_y = 24
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
@@ -45371,9 +45439,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
@@ -46007,9 +46083,6 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bVF" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -46220,26 +46293,17 @@
/area/engine/atmos)
"bVY" = (
/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/item/flashlight/lamp,
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "HoPAft";
+ name = "HoP Aft Desk Shutters"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southright{
- name = "Primary Tool Storage Desk";
- req_access_txt = "11"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/turf/open/floor/plasteel/dark,
+/area/security/checkpoint/customs)
"bVZ" = (
/obj/machinery/power/apc{
name = "Cargo Bay APC";
@@ -46368,9 +46432,6 @@
/area/science/mixing)
"bWm" = (
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/engineering{
name = "AI SMES Access";
req_one_access_txt = "10;24"
@@ -46472,9 +46533,6 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bWv" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
@@ -48706,7 +48764,7 @@
/turf/open/floor/engine,
/area/science/storage)
"cbh" = (
-/obj/machinery/rnd/experimentor,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
/area/science/explab)
"cbi" = (
@@ -49059,6 +49117,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"cbQ" = (
@@ -49393,11 +49454,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,19 +49600,22 @@
/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{
- dir = 8;
- light_color = "#e8eaff"
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/computer/rdconsole/experiment{
+ dir = 1
},
-/obj/machinery/rnd/bepis,
-/turf/open/floor/engine,
+/turf/open/floor/plasteel,
/area/science/explab)
"ccM" = (
/obj/structure/disposalpipe/segment{
@@ -49703,9 +49773,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 +49880,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 +50208,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 +50406,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 +50430,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 +50467,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 +50677,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 +50763,7 @@
dir = 6
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfb" = (
/obj/machinery/light{
dir = 8
@@ -50708,7 +50814,7 @@
dir = 10
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfg" = (
/obj/structure/chair{
dir = 8
@@ -50746,32 +50852,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 +50911,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 +50935,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 +50955,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 +50996,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 +51012,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 +51038,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 +51061,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 +51073,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 +51088,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 +51214,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 +51262,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 +51345,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 +51373,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 +51399,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 +51410,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,
@@ -51323,8 +51446,8 @@
/area/quartermaster/warehouse)
"cgt" = (
/obj/structure/rack,
-/obj/item/caution,
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
+/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
@@ -51337,7 +51460,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 +51481,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"
@@ -51406,7 +51529,6 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -51418,7 +51540,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 +51557,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 +51624,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 +51671,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 +51684,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 +51746,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 +51790,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 +51808,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 +51872,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
@@ -51793,14 +51921,11 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"chy" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
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 +51936,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 +51961,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 +51977,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 +51987,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 +52001,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,32 +52023,24 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chL" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 6
- },
/turf/open/floor/plasteel,
/area/engine/atmos)
"chM" = (
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"chN" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/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 +52166,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 +52180,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 +52196,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 +52230,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 +52364,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 +52449,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 +52493,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 +52653,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 +52729,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 +52800,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 +52817,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 +52947,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 +52955,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 +53083,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 +53130,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 +53187,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 +53210,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 +53266,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 +53278,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 +53341,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 +53364,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 +53385,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 +53416,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 +53431,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 +53451,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 +53493,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 +54027,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 +54152,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 +54216,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmg" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -54153,7 +54234,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 +54358,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 +54413,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 +54430,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmH" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
@@ -54504,26 +54569,26 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cmT" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/obj/item/folder/red,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/machinery/door/window/northright{
- name = "Security Checkpoint";
- req_access_txt = "1"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/full,
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
},
/turf/open/floor/plasteel,
-/area/security/checkpoint/supply)
+/area/engine/workshop)
"cmU" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -54540,10 +54605,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 +54626,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 +54656,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 +54685,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 +54726,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 +54792,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 +54814,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cns" = (
/obj/machinery/firealarm{
dir = 8;
@@ -54756,7 +54826,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 +54871,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cny" = (
/obj/machinery/light{
dir = 4;
@@ -54885,19 +54955,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 +54992,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,
@@ -54925,6 +55002,9 @@
/obj/item/target/alien,
/obj/item/target,
/obj/item/target/clown,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"cnM" = (
@@ -54968,9 +55048,6 @@
/turf/open/space/basic,
/area/quartermaster/warehouse)
"cnR" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
@@ -54995,7 +55072,8 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"cnT" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
"cnU" = (
@@ -55110,25 +55188,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 +55235,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 +55279,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 +55362,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 +55616,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 +55699,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpb" = (
/obj/structure/sink{
dir = 4;
@@ -55738,7 +55814,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 +55859,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 +55941,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 +55963,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 +56006,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 +56069,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 +56079,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 +56139,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 +56154,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 +56163,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 +56183,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 +56204,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 +56219,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 +56230,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 +56327,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 +56359,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 +56372,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 +56384,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 +56400,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 +56533,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 +56548,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 +56564,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 +56637,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 +56651,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,
@@ -56607,9 +56688,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cqS" = (
-/obj/machinery/computer/rdconsole/experiment{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line,
/obj/machinery/requests_console{
department = "Science";
@@ -56618,25 +56696,19 @@
pixel_x = -30;
receive_ore_updates = 1
},
+/obj/structure/table,
+/obj/item/book/manual/wiki/experimentor,
/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 +56796,7 @@
id = "EngiCargoConveyer"
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"crc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56810,18 +56882,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 +56929,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 +57269,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 +57534,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 +57556,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 +57564,7 @@
dir = 9
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"csu" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -57879,20 +57948,25 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"ctl" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/effect/turf_decal/stripes/white/full,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/modular_computer/console/preset/engineering,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
+ },
/turf/open/floor/plasteel,
/area/engine/workshop)
"ctm" = (
@@ -58093,21 +58167,17 @@
/turf/open/floor/plating,
/area/medical/virology)
"ctE" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/southleft{
+ name = "Workshop Desk";
+ req_access_txt = "11"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/modular_computer/console/preset/engineering,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/window/reinforced/spawner/north,
/turf/open/floor/plasteel,
/area/engine/workshop)
"ctF" = (
@@ -58121,13 +58191,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 +58351,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{
@@ -59468,34 +59528,38 @@
/area/science/xenobiology)
"cvZ" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/clipboard,
-/obj/item/stamp/denied{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/stamp,
/obj/machinery/door/window/southright{
- name = "Customs Desk";
- req_access_txt = "57"
+ name = "Workshop Desk";
+ req_access_txt = "11"
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "HoPAft";
- name = "HoP Aft Desk Shutters"
+/obj/item/folder/yellow,
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
},
-/turf/open/floor/plasteel/dark,
-/area/security/checkpoint/customs)
+/turf/open/floor/plasteel,
+/area/engine/workshop)
"cwa" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/flashlight/lamp,
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "HoPAft";
- name = "HoP Aft Desk Shutters"
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/security/checkpoint/customs)
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/door/window/southleft{
+ name = "Primary Tool Storage Desk";
+ req_access_txt = "11"
+ },
+/obj/item/folder/yellow,
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
"cwb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -59525,13 +59589,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 +59727,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 +59956,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,
@@ -60604,6 +60669,7 @@
pixel_y = 24
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/toilet/restrooms";
dir = 4;
name = "Restrooms APC";
pixel_x = 24
@@ -60739,14 +60805,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 +60842,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 +60946,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 +61004,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 +61080,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 +61197,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{
@@ -61844,7 +61826,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -62183,13 +62165,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 +62225,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
@@ -62943,7 +62925,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/obj/structure/cable{
icon_state = "4-8"
@@ -63931,24 +63913,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 +63925,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 +64310,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 +64603,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 +64618,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 +64647,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 +64659,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 +64752,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 +64774,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 +65197,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 +65208,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 +65223,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 +65231,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 +65261,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 +65317,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 +65964,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 +65987,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 +66847,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 +66870,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 +66879,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 +66931,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 +66950,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 +66985,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJB" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -67031,7 +66998,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJC" = (
/obj/machinery/door/airlock/engineering{
name = "Gravity Generator";
@@ -67101,8 +67068,8 @@
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"cJH" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 9
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -67125,14 +67092,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 +67111,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 +67121,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 +67131,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 +67385,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 +67394,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{
@@ -67707,11 +67674,6 @@
/obj/machinery/atmospherics/pipe/simple/green/visible,
/turf/open/floor/plating,
/area/engine/atmos)
-"cLc" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plating,
-/area/engine/atmos)
"cLd" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -68132,14 +68094,14 @@
/turf/open/floor/plating,
/area/engine/storage)
"cMa" = (
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ffc1c1"
- },
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4
},
+/obj/machinery/airlock_sensor/incinerator_atmos{
+ pixel_x = -8;
+ pixel_y = 24
+ },
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"cMb" = (
@@ -68279,17 +68241,22 @@
pixel_x = -40;
pixel_y = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
+/obj/machinery/button/ignition/incinerator/atmos{
+ pixel_x = -24;
+ pixel_y = -9
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMw" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ name = "Waste Release"
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cMx" = (
@@ -68407,10 +68374,13 @@
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cMI" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 9
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
+ dir = 4
},
-/turf/closed/wall/r_wall,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 27
+ },
+/turf/open/floor/plasteel,
/area/engine/atmos)
"cMJ" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -68448,10 +68418,8 @@
/turf/open/floor/plating,
/area/engine/atmos)
"cMO" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 4
- },
/turf/open/floor/plating,
/area/engine/atmos)
"cMP" = (
@@ -68680,6 +68648,30 @@
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/router/air)
+"cNm" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/door/window/southright{
+ name = "Primary Tool Storage Desk";
+ req_access_txt = "11"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
"cNn" = (
/obj/machinery/conveyor/auto{
dir = 8;
@@ -68692,26 +68684,28 @@
/area/engine/workshop)
"cNp" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southleft{
- name = "Workshop Desk";
- req_access_txt = "11"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/engine/workshop)
-"cNq" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southright{
- name = "Workshop Desk";
- req_access_txt = "11"
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/item/folder/red,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/door/window/northright{
+ name = "Security Checkpoint";
+ req_access_txt = "1"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
},
-/obj/item/folder/yellow,
/turf/open/floor/plasteel,
-/area/engine/workshop)
+/area/security/checkpoint/supply)
"cNr" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -68866,7 +68860,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 +68868,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 +69111,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{
@@ -70780,6 +70770,13 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"dnN" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 5
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"dpO" = (
/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
dir = 4
@@ -70799,6 +70796,14 @@
},
/turf/open/floor/plating,
/area/router)
+"dSZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plating,
+/area/engine/atmos)
"dVR" = (
/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/floor/plasteel,
@@ -70810,13 +70815,19 @@
},
/turf/open/floor/engine,
/area/science/storage)
+"ebG" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plating,
+/area/science/mixing)
"eCy" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{
+ pixel_x = -25;
+ pixel_y = 7
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"eIh" = (
@@ -70834,6 +70845,10 @@
dir = 1
},
/area/engine/atmos)
+"eJy" = (
+/obj/machinery/rnd/experimentor,
+/turf/open/floor/engine,
+/area/science/explab)
"eKM" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/visible,
/turf/open/floor/plasteel,
@@ -70994,6 +71009,13 @@
/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/turf/open/space/basic,
/area/space/nearstation)
+"iCa" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/science/mixing)
"iQY" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 4
@@ -71019,6 +71041,13 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"jAv" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+ dir = 4
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"kzb" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
@@ -71055,6 +71084,10 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"mqE" = (
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
+/turf/closed/wall/r_wall,
+/area/engine/atmos)
"mxW" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
@@ -71062,6 +71095,13 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"mDW" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 10
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/engine/atmos)
"mEa" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8;
@@ -71204,8 +71244,8 @@
/turf/open/space/basic,
/area/space/nearstation)
"rUl" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 6
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -71233,6 +71273,10 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"sSg" = (
+/obj/machinery/rnd/bepis,
+/turf/open/floor/engine,
+/area/science/explab)
"sVC" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -71281,8 +71325,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"tZC" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -71308,6 +71352,14 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"uYy" = (
+/obj/structure/grille,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"vcb" = (
/obj/machinery/atmospherics/pipe/simple/brown/visible,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -90812,10 +90864,10 @@ bOv
bfo
blI
bfo
-bWS
-bcw
-bcw
-bcw
+bXg
+ebG
+ebG
+iCa
bcy
cbu
csR
@@ -91324,9 +91376,9 @@ boJ
fuR
bzX
bAl
-boL
+bdf
bAG
-cnT
+bdf
boQ
cKJ
bAP
@@ -91579,11 +91631,11 @@ bcy
bcy
bcy
bcy
-bcy
+bWS
bgC
bdf
boR
-bDL
+bdf
boQ
cKJ
bAP
@@ -91617,10 +91669,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGp
cJw
-cwV
+cyX
aaU
aaU
aaU
@@ -91836,11 +91888,11 @@ bQe
aaU
aaU
aaU
-bcw
+boL
bdf
bdf
bpM
-bFp
+bvj
bvj
cKK
bAU
@@ -91874,10 +91926,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92093,7 +92145,7 @@ aye
aaU
aaU
aaU
-bcw
+bDL
cnL
bdf
bpR
@@ -92119,7 +92171,7 @@ cHj
cqS
cav
cav
-ccL
+ctb
caX
caX
caX
@@ -92131,10 +92183,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJB
-cwV
+cyX
aaU
aaa
aaU
@@ -92352,8 +92404,8 @@ abp
abp
bcy
biK
-bdf
-bpR
+bFp
+cnT
bJT
bLl
cKM
@@ -92373,13 +92425,13 @@ aVF
caw
caA
cHk
-caP
+ccL
caT
caX
-caX
+eJy
caX
cbh
-caX
+sSg
caX
cbx
cav
@@ -92388,10 +92440,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92645,10 +92697,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92902,10 +92954,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cHK
cJK
-cwV
+cyX
aaU
aaa
aaU
@@ -93158,12 +93210,12 @@ cav
aaa
aaa
aaU
-cwV
-cEj
+cyX
+cze
cHL
cJL
-cEj
-cwV
+cze
+cyX
aaU
aaU
aaa
@@ -93414,14 +93466,14 @@ cav
aaU
aaU
aaU
-cwV
-cwV
+cyX
+cyX
cGj
cHM
cJN
cJv
-cwV
-cwV
+cyX
+cyX
aaU
aaa
aaa
@@ -93666,19 +93718,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 +93973,12 @@ cHu
cHw
cHB
cHH
-cwd
-cBl
-cEk
-cEN
-cEN
-cEN
+cyV
+cza
+czl
+czq
+czq
+czq
cFm
cFq
cFy
@@ -93935,7 +93987,7 @@ cJl
cJP
cKs
cJv
-cwV
+cyX
aaU
aaa
aaa
@@ -94178,12 +94230,12 @@ cHv
caG
cHC
cHI
-cwq
-cBr
-cEl
-cEl
-cFl
-cEl
+cyW
+czb
+czm
+czm
+cEj
+czm
cFp
cFw
cFz
@@ -94192,7 +94244,7 @@ cJo
cJQ
cKs
cJv
-cwV
+cyX
aaU
aaa
aaa
@@ -94435,21 +94487,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 +94751,14 @@ aaU
aaU
aaU
aaU
-cwV
-cwV
+cyX
+cyX
cGo
cJv
cJv
cGo
-cwV
-cwV
+cyX
+cyX
aaU
aaa
aaa
@@ -94875,11 +94927,11 @@ aUV
aYB
bbg
bcH
-bnZ
+aYW
bqi
bIl
bcJ
-bOY
+bod
bdr
beJ
beJ
@@ -94957,12 +95009,12 @@ aaa
aaa
aaa
aaU
-cwV
-cEj
-cwV
-cwV
-cEj
-cwV
+cyX
+cze
+cyX
+cyX
+cze
+cyX
aaU
aaU
aaa
@@ -95132,11 +95184,11 @@ bcN
aYJ
aNL
aVJ
-aYW
+aYX
baF
bIr
bcx
-cvZ
+bOY
bdr
beJ
beT
@@ -95389,11 +95441,11 @@ bcQ
aUC
aNL
aVJ
-aYX
+bnZ
baD
bIV
bKg
-cwa
+bVY
bdr
beJ
bfd
@@ -101239,7 +101291,7 @@ aaa
aaa
aaa
abp
-akN
+aaa
aTd
aaa
abp
@@ -103584,28 +103636,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 +103892,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 +104150,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 +104407,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 +104664,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 +104921,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 +105178,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 +105435,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 +105703,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
@@ -105702,7 +105754,7 @@ cgD
cdV
chy
chN
-bWQ
+uYy
bWQ
cdo
aPg
@@ -105908,22 +105960,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 +106217,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 +106299,9 @@ bum
cyU
czd
czj
-blp
-blp
-bme
+bui
+bui
+buo
bxj
bxj
bxj
@@ -106422,22 +106474,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 +106556,9 @@ bsZ
bxj
byU
czk
-blp
-coy
-cdd
+bui
+cgQ
+cmz
aYp
aaa
aaa
@@ -106692,9 +106744,9 @@ aaU
aaU
cuA
cuy
-aLO
-aOx
-aOU
+aND
+aOq
+aOT
aaU
aaa
aaa
@@ -106761,9 +106813,9 @@ aaU
bxj
byU
czk
-blp
-ctH
-cdd
+bui
+cgV
+cmz
csc
aaa
aaa
@@ -106949,9 +107001,9 @@ aaa
aaa
aaa
aaU
-aMa
-aOC
-aOX
+aNQ
+aOx
+aOV
aaU
aaa
aaa
@@ -107003,7 +107055,7 @@ cvb
cvd
cvd
cNa
-cNp
+ctE
ber
cIQ
cgB
@@ -107018,9 +107070,9 @@ aaU
bxj
byU
czk
-blp
-cqT
-cdd
+bui
+cju
+cmz
aYp
aaa
aaa
@@ -107206,9 +107258,9 @@ aaa
aaa
aaa
aaU
-aMa
-aOE
-aOX
+aNQ
+aOC
+aOV
aaU
aaa
aaa
@@ -107244,7 +107296,7 @@ chj
aXF
chD
cid
-cju
+bfM
ckz
cmG
coT
@@ -107260,7 +107312,7 @@ cuV
cyv
cuV
cNb
-cNq
+cvZ
beW
cIM
cgB
@@ -107272,15 +107324,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 +107578,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 +107835,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 +108061,14 @@ aQB
aQT
aSf
aTj
-aTm
-aVb
-aTv
-aTv
-aTv
-aTv
-bfn
-bjx
+aUe
+aXP
+aUf
+aUf
+aUf
+aUf
+bgJ
+blp
bmK
bov
bqR
@@ -108025,7 +108077,7 @@ cqs
cqG
crt
cdm
-ctl
+cmT
cuL
cvd
cAp
@@ -108040,28 +108092,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 +108317,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
@@ -108282,7 +108334,7 @@ bxz
bwP
cBn
cBH
-ctE
+ctl
cuM
cvg
cBa
@@ -108297,28 +108349,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 +108574,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 +108606,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 +108804,10 @@ bka
bmV
bka
bps
-ang
-ang
-ang
-ang
+aPa
+aPa
+aPa
+aPa
cuB
aWj
aaU
@@ -108779,16 +108831,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 +108863,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 +109061,10 @@ bka
bnb
boV
bpt
-apd
-bfI
-cfy
-ang
+aRj
+aTm
+aTz
+aPa
cuC
cuD
cuD
@@ -109036,16 +109088,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 +109120,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 +109318,10 @@ bms
bnd
boX
bpH
-ang
-bnt
-clH
-coh
+aPa
+aTv
+aTZ
+aUd
aRu
aSv
aSy
@@ -109293,16 +109345,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 +109377,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 +109576,9 @@ bno
boZ
bpJ
aRF
-bvb
-cog
-ang
+aTw
+aUb
+aPa
aRX
aSw
aSM
@@ -109550,16 +109602,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 +109634,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 +109832,10 @@ bka
bnw
bka
brA
-ang
-ang
-ang
-ang
+aPa
+aPa
+aPa
+aPa
aaU
aaU
aaU
@@ -109807,16 +109859,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 +109891,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 +110116,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 +110148,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 +110333,11 @@ aRT
cBS
cBU
cBY
-aqU
-acK
-acK
-acK
-aqU
+asB
+arP
+arP
+arP
+asB
aaa
aaa
aVs
@@ -110321,16 +110373,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 +110405,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 +110590,11 @@ aXn
cBM
bDY
bEd
-aqU
-awA
-aIN
-aMz
-acK
+asB
+auR
+avE
+axg
+arP
aaa
aaa
aaa
@@ -110579,14 +110631,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 +110662,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 +110845,12 @@ aql
aCe
aYK
aDr
-aci
-aqU
-aqU
-azg
-aHL
-aMK
+arO
+asB
+asB
+auY
+avw
+axt
anK
anK
aHA
@@ -110867,28 +110919,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 +111102,12 @@ aka
aLU
aNE
aRd
-acK
-arX
-asM
-azo
-aKj
-aNx
+arP
+asC
+asN
+avc
+avH
+axM
aTo
aTt
aTJ
@@ -111124,19 +111176,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 +111359,12 @@ aKf
aMb
aPl
aRf
-adR
-ast
-auR
-aGH
-aKp
-aND
+arQ
+asD
+asR
+avl
+avI
+axR
aTr
arH
aVa
@@ -111384,15 +111436,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 +111616,12 @@ aKf
aMb
aPx
aLj
-anh
+arV
asG
+asS
avw
-aHL
-aHL
-aNQ
+avw
+axV
aHx
asc
aWn
@@ -111629,7 +111681,7 @@ ciL
cLr
cwQ
bPx
-bod
+cwa
beW
bXX
cIM
@@ -111644,9 +111696,9 @@ aaU
bxw
bza
bMQ
-blp
-cnf
-cdd
+bui
+cma
+cmz
aYp
aaa
aaa
@@ -111821,12 +111873,12 @@ aKm
aMc
aPx
aRg
-aqc
+arX
asI
-aws
-aIf
-aLs
-aOc
+asU
+avA
+avK
+ayb
aHz
btb
aWn
@@ -111871,7 +111923,7 @@ cLZ
chI
ciH
cjX
-ckF
+bnt
cns
cpo
cpT
@@ -111886,7 +111938,7 @@ con
coo
cwR
bPy
-bVY
+cNm
bWn
bYO
cJc
@@ -111901,9 +111953,9 @@ bpP
cro
bza
bMQ
-blp
-ctH
-cdd
+bui
+cgV
+cmz
csc
aaa
aaa
@@ -112071,19 +112123,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 +112210,9 @@ bYe
bHL
bYt
bYD
-blp
-crU
-cdd
+bui
+cmy
+cmz
aYp
aaa
aaa
@@ -112339,7 +112391,7 @@ aPx
aTN
avm
aVH
-aWX
+avQ
aZF
anK
aHz
@@ -112405,20 +112457,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 +112714,11 @@ bdH
bWO
cqR
bqE
-cdn
-cfi
-cgH
-cgN
-ckc
+bom
+boz
+bqL
+brv
+bBc
btA
bMQ
bta
@@ -112919,11 +112971,11 @@ cvN
bjm
bXX
bqD
-ceu
-cfj
-cgI
-cgO
-ckf
+bon
+bpi
+bqM
+brN
+bBe
bLZ
bNt
bta
@@ -113176,11 +113228,11 @@ bdI
cNx
bXX
bqD
-cdn
-cfk
-cgJ
-cgP
-ckc
+bom
+bpj
+bqU
+btK
+bBc
btB
bNV
bta
@@ -113433,11 +113485,11 @@ cIC
bjm
bXX
bqD
-cev
-cfl
-cgI
-cgQ
-cko
+box
+bpT
+bqM
+btL
+bBm
btC
bPm
bta
@@ -113690,11 +113742,11 @@ bBU
bnN
crc
buw
-cex
-cfm
-cgH
-cgV
-ckc
+boy
+bpU
+bqL
+btO
+bBc
btD
bPm
bxH
@@ -113947,11 +113999,11 @@ bgf
bez
cxB
bhf
-cex
-cex
-cex
-cex
-cex
+boy
+boy
+boy
+boy
+boy
btz
bPn
btE
@@ -117289,7 +117341,7 @@ bdM
cNA
bhb
ciE
-cmT
+cNp
cnB
csh
cHV
@@ -118803,7 +118855,7 @@ bNE
cww
cpO
bYP
-cRg
+cMI
cMH
cww
cMb
@@ -119580,7 +119632,7 @@ chn
eCy
chL
cMv
-cMI
+cMJ
anr
aaa
aaa
@@ -119837,7 +119889,7 @@ chp
chx
chM
gDY
-jiZ
+mqE
anr
aaa
aaa
@@ -120091,7 +120143,7 @@ uVD
mqB
dpO
tZC
-qWY
+cwB
rUl
cMw
cfs
@@ -120605,8 +120657,8 @@ sRD
nAF
cgz
cJH
-cwB
-cMl
+qWY
+cJH
cMx
cMJ
cxc
@@ -121369,7 +121421,7 @@ bSb
cKS
cKY
bQO
-cLc
+cMO
eIh
bYd
tXV
@@ -121379,7 +121431,7 @@ cwB
cMc
cMm
cMy
-cML
+dSZ
cLa
cKY
cLu
@@ -122397,7 +122449,7 @@ bTH
cKU
cKY
cLa
-cLc
+cMO
fgS
car
cwB
@@ -122407,7 +122459,7 @@ cwB
cMg
cMq
cMB
-cML
+dSZ
cMQ
cKY
cLw
@@ -123178,8 +123230,8 @@ cLs
cLs
cMs
cME
-cMN
-aaU
+mDW
+dnN
bZR
caJ
bpq
@@ -123425,7 +123477,7 @@ bTK
cKW
cKY
bQV
-cLc
+cMO
cLk
ctk
prx
@@ -123436,7 +123488,7 @@ prx
iQY
cMF
cMO
-cMS
+jAv
cMT
cLy
blM
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/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm
index a38d2b9e1d..b7adb4a518 100644
--- a/_maps/map_files/LambdaStation/dorms.dmm
+++ b/_maps/map_files/LambdaStation/dorms.dmm
@@ -10679,7 +10679,7 @@
light_color = "#e8eaff"
},
/obj/machinery/vending/wardrobe/jani_wardrobe{
- products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
+ products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/clothing/suit/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
},
/turf/open/floor/plating,
/area/janitor)
@@ -13637,7 +13637,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"IX" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
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/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 3c160180da..c2953916e0 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -12681,7 +12681,7 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"axL" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -39921,9 +39921,6 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bzU" = (
-/obj/structure/chair/comfy/teal{
- dir = 4
- },
/obj/structure/chair/comfy/black{
dir = 4
},
@@ -52010,19 +52007,23 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bZV" = (
-/obj/item/storage/toolbox/emergency,
-/obj/item/hand_labeler,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/storage/box/lights/mixed,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bZW" = (
-/obj/item/cigbutt,
+/obj/item/cigbutt{
+ pixel_x = 6;
+ pixel_y = -6
+ },
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/item/storage/toolbox/emergency,
+/obj/item/hand_labeler,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bZX" = (
@@ -53085,7 +53086,6 @@
},
/area/maintenance/port/aft)
"cbG" = (
-/obj/item/storage/box/lights/mixed,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -53178,8 +53178,6 @@
network = list("ss13","medbay")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -55173,7 +55171,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/machinery/bloodbankgen,
+/obj/vehicle/ridden/wheelchair,
/turf/open/floor/plasteel/dark,
/area/medical/sleeper)
"cfL" = (
@@ -55715,7 +55713,6 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cgM" = (
@@ -56421,35 +56418,29 @@
/turf/closed/wall,
/area/medical/surgery)
"cib" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/closed/wall,
+/obj/structure/closet/secure_closet/medical2,
+/turf/open/floor/plasteel/white/corner,
/area/medical/surgery)
"cic" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+ dir = 10
},
-/turf/closed/wall,
-/area/medical/surgery)
-"cid" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Medbay Maintenance";
- req_access_txt = "5"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+/turf/open/floor/plasteel/white/side{
dir = 1
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/area/medical/surgery)
+"cid" = (
+/obj/structure/curtain{
+ icon_state = "closed"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"cie" = (
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -57093,56 +57084,65 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cjw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_y = 5
},
-/turf/open/floor/plasteel/dark,
-/area/medical/surgery)
-"cjx" = (
-/obj/structure/chair,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
+/obj/machinery/light_switch{
+ pixel_x = -26
},
-/turf/open/floor/plasteel/dark,
-/area/medical/surgery)
-"cjy" = (
-/obj/item/cigbutt,
-/obj/machinery/light/small{
- dir = 1
+/obj/machinery/vending/wallmed{
+ pixel_y = 29
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white/corner,
/area/medical/surgery)
"cjz" = (
-/obj/structure/chair,
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/medical/surgery)
-"cjA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/structure/closet/secure_closet/medical2,
+/turf/open/floor/plasteel/white/corner{
dir = 8
},
-/turf/open/floor/plasteel/dark,
+/area/medical/surgery)
+"cjA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
/area/medical/surgery)
"cjB" = (
-/obj/item/cigbutt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/iv_drip,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/firealarm{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cjC" = (
-/obj/structure/chair,
-/turf/open/floor/plasteel/dark,
+/obj/structure/table,
+/obj/item/radio/intercom{
+ broadcasting = 1;
+ frequency = 1485;
+ listening = 0;
+ name = "Station Intercom (Medbay)";
+ pixel_y = 22
+ },
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/suit/apron/surgical,
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cjD" = (
-/obj/structure/chair,
-/obj/machinery/light/small{
- dir = 1
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_y = 5
+ },
+/obj/machinery/light_switch{
+ pixel_x = 28
+ },
+/obj/machinery/vending/wallmed{
+ pixel_y = 29
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 8
},
-/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"cjE" = (
/obj/structure/bed/roller,
@@ -57153,9 +57153,6 @@
name = "Station Intercom (Medbay)";
pixel_x = -30
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
/obj/machinery/camera{
c_tag = "Medbay Sleepers";
dir = 4;
@@ -57171,12 +57168,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"cjF" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"cjG" = (
@@ -57188,7 +57180,6 @@
/area/medical/sleeper)
"cjH" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"cjI" = (
@@ -57790,71 +57781,66 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"ckU" = (
-/obj/structure/chair,
-/obj/structure/sign/warning/nosmoking{
- pixel_x = -28
+/obj/machinery/computer/operating{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/surgery)
-"ckV" = (
-/obj/structure/chair,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/surgery)
-"ckW" = (
-/obj/machinery/holopad,
-/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"ckX" = (
-/obj/structure/chair,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/white/side{
dir = 8
},
-/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"ckY" = (
-/obj/structure/chair,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 1
},
-/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"ckZ" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel/white/side{
dir = 4
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
- name = "Observation"
- },
-/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"cla" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
/area/medical/surgery)
"clb" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
+/obj/effect/landmark/start/medical_doctor,
+/turf/open/floor/plasteel/white,
/area/medical/surgery)
"clc" = (
-/obj/item/cigbutt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/computer/operating{
dir = 8
},
-/obj/structure/sign/warning/nosmoking{
- pixel_x = 28
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 8
},
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"cld" = (
/obj/machinery/sleeper{
@@ -57894,6 +57880,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"clg" = (
@@ -57974,6 +57961,9 @@
/area/medical/medbay/central)
"cln" = (
/obj/effect/turf_decal/tile/blue,
+/obj/vehicle/ridden/wheelchair{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"clo" = (
@@ -58441,26 +58431,32 @@
/turf/open/floor/wood,
/area/maintenance/port/aft)
"cmk" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
+/obj/structure/table/optable,
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
/area/medical/surgery)
"cml" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
/area/medical/surgery)
"cmm" = (
-/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
/area/medical/surgery)
"cmn" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
- name = "Observation"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
/area/medical/surgery)
"cmo" = (
/obj/effect/spawner/structure/window,
@@ -58903,78 +58899,30 @@
/turf/open/floor/wood,
/area/maintenance/port/aft)
"cnm" = (
-/obj/structure/table,
-/obj/item/hemostat,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
-/turf/open/floor/plasteel,
-/area/medical/surgery)
-"cnn" = (
-/obj/structure/table,
-/obj/item/surgicaldrill,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white/side,
-/area/medical/surgery)
-"cno" = (
-/obj/structure/table,
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/item/circular_saw,
-/turf/open/floor/plasteel/white/side,
+/obj/structure/sign/poster/official/cleanliness,
+/turf/closed/wall,
/area/medical/surgery)
"cnp" = (
-/obj/structure/table,
-/obj/item/cautery{
- pixel_x = 4
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/razor{
- pixel_y = 5
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/medical/glass{
+ name = "Operating Theatre";
+ req_access_txt = "45"
},
-/turf/open/floor/plasteel/white/side,
+/turf/open/floor/plasteel/white,
/area/medical/surgery)
"cnq" = (
-/obj/structure/table,
-/obj/item/retractor,
-/turf/open/floor/plasteel,
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
/area/medical/surgery)
"cnr" = (
-/obj/machinery/computer/med_data{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
-/turf/open/floor/plasteel/white/side,
-/area/medical/surgery)
-"cns" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white/side,
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
/area/medical/surgery)
"cnt" = (
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom{
- broadcasting = 1;
- frequency = 1485;
- listening = 0;
- name = "Station Intercom (Medbay)";
- pixel_x = 30
- },
-/obj/structure/bedsheetbin{
- pixel_x = 2
- },
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/eyepatch,
-/obj/item/clothing/glasses/sunglasses/blindfold,
-/obj/item/clothing/ears/earmuffs,
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/gun/syringe/dart,
-/turf/open/floor/plasteel/white/side,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
/area/medical/surgery)
"cnu" = (
/obj/machinery/power/apc{
@@ -59637,89 +59585,96 @@
},
/area/maintenance/port/aft)
"coy" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
+/obj/structure/chair{
+ dir = 1
},
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coz" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/vomit/old{
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coA" = (
-/obj/effect/landmark/start/medical_doctor,
-/turf/open/floor/plasteel/white,
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coC" = (
-/obj/machinery/power/apc{
- areastring = "/area/medical/surgery";
- dir = 4;
- name = "Surgery APC";
- pixel_x = 26
- },
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/structure/table,
-/obj/item/surgical_drapes,
-/turf/open/floor/plasteel/white/side{
- dir = 8
+/obj/effect/landmark/start/medical_doctor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coD" = (
-/obj/structure/bed/roller,
-/obj/machinery/light/small{
- dir = 8
+/obj/item/cigbutt{
+ pixel_x = -8;
+ pixel_y = 12
},
-/obj/machinery/iv_drip,
-/turf/open/floor/plasteel/white,
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/structure/chair{
+ dir = 1
},
-/turf/open/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coF" = (
-/obj/structure/bed,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/item/trash/popcorn{
+ pixel_x = -5;
+ pixel_y = -4
},
-/obj/item/bedsheet/medical,
-/turf/open/floor/plasteel/white,
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel/dark,
/area/medical/surgery)
"coG" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/table/optable,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
},
-/turf/open/floor/plating,
/area/medical/surgery)
"coH" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/cryo)
"coI" = (
@@ -60439,96 +60394,90 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"cpT" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Surgery Maintenance";
- req_access_txt = "45"
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"cpU" = (
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"cpW" = (
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"cpX" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
- name = "Operating Theatre";
- req_access_txt = "45"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"cpY" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"cpZ" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/landmark/start/medical_doctor,
-/obj/machinery/holopad,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"cpT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel/white,
/area/medical/surgery)
+"cpW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
+ },
+/area/medical/surgery)
+"cpX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
+ },
+/area/medical/surgery)
+"cpZ" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
+ },
+/area/medical/surgery)
"cqa" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
/area/medical/surgery)
"cqb" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/medical{
name = "Surgery Observation"
},
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"cqc" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/white,
/area/medical/cryo)
"cqd" = (
@@ -61165,66 +61114,36 @@
},
/area/maintenance/port/aft)
"crj" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
/obj/machinery/light_switch{
- pixel_x = -28
+ pixel_x = -26
},
-/turf/open/floor/plasteel/white/side{
+/turf/open/floor/plasteel/white/corner,
+/area/medical/surgery)
+"crl" = (
+/turf/open/floor/plasteel/white/side,
+/area/medical/surgery)
+"crm" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side,
+/area/medical/surgery)
+"crn" = (
+/obj/machinery/light{
dir = 4
},
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
-"crk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+"cro" = (
+/obj/effect/landmark/blobstart,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/plasteel/white,
/area/medical/surgery)
-"crl" = (
-/obj/machinery/computer/operating{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"crm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"crn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
-/turf/open/floor/plasteel/white/side{
- dir = 8
- },
-/area/medical/surgery)
-"cro" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/structure/sign/warning/nosmoking{
- pixel_x = -28
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
"crq" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/machinery/light_switch{
- pixel_x = 26
- },
-/turf/open/floor/plasteel/white,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"crr" = (
/obj/machinery/airalarm{
@@ -61669,23 +61588,46 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"csj" = (
-/obj/structure/closet/secure_closet/medical2,
/obj/structure/sign/warning/nosmoking{
pixel_x = -28
},
-/turf/open/floor/plasteel,
+/obj/machinery/limbgrower,
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
/area/medical/surgery)
"csk" = (
+/obj/machinery/light,
+/obj/machinery/bloodbankgen,
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
+"csl" = (
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
-/turf/open/floor/plasteel/white/side{
- dir = 1
+/obj/structure/window/reinforced{
+ dir = 8
},
+/obj/structure/closet/crate/freezer/blood,
+/obj/machinery/door/window/northleft{
+ name = "Surgery Supplies";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/turf/open/floor/plasteel/white,
/area/medical/surgery)
-"csl" = (
-/obj/machinery/light,
+"csm" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/machinery/door/window/northright{
+ name = "Surgery Supplies";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
/obj/machinery/camera{
c_tag = "Medbay Surgery";
dir = 1;
@@ -61693,72 +61635,38 @@
},
/turf/open/floor/plasteel/white,
/area/medical/surgery)
-"csm" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/open/floor/plasteel/white/side{
- dir = 1
- },
-/area/medical/surgery)
"csn" = (
-/obj/item/radio/intercom{
- broadcasting = 1;
- frequency = 1485;
- listening = 0;
- name = "Station Intercom (Medbay)";
- pixel_y = -30
- },
-/obj/structure/closet/crate/freezer/blood,
-/turf/open/floor/plasteel,
-/area/medical/surgery)
-"cso" = (
-/obj/structure/bed/roller,
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/chair/office/light{
+ dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/surgery)
-"csp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+"cso" = (
+/obj/item/bedsheet/medical{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/bed{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/medical/surgery)
+"csp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"csq" = (
/obj/structure/bed,
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
/obj/item/bedsheet/medical,
-/obj/machinery/newscaster{
- pixel_y = -32
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = 28
},
-/obj/machinery/camera{
- c_tag = "Medbay Recovery Room";
- dir = 1;
- network = list("ss13","medbay")
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/plasteel/white/side{
dir = 8
},
-/turf/open/floor/plasteel/white,
/area/medical/surgery)
"csr" = (
/obj/machinery/door/airlock/maintenance{
@@ -62325,8 +62233,12 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"ctr" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
+/obj/structure/bed{
+ dir = 1
+ },
+/obj/item/bedsheet/medical{
+ dir = 1
+ },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/airalarm{
dir = 4;
@@ -62376,6 +62288,16 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/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/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a)
"ctv" = (
@@ -62458,7 +62380,7 @@
"ctD" = (
/obj/structure/sign/directions/evac,
/turf/closed/wall,
-/area/medical/genetics)
+/area/medical/paramedic)
"ctE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
@@ -62728,29 +62650,38 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cui" = (
-/obj/structure/closet/crate,
-/obj/item/coin/silver,
-/obj/item/reagent_containers/spray/weedspray,
-/obj/item/paper,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
+/obj/structure/table/reinforced,
+/obj/structure/bedsheetbin{
+ pixel_x = 2
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/glasses/sunglasses/blindfold,
+/obj/item/clothing/mask/muzzle,
+/obj/item/clothing/glasses/eyepatch,
+/obj/item/gun/syringe/dart,
+/obj/item/storage/belt/medical{
+ pixel_y = 2
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/medical/surgery)
"cuj" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
+/obj/structure/sign/poster/official/medical_green_cross{
+ pixel_y = -32
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/port/aft";
- dir = 1;
- name = "Port Quarter Maintenance APC";
- pixel_y = 24
+/obj/structure/bed{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/item/bedsheet/medical{
+ dir = 1
+ },
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/medical/surgery)
"cuk" = (
/obj/structure/table,
/obj/item/folder/white{
@@ -62936,14 +62867,16 @@
},
/obj/item/folder/white{
pixel_x = 4;
- pixel_y = -3
+ pixel_y = 4
},
/obj/item/folder/white{
pixel_x = 4;
- pixel_y = -3
+ pixel_y = 4
},
/obj/item/storage/pill_bottle/mutadone,
-/obj/item/storage/pill_bottle/mannitol,
+/obj/item/storage/pill_bottle/mannitol{
+ pixel_x = 5
+ },
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -62981,10 +62914,12 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -5
+ },
/turf/open/floor/plasteel/dark,
/area/medical/genetics)
"cuw" = (
-/obj/structure/filingcabinet/chestdrawer,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -62994,51 +62929,41 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cux" = (
-/obj/structure/noticeboard{
- desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests.";
- name = "requests board";
- pixel_x = -32;
- pixel_y = 32
+/obj/machinery/computer/crew,
+/obj/machinery/vending/wallmed{
+ pixel_x = -25
},
+/turf/open/floor/plasteel,
+/area/medical/paramedic)
+"cux" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
"cuy" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "genetics_shutters";
- name = "genetics shutters"
+/obj/structure/table/glass,
+/obj/item/flashlight/lamp{
+ pixel_x = -1;
+ pixel_y = 11
},
-/turf/open/floor/plating,
-/area/medical/genetics)
-"cuz" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 6
+/obj/effect/spawner/lootdrop/cig_packs{
+ pixel_x = 5;
+ pixel_y = -4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
"cuA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue{
@@ -63047,6 +62972,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cuB" = (
@@ -63346,8 +63274,8 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cvn" = (
-/obj/structure/chair{
- dir = 8
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = 32
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -63528,72 +63456,61 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cvC" = (
-/obj/machinery/firealarm{
- dir = 4;
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/chair/office/light{
+ dir = 1
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/medical/paramedic";
+ dir = 8;
+ name = "Paramedic Station APC";
pixel_x = -24
},
-/obj/item/storage/box/syringes,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
},
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
"cvD" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/geneticist,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
},
+/obj/item/cigbutt{
+ pixel_x = -15;
+ pixel_y = 14
+ },
+/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
"cvE" = (
-/obj/structure/table/reinforced,
+/obj/structure/table/glass,
/obj/item/folder/white{
pixel_x = 4;
- pixel_y = -3
+ pixel_y = 4
},
-/obj/item/pen,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/eastright{
- dir = 8;
- name = "Genetics Desk";
- req_access_txt = "5;9"
+/obj/item/pen/blue{
+ pixel_x = 5;
+ pixel_y = 3
},
-/obj/machinery/door/window/southleft{
- dir = 4;
- name = "Outer Window"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "genetics_shutters";
- name = "genetics shutters"
- },
-/turf/open/floor/plating,
-/area/medical/genetics)
-"cvF" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
+"cvF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/medical/paramedic)
"cvG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/extinguisher_cabinet{
@@ -63853,7 +63770,14 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cwj" = (
-/obj/item/cigbutt,
+/obj/structure/closet/crate,
+/obj/item/coin/silver,
+/obj/item/reagent_containers/spray/weedspray,
+/obj/item/paper,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cwm" = (
@@ -63865,12 +63789,10 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cwn" = (
-/obj/structure/rack,
-/obj/item/clothing/glasses/sunglasses,
-/obj/item/flashlight/pen,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/medical/surgery)
"cwo" = (
/obj/machinery/light/small{
dir = 8
@@ -64061,20 +63983,15 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cwD" = (
-/obj/item/storage/box/disks{
- pixel_x = 2;
- pixel_y = 2
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = -29
},
/obj/machinery/camera{
- c_tag = "Genetics Desk";
+ c_tag = "Paramedics Office";
dir = 4;
network = list("ss13","medbay")
},
-/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -64082,26 +63999,15 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
"cwE" = (
-/obj/machinery/light{
- dir = 4
- },
/obj/structure/disposalpipe/segment,
-/obj/machinery/button/door{
- id = "genetics_shutters";
- name = "genetics shutters control";
- pixel_x = 28;
- req_access_txt = "9"
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/medical/genetics)
+/area/medical/paramedic)
"cwF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
@@ -64109,6 +64015,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cwG" = (
@@ -64333,11 +64240,28 @@
},
/area/maintenance/port/aft)
"cxc" = (
-/obj/item/trash/chips,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay Recovery Room";
+ dir = 1;
+ network = list("ss13","medbay")
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/structure/sign/poster/official/love_ian{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/medical/surgery)
"cxd" = (
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/rack,
+/obj/item/clothing/glasses/sunglasses,
+/obj/item/flashlight/pen,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -64383,6 +64307,16 @@
req_access_txt = "5"
},
/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"cxi" = (
@@ -64491,12 +64425,12 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cxu" = (
@@ -64513,57 +64447,62 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cxv" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/medical/genetics)
-"cxw" = (
-/obj/item/folder/white{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/stack/packageWrap,
-/obj/item/pen,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cxx" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
},
+/obj/effect/landmark/start/paramedic,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cxy" = (
-/obj/structure/sign/warning/nosmoking{
- pixel_x = 28
- },
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
+/area/medical/paramedic)
+"cxw" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/suit_storage_unit/paramedic,
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/medical/paramedic)
+"cxx" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light,
+/obj/structure/closet/secure_closet/paramedic,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/medical/paramedic)
+"cxy" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cxz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/turf/open/floor/plasteel,
+/area/medical/paramedic)
+"cxz" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=10.1-Central-from-Aft";
location = "10-Aft-To-Central"
@@ -64571,6 +64510,12 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cxA" = (
@@ -64580,6 +64525,9 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cxB" = (
@@ -64710,17 +64658,36 @@
},
/area/maintenance/port/aft)
"cxR" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/trash/chips,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cxS" = (
-/obj/item/latexballon,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/cleanable/oil/streak,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cxT" = (
-/obj/item/clothing/suit/ianshirt,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cxU" = (
@@ -64885,6 +64852,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cyh" = (
@@ -64892,67 +64860,74 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/structure/mirror{
+ pixel_x = 28
+ },
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cyi" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/research{
- id_tag = "AuxGenetics";
- name = "Genetics Lab";
- req_access_txt = "9"
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = "MedbayFoyer";
+ name = "Medbay";
+ req_access_txt = "5"
},
+/obj/machinery/door/firedoor,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/medical/paramedic)
+"cyk" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/medical/paramedic)
+"cyl" = (
+/turf/closed/wall,
+/area/medical/paramedic)
+"cym" = (
+/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cyj" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cyk" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cyl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/medical/genetics)
-"cym" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
id_tag = "AuxGenetics";
name = "Genetics Access";
req_access_txt = "9"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/medical/genetics)
"cyn" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = -26
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cyo" = (
@@ -65278,13 +65253,6 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cza" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/structure/mirror{
- pixel_x = 28
- },
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -65292,65 +65260,66 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"czb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/machinery/camera{
+ c_tag = "Genetics Lab";
+ dir = 6;
+ network = list("ss13","medbay")
+ },
/turf/open/floor/plasteel,
/area/medical/genetics)
"czc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/light/small{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/medical/genetics)
"czd" = (
-/obj/machinery/light_switch{
- pixel_x = 23
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/medical/genetics)
"cze" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/closed/wall,
+/obj/machinery/door/airlock/research{
+ id_tag = "AuxGenetics";
+ name = "Genetics Access";
+ req_access_txt = "9"
+ },
+/turf/open/floor/plasteel,
/area/medical/genetics)
"czf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_x = -26
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"czg" = (
@@ -65363,9 +65332,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"czh" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
/obj/machinery/button/door{
id = "Skynet_launch";
name = "Mech Bay Door Control";
@@ -65374,6 +65340,7 @@
req_one_access_txt = "29"
},
/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"czi" = (
@@ -65928,6 +65895,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/turf/open/floor/plasteel/dark,
/area/medical/genetics)
"cAh" = (
@@ -67855,9 +67825,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cEd" = (
@@ -67876,28 +67844,21 @@
pixel_y = -3
},
/obj/item/clothing/gloves/color/latex,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cEe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/closed/wall,
-/area/medical/morgue)
-"cEf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
},
+/area/medical/surgery)
+"cEf" = (
/turf/closed/wall,
/area/hallway/primary/aft)
"cEg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
@@ -67908,13 +67869,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cEh" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cEi" = (
@@ -68343,12 +68302,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cEX" = (
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cEY" = (
@@ -68357,9 +68322,15 @@
name = "Morgue";
req_access_txt = "6"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cEZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel/dark,
/area/hallway/primary/aft)
"cFa" = (
@@ -68840,6 +68811,9 @@
/area/medical/morgue)
"cFY" = (
/obj/structure/closet,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel/dark,
/area/hallway/primary/aft)
"cFZ" = (
@@ -68848,6 +68822,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cGa" = (
@@ -72322,17 +72299,14 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cMo" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port/aft";
+ dir = 1;
+ name = "Port Quarter Maintenance APC";
+ pixel_y = 24
},
/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -72899,10 +72873,16 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cNg" = (
-/obj/structure/rack,
-/obj/item/flashlight,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/light/small,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/cigbutt,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cNh" = (
@@ -75895,8 +75875,12 @@
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"cUH" = (
-/obj/structure/table/optable,
-/turf/open/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
+ },
/area/medical/surgery)
"cUL" = (
/obj/docking_port/stationary/random{
@@ -79639,9 +79623,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
- },
/obj/structure/cable/yellow{
icon_state = "2-4"
},
@@ -80246,6 +80227,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/power/apc{
+ areastring = "/area/medical/surgery";
+ name = "Surgery APC";
+ pixel_y = -26
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"dwj" = (
@@ -81359,6 +81348,12 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/engine/engineering)
+"fpa" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"fpY" = (
/turf/closed/wall,
/area/crew_quarters/cryopod)
@@ -81457,6 +81452,32 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"gtn" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = 28
+ },
+/turf/open/floor/plasteel/dark,
+/area/medical/genetics)
+"gwW" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"gEk" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -81519,6 +81540,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
/area/security/vacantoffice)
+"hny" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/white/side,
+/area/medical/surgery)
"hyP" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two"
@@ -81766,6 +81792,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"kgN" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/medical/glass{
+ name = "Operating Theatre";
+ req_access_txt = "45"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"krD" = (
/turf/closed/wall,
/area/science/circuit)
@@ -81982,8 +82017,22 @@
/turf/open/floor/plasteel/white,
/area/science/circuit)
"lWL" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
+/obj/structure/window{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ broadcasting = 1;
+ frequency = 1485;
+ listening = 0;
+ name = "Station Intercom (Medbay)";
+ pixel_y = -30
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
/area/medical/surgery)
"lWY" = (
/obj/machinery/door/airlock/hatch{
@@ -82057,6 +82106,10 @@
},
/turf/open/floor/wood,
/area/security/vacantoffice)
+"mqC" = (
+/obj/structure/lattice,
+/turf/closed/wall,
+/area/maintenance/port/aft)
"mvj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -82110,6 +82163,10 @@
icon_state = "panelscorched"
},
/area/maintenance/port/aft)
+"nho" = (
+/obj/item/latexballon,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"nhy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -82265,6 +82322,12 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"oeQ" = (
+/obj/structure/rack,
+/obj/item/clothing/mask/gas,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"ohj" = (
/obj/item/integrated_electronics/analyzer,
/obj/item/integrated_electronics/debugger,
@@ -82519,6 +82582,16 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"qee" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 27
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"qhe" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -82627,6 +82700,16 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"reM" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/genetics)
"roa" = (
/obj/structure/chair/stool,
/obj/machinery/light/small{
@@ -82650,6 +82733,13 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
+"rvd" = (
+/obj/structure/rack,
+/obj/item/flashlight,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/small,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"rzX" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -82759,6 +82849,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"sos" = (
+/obj/structure/mirror,
+/turf/closed/wall,
+/area/medical/surgery)
"sqe" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/space/basic,
@@ -82780,6 +82874,17 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"sBC" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/medical/paramedic)
+"sCN" = (
+/obj/item/clothing/suit/ianshirt,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"sFv" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -82954,6 +83059,13 @@
/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"umv" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"upN" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -83074,6 +83186,14 @@
},
/turf/open/floor/wood,
/area/security/vacantoffice)
+"vwZ" = (
+/obj/machinery/atmospherics/pipe/manifold4w/general{
+ color = "#0000ff"
+ },
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
+ },
+/area/medical/surgery)
"vxG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -100807,7 +100927,7 @@ cwi
dux
dux
dux
-aaa
+dux
aaa
cBR
cCK
@@ -101062,10 +101182,10 @@ cuf
cvk
cwh
bXE
+bXE
dvq
dux
aaa
-aaa
cBR
cBR
cDE
@@ -101318,10 +101438,10 @@ chZ
chZ
cvl
cbx
+cfD
ceu
dux
-dux
-aaf
+mqC
aaa
aaa
cBR
@@ -101568,7 +101688,7 @@ cia
cia
cia
cia
-cpT
+cDP
cia
cia
cia
@@ -101576,11 +101696,11 @@ ceu
dyg
dvt
bXE
+bXE
dvE
dux
aaf
aaf
-aaf
dBN
cDG
cEJ
@@ -101823,21 +101943,21 @@ cia
cjw
ckU
cmk
-cnm
+cnt
coy
-cpU
+cUH
crj
csj
cia
cug
dyg
+bXE
dDw
bXE
-cNg
+rvd
dux
aaa
aaa
-aaa
cBR
cDH
cEK
@@ -102076,25 +102196,25 @@ bXE
cer
dux
dwb
-cib
-cjx
-ckV
+cia
+cjC
+cla
cml
-cnn
+cnt
coz
-coz
-crk
+cUH
+crq
csk
cia
cuh
cvm
cDK
-cxc
+ceu
cxR
+oeQ
dux
aaa
aaa
-aaa
dBN
cDI
cEL
@@ -102333,11 +102453,11 @@ bXE
bYJ
dux
dwe
+cia
+cjB
+cpT
cic
-cjy
-ckW
-cmk
-cno
+cnr
coA
cUH
crl
@@ -102346,12 +102466,12 @@ cia
ceu
ceu
dyg
+ceu
dux
dux
dux
aaa
aaa
-aaa
cBR
cDJ
cEM
@@ -102590,25 +102710,25 @@ dvt
dux
dux
dwb
-cic
+cia
cjz
ckX
cmm
cnp
coB
-coB
+vwZ
crm
csm
cia
-cui
+dux
cwj
-dyg
+cNg
+ceu
dux
-cxS
+nho
dux
aaf
aaf
-aaf
cBR
cBR
cBR
@@ -102847,23 +102967,23 @@ cdi
dux
cdl
dwb
-cic
-cjA
-ckY
-cmk
+cia
+cnm
+sos
+cid
cnq
coC
cpW
crn
csn
-cia
-cdl
-cMm
-cMo
+cui
dux
-cxT
+cxS
+cNf
+fpa
+dux
+sCN
dux
-aaa
aaa
aaa
aaf
@@ -103104,25 +103224,25 @@ dux
dux
cfD
dwb
-cic
cia
+cib
ckZ
-cia
-cia
-cia
+cjA
+kgN
+coB
cpX
cia
lWL
cia
-ceu
+cia
dyg
+bXE
dyw
dux
-cxS
+nho
dux
aaa
aaa
-aaa
aaf
aaa
aaa
@@ -103361,20 +103481,20 @@ cdj
cse
cdj
cgL
-cid
+cia
cjB
-cla
-cmk
+cro
+ckY
cnr
coD
-cpY
-cro
+cqa
+cnt
cso
+cuj
cia
-cfD
dyj
ceu
-dux
+ceu
dux
dux
dux
@@ -103618,18 +103738,18 @@ cdk
ceu
cfE
dwi
-cic
+cia
cjC
clb
cmn
-cns
+cnt
coE
cpZ
-coB
+hny
csp
+cwn
csr
-duH
-dyg
+cxT
ceu
cMm
cwm
@@ -103875,17 +103995,17 @@ dux
dux
cfF
dwj
-cic
+cia
cjD
clc
-cmk
+coG
cnt
coF
-cqa
-crq
+cEe
+cnt
csq
+cxc
cia
-dux
diM
cwm
cNf
@@ -104132,20 +104252,20 @@ cdl
cev
cev
cgO
-cic
cia
cia
cia
cia
-coG
+cia
+cia
cqb
cia
cia
cia
-cuj
-cbx
+cia
+cMo
dDw
-bXE
+gwW
cxU
cxU
czN
@@ -104401,7 +104521,7 @@ csr
duH
bXE
cvn
-cwn
+dvE
cxd
cxU
cyN
@@ -104655,9 +104775,9 @@ coI
cqd
crs
css
-dux
-dux
-dux
+cvp
+cvp
+cvp
cxU
cxU
cxU
@@ -108773,7 +108893,7 @@ cvA
cwB
cxt
cyg
-cyZ
+reM
cAd
ctA
dbr
@@ -109285,10 +109405,10 @@ ctA
ctA
ctA
ctA
-cxv
-cyi
ctA
ctA
+cym
+ctA
ctA
cCi
cCW
@@ -109538,12 +109658,12 @@ coV
cqt
cga
cKJ
-ctB
+cyl
cuw
cvC
cwD
cxw
-cyj
+cyl
czb
cAf
cBc
@@ -110052,18 +110172,18 @@ coX
cnL
cga
cbC
-ctB
+cyl
cuy
cvE
-ctB
+cxv
cxy
cyl
czd
-cAg
+gtn
ctB
cCe
cCe
-cEe
+cCe
cEY
cCe
cCe
@@ -110310,11 +110430,11 @@ coY
cga
csI
ctD
-cuz
cvF
-ctB
-ctB
-cym
+sBC
+cyl
+cyi
+cyl
cze
ctB
cBd
@@ -110825,18 +110945,18 @@ crG
csK
ctF
car
-car
+czg
car
cxA
car
-czg
+car
cAi
ctF
car
car
-czg
-cFb
car
+cFb
+czg
car
cHO
cIF
@@ -111082,7 +111202,7 @@ crH
csL
ctG
cgc
-cvG
+qee
chh
cxB
cyo
@@ -111093,7 +111213,7 @@ cCm
cpa
cEh
cFc
-chh
+umv
chh
cvG
cIG
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 0aaeba8e39..d367ed82b1 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -24603,7 +24603,7 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"beS" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"beU" = (
@@ -61215,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{
@@ -103637,7 +103645,7 @@ bbI
bcG
bdM
beP
-bfH
+vzp
bfH
bhv
bbI
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/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 51a5fb3ece..a084f2ae34 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -136,11 +136,15 @@
#define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand" //from base of atom/attack_hand(): (mob/user)
#define COMSIG_ATOM_ATTACK_PAW "atom_attack_paw" //from base of atom/attack_paw(): (mob/user)
#define COMPONENT_NO_ATTACK_HAND 1 //works on all 3.
+/////////////////
+
//This signal return value bitflags can be found in __DEFINES/misc.dm
#define COMSIG_ATOM_INTERCEPT_Z_FALL "movable_intercept_z_impact" //called for each movable in a turf contents on /turf/zImpact(): (atom/movable/A, levels)
-
-/////////////////
+/// Called from orbit component: (atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+#define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin"
+/// Called from orbit component: (atom/movable/orbiter, refreshing)
+#define COMSIG_ATOM_ORBIT_END "atom_orbit_end"
#define COMSIG_ENTER_AREA "enter_area" //from base of area/Entered(): (/area)
#define COMSIG_EXIT_AREA "exit_area" //from base of area/Exited(): (/area)
@@ -536,3 +540,7 @@
#define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift" //from turf ShiftClickOn(): (/mob)
#define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt" //from turf AltClickOn(): (/mob)
#define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl" //from monkey CtrlClickOn(): (/mob)
+
+// twitch plays
+/// Returns direction: (wipe_votes)
+#define COMSIG_TWITCH_PLAYS_MOVEMENT_DATA "twitch_plays_movement_data"
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index 7fe5fa4876..ecd043a66a 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -55,6 +55,9 @@
//donator items
#define LOADOUT_CATEGORY_DONATOR "Donator"
+//unlockable items
+#define LOADOUT_CATEGORY_UNLOCKABLE "Unlockable"
+
//how many prosthetics can we have
#define MAXIMUM_LOADOUT_PROSTHETICS 2
diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm
index efd715b85a..74ca459fa1 100644
--- a/code/__DEFINES/species.dm
+++ b/code/__DEFINES/species.dm
@@ -5,6 +5,7 @@
#define SPECIES_ANDROID "android"
#define SPECIES_ANGEL "angel"
#define SPECIES_MAMMAL "mammal"
+ #define SPECIES_MAMMAL_SYNTHETIC "mammal_synthetic"
#define SPECIES_ARACHNID "arachnid"
#define SPECIES_INSECT "insect"
#define SPECIES_DULLAHAN "dullahan"
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/_logging.dm b/code/__HELPERS/_logging.dm
index a1080a1064..18d02229dd 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -86,10 +86,6 @@
if (CONFIG_GET(flag/log_attack))
WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]")
-/proc/log_wounded(text)
- if (CONFIG_GET(flag/log_attack))
- WRITE_LOG(GLOB.world_attack_log, "WOUND: [text]")
-
/proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE)
if (CONFIG_GET(flag/log_manifest))
WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]")
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/roundend.dm b/code/__HELPERS/roundend.dm
index e4a2e6521a..a860a8cd3f 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -238,8 +238,11 @@
CHECK_TICK
SSdbcore.SetRoundEnd()
//Collects persistence features
- if(mode.allow_persistence_save)
- SSpersistence.CollectData()
+ if(mode.station_was_nuked)
+ SSpersistence.station_was_destroyed = TRUE
+ if(!mode.allow_persistence_save)
+ SSpersistence.station_persistence_save_disabled = TRUE
+ SSpersistence.CollectData()
//stop collecting feedback during grifftime
SSblackbox.Seal()
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 0444e42e91..7fad1690e6 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
//LANGUAGE CHARACTER CUSTOMIZATION
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles"))
-GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc))
+GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien))
//SPECIES BODYPART LISTS
//locked parts are those that your picked species requires to have
diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
index 0f0ac52214..4a61a94dc7 100644
--- a/code/_globalvars/lists/loadout_categories.dm
+++ b/code/_globalvars/lists/loadout_categories.dm
@@ -9,5 +9,6 @@ GLOBAL_LIST_INIT(loadout_categories, list(
LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORIES_NONE,
LOADOUT_CATEGORY_GLOVES = LOADOUT_SUBCATEGORIES_NONE,
LOADOUT_CATEGORY_GLASSES = LOADOUT_SUBCATEGORIES_NONE,
- LOADOUT_CATEGORY_DONATOR = LOADOUT_SUBCATEGORIES_NONE
+ LOADOUT_CATEGORY_DONATOR = LOADOUT_SUBCATEGORIES_NONE,
+ LOADOUT_CATEGORY_UNLOCKABLE = LOADOUT_SUBCATEGORIES_NONE
))
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 67e4a97894..dc8e9e1859 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -566,3 +566,20 @@
config_entry_value = 0.333
min_val = 0
integer = FALSE
+
+/// Amount of dirtyness tiles need to spawn dirt.
+/datum/config_entry/number/turf_dirt_threshold
+ config_entry_value = 100
+ min_val = 1
+ integer = TRUE
+
+/// Alpha dirt starts at
+/datum/config_entry/number/dirt_alpha_starting
+ config_entry_value = 127
+ max_val = 255
+ min_val = 0
+ integer = TRUE
+
+/// Dirtyness multiplier for making turfs dirty
+/datum/config_entry/number/turf_dirty_multiplier
+ config_entry_value = 1
diff --git a/code/controllers/configuration/entries/persistence.dm b/code/controllers/configuration/entries/persistence.dm
new file mode 100644
index 0000000000..2444034b86
--- /dev/null
+++ b/code/controllers/configuration/entries/persistence.dm
@@ -0,0 +1,20 @@
+/// Whether or not to use the persistence system for cleanable objects
+/datum/config_entry/flag/persistent_debris
+ config_entry_value = FALSE
+
+/// Whether or not to nuke all roundstart debris that isn't due to persistence if the above is true
+/datum/config_entry/flag/persistent_debris_only
+ config_entry_value = TRUE
+
+/// Max amount of objects to store, total
+/datum/config_entry/number/persistent_debris_global_max
+ config_entry_value = 10000
+ integer = TRUE
+
+/// Max amount of objects to store per type
+/datum/config_entry/number/persistent_debris_type_max
+ config_entry_value = 2000
+ integer = TRUE
+
+/// Wipe dirty stuff on nuke
+/datum/config_entry/flag/persistent_debris_wipe_on_nuke
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index b93c35541b..2d2fac1d13 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -139,18 +139,22 @@ SUBSYSTEM_DEF(garbage)
lastlevel = level
- for (var/refID in queue)
- if (!refID)
+ //We do this rather then for(var/refID in queue) because that sort of for loop copies the whole list.
+ //Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun.
+ for (var/i in 1 to length(queue))
+ var/list/L = queue[i]
+ if (length(L) < 2)
count++
if (MC_TICK_CHECK)
return
continue
- var/GCd_at_time = queue[refID]
+ var/GCd_at_time = L[1]
if(GCd_at_time > cut_off_time)
break // Everything else is newer, skip them
count++
+ var/refID = L[2]
var/datum/D
D = locate(refID)
@@ -241,10 +245,7 @@ SUBSYSTEM_DEF(garbage)
D.gc_destroyed = gctime
var/list/queue = queues[level]
- if (queue[refid])
- queue -= refid // Removing any previous references that were GC'd so that the current object will be at the end of the list.
-
- queue[refid] = gctime
+ queue[++queue.len] = list(gctime, refid) // not += for byond reasons
//this is mainly to separate things profile wise.
/datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 4963e33cc3..779ee2fbac 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -698,6 +698,8 @@ SUBSYSTEM_DEF(job)
if(polychromic && istype(polychromic))
var/list/polychromic_entry = polychromic.colors_by_atom[I]
if(polychromic_entry)
+ if(polychromic.suits_with_helmet_typecache[I.type]) //is this one of those toggleable hood/helmet things?
+ polychromic.connect_helmet(I,i[LOADOUT_COLOR])
polychromic.colors_by_atom[I] = i[LOADOUT_COLOR]
I.update_icon()
else
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 2ea3b29c91..90908bbde0 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -41,6 +41,8 @@ SUBSYSTEM_DEF(mapping)
var/datum/space_level/transit
var/datum/space_level/empty_space
var/num_of_res_levels = 1
+ /// Lookup for zlevel to station z. text = num.
+ var/list/z_to_station_z_index
var/stat_map_name = "Loading..."
@@ -259,6 +261,16 @@ SUBSYSTEM_DEF(mapping)
INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
return parsed_maps
+/datum/controller/subsystem/mapping/proc/setup_station_z_index()
+ z_to_station_z_index = list()
+ var/sz = 1
+ var/cz = station_start
+ if(islist(config.map_file))
+ for(var/map in config.map_file)
+ z_to_station_z_index["[cz++]"] = sz++
+ else
+ z_to_station_z_index["[station_start]"] = 1
+
/datum/controller/subsystem/mapping/proc/loadWorld()
//if any of these fail, something has gone horribly, HORRIBLY, wrong
var/list/FailedZs = list()
@@ -271,6 +283,8 @@ SUBSYSTEM_DEF(mapping)
INIT_ANNOUNCE("Loading [config.map_name]...")
LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION, FALSE, config.orientation)
+ setup_station_z_index()
+
if(SSdbcore.Connect())
var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]")
query_round_map_name.Execute()
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm
similarity index 51%
rename from code/controllers/subsystem/persistence.dm
rename to code/controllers/subsystem/persistence/_persistence.dm
index 4fcc7828d5..e8faf80e5d 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence/_persistence.dm
@@ -5,18 +5,14 @@ SUBSYSTEM_DEF(persistence)
name = "Persistence"
init_order = INIT_ORDER_PERSISTENCE
flags = SS_NO_FIRE
- var/list/satchel_blacklist = list() //this is a typecache
- var/list/new_secret_satchels = list() //these are objects
- var/list/old_secret_satchels = list()
+
+ /// Marks if the station got horribly destroyed
+ var/station_was_destroyed = FALSE
+ /// Marks if persistence save should be disabled
+ var/station_persistence_save_disabled = FALSE
var/list/obj/structure/chisel_message/chisel_messages = list()
var/list/saved_messages = list()
- var/list/saved_modes = list(1,2,3)
- var/list/saved_dynamic_rules = list(list(),list(),list())
- var/list/saved_storytellers = list("foo","bar","baz")
- var/list/average_dynamic_threat = 50
- var/list/saved_maps
- var/list/saved_trophies = list()
var/list/spawned_objects = list()
var/list/antag_rep = list()
var/list/antag_rep_change = list()
@@ -28,63 +24,82 @@ SUBSYSTEM_DEF(persistence)
var/list/paintings = list()
/datum/controller/subsystem/persistence/Initialize()
- LoadSatchels()
- LoadPoly()
- LoadChiselMessages()
- LoadTrophies()
- LoadRecentModes()
- LoadRecentStorytellers()
- LoadRecentRulesets()
- LoadRecentMaps()
- LoadPhotoPersistence()
+ LoadServerPersistence()
+ LoadGamePersistence()
+ var/map_persistence_path = get_map_persistence_path()
+ if(map_persistence_path)
+ LoadMapPersistence()
+ return ..()
+
+/**
+ * Gets the persistence path of the current map.
+ */
+/datum/controller/subsystem/persistence/proc/get_map_persistence_path()
+ ASSERT(SSmapping.config)
+ if(!SSmapping.config.persistence_key || (SSmapping.config.persistence_key == "NO_PERSIST"))
+ return null
+ return "data/persistence/[ckey(SSmapping.config.persistence_key)]"
+
+/datum/controller/subsystem/persistence/proc/CollectData()
+ SaveServerPersistence()
+ if(station_persistence_save_disabled)
+ return
+ SaveGamePersistence()
+ var/map_persistence_path = get_map_persistence_path()
+ if(map_persistence_path)
+ SaveMapPersistence()
+
+/**
+ * Loads persistent data relevant to the server: Configurations, past gamemodes, votes, antag rep, etc
+ */
+/datum/controller/subsystem/persistence/proc/LoadServerPersistence()
for(var/client/C in GLOB.clients)
LoadSavedVote(C.ckey)
if(CONFIG_GET(flag/use_antag_rep))
LoadAntagReputation()
LoadRandomizedRecipes()
- LoadPanicBunker()
LoadPaintings()
- return ..()
-/datum/controller/subsystem/persistence/proc/LoadSatchels()
- var/placed_satchel = 0
- var/path
+/**
+ * Saves persistent data relevant to the server: Configurations, past gamemodes, votes, antag rep, etc
+ */
+/datum/controller/subsystem/persistence/proc/SaveServerPersistence()
+ if(CONFIG_GET(flag/use_antag_rep))
+ CollectAntagReputation()
+ SaveRandomizedRecipes()
- var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
- var/list/json = list()
- if(fexists(json_file))
- json = json_decode(file2text(json_file))
+/**
+ * Loads persistent data relevant to the game in general: Photos, etc
+ *
+ * Legacy map persistence systems also use this.
+ */
+/datum/controller/subsystem/persistence/proc/LoadGamePersistence()
+ LoadChiselMessages()
+ LoadPhotoPersistence()
+ LoadPaintings()
- old_secret_satchels = json["data"]
- var/obj/item/storage/backpack/satchel/flat/F
- if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear.
- var/pos = rand(1, old_secret_satchels.len)
- F = new()
- old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
- F.x = old_secret_satchels[pos]["x"]
- F.y = old_secret_satchels[pos]["y"]
- F.z = SSmapping.station_start
- path = text2path(old_secret_satchels[pos]["saved_obj"])
+/**
+ * Saves persistent data relevant to the game in general: Photos, etc
+ *
+ * Legacy map persistence systems also use this.
+ */
+/datum/controller/subsystem/persistence/proc/SaveGamePersistence()
+ CollectChiselMessages()
+ SavePhotoPersistence() //THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
+ SavePaintings()
+ SaveScars()
- if(F)
- if(isfloorturf(F.loc) && !isplatingturf(F.loc))
- F.hide(1)
- if(ispath(path))
- var/spawned_item = new path(F)
- spawned_objects[spawned_item] = TRUE
- placed_satchel++
- var/free_satchels = 0
- for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
- if(isfloorturf(T) && !isplatingturf(T))
- new /obj/item/storage/backpack/satchel/flat/secret(T)
- free_satchels++
- if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves
- break
+/**
+ * Loads persistent data relevant to the current map: Objects, etc.
+ */
+/datum/controller/subsystem/persistence/proc/LoadMapPersistence()
+ return
-/datum/controller/subsystem/persistence/proc/LoadPoly()
- for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
- twitterize(P.speech_buffer, "polytalk")
- break //Who's been duping the bird?!
+/**
+ * Saves persistent data relevant to the current map: Objects, etc.
+ */
+/datum/controller/subsystem/persistence/proc/SaveMapPersistence()
+ return
/datum/controller/subsystem/persistence/proc/LoadChiselMessages()
var/list/saved_messages = list()
@@ -131,63 +146,6 @@ SUBSYSTEM_DEF(persistence)
log_world("Loaded [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")
-/datum/controller/subsystem/persistence/proc/LoadTrophies()
- if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
- var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
- var/saved_json
- S >> saved_json
- if(!saved_json)
- return
- saved_trophies = json_decode(saved_json)
- fdel("data/npc_saves/TrophyItems.sav")
- else
- var/json_file = file("data/npc_saves/TrophyItems.json")
- if(!fexists(json_file))
- return
- var/list/json = json_decode(file2text(json_file))
- if(!json)
- return
- saved_trophies = json["data"]
- SetUpTrophies(saved_trophies.Copy())
-
-/datum/controller/subsystem/persistence/proc/LoadRecentModes()
- var/json_file = file("data/RecentModes.json")
- if(!fexists(json_file))
- return
- var/list/json = json_decode(file2text(json_file))
- if(!json)
- return
- saved_modes = json["data"]
-
-/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
- var/json_file = file("data/RecentRulesets.json")
- if(!fexists(json_file))
- return
- var/list/json = json_decode(file2text(json_file))
- if(!json)
- return
- saved_dynamic_rules = json["data"]
-
-/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
- var/json_file = file("data/RecentStorytellers.json")
- if(!fexists(json_file))
- return
- var/list/json = json_decode(file2text(json_file))
- if(!json)
- return
- saved_storytellers = json["data"]
- if(saved_storytellers.len > 3)
- average_dynamic_threat = saved_storytellers[4]
- saved_storytellers.len = 3
-
-/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
- var/json_file = file("data/RecentMaps.json")
- if(!fexists(json_file))
- return
- var/list/json = json_decode(file2text(json_file))
- if(!json)
- return
- saved_maps = json["maps"]
/datum/controller/subsystem/persistence/proc/LoadAntagReputation()
var/json = file2text(FILE_ANTAG_REP)
@@ -208,59 +166,6 @@ SUBSYSTEM_DEF(persistence)
return
saved_votes[ckey] = json["data"]
-/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
- for(var/A in GLOB.trophy_cases)
- var/obj/structure/displaycase/trophy/T = A
- if (T.showpiece)
- continue
- T.added_roundstart = TRUE
-
- var/trophy_data = pick_n_take(trophy_items)
-
- if(!islist(trophy_data))
- continue
-
- var/list/chosen_trophy = trophy_data
-
- if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed
- continue
-
- var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null
- if(!path)
- continue
-
- T.showpiece = new /obj/item/showpiece_dummy(T, path)
- T.trophy_message = chosen_trophy["message"]
- T.placer_key = chosen_trophy["placer_key"]
- T.update_icon()
-
-/datum/controller/subsystem/persistence/proc/CollectData()
- CollectChiselMessages()
- CollectSecretSatchels()
- CollectTrophies()
- CollectRoundtype()
- if(istype(SSticker.mode, /datum/game_mode/dynamic))
- var/datum/game_mode/dynamic/mode = SSticker.mode
- CollectStoryteller(mode)
- CollectRulesets(mode)
- RecordMaps()
- SavePhotoPersistence() //THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
- if(CONFIG_GET(flag/use_antag_rep))
- CollectAntagReputation()
- SaveRandomizedRecipes()
- SavePanicBunker()
- SavePaintings()
- SaveScars()
-
-/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
- var/bunker_path = file("data/bunker_passthrough.json")
- if(fexists(bunker_path))
- var/list/json = json_decode(file2text(bunker_path))
- GLOB.bunker_passthrough = json["data"]
- for(var/ckey in GLOB.bunker_passthrough)
- if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
- GLOB.bunker_passthrough -= ckey
-
/datum/controller/subsystem/persistence/proc/GetPhotoAlbums()
var/album_path = file("data/photo_albums.json")
if(fexists(album_path))
@@ -330,35 +235,6 @@ SUBSYSTEM_DEF(persistence)
WRITE_FILE(frame_path, frame_json)
-/datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
- satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
- var/list/satchels_to_add = list()
- for(var/A in new_secret_satchels)
- var/obj/item/storage/backpack/satchel/flat/F = A
- if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
- continue
- var/list/savable_obj = list()
- for(var/obj/O in F)
- if(is_type_in_typecache(O, satchel_blacklist) || (O.flags_1 & ADMIN_SPAWNED_1))
- continue
- if(O.persistence_replacement)
- savable_obj += O.persistence_replacement
- else
- savable_obj += O.type
- if(isemptylist(savable_obj))
- continue
- var/list/data = list()
- data["x"] = F.x
- data["y"] = F.y
- data["saved_obj"] = pick(savable_obj)
- satchels_to_add += list(data)
-
- var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
- var/list/file_data = list()
- fdel(json_file)
- file_data["data"] = old_secret_satchels + satchels_to_add
- WRITE_FILE(json_file, json_encode(file_data))
-
/datum/controller/subsystem/persistence/proc/CollectChiselMessages()
var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")
@@ -374,84 +250,6 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/SaveChiselMessage(obj/structure/chisel_message/M)
saved_messages += list(M.pack()) // dm eats one list
-
-/datum/controller/subsystem/persistence/proc/CollectTrophies()
- var/json_file = file("data/npc_saves/TrophyItems.json")
- var/list/file_data = list()
- file_data["data"] = remove_duplicate_trophies(saved_trophies)
- fdel(json_file)
- WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/SavePanicBunker()
- var/json_file = file("data/bunker_passthrough.json")
- var/list/file_data = list()
- file_data["data"] = GLOB.bunker_passthrough
- fdel(json_file)
- WRITE_FILE(json_file,json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/remove_duplicate_trophies(list/trophies)
- var/list/ukeys = list()
- . = list()
- for(var/trophy in trophies)
- var/tkey = "[trophy["path"]]-[trophy["message"]]"
- if(ukeys[tkey])
- continue
- else
- . += list(trophy)
- ukeys[tkey] = TRUE
-
-/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
- if(!T.added_roundstart && T.showpiece)
- var/list/data = list()
- data["path"] = T.showpiece.type
- data["message"] = T.trophy_message
- data["placer_key"] = T.placer_key
- saved_trophies += list(data)
-
-/datum/controller/subsystem/persistence/proc/CollectRoundtype()
- saved_modes[3] = saved_modes[2]
- saved_modes[2] = saved_modes[1]
- saved_modes[1] = SSticker.mode.config_tag
- var/json_file = file("data/RecentModes.json")
- var/list/file_data = list()
- file_data["data"] = saved_modes
- fdel(json_file)
- WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
- saved_storytellers.len = 3
- saved_storytellers[3] = saved_storytellers[2]
- saved_storytellers[2] = saved_storytellers[1]
- saved_storytellers[1] = mode.storyteller.name
- average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
- var/json_file = file("data/RecentStorytellers.json")
- var/list/file_data = list()
- file_data["data"] = saved_storytellers + average_dynamic_threat
- fdel(json_file)
- WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
- saved_dynamic_rules[3] = saved_dynamic_rules[2]
- saved_dynamic_rules[2] = saved_dynamic_rules[1]
- saved_dynamic_rules[1] = list()
- for(var/r in mode.executed_rules)
- var/datum/dynamic_ruleset/rule = r
- saved_dynamic_rules[1] += rule.config_tag
- var/json_file = file("data/RecentRulesets.json")
- var/list/file_data = list()
- file_data["data"] = saved_dynamic_rules
- fdel(json_file)
- WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/RecordMaps()
- saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
- var/json_file = file("data/RecentMaps.json")
- var/list/file_data = list()
- file_data["maps"] = saved_maps
- fdel(json_file)
- WRITE_FILE(json_file, json_encode(file_data))
-
-
/datum/controller/subsystem/persistence/proc/CollectAntagReputation()
var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum)
diff --git a/code/controllers/subsystem/persistence/cleanable_debris.dm b/code/controllers/subsystem/persistence/cleanable_debris.dm
new file mode 100644
index 0000000000..a0817c460b
--- /dev/null
+++ b/code/controllers/subsystem/persistence/cleanable_debris.dm
@@ -0,0 +1,177 @@
+/**
+ * Persistence for cleanable debris.
+ */
+/datum/controller/subsystem/persistence
+ /// tracks if we already loaded debris. Unlike everything else, this can actually be a major problem if some badmin procs it twice.
+ var/loaded_debris = FALSE
+
+/datum/controller/subsystem/persistence/LoadMapPersistence()
+ . = ..()
+ if(CONFIG_GET(flag/persistent_debris))
+ LoadMapDebris()
+
+/datum/controller/subsystem/persistence/SaveMapPersistence()
+ . = ..()
+ if(CONFIG_GET(flag/persistent_debris))
+ SaveMapDebris()
+
+/datum/controller/subsystem/persistence/proc/LoadMapDebris()
+ if(CONFIG_GET(flag/persistent_debris_only))
+ wipe_existing_debris()
+ if(!fexists("[get_map_persistence_path()]/debris.json"))
+ return
+ if(loaded_debris)
+ return
+ loaded_debris = TRUE
+ var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+ var/list/allowed_z_cache = list()
+ for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+ allowed_z_cache[num2text(z)] = TRUE
+ var/list/data = json_decode(file2text("[get_map_persistence_path()]/debris.json"))
+ var/list/z_lookup = list()
+ var/loaded = 0
+ var/list/loaded_by_type = list()
+ var/nopath = 0
+ var/badloc = 0
+ var/noturf = 0
+ /// reverse it
+ for(var/z in SSmapping.z_to_station_z_index)
+ var/sz = SSmapping.z_to_station_z_index[z]
+ z_lookup[num2text(sz)] = text2num(z)
+ for(var/z in data)
+ var/actual_z = z_lookup[z]
+ var/list/L1 = data[z]
+ for(var/x in L1)
+ var/list/L2 = data[z][x]
+ for(var/y in L2)
+ var/turf/tile = locate(text2num(x), text2num(y), actual_z)
+ if(!tile)
+ noturf++
+ continue
+ var/list/objects = data[z][x][y]
+ for(var/_L in objects)
+ var/list/objdata
+ var/path
+ if(islist(_L))
+ objdata = _L
+ path = text2path(objdata["__PATH__"])
+ else
+ path = text2path(_L)
+ objdata = objects[_L]
+ if(!path)
+ nopath++
+ continue
+ if(!IsValidDebrisLocation(tile, allowed_turf_typecache, allowed_z_cache, path, TRUE))
+ badloc++
+ continue
+ var/obj/effect/decal/cleanable/instantiated = new path(tile)
+ loaded_by_type[path] += 1
+ loaded++
+ if(objdata)
+ instantiated.PersistenceLoad(objdata)
+ var/list/bytype = list()
+ for(var/path in loaded_by_type)
+ bytype += "[path] - [loaded_by_type[path]]"
+ subsystem_log(
+ {"Debris loading completed:
+ Errors:
+ No path: [nopath]
+ Invalid location: [badloc]
+ No turf on map: [noturf]
+ Total loaded: [loaded]
+ By type:
+ [bytype.Join("\n")]"}
+ )
+
+/datum/controller/subsystem/persistence/proc/SaveMapDebris()
+ if(fexists("[get_map_persistence_path()]/debris.json"))
+ fdel("[get_map_persistence_path()]/debris.json")
+ if(CONFIG_GET(flag/persistent_debris_wipe_on_nuke) && station_was_destroyed)
+ return // local janitor cheers on nukeop team to save some work
+ var/list/data = list()
+ var/list/z_lookup = SSmapping.z_to_station_z_index
+ var/list/debris = RelevantPersistentDebris()
+ var/obj/effect/decal/cleanable/saving
+ var/global_max = CONFIG_GET(number/persistent_debris_global_max)
+ var/type_max = CONFIG_GET(number/persistent_debris_type_max)
+ var/stored = 0
+ var/list/stored_by_type = list()
+ for(var/i in debris)
+ saving = i
+ var/list/serializing = list()
+ var/path = saving.PersistenceSave(serializing)
+ if(!path)
+ continue
+ if(stored_by_type[path] > type_max)
+ continue
+ var/text_z = num2text(z_lookup[num2text(saving.z)])
+ var/text_y = num2text(saving.y)
+ var/text_x = num2text(saving.x)
+ LAZYINITLIST(data[text_z])
+ LAZYINITLIST(data[text_z][text_x])
+ LAZYINITLIST(data[text_z][text_x][text_y])
+ if(saving.persistence_allow_stacking)
+ serializing["__PATH__"] = path
+ data[text_z][text_x][text_y] += list(serializing)
+ else
+ data[text_z][text_x][text_y][path] = serializing
+ stored++
+ if(stored > global_max)
+ var/w = "Persistent debris saving globally aborted due to global max >= [global_max]. Either janitors never do their jobs or something is wrong."
+ message_admins(w)
+ subsystem_log(w)
+ return
+ stored_by_type[path] = stored_by_type[path]? stored_by_type[path] + 1 : 1
+ if(stored_by_type[path] > type_max)
+ var/w = "Persistent debris saving aborted for type [path] due to type max >= [global_max]. Either janitors never do their jobs or something is wrong."
+ message_admins(w)
+ subsystem_log(w)
+
+ var/list/bytype = list()
+ for(var/path in stored_by_type)
+ bytype += "[path] - [stored_by_type[path]]"
+ subsystem_log(
+ {"Debris saving completed:
+ Total: [stored]
+ By type:
+ [bytype.Join("\n")]"}
+ )
+ WRITE_FILE(file("[get_map_persistence_path()]/debris.json"), json_encode(data))
+
+/datum/controller/subsystem/persistence/proc/IsValidDebrisLocation(turf/tile, list/allowed_typecache, list/allowed_zcache, obj/effect/decal/cleanable/type, loading = FALSE)
+ if(!allowed_typecache[tile.type])
+ return FALSE
+ var/area/A = tile.loc
+ if(!A.persistent_debris_allowed)
+ return FALSE
+ if(!allowed_zcache[num2text(tile.z)])
+ return FALSE
+ if(loading)
+ if(!initial(type.persistence_allow_stacking))
+ var/obj/effect/decal/cleanable/C = locate(type) in tile
+ if(!QDELETED(C))
+ return FALSE
+ // Saving verifies allow stacking in the save proc.
+ for(var/obj/structure/window/W in tile)
+ if(W.fulltile)
+ return FALSE
+ return TRUE
+
+/datum/controller/subsystem/persistence/proc/wipe_existing_debris()
+ var/list/existing = RelevantPersistentDebris()
+ QDEL_LIST(existing)
+
+/datum/controller/subsystem/persistence/proc/RelevantPersistentDebris()
+ var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+ var/list/allowed_z_cache = list()
+ for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+ allowed_z_cache[num2text(z)] = TRUE
+ . = list()
+ for(var/obj/effect/decal/cleanable/C in world)
+ if(!C.loc || QDELETED(C))
+ continue
+ if(!C.persistent)
+ continue
+ if(!IsValidDebrisLocation(C.loc, allowed_turf_typecache, allowed_z_cache, C.type, FALSE))
+ continue
+ . += C
diff --git a/code/controllers/subsystem/persistence/panic_bunker.dm b/code/controllers/subsystem/persistence/panic_bunker.dm
new file mode 100644
index 0000000000..93ada2835c
--- /dev/null
+++ b/code/controllers/subsystem/persistence/panic_bunker.dm
@@ -0,0 +1,26 @@
+/**
+ * Persists panic bunker whitelisting for a configured period of time
+ */
+/datum/controller/subsystem/persistence/LoadServerPersistence()
+ . = ..()
+ LoadPanicBunker()
+
+/datum/controller/subsystem/persistence/SaveServerPersistence()
+ . = ..()
+ SavePanicBunker()
+
+/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
+ var/bunker_path = file("data/bunker_passthrough.json")
+ if(fexists(bunker_path))
+ var/list/json = json_decode(file2text(bunker_path))
+ GLOB.bunker_passthrough = json["data"]
+ for(var/ckey in GLOB.bunker_passthrough)
+ if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
+ GLOB.bunker_passthrough -= ckey
+
+/datum/controller/subsystem/persistence/proc/SavePanicBunker()
+ var/json_file = file("data/bunker_passthrough.json")
+ var/list/file_data = list()
+ file_data["data"] = GLOB.bunker_passthrough
+ fdel(json_file)
+ WRITE_FILE(json_file,json_encode(file_data))
diff --git a/code/controllers/subsystem/persistence/poly_parrot.dm b/code/controllers/subsystem/persistence/poly_parrot.dm
new file mode 100644
index 0000000000..64743e9623
--- /dev/null
+++ b/code/controllers/subsystem/persistence/poly_parrot.dm
@@ -0,0 +1,11 @@
+/**
+ * Persists poly messages across rounds
+ */
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+ . = ..()
+ LoadPoly()
+
+/datum/controller/subsystem/persistence/proc/LoadPoly()
+ for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
+ twitterize(P.speech_buffer, "polytalk")
+ break //Who's been duping the bird?!
diff --git a/code/controllers/subsystem/persistence/recent_votes_etc.dm b/code/controllers/subsystem/persistence/recent_votes_etc.dm
new file mode 100644
index 0000000000..f1b902d6ab
--- /dev/null
+++ b/code/controllers/subsystem/persistence/recent_votes_etc.dm
@@ -0,0 +1,107 @@
+/**
+ * Stores recently played gamemodes, maps, etc.
+ */
+/datum/controller/subsystem/persistence
+ var/list/saved_modes = list(1,2,3)
+ var/list/saved_dynamic_rules = list(list(),list(),list())
+ var/list/saved_storytellers = list("foo","bar","baz")
+ var/list/average_dynamic_threat = 50
+ var/list/saved_maps
+
+/datum/controller/subsystem/persistence/SaveServerPersistence()
+ . = ..()
+ CollectRoundtype()
+ if(istype(SSticker.mode, /datum/game_mode/dynamic))
+ var/datum/game_mode/dynamic/mode = SSticker.mode
+ CollectStoryteller(mode)
+ CollectRulesets(mode)
+ RecordMaps()
+
+/datum/controller/subsystem/persistence/LoadServerPersistence()
+ . = ..()
+ LoadRecentModes()
+ LoadRecentStorytellers()
+ LoadRecentRulesets()
+ LoadRecentMaps()
+
+/datum/controller/subsystem/persistence/proc/CollectRoundtype()
+ saved_modes[3] = saved_modes[2]
+ saved_modes[2] = saved_modes[1]
+ saved_modes[1] = SSticker.mode.config_tag
+ var/json_file = file("data/RecentModes.json")
+ var/list/file_data = list()
+ file_data["data"] = saved_modes
+ fdel(json_file)
+ WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
+ saved_storytellers.len = 3
+ saved_storytellers[3] = saved_storytellers[2]
+ saved_storytellers[2] = saved_storytellers[1]
+ saved_storytellers[1] = mode.storyteller.name
+ average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
+ var/json_file = file("data/RecentStorytellers.json")
+ var/list/file_data = list()
+ file_data["data"] = saved_storytellers + average_dynamic_threat
+ fdel(json_file)
+ WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
+ saved_dynamic_rules[3] = saved_dynamic_rules[2]
+ saved_dynamic_rules[2] = saved_dynamic_rules[1]
+ saved_dynamic_rules[1] = list()
+ for(var/r in mode.executed_rules)
+ var/datum/dynamic_ruleset/rule = r
+ saved_dynamic_rules[1] += rule.config_tag
+ var/json_file = file("data/RecentRulesets.json")
+ var/list/file_data = list()
+ file_data["data"] = saved_dynamic_rules
+ fdel(json_file)
+ WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/RecordMaps()
+ saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
+ var/json_file = file("data/RecentMaps.json")
+ var/list/file_data = list()
+ file_data["maps"] = saved_maps
+ fdel(json_file)
+ WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/LoadRecentModes()
+ var/json_file = file("data/RecentModes.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ if(!json)
+ return
+ saved_modes = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
+ var/json_file = file("data/RecentRulesets.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ if(!json)
+ return
+ saved_dynamic_rules = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
+ var/json_file = file("data/RecentStorytellers.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ if(!json)
+ return
+ saved_storytellers = json["data"]
+ if(saved_storytellers.len > 3)
+ average_dynamic_threat = saved_storytellers[4]
+ saved_storytellers.len = 3
+
+/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
+ var/json_file = file("data/RecentMaps.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ if(!json)
+ return
+ saved_maps = json["maps"]
diff --git a/code/controllers/subsystem/persistence/secret_satchels.dm b/code/controllers/subsystem/persistence/secret_satchels.dm
new file mode 100644
index 0000000000..fa2a445317
--- /dev/null
+++ b/code/controllers/subsystem/persistence/secret_satchels.dm
@@ -0,0 +1,79 @@
+/**
+ * Secret satchel persistence - allows storing of items in underfloor satchels that's loaded later.
+ */
+/datum/controller/subsystem/persistence
+ var/list/satchel_blacklist = list() //this is a typecache
+ var/list/new_secret_satchels = list() //these are objects
+ var/list/old_secret_satchels = list()
+
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+ . = ..()
+ LoadSatchels()
+
+/datum/controller/subsystem/persistence/SaveGamePersistence()
+ . = ..()
+ CollectSecretSatchels()
+
+/datum/controller/subsystem/persistence/proc/LoadSatchels()
+ var/placed_satchel = 0
+ var/path
+
+ var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+ var/list/json = list()
+ if(fexists(json_file))
+ json = json_decode(file2text(json_file))
+
+ old_secret_satchels = json["data"]
+ var/obj/item/storage/backpack/satchel/flat/F
+ if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear.
+ var/pos = rand(1, old_secret_satchels.len)
+ F = new()
+ old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
+ F.x = old_secret_satchels[pos]["x"]
+ F.y = old_secret_satchels[pos]["y"]
+ F.z = SSmapping.station_start
+ path = text2path(old_secret_satchels[pos]["saved_obj"])
+
+ if(F)
+ if(isfloorturf(F.loc) && !isplatingturf(F.loc))
+ F.hide(1)
+ if(ispath(path))
+ var/spawned_item = new path(F)
+ spawned_objects[spawned_item] = TRUE
+ placed_satchel++
+ var/free_satchels = 0
+ for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
+ if(isfloorturf(T) && !isplatingturf(T))
+ new /obj/item/storage/backpack/satchel/flat/secret(T)
+ free_satchels++
+ if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves
+ break
+
+/datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
+ satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
+ var/list/satchels_to_add = list()
+ for(var/A in new_secret_satchels)
+ var/obj/item/storage/backpack/satchel/flat/F = A
+ if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
+ continue
+ var/list/savable_obj = list()
+ for(var/obj/O in F)
+ if(is_type_in_typecache(O, satchel_blacklist) || (O.flags_1 & ADMIN_SPAWNED_1))
+ continue
+ if(O.persistence_replacement)
+ savable_obj += O.persistence_replacement
+ else
+ savable_obj += O.type
+ if(isemptylist(savable_obj))
+ continue
+ var/list/data = list()
+ data["x"] = F.x
+ data["y"] = F.y
+ data["saved_obj"] = pick(savable_obj)
+ satchels_to_add += list(data)
+
+ var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+ var/list/file_data = list()
+ fdel(json_file)
+ file_data["data"] = old_secret_satchels + satchels_to_add
+ WRITE_FILE(json_file, json_encode(file_data))
diff --git a/code/controllers/subsystem/persistence/trophies.dm b/code/controllers/subsystem/persistence/trophies.dm
new file mode 100644
index 0000000000..770ca99125
--- /dev/null
+++ b/code/controllers/subsystem/persistence/trophies.dm
@@ -0,0 +1,84 @@
+/**
+ * Stores trophies in curator display cases
+ */
+/datum/controller/subsystem/persistence
+ var/list/saved_trophies = list()
+
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+ . = ..()
+ LoadTrophies()
+
+/datum/controller/subsystem/persistence/SaveGamePersistence()
+ . = ..()
+ CollectTrophies()
+
+/datum/controller/subsystem/persistence/proc/LoadTrophies()
+ if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
+ var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
+ var/saved_json
+ S >> saved_json
+ if(!saved_json)
+ return
+ saved_trophies = json_decode(saved_json)
+ fdel("data/npc_saves/TrophyItems.sav")
+ else
+ var/json_file = file("data/npc_saves/TrophyItems.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ if(!json)
+ return
+ saved_trophies = json["data"]
+ SetUpTrophies(saved_trophies.Copy())
+
+/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
+ for(var/A in GLOB.trophy_cases)
+ var/obj/structure/displaycase/trophy/T = A
+ if (T.showpiece)
+ continue
+ T.added_roundstart = TRUE
+
+ var/trophy_data = pick_n_take(trophy_items)
+
+ if(!islist(trophy_data))
+ continue
+
+ var/list/chosen_trophy = trophy_data
+
+ if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed
+ continue
+
+ var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null
+ if(!path)
+ continue
+
+ T.showpiece = new /obj/item/showpiece_dummy(T, path)
+ T.trophy_message = chosen_trophy["message"]
+ T.placer_key = chosen_trophy["placer_key"]
+ T.update_icon()
+
+/datum/controller/subsystem/persistence/proc/CollectTrophies()
+ var/json_file = file("data/npc_saves/TrophyItems.json")
+ var/list/file_data = list()
+ file_data["data"] = remove_duplicate_trophies(saved_trophies)
+ fdel(json_file)
+ WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/remove_duplicate_trophies(list/trophies)
+ var/list/ukeys = list()
+ . = list()
+ for(var/trophy in trophies)
+ var/tkey = "[trophy["path"]]-[trophy["message"]]"
+ if(ukeys[tkey])
+ continue
+ else
+ . += list(trophy)
+ ukeys[tkey] = TRUE
+
+/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
+ if(!T.added_roundstart && T.showpiece)
+ var/list/data = list()
+ data["path"] = T.showpiece.type
+ data["message"] = T.trophy_message
+ data["placer_key"] = T.placer_key
+ saved_trophies += list(data)
diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
index 753adf7ff4..dae685b08f 100644
--- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -72,6 +72,52 @@
category = CAT_WEAPONRY
subcategory = CAT_MELEE
+/datum/crafting_recipe/bokken
+ name = "Training Bokken"
+ result = /obj/item/melee/bokken
+ tools = list(TOOL_SCREWDRIVER)
+ reqs = list(/obj/item/bokken_blade = 1,
+ /obj/item/bokken_hilt = 1,
+ /obj/item/stack/sheet/cloth = 2,
+ /obj/item/stack/sheet/leather = 1)
+ time = 60
+ category = CAT_WEAPONRY
+ subcategory = CAT_MELEE
+
+/datum/crafting_recipe/bokken_steelwood
+ name = "Training Bokken"
+ result = /obj/item/melee/bokken/steelwood
+ tools = list(TOOL_SCREWDRIVER)
+ reqs = list(/obj/item/bokken_steelblade = 1,
+ /obj/item/bokken_hilt = 1,
+ /obj/item/stack/sheet/cloth = 2,
+ /obj/item/stack/sheet/leather = 1)
+ time = 60
+ category = CAT_WEAPONRY
+ subcategory = CAT_MELEE
+
+/datum/crafting_recipe/wakibokken
+ name = "Training Wakizashi Bokken"
+ result = /obj/item/melee/bokken/waki
+ tools = list(TOOL_SCREWDRIVER)
+ reqs = list(/obj/item/wakibokken_blade = 1,
+ /obj/item/bokken_hilt = 1,
+ /obj/item/stack/sheet/cloth = 1)
+ time = 40
+ category = CAT_WEAPONRY
+ subcategory = CAT_MELEE
+
+/datum/crafting_recipe/wakibokken_steelwood
+ name = "Training Wakizashi Steelwood Bokken"
+ result = /obj/item/melee/bokken/waki/steelwood
+ tools = list(TOOL_SCREWDRIVER)
+ reqs = list(/obj/item/wakibokken_steelblade = 1,
+ /obj/item/bokken_hilt = 1,
+ /obj/item/stack/sheet/cloth = 1)
+ time = 40
+ category = CAT_WEAPONRY
+ subcategory = CAT_MELEE
+
/datum/crafting_recipe/bola
name = "Bola"
result = /obj/item/restraints/legcuffs/bola
@@ -434,3 +480,51 @@
time = 20
category = CAT_WEAPONRY
subcategory = CAT_PARTS
+
+// BOKKEN CRAFTING
+
+/datum/crafting_recipe/bokken_blade
+ name = "Training Bokken Blade"
+ result = /obj/item/bokken_blade
+ tools = list(/obj/item/hatchet)
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 5)
+ time = 20
+ category = CAT_WEAPONRY
+ subcategory = CAT_PARTS
+
+/datum/crafting_recipe/wakibokken_blade
+ name = "Training Wakizashi Bokken Blade"
+ result = /obj/item/wakibokken_blade
+ tools = list(/obj/item/hatchet)
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 2)
+ time = 20
+ category = CAT_WEAPONRY
+ subcategory = CAT_PARTS
+
+/datum/crafting_recipe/bokken_steelblade
+ name = "Training Ironwood Bokken Blade"
+ result = /obj/item/bokken_steelblade
+ tools = list(/obj/item/hatchet, TOOL_WELDER)
+ reqs = list(/obj/item/grown/log/steel = 2)
+ time = 20
+ category = CAT_WEAPONRY
+ subcategory = CAT_PARTS
+
+/datum/crafting_recipe/wakibokken_blade
+ name = "Training Wakizashi Ironwood Bokken Blade"
+ result = /obj/item/wakibokken_steelblade
+ tools = list(/obj/item/hatchet, TOOL_WELDER)
+ reqs = list(/obj/item/grown/log/steel = 1)
+ time = 20
+ category = CAT_WEAPONRY
+ subcategory = CAT_PARTS
+
+/datum/crafting_recipe/bokken_hilt
+ name = "Training Bokken hilt"
+ result = /obj/item/bokken_hilt
+ tools = list(/obj/item/hatchet)
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 5,
+ /obj/item/stack/sheet/cloth = 2)
+ time = 20
+ category = CAT_WEAPONRY
+ subcategory = CAT_PARTS
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index 53373de6d7..49b19f767c 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -54,6 +54,7 @@
move_react()
/datum/component/orbiter/proc/begin_orbit(atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+ SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
if(orbiter.orbiting)
if(orbiter.orbiting == src)
orbiter.orbiting.end_orbit(orbiter, TRUE)
@@ -87,6 +88,7 @@
/datum/component/orbiter/proc/end_orbit(atom/movable/orbiter, refreshing=FALSE)
if(!orbiters[orbiter])
return
+ SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_END, orbiter, refreshing)
UnregisterSignal(orbiter, COMSIG_MOVABLE_MOVED)
orbiter.SpinAnimation(0, 0)
if(istype(orbiters[orbiter],/matrix)) //This is ugly.
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 973ca7463e..03f3820a9b 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -133,7 +133,7 @@
//KEYS
/datum/component/riding/proc/keycheck(mob/user)
- return !keytype || user.is_holding_item_of_type(keytype)
+ return !keytype || user?.is_holding_item_of_type(keytype)
//BUCKLE HOOKS
/datum/component/riding/proc/restore_position(mob/living/buckled_mob)
@@ -153,7 +153,7 @@
/datum/component/riding/proc/handle_ride(mob/user, direction)
var/atom/movable/AM = parent
- if(user.incapacitated())
+ if(user && user.incapacitated())
Unbuckle(user)
return
if(world.time < last_vehicle_move + ((last_move_diagonal? 2 : 1) * vehicle_move_delay))
diff --git a/code/datums/components/twitch_plays.dm b/code/datums/components/twitch_plays.dm
new file mode 100644
index 0000000000..aadbd58b4b
--- /dev/null
+++ b/code/datums/components/twitch_plays.dm
@@ -0,0 +1,104 @@
+/**
+ * Observers voting on things through orbiting
+ */
+/datum/component/twitch_plays
+ /// Observers
+ var/list/mob/players = list()
+
+/datum/component/twitch_plays/Initialize(...)
+ . = ..()
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, .proc/on_start_orbit)
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_END, .proc/on_end_orbit)
+
+/datum/component/twitch_plays/Destroy(force, silent)
+ for(var/i in players)
+ DetachPlayer(i)
+ return ..()
+
+/datum/component/twitch_plays/proc/on_start_orbit(datum/source, atom/movable/orbiter)
+ if(!isobserver(orbiter))
+ return
+ AttachPlayer(orbiter)
+
+/datum/component/twitch_plays/proc/on_end_orbit(datum/source, atom/movable/orbiter)
+ if(!(orbiter in players))
+ return
+ DetachPlayer(orbiter)
+
+/datum/component/twitch_plays/proc/AttachPlayer(mob/dead/observer)
+ players |= observer
+ RegisterSignal(observer, COMSIG_PARENT_QDELETING, .proc/on_end_orbit)
+
+/datum/component/twitch_plays/proc/DetachPlayer(mob/dead/observer)
+ players -= observer
+ UnregisterSignal(observer, COMSIG_PARENT_QDELETING)
+
+/// Simple movement one
+/datum/component/twitch_plays/simple_movement
+ /// Movement votes by observer
+ var/list/votes = list()
+ /// Allow diagonals
+ var/allow_diagonal = FALSE
+
+/datum/component/twitch_plays/simple_movement/Initialize(...)
+ . = ..()
+ if(. & COMPONENT_INCOMPATIBLE)
+ return
+ RegisterSignal(parent, COMSIG_TWITCH_PLAYS_MOVEMENT_DATA, .proc/fetch_data)
+
+/datum/component/twitch_plays/simple_movement/AttachPlayer(mob/dead/observer)
+ . = ..()
+ RegisterSignal(observer, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move)
+
+/datum/component/twitch_plays/simple_movement/DetachPlayer(mob/dead/observer)
+ . = ..()
+ UnregisterSignal(observer, COMSIG_MOVABLE_PRE_MOVE)
+
+/datum/component/twitch_plays/simple_movement/proc/pre_move(datum/source, turf/newLoc)
+ if(get_dist(newLoc, parent) > 1) // they're trying to escape orbit
+ return
+ . = COMPONENT_MOVABLE_BLOCK_PRE_MOVE
+ var/dir = get_dir(parent, newLoc)
+ if(!dir)
+ return
+ if(allow_diagonal || !((dir - 1) & dir))
+ votes[source] = dir
+ else // pick one or the other
+ votes[source] = prob(50)? (dir & ~(dir - 1)) : (dir & (dir - 1))
+
+/datum/component/twitch_plays/simple_movement/proc/fetch_data(datum/source, wipe_votes)
+ if(!votes.len)
+ return
+ var/list/total = list(TEXT_NORTH, TEXT_SOUTH, TEXT_EAST, TEXT_WEST)
+ for(var/i in votes)
+ total[num2text(votes[i])] += 1
+ . = text2num(pickweight(total, 0))
+ if(wipe_votes)
+ votes.len = 0
+
+/datum/component/twitch_plays/simple_movement/auto
+ var/move_delay = 2
+ var/last_move = 0
+
+/datum/component/twitch_plays/simple_movement/auto/Initialize(...)
+ if(!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+ . = ..()
+ if(. & COMPONENT_INCOMPATIBLE)
+ return
+ START_PROCESSING(SSfastprocess, src)
+
+/datum/component/twitch_plays/simple_movement/auto/Destroy(force, silent)
+ STOP_PROCESSING(SSfastprocess, src)
+ return ..()
+
+/datum/component/twitch_plays/simple_movement/auto/process()
+ var/dir = fetch_data(null, TRUE)
+ if(!dir)
+ return
+ if(world.time < (last_move + move_delay))
+ return
+ last_move = world.time
+ step(parent, dir)
diff --git a/code/datums/elements/polychromic.dm b/code/datums/elements/polychromic.dm
index 600bf9250e..5e888e0609 100644
--- a/code/datums/elements/polychromic.dm
+++ b/code/datums/elements/polychromic.dm
@@ -165,6 +165,15 @@
/datum/element/polychromic/proc/on_examine(atom/source, mob/user, list/examine_list)
examine_list += "Alt-click to recolor it."
+/datum/element/polychromic/proc/connect_helmet(atom/I, var/applycolor)
+ if(isitem(I))
+ if(istype(I,/obj/item/clothing/suit/hooded))
+ var/obj/item/clothing/suit/hooded/Isuit = I
+ colors_by_atom[Isuit.hood] = applycolor
+ else if(istype(I,/obj/item/clothing/suit/space/hardsuit))
+ var/obj/item/clothing/suit/space/hardsuit/Isuit = I
+ colors_by_atom[Isuit.helmet] = applycolor
+
/datum/element/polychromic/proc/register_helmet(atom/source, obj/item/clothing/head/H)
if(!isitem(H)) //backup in case if it messes up somehow
if(istype(source,/obj/item/clothing/suit/hooded)) //so how come it be like this, where toggleable headslots are named separately (helmet/hood) anyways?
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 5e9371f754..79c12c7fea 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -85,6 +85,15 @@
var/mob/M = teleatom
M.cancel_camera()
+ var/static/list/bread_cache = typecacheof(/obj/item/reagent_containers/food/snacks/store/bread)
+ var/list/breadlist = typecache_filter_list(teleatom.GetAllContents(), bread_cache)
+ if(breadlist.len && (channel == TELEPORT_CHANNEL_BLUESPACE || channel == TELEPORT_CHANNEL_QUANTUM))
+ for(var/obj/item/reagent_containers/food/snacks/store/bread/bread in breadlist)
+ bread.bread_teleport()
+ else if(istype(teleatom, /obj/item/reagent_containers/food/snacks/store/bread))
+ var/obj/item/reagent_containers/food/snacks/store/bread/bread = teleatom
+ bread.bread_teleport()
+
return TRUE
/proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound)
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/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 5e3306937c..b2673c960e 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -41,6 +41,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
power_environ = FALSE
valid_territory = FALSE
outdoors = TRUE
+ persistent_debris_allowed = FALSE
ambientsounds = SPACE
blob_allowed = FALSE //Eating up space doesn't count for victory as a blob.
considered_hull_exterior = TRUE
@@ -329,10 +330,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
@@ -484,6 +481,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
+/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"
@@ -494,6 +496,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"
@@ -798,6 +804,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
ambientsounds = MEDICAL
sound_environment = SOUND_AREA_STANDARD_STATION
+/area/medical/clinic
+ name = "Clinic"
+ icon_state = "medbay3"
+ ambientsounds = MEDICAL
+
/area/medical/abandoned
name = "Abandoned Medbay"
icon_state = "medbay3"
@@ -1078,11 +1089,20 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
flags_1 = NONE
sound_environment = SOUND_AREA_SMALL_ENCLOSED
+/area/janitor/aux
+ name = "Auxiliary Custodial Closet"
+ icon_state = "janitor"
+ flags_1 = NONE
+
/area/hydroponics
name = "Hydroponics"
icon_state = "hydro"
sound_environment = SOUND_AREA_STANDARD_STATION
+/area/hydroponics/lobby
+ name = "Hydroponics Lobby"
+ icon_state = "hydro"
+
/area/hydroponics/garden
name = "Garden"
icon_state = "garden"
@@ -1103,6 +1123,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "toxlab"
sound_environment = SOUND_AREA_STANDARD_STATION
+/area/science/observatory
+ name = "Research Observatory"
+ icon_state = "toxmisc"
+
/area/science/lab
name = "Research and Development"
icon_state = "toxlab"
@@ -1145,6 +1169,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Research Division Server Room"
icon_state = "server"
+/area/science/server/compcore
+ name = "Computer Core"
+ icon_state = "server"
+
/area/science/explab
name = "Experimentation Lab"
icon_state = "toxmisc"
@@ -1234,6 +1262,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"
@@ -1452,100 +1484,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
@@ -1602,10 +1540,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/area/areas.dm b/code/game/area/areas.dm
index 09f32a399b..4790d20f64 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -80,6 +80,10 @@
var/clockwork_warp_allowed = TRUE
/// Message to display when the clockwork warp fails
var/clockwork_warp_fail = "The structure there is too dense for warping to pierce. (This is normal in high-security areas.)"
+ /// Persistent debris alowed
+ var/persistent_debris_allowed = TRUE
+ /// Dirty flooring allowed
+ var/dirt_buildup_allowed = TRUE
/// If mining tunnel generation is allowed in this area
var/tunnel_allowed = FALSE
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index d7106f6231..ce2d321bc6 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -251,7 +251,6 @@
. = pulledby
pulledby = new_pulledby
-
/atom/movable/proc/Move_Pulled(atom/A)
if(!pulling)
return FALSE
@@ -271,13 +270,6 @@
pulling.Move(get_step(pulling.loc, move_dir), move_dir, glide_size)
return TRUE
-/mob/living/Move_Pulled(atom/A)
- . = ..()
- if(!. || !isliving(A))
- return
- var/mob/living/L = A
- set_pull_offsets(L, grab_state)
-
/atom/movable/proc/check_pulling()
if(pulling)
var/atom/movable/pullee = pulling
diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm
index 38edcd6d8a..84f518664f 100644
--- a/code/game/machinery/colormate.dm
+++ b/code/game/machinery/colormate.dm
@@ -106,15 +106,15 @@
dat += " 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/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 34996177af..5a6d5e54e9 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -1,6 +1,13 @@
/obj/effect/decal/cleanable
gender = PLURAL
layer = ABOVE_NORMAL_TURF_LAYER
+ /// Is this kind of cleanable decal persistent
+ var/persistent = FALSE
+ /// Can we stack multiple in one tile?
+ var/persistence_allow_stacking = FALSE
+ /// Are we deleted by turf changes?
+ var/wiped_by_floor_change = FALSE
+
var/list/random_icon_states = null
var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
@@ -29,9 +36,21 @@
addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, beauty)), 0)
+/**
+ * A data list is passed into this.
+ * This should return null to skip saving, or the type of data to save. Type must be /cleanable.
+ */
+/obj/effect/decal/cleanable/proc/PersistenceSave(list/data)
+ return type
+
+/**
+ * Loads from a data list.
+ */
+/obj/effect/decal/cleanable/proc/PersistenceLoad(list/data)
+ return
+
/obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C) // Returns true if we should give up in favor of the pre-existing decal
- if(mergeable_decal)
- qdel(C)
+ return mergeable_decal
/obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food/drinks))
diff --git a/code/game/objects/effects/decals/cleanable/gibs.dm b/code/game/objects/effects/decals/cleanable/gibs.dm
index 7df0153ddc..4b63cbecc8 100644
--- a/code/game/objects/effects/decals/cleanable/gibs.dm
+++ b/code/game/objects/effects/decals/cleanable/gibs.dm
@@ -6,6 +6,7 @@
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
mergeable_decal = FALSE
bloodiness = 0 //This isn't supposed to be bloody.
+ persistent = TRUE
var/body_colors = "#e3ba84" //a default color just in case.
var/gibs_reagent_id = /datum/reagent/liquidgibs
var/gibs_bloodtype = "A+"
@@ -31,6 +32,10 @@
flesh.color = body_colors
add_overlay(flesh)
+/obj/effect/decal/cleanable/blood/gibs/PersistenceSave(list/data)
+ . = ..()
+ return /obj/effect/decal/cleanable/blood/gibs/old
+
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
return
@@ -159,6 +164,10 @@
. = ..()
update_icon()
+/obj/effect/decal/cleanable/blood/gibs/slime/PersistenceSave(list/data)
+ . = ..()
+ return type
+
/obj/effect/decal/cleanable/blood/gibs/slime/update_icon()
add_atom_colour(body_colors, FIXED_COLOUR_PRIORITY)
cut_overlays()
@@ -198,6 +207,10 @@
. = ..()
update_icon()
+/obj/effect/decal/cleanable/blood/gibs/synth/PersistenceSave(list/data)
+ . = ..()
+ return type
+
//IPCs
/obj/effect/decal/cleanable/blood/gibs/ipc
desc = "They look sharp yet oozing."
@@ -209,6 +222,10 @@
. = ..()
update_icon()
+/obj/effect/decal/cleanable/blood/gibs/ipc/PersistenceSave(list/data)
+ . = ..()
+ return type
+
/obj/effect/decal/cleanable/blood/gibs/ipc/update_icon()
add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
cut_overlays()
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index fa16a95faf..6d051b6c8c 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -8,12 +8,18 @@
bloodiness = BLOOD_AMOUNT_PER_DECAL
color = BLOOD_COLOR_HUMAN //default so we don't have white splotches everywhere.
beauty = -100
+ persistent = TRUE
+ var/fixed_color = FALSE
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
+ if(C.fixed_color)
+ qdel(C)
+ return FALSE
if (C.blood_DNA)
blood_DNA |= C.blood_DNA
+ qdel(C)
update_icon()
- ..()
+ return FALSE
/obj/effect/decal/cleanable/blood/transfer_blood_dna()
..()
@@ -24,7 +30,22 @@
update_icon()
/obj/effect/decal/cleanable/blood/update_icon()
- color = blood_DNA_to_color()
+ . = ..()
+ if(!fixed_color)
+ add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
+
+/obj/effect/decal/cleanable/blood/PersistenceSave(list/data)
+ . = ..()
+ data["color"] = color
+
+/obj/effect/decal/cleanable/blood/PersistenceLoad(list/data)
+ . = ..()
+ if(data["color"])
+ fixed_color = TRUE
+ add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
+ name = "dried blood"
+ desc = "Looks like it's been here a while. Eew"
+ bloodiness = 0
/obj/effect/decal/cleanable/blood/old
name = "dried blood"
@@ -38,6 +59,7 @@
/obj/effect/decal/cleanable/blood/splats
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
+ persistence_allow_stacking = TRUE
/obj/effect/decal/cleanable/blood/splatter
random_icon_states = list("splatter1", "splatter2", "splatter3", "splatter4", "splatter5")
@@ -48,16 +70,43 @@
random_icon_states = null
beauty = -50
+/obj/effect/decal/cleanable/blood/tracks/PersistenceSave(list/data)
+ . = ..()
+ data["dir"] = dir
+
+/obj/effect/decal/cleanable/blood/tracks/PersistenceLoad(list/data)
+ . = ..()
+ if(data["dir"])
+ setDir(text2num(data["dir"]))
+
/obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
name = "blood"
icon_state = "ltrails_1"
desc = "Your instincts say you shouldn't be following these."
random_icon_states = null
beauty = -50
+ persistent = TRUE
+ persistence_allow_stacking = TRUE
var/list/existing_dirs = list()
+ var/fixed_color = FALSE
+
+/obj/effect/decal/cleanable/trail_holder/PersistenceSave(list/data)
+ . = ..()
+ data["dir"] = dir
+ data["color"] = color
+
+/obj/effect/decal/cleanable/trail_holder/PersistenceLoad(list/data)
+ . = ..()
+ if(data["dir"])
+ setDir(text2num(data["dir"]))
+ if(data["color"])
+ fixed_color = TRUE
+ add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
/obj/effect/decal/cleanable/trail_holder/update_icon()
- color = blood_DNA_to_color()
+ . = ..()
+ if(!fixed_color)
+ add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
/obj/effect/cleanable/trail_holder/Initialize()
. = ..()
@@ -84,8 +133,19 @@
var/entered_dirs = 0
var/exited_dirs = 0
blood_state = BLOOD_STATE_BLOOD //the icon state to load images from
+ persistent = TRUE
+ persistence_allow_stacking = TRUE
var/list/shoe_types = list()
+/obj/effect/decal/cleanable/blood/footprints/PersistenceSave(list/data)
+ . = ..()
+ data["dir"] = dir
+
+/obj/effect/decal/cleanable/blood/footprints/PersistenceLoad(list/data)
+ . = ..()
+ if(data["dir"])
+ setDir(text2num(data["dir"]))
+
/obj/effect/decal/cleanable/blood/footprints/Crossed(atom/movable/O)
if(ishuman(O))
var/mob/living/carbon/human/H = O
@@ -143,7 +203,7 @@
return
if(color != C.color)
return
- ..()
+ return ..()
/obj/effect/decal/cleanable/blood/footprints/can_bloodcrawl_in()
if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 044c5c6e86..0f7d7c185d 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -12,6 +12,8 @@
icon_state = "ash"
mergeable_decal = FALSE
beauty = -50
+ persistent = TRUE
+ persistence_allow_stacking = TRUE
/obj/effect/decal/cleanable/ash/Initialize()
. = ..()
@@ -38,6 +40,8 @@
icon = 'icons/obj/shards.dmi'
icon_state = "tiny"
beauty = -100
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/glass/Initialize()
. = ..()
@@ -53,10 +57,33 @@
name = "dirt"
desc = "Someone should clean that up."
icon_state = "dirt"
+ alpha = 127
canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/closed/wall, /obj/structure/falsewall)
smooth = SMOOTH_FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
beauty = -75
+ mergeable_decal = TRUE
+ persistent = TRUE
+ wiped_by_floor_change = TRUE
+
+/obj/effect/decal/cleanable/dirt/Initialize(mapload)
+ . = ..()
+ alpha = CONFIG_GET(number/dirt_alpha_starting)
+
+/obj/effect/decal/cleanable/dirt/proc/dirty(strength = 1)
+ if(alpha < 255)
+ alpha += strength
+ if(alpha > 255)
+ alpha = 255
+
+/obj/effect/decal/cleanable/dirt/PersistenceSave(list/data)
+ . = ..()
+ data["alpha"] = alpha
+
+/obj/effect/decal/cleanable/dirt/PersistenceLoad(list/data)
+ . = ..()
+ if(data["alpha"])
+ alpha = text2num(data["alpha"])
/obj/effect/decal/cleanable/dirt/Initialize()
. = ..()
@@ -94,6 +121,8 @@
light_color = LIGHT_COLOR_GREEN
icon_state = "greenglow"
beauty = -300
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
. = ..()
@@ -122,6 +151,8 @@
icon_state = "molten"
mergeable_decal = FALSE
beauty = -150
+ persistent = TRUE
+ persistence_allow_stacking = TRUE
/obj/effect/decal/cleanable/molten_object/large
name = "big gooey grey mass"
@@ -136,6 +167,7 @@
icon_state = "vomit_1"
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
beauty = -150
+ persistent = TRUE
/obj/effect/decal/cleanable/vomit/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(ishuman(user))
@@ -151,6 +183,10 @@
reagents.trans_to(H, reagents.total_volume)
qdel(src)
+/obj/effect/decal/cleanable/vomit/PersistenceSave(list/data)
+ . = ..()
+ return /obj/effect/decal/cleanable/vomit/old
+
/obj/effect/decal/cleanable/vomit/old
name = "crusty dried vomit"
desc = "You try not to look at the chunks, and fail."
@@ -166,12 +202,16 @@
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
beauty = -100
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/plant_smudge
name = "plant smudge"
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_plant")
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/egg_smudge
name = "smashed egg"
@@ -179,6 +219,8 @@
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/pie_smudge //honk
name = "smashed pie"
@@ -186,6 +228,8 @@
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/chem_pile
name = "chemical pile"
@@ -193,6 +237,8 @@
gender = NEUTER
icon = 'icons/obj/objects.dmi'
icon_state = "ash"
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/shreds
name = "shreds"
@@ -200,6 +246,8 @@
icon_state = "shreds"
gender = PLURAL
mergeable_decal = FALSE
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
@@ -222,6 +270,8 @@
desc = "The herpes of arts and crafts."
icon = 'icons/effects/atmospherics.dmi'
gender = NEUTER
+ mergeable_decal = TRUE
+ persistent = TRUE
/obj/effect/decal/cleanable/glitter/pink
name = "pink glitter"
@@ -247,3 +297,5 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
+ mergeable_decal = TRUE
+ persistent = TRUE
diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
index 62086fc540..9dd3c2a852 100644
--- a/code/game/objects/effects/decals/cleanable/robots.dm
+++ b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -11,6 +11,7 @@
bloodiness = BLOOD_AMOUNT_PER_DECAL
mergeable_decal = FALSE
beauty = -50
+ persistent = TRUE
/obj/effect/decal/cleanable/robot_debris/Initialize(mapload, list/datum/disease/diseases)
. = ..()
@@ -52,6 +53,7 @@
blood_state = BLOOD_STATE_OIL
bloodiness = BLOOD_AMOUNT_PER_DECAL
beauty = -100
+ persistent = TRUE
/obj/effect/decal/cleanable/oil/Initialize()
. = ..()
@@ -61,8 +63,10 @@
/obj/effect/decal/cleanable/oil/streak
random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
beauty = -50
+ persistent = TRUE
/obj/effect/decal/cleanable/oil/slippery
+ persistent = FALSE
/obj/effect/decal/cleanable/oil/slippery/Initialize()
. = ..()
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 8cfdad0432..387b8c167d 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -5,6 +5,8 @@
icon_state = "rune1"
plane = ABOVE_WALL_PLANE //makes the graffiti visible over a wall.
gender = NEUTER
+ persistent = TRUE
+ persistence_allow_stacking = TRUE
mergeable_decal = FALSE
var/do_icon_rotate = TRUE
var/rotation = 0
@@ -29,3 +31,35 @@
if(main)
paint_colour = main
add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
+
+/obj/effect/decal/cleanable/crayon/PersistenceSave(list/data)
+ . = ..()
+ if(icon != initial(icon)) // no support for alticons yet, awful system anyways
+ return null
+ data["icon_state"] = icon_state
+ data["paint_color"] = paint_colour
+ if(do_icon_rotate)
+ data["rotation"] = rotation
+ data["name"] = name
+ if(pixel_x != initial(pixel_x))
+ data["pixel_x"] = pixel_x
+ if(pixel_y != initial(pixel_y))
+ data["pixel_y"] = pixel_y
+
+/obj/effect/decal/cleanable/crayon/PersistenceLoad(list/data)
+ . = ..()
+ if(data["name"])
+ name = data["name"]
+ if(do_icon_rotate && data["rotation"])
+ var/matrix/M = matrix()
+ M.Turn(text2num(data["rotation"]))
+ transform = M
+ if(data["paint_color"])
+ paint_colour = data["paint_color"]
+ add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
+ if(data["icon_state"])
+ icon_state = data["icon_state"]
+ if(data["pixel_x"])
+ pixel_x = data["pixel_x"]
+ if(data["pixel_y"])
+ pixel_y = data["pixel_y"]
diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm
index 21cfd1fbad..b7f7f5f2d1 100644
--- a/code/game/objects/items/credit_holochip.dm
+++ b/code/game/objects/items/credit_holochip.dm
@@ -80,6 +80,17 @@
to_chat(user, "You insert the credits into [src].")
update_icon()
qdel(H)
+ if(istype(I, /obj/item/card/id))
+ var/obj/item/card/id/ID = I
+ if(!ID.registered_account)
+ to_chat(user, "[ID] doesn't have a linked account to deposit into!")
+ return
+ for(var/obj/item/holochip/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/stack/spacecash/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/coin/money in src.loc.contents)
+ ID.attackby(money, user)
/obj/item/holochip/AltClick(mob/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index c3127c246f..86d7766fd5 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -16,9 +16,9 @@ GLOBAL_LIST_EMPTY(power_sinks)
throw_speed = 1
throw_range = 2
custom_materials = list(/datum/material/iron=750)
- var/drain_rate = 1600000 // amount of power to drain per tick
+ var/drain_rate = 2000000 // amount of power to drain per tick. Currently 2MJ.
var/power_drained = 0 // has drained this much power
- var/max_power = 1e10 // maximum power that can be drained before exploding
+ var/max_power = 2000000000 // maximum power that can be drained before exploding. Currently 2GJ. About 17 minutes to explode at the max rate.
var/mode = 0 // 0 = off, 1=clamped (off), 2=operating
var/admins_warned = FALSE // stop spam, only warn the admins once that we are about to boom
@@ -155,5 +155,5 @@ GLOBAL_LIST_EMPTY(power_sinks)
if(power_drained >= max_power)
STOP_PROCESSING(SSobj, src)
- explosion(src.loc, 4,8,16,32)
+ explosion(src.loc, 3,7,14,28)
qdel(src)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index eb444cdb12..70edd3f43d 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -264,6 +264,30 @@ effective or pretty fucking useless.
GLOB.active_jammers -= src
update_icon()
+/*portable turret*/
+/obj/item/storage/toolbox/emergency/turret
+ desc = "You feel a strange urge to hit this with a wrench."
+
+/obj/item/storage/toolbox/emergency/turret/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/analyzer(src)
+ new /obj/item/wirecutters(src)
+
+/obj/item/storage/toolbox/emergency/turret/attackby(obj/item/I, mob/living/user, params)
+ if(I.tool_behaviour == TOOL_WRENCH && user.a_intent == INTENT_HARM)
+ user.visible_message("[user] bashes [src] with [I]!", \
+ "You bash [src] with [I]!", null, COMBAT_MESSAGE_RANGE)
+ playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1)
+ var/obj/machinery/porta_turret/syndicate/pod/toolbox/turret = new(get_turf(loc))
+ turret.faction = list("[REF(user)]")
+ qdel(src)
+ return
+
+ ..()
+
/obj/item/headsetupgrader
name = "headset upgrader"
desc = "A tool that can be used to upgrade a normal headset to be able to protect from flashbangs."
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 5f93f28786..ee259c4050 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -19,6 +19,7 @@
var/boom_sizes = list(0, 0, 3)
var/can_attach_mob = FALSE
var/full_damage_on_mobs = FALSE
+ var/can_gib_mobs = FALSE
/obj/item/grenade/plastic/Initialize()
. = ..()
@@ -72,7 +73,7 @@
explosion(get_step(T, aim_dir), boom_sizes[1], boom_sizes[2], boom_sizes[3])
else
explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3])
- if(ismob(target))
+ if(ismob(target) && can_gib_mobs)
var/mob/M = target
M.gib()
qdel(src)
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 913d73bdad..224c4ffb9b 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -1,17 +1,3 @@
-/obj/item/caution
- desc = "Caution! Wet Floor!"
- name = "wet floor sign"
- icon = 'icons/obj/janitor.dmi'
- icon_state = "caution"
- lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
- force = 1
- throwforce = 3
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("warned", "cautioned", "smashed")
-
/obj/item/choice_beacon
name = "choice beacon"
desc = "Hey, why are you viewing this?!! Please let Centcom know about this odd occurance."
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index 01ef96b7e8..62a3530afe 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -24,13 +24,17 @@
create_reagents(mopcap, NONE, NO_REAGENTS_VALUE)
-/obj/item/mop/proc/clean(turf/A)
+/obj/item/mop/proc/clean(turf/A, mob/user)
if(reagents.has_reagent(/datum/reagent/water, 1) || reagents.has_reagent(/datum/reagent/water/holywater, 1) || reagents.has_reagent(/datum/reagent/consumable/ethanol/vodka, 1) || reagents.has_reagent(/datum/reagent/space_cleaner, 1))
SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
A.clean_blood()
+ var/cleaned_something = FALSE
for(var/obj/effect/O in A)
if(is_cleanable(O))
+ cleaned_something = TRUE
qdel(O)
+ if(cleaned_something && user && user.client)
+ user.client.increment_progress("janitor", 1)
reagents.reaction(A, TOUCH, 10) //Needed for proper floor wetting.
reagents.remove_any(1) //reaction() doesn't use up the reagents
@@ -59,7 +63,7 @@
if(!L.UseStaminaBuffer(stamusage, warn = TRUE))
return
user.visible_message("[user] cleans \the [T] with [src].", "You clean \the [T] with [src].")
- clean(T)
+ clean(T, user)
user.DelayNextAction(CLICK_CD_MELEE)
user.do_attack_animation(T, used_item = src)
playsound(T, "slosh", 50, 1)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index a9cd4c33a7..e4d1dd8516 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -392,6 +392,7 @@
created_name = new_name
else
created_name = ""
+ log_game("[key_name(usr)] renamed [src] ([REF(src)]) to [created_name].")
else if(href_list["Master"])
forced_ai = select_active_ai(usr)
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 954950f5e6..e2036835ce 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -33,6 +33,20 @@
. = ..()
update_desc()
+/obj/item/stack/spacecash/attackby(obj/item/W, mob/user, params)
+ . = ..()
+ if(istype(W, /obj/item/card/id))
+ var/obj/item/card/id/ID = W
+ if(!ID.registered_account)
+ to_chat(user, "[ID] doesn't have a linked account to deposit into!")
+ return
+ for(var/obj/item/holochip/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/stack/spacecash/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/coin/money in src.loc.contents)
+ ID.attackby(money, user)
+
/obj/item/stack/spacecash/c1
icon_state = "spacecash"
singular_name = "one credit bill"
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 8526727464..9f126f492b 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -253,7 +253,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
- new/datum/stack_recipe("training bokken", /obj/item/melee/bokken, 10, time = 15),\
null, \
new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
@@ -794,7 +793,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 10, time = 10, one_per_turf = 1, on_floor = 1), \
new /datum/stack_recipe("duct", /obj/item/stack/ducts,1), \
new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/glass_base/laserpointer_shell, 30), \
- new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
+ new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
/obj/item/stack/sheet/plastic
name = "plastic"
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index abd862736b..80818b5fff 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -802,7 +802,8 @@
. += "Alt-click it to quickly draw the blade."
/obj/item/storage/belt/sabre/PopulateContents()
- new starting_sword(src)
+ if(starting_sword)
+ new starting_sword(src)
/obj/item/storage/belt/sabre/rapier
name = "rapier sheath"
@@ -864,6 +865,7 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 2
STR.max_w_class = WEIGHT_CLASS_BULKY + WEIGHT_CLASS_NORMAL //katana and waki.
+ STR.max_combined_w_class = 7
/obj/item/melee/smith/twohand/katana/on_exit_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/twin/B = S.parent
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 73246276c2..7a067257cb 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -103,6 +103,39 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
/obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents()
return
+/obj/item/storage/toolbox/mechanical/old/clean // the assistant traitor toolbox, damage scales with TC inside
+ name = "toolbox"
+ desc = "An old, blue toolbox. It menaces with a sickening miasma of robust energies. You sure about this, Brain?"
+ icon_state = "toolbox_blue_clean"
+ force = 19
+ throwforce = 22
+ wound_bonus = 0
+ bare_wound_bonus = 10
+
+/obj/item/storage/toolbox/mechanical/old/clean/proc/calc_damage()
+ var/power = 0
+ for (var/obj/item/stack/telecrystal/TC in GetAllContents())
+ power += TC.amount
+ force = 19 + power
+ throwforce = 22 + power
+
+/obj/item/storage/toolbox/mechanical/old/clean/attack(mob/target, mob/living/user)
+ calc_damage() // one damage for one telecrystal equals about thirty seven(?) damage if you pour ALL your tc
+ ..()
+
+/obj/item/storage/toolbox/mechanical/old/clean/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ calc_damage()
+ ..()
+
+/obj/item/storage/toolbox/mechanical/old/clean/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wrench(src)
+ new /obj/item/weldingtool(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/wirecutters(src)
+ new /obj/item/multitool(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
+
/obj/item/storage/toolbox/electrical
name = "electrical toolbox"
icon_state = "yellow"
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 3f2dc2506a..07900d6bbf 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -296,8 +296,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
- force = 7 //how much harm mode damage we do
- var/stamina_damage_increment = 4 //how much extra damage do we do when in non-harm mode
+ force = 10 //how much harm mode damage we do
+ var/stamina_damage_increment = 5 //how much extra damage do we do when in non-harm mode
throwforce = 10
damtype = STAMINA
attack_verb = list("whacked", "smacked", "struck")
@@ -310,11 +310,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
var/quick_parry = FALSE // false = default parry, true = really small parry window
item_flags = ITEM_CAN_PARRY
block_parry_data = /datum/block_parry_data/bokken
+ var/default_parry_data = /datum/block_parry_data/bokken
+ var/quick_parry_data = /datum/block_parry_data/bokken/quick_parry
bare_wound_bonus = 0
wound_bonus = 0
/datum/block_parry_data/bokken // fucked up parry data, emphasizing quicker, shorter parries
- parry_stamina_cost = 8 // be wise about when you parry, though, else you won't be able to fight enough to make it count
+ parry_stamina_cost = 10 // be wise about when you parry, though, else you won't be able to fight enough to make it count
parry_time_windup = 0
parry_time_active = 10 // small parry window
parry_time_spindown = 0
@@ -330,11 +332,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
)
parry_failed_stagger_duration = 3 SECONDS
parry_data = list(
- PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25
+ PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 10*2.5 = 25, 11*2.5 = 27.5, 12*2.5 = 30, 13*2.5 = 32.5
)
/datum/block_parry_data/bokken/quick_parry // emphasizing REALLY SHORT PARRIES
- parry_stamina_cost = 6 // still more costly than most parries, but less than a full bokken parry
+ parry_stamina_cost = 8 // still more costly than most parries, but less than a full bokken parry
parry_time_active = 5 // REALLY small parry window
parry_time_perfect = 2.5 // however...
parry_time_perfect_leeway = 2 // the entire time, the parry is perfect
@@ -371,9 +373,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
. = ..()
quick_parry = !quick_parry
if(quick_parry)
- block_parry_data = /datum/block_parry_data/bokken/quick_parry
+ block_parry_data = quick_parry_data
else
- block_parry_data = /datum/block_parry_data/bokken
+ block_parry_data = default_parry_data
to_chat(user, "[src] is now [quick_parry ? "emphasizing shorter parries, forcing you to riposte or be staggered" : "emphasizing longer parries, with a shorter window to riposte but more forgiving parries"].")
/obj/item/melee/bokken/attackby(obj/item/I, mob/living/user, params)
@@ -410,23 +412,76 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
if(burnt)
. += " Burned into the \"blade\" is [burned_in]."
+/obj/item/melee/bokken/steelwood
+ name = "steelwood bokken"
+ desc = "A misnomer of sorts, this is effectively a blunt katana made from steelwood, a dense organic wood derived from steelcaps. Why steelwood? Druids can use it. Duh."
+ icon_state = "bokken_steel"
+ item_state = "bokken_steel"
+ force = 12
+ stamina_damage_increment = 3
+
+/obj/item/melee/bokken/waki
+ name = "wakizashi bokken"
+ desc = "A space-Japanese training sword made of wood and shaped like a wakizashi."
+ icon_state = "wakibokken"
+ item_state = "wakibokken"
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_NORMAL
+ force = 6
+ stamina_damage_increment = 4
+ block_parry_data = /datum/block_parry_data/bokken/waki
+ default_parry_data = /datum/block_parry_data/bokken/waki
+ quick_parry_data = /datum/block_parry_data/bokken/waki/quick_parry
+
+/datum/block_parry_data/bokken/waki // weaker parries than the bigger variant, but cheaper and faster recovery, like quick parry
+ parry_stamina_cost = 4
+ parry_time_windup = 0
+ parry_time_active = 6
+ parry_time_spindown = 0
+ parry_time_perfect = 1.5
+ parry_time_perfect_leeway = 1
+ parry_imperfect_falloff_percent = 7.5
+ parry_efficiency_to_counterattack = 120
+ parry_efficiency_considered_successful = 65
+ parry_efficiency_perfect = 120
+ parry_efficiency_perfect_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 30,
+ )
+ parry_failed_stagger_duration = 2 SECONDS
+ parry_data = list(
+ PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 1.5, // 6*1.5 = 9, 7*1.5 = 10.5, 8*1.5 = 12, 9*1.5 = 13.5
+ )
+
+/datum/block_parry_data/bokken/waki/quick_parry //For the parry spammer in you
+ parry_stamina_cost = 2 // Slam that parry button
+ parry_time_active = 2.5
+ parry_time_perfect = 1
+ parry_time_perfect_leeway = 1
+ parry_failed_stagger_duration = 1 SECONDS
+ parry_failed_clickcd_duration = 1 SECONDS
+
+/datum/block_parry_data/bokken/waki/quick_parry/proj
+ parry_efficiency_perfect_override = list()
+
+/obj/item/melee/bokken/waki/steelwood
+ name = "wakizashi steelwood bokken"
+ desc = "A misnomer of sorts, this is effectively a blunt wakizashi made from steelwood, a dense organic wood derived from steelcaps. Why steelwood? Druids can use it. Duh."
+ icon_state = "wakibokken_steel"
+ item_state = "wakibokken_steel"
+ force = 8
+ stamina_damage_increment = 2
+
/obj/item/melee/bokken/debug
name = "funny debug parrying stick"
desc = "if you see this you've fucked up somewhere my good man"
block_parry_data = /datum/block_parry_data/bokken/debug
-
-/obj/item/melee/bokken/debug/AltClick(mob/user)
- quick_parry = !quick_parry
- if(quick_parry)
- block_parry_data = /datum/block_parry_data/bokken/quick_parry/debug
- else
- block_parry_data = /datum/block_parry_data/bokken/debug
- to_chat(user, "[src] is now [quick_parry ? "emphasizing shorter parries, forcing you to riposte or be staggered" : "emphasizing longer parries, with a shorter window to riposte but more forgiving parries"].")
+ default_parry_data = /datum/block_parry_data/bokken/debug
+ quick_parry_data = /datum/block_parry_data/bokken/quick_parry/debug
/datum/block_parry_data/bokken/debug
parry_efficiency_perfect_override = list()
parry_data = list(
- PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25
+ PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 10*2.5 = 25, 11*2.5 = 27.5, 12*2.5 = 30, 13*2.5 = 32.5
PARRY_DISARM_ATTACKER = TRUE,
PARRY_KNOCKDOWN_ATTACKER = 10,
PARRY_STAGGER_ATTACKER = 10,
@@ -436,13 +491,63 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/datum/block_parry_data/bokken/quick_parry/debug
parry_efficiency_perfect_override = list()
parry_data = list(
- PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25
+ PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 10*2.5 = 25, 11*2.5 = 27.5, 12*2.5 = 30, 13*2.5 = 32.5
PARRY_DISARM_ATTACKER = TRUE,
PARRY_KNOCKDOWN_ATTACKER = 10,
PARRY_STAGGER_ATTACKER = 10,
PARRY_DAZE_ATTACKER = 10,
)
+/// BOKKEN CRAFTNG PIECES
+
+/obj/item/bokken_blade
+ name = "training bokken wooden blade"
+ desc = "The blade piece of a bokken katana."
+ icon = 'icons/obj/smith.dmi'
+ icon_state = "bokken"
+ item_state = "bone_dagger"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/bokken_steelblade
+ name = "training bokken steelwood blade"
+ desc = "The blade piece of a steelwood bokken katana."
+ icon = 'icons/obj/smith.dmi'
+ icon_state = "bokken_steel"
+ item_state = "switchblade_ext"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/wakibokken_blade
+ name = "training bokken wooden wakizashi blade"
+ desc = "The blade piece of a bokken wakizashi."
+ icon = 'icons/obj/smith.dmi'
+ icon_state = "wakibokken"
+ item_state = "bone_dagger"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/wakibokken_steelblade
+ name = "training bokken steelwood wakizashi blade"
+ desc = "The blade piece of a steelwood bokken katana."
+ icon = 'icons/obj/smith.dmi'
+ icon_state = "wakibokken_steel"
+ item_state = "switchblade_ext"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/bokken_hilt
+ name = "training bokken hilt"
+ desc = "The hilt piece of a bokken. This hilt is appropriate for any potential blade length or material."
+ icon = 'icons/obj/smith.dmi'
+ icon_state = "bokken_hilt"
+ item_state = "bone_dagger"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
/obj/item/wirerod
name = "wired rod"
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index c36fba96cb..e718bce620 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -243,7 +243,7 @@ LINEN BINS
/obj/item/bedsheet/random/Initialize()
..()
- var/type = pick(typesof(/obj/item/bedsheet) - list(/obj/item/bedsheet/random, /obj/item/bedsheet/chameleon))
+ var/type = pick(typesof(/obj/item/bedsheet) - (list(/obj/item/bedsheet/random, /obj/item/bedsheet/chameleon) + typesof(/obj/item/bedsheet/unlockable)))
new type(loc)
return INITIALIZE_HINT_QDEL
@@ -257,9 +257,32 @@ LINEN BINS
chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/bedsheet
chameleon_action.chameleon_name = "Bedsheet"
- chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/bedsheet/chameleon, /obj/item/bedsheet/random), only_root_path = TRUE)
+ chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/bedsheet/chameleon, /obj/item/bedsheet/random, /obj/item/bedsheet/unlockable), only_root_path = FALSE)
chameleon_action.initialize_disguises()
+//unlockable bedsheets
+/obj/item/bedsheet/unlockable
+ name = "unlockable bedsheet"
+ desc = "this shouldn't be here!"
+
+//janitor: clean 100 messes with mop as janitor
+/obj/item/bedsheet/unlockable/janitor
+ name = "janitor bedsheet"
+ desc = "A white bedsheet, with a warning sign on the front."
+ icon_state = "sheetjanitor"
+
+//cook: use microwave 100 times properly (contents must make one good item) as cook
+/obj/item/bedsheet/unlockable/cook
+ name = "cook bedsheet"
+ desc = "A grey bedsheet, with a microwave on the front."
+ icon_state = "sheetcook"
+
+//miner: redeem 100,000 mining points
+/obj/item/bedsheet/unlockable/miner
+ name = "miner bedsheet"
+ desc = "A red and black bedsheet. It seems to be made with goliath hide."
+ icon_state = "sheetminer"
+
//bedsheet bin
/obj/structure/bedsheetbin
name = "linen bin"
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 21b75e8af3..3af0d0278a 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -70,7 +70,7 @@
new /obj/item/melee/flyswatter(src)
new /obj/item/flashlight(src)
for(var/i in 1 to 3)
- new /obj/item/caution(src)
+ new /obj/item/clothing/suit/caution(src)
new /obj/item/holosign_creator(src)
new /obj/item/lightreplacer(src)
new /obj/item/soap(src)
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/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 10a9f2afd4..0c99188c49 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -73,7 +73,7 @@
l.janicart_insert(user,src)
else
to_chat(user, fail_msg)
- else if(istype(I, /obj/item/caution))
+ else if(istype(I, /obj/item/clothing/suit/caution))
if(signs < max_signs)
put_in_cart(I, user)
signs++
@@ -104,7 +104,7 @@
items += list("Spray bottle" = image(icon = myspray.icon, icon_state = myspray.icon_state))
if(myreplacer)
items += list("Light replacer" = image(icon = myreplacer.icon, icon_state = myreplacer.icon_state))
- var/obj/item/caution/sign = locate() in src
+ var/obj/item/clothing/suit/caution/sign = locate() in src
if(sign)
items += list("Sign" = image(icon = sign.icon, icon_state = sign.icon_state))
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 493e88d442..7e00b1cf63 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -1,5 +1,12 @@
/turf/open
plane = FLOOR_PLANE
+ /// Does dirt buildup happen on us?
+ var/dirt_buildup_allowed = FALSE
+ /// Dirt level.
+ var/dirtyness = 0
+ /// Dirt level to spawn dirt. Null to use config.
+ var/dirt_spawn_threshold
+ /// Slowdown applied to mobs on us.
var/slowdown = 0 //negative for faster, positive for slower
var/postdig_icon_change = FALSE
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm
index 5e8f55feed..9490d728fe 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -9,6 +9,7 @@
canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm)
density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf
bullet_bounce_sound = null //abandon all hope ye who enter
+ dirt_buildup_allowed = FALSE
/turf/open/chasm/Initialize()
. = ..()
diff --git a/code/game/turfs/simulated/dirtystation.dm b/code/game/turfs/simulated/dirtystation.dm
index e29d75a248..add8467ceb 100644
--- a/code/game/turfs/simulated/dirtystation.dm
+++ b/code/game/turfs/simulated/dirtystation.dm
@@ -8,6 +8,9 @@
//Making the station dirty, one tile at a time. Called by master controller's setup_objects
/turf/open/floor/proc/MakeDirty()
+ if(CONFIG_GET(flag/persistent_debris_only))
+ return
+
if(prob(66)) //fastest possible exit 2/3 of the time
return
@@ -38,7 +41,7 @@
return
//Construction zones. Blood, sweat, and oil. Oh, and dirt.
- var/static/list/engine_dirt_areas = typecacheof(list(/area/engine,
+ var/static/list/engine_dirt_areas = typecacheof(list(/area/engine,
/area/crew_quarters/heads/chief,
/area/ruin/space/derelict/assembly_line,
/area/science/robotics,
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index ddec9750d9..6a4ddea63b 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -5,6 +5,7 @@
name = "floor"
icon = 'icons/turf/floors.dmi'
baseturfs = /turf/open/floor/plating
+ dirt_buildup_allowed = TRUE
footstep = FOOTSTEP_FLOOR
barefootstep = FOOTSTEP_HARD_BAREFOOT
@@ -137,6 +138,9 @@
burnt = 1
/turf/open/floor/proc/make_plating()
+ for(var/obj/effect/decal/cleanable/C in src)
+ if(C.wiped_by_floor_change)
+ qdel(C)
return ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
/turf/open/floor/ChangeTurf(path, new_baseturf, flags)
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 35ee06a584..ad3cf86864 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -61,6 +61,9 @@
to_chat(user, "You begin reinforcing the floor...")
if(do_after(user, 30, target = src))
if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine))
+ for(var/obj/effect/decal/cleanable/decal in src)
+ if(decal.wiped_by_floor_change)
+ qdel(decal)
PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR)
playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
R.use(2)
@@ -78,6 +81,9 @@
to_chat(user, "You begin adding glass to the floor...")
if(do_after(user, 5, target = src))
if (G.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass))
+ for(var/obj/effect/decal/cleanable/decal in src)
+ if(decal.wiped_by_floor_change)
+ qdel(decal)
PlaceOnTop(/turf/open/transparent/glass, flags = CHANGETURF_INHERIT_AIR)
playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
G.use(2)
@@ -95,6 +101,9 @@
to_chat(user, "You begin adding reinforced glass to the floor...")
if(do_after(user, 10, target = src))
if (RG.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass/reinforced))
+ for(var/obj/effect/decal/cleanable/decal in src)
+ if(decal.wiped_by_floor_change)
+ qdel(decal)
PlaceOnTop(/turf/open/transparent/glass/reinforced, flags = CHANGETURF_INHERIT_AIR)
playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
RG.use(2)
@@ -110,6 +119,9 @@
var/obj/item/stack/tile/W = C
if(!W.use(1))
return
+ for(var/obj/effect/decal/cleanable/decal in src)
+ if(decal.wiped_by_floor_change)
+ qdel(decal)
if(istype(W, /obj/item/stack/tile/material))
var/turf/newturf = PlaceOnTop(/turf/open/floor/material, flags = CHANGETURF_INHERIT_AIR)
newturf.set_custom_materials(W.custom_materials)
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm
index 42b4707b50..f8c6ff1ce2 100644
--- a/code/game/turfs/simulated/floor/reinf_floor.dm
+++ b/code/game/turfs/simulated/floor/reinf_floor.dm
@@ -43,6 +43,9 @@
return TRUE
if(floor_tile)
new floor_tile(src, 2)
+ for(var/obj/effect/decal/cleanable/C in src)
+ if(C.wiped_by_floor_change)
+ qdel(C)
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
return TRUE
diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm
index 2f223f2c40..e7471478fb 100644
--- a/code/game/turfs/simulated/lava.dm
+++ b/code/game/turfs/simulated/lava.dm
@@ -6,6 +6,7 @@
gender = PLURAL //"That's some lava."
baseturfs = /turf/open/lava //lava all the way down
slowdown = 2
+ dirt_buildup_allowed = FALSE
light_range = 2
light_power = 0.75
diff --git a/code/game/turfs/simulated/reebe_void.dm b/code/game/turfs/simulated/reebe_void.dm
index 14aa02065d..3f3bf31f9b 100644
--- a/code/game/turfs/simulated/reebe_void.dm
+++ b/code/game/turfs/simulated/reebe_void.dm
@@ -6,6 +6,7 @@
planetary_atmos = TRUE
bullet_bounce_sound = null //forever falling
tiled_dirt = FALSE
+ dirt_buildup_allowed = FALSE
/turf/open/indestructible/reebe_void/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 113f4c216d..52b3436154 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -3,6 +3,7 @@
icon_state = "0"
name = "\proper space"
intact = 0
+ dirt_buildup_allowed = FALSE
temperature = TCMB
thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index f3da1954a9..e532dcc2b2 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -48,6 +48,8 @@
if(C.prefs.toggles & SOUND_PRAYERS)
if(usr.job == "Chaplain")
SEND_SOUND(C, sound('sound/effects/pray.ogg'))
+ else
+ SEND_SOUND(C, sound('sound/effects/ding.ogg'))
to_chat(usr, "You pray to the gods: \"[msg_tmp]\"")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/antagonists/blob/blob/blobs/resource.dm b/code/modules/antagonists/blob/blob/blobs/resource.dm
index 76aecf717d..2ed9744327 100644
--- a/code/modules/antagonists/blob/blob/blobs/resource.dm
+++ b/code/modules/antagonists/blob/blob/blobs/resource.dm
@@ -26,7 +26,7 @@
return
flick("blob_resource_glow", src)
if(overmind)
- overmind.add_points(1)
+ overmind.add_points(2)
resource_delay = world.time + 40 + overmind.resource_blobs.len * 2.5 //4 seconds plus a quarter second for each resource blob the overmind has
else
resource_delay = world.time + 40
diff --git a/code/modules/antagonists/blob/blob/powers.dm b/code/modules/antagonists/blob/blob/powers.dm
index dff8e22552..cd53f624a6 100644
--- a/code/modules/antagonists/blob/blob/powers.dm
+++ b/code/modules/antagonists/blob/blob/powers.dm
@@ -147,7 +147,7 @@
set category = "Blob"
set name = "Create Factory Blob (60)"
set desc = "Create a spore tower that will spawn spores to harass your enemies."
- createSpecial(60, /obj/structure/blob/factory, 7, 1)
+ createSpecial(60, /obj/structure/blob/factory, 5, 1)
/mob/camera/blob/verb/create_blobbernaut()
set category = "Blob"
@@ -195,6 +195,7 @@
to_chat(blobber, "The [blobstrain.name] reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]")
else
to_chat(src, "You could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.")
+ B.naut = FALSE
add_points(40)
/mob/camera/blob/verb/relocate_core()
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 574ebf66a1..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.", "This is an item intended for donator use only. You are not authorized to use this item.")
return
+ if(istype(G, /datum/gear/unlockable) && !can_use_unlockable(G))
+ to_chat(user, "To use this item, you need to meet the defined requirements!")
+ return
if(gear_points >= initial(G.cost))
var/list/new_loadout_data = list(LOADOUT_ITEM = "[G.type]")
if(length(G.loadout_initial_colors))
@@ -2960,6 +2975,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(find_gear)
loadout_data["SAVE_[save_slot]"] -= list(find_gear)
+/datum/preferences/proc/can_use_unlockable(datum/gear/unlockable/unlockable_gear)
+ if(unlockable_loadout_data[unlockable_gear.progress_key] >= unlockable_gear.progress_required)
+ return TRUE
+ return FALSE
+
#undef DEFAULT_SLOT_AMT
#undef HANDS_SLOT_AMT
#undef BACKPACK_SLOT_AMT
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 86f7622a93..0db9fbb66c 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 47
+#define SAVEFILE_VERSION_MAX 48
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -285,6 +285,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["loadout"] = safe_json_encode(loadout_data)
+ if(current_version < 48) //unlockable loadout items but we need to clear bad data from a mistake
+ S["unlockable_loadout"] = list()
+
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
@@ -427,6 +430,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
verify_keybindings_valid() // one of these days this will runtime and you'll be glad that i put it in a different proc so no one gets their saves wiped
+ if(S["unlockable_loadout"])
+ unlockable_loadout_data = safe_json_decode(S["unlockable_loadout"])
+ else
+ unlockable_loadout_data = list()
+
if(needs_update >= 0) //save the updated version
var/old_default_slot = default_slot
var/old_max_save_slots = max_save_slots
@@ -532,6 +540,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["auto_ooc"], auto_ooc)
WRITE_FILE(S["no_tetris_storage"], no_tetris_storage)
+ if(length(unlockable_loadout_data))
+ WRITE_FILE(S["unlockable_loadout"], safe_json_encode(unlockable_loadout_data))
+ else
+ WRITE_FILE(S["unlockable_loadout"], safe_json_encode(list()))
+
return 1
/datum/preferences/proc/load_character(slot, bypass_cooldown = FALSE)
@@ -736,7 +749,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
belly_prefs = json_from_file["belly_prefs"]
//gear loadout
- loadout_data = safe_json_decode(S["loadout"])
+ if(S["loadout"])
+ loadout_data = safe_json_decode(S["loadout"])
+ else
+ loadout_data = list()
//try to fix any outdated data if necessary
//preference updating will handle saving the updated data for us.
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 149f17f4d6..6dfcd72c10 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -541,6 +541,21 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
allowed = list(/obj/item/clothing/mask/facehugger/toy)
+/obj/item/clothing/suit/caution
+ name = "wet floor sign"
+ desc = "Caution! Wet Floor!"
+ icon_state = "caution"
+ lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
+ force = 1
+ throwforce = 3
+ throw_speed = 2
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
+ body_parts_covered = CHEST|GROIN
+ attack_verb = list("warned", "cautioned", "smashed")
+ armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
// WINTER COATS
/obj/item/clothing/suit/hooded/wintercoat
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 23cb2b1c15..e617d2d57b 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -244,35 +244,33 @@
/obj/item/clothing/under/proc/rolldown()
if(!can_use(usr))
return
- if(!can_adjust)
- to_chat(usr, "You cannot wear this suit any differently!")
- return
- if(toggle_jumpsuit_adjust())
- to_chat(usr, "You adjust the suit to wear it more casually.")
- else
- to_chat(usr, "You adjust the suit back to normal.")
- if(ishuman(usr))
+ if(toggle_jumpsuit_adjust() && ishuman(usr))
var/mob/living/carbon/human/H = usr
H.update_inv_w_uniform()
H.update_body()
/obj/item/clothing/under/proc/toggle_jumpsuit_adjust()
+ if(!can_adjust)
+ to_chat(usr, "You cannot wear this suit any differently!")
+ return FALSE
adjusted = !adjusted
if(adjusted)
+ to_chat(usr, "You adjust the suit to wear it more casually.")
if(fitted != FEMALE_UNIFORM_TOP)
fitted = NO_FEMALE_UNIFORM
if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted
body_parts_covered &= ~CHEST
mutantrace_variation &= ~USE_TAUR_CLIP_MASK //How are we supposed to see the uniform otherwise?
else
+ to_chat(usr, "You adjust the suit back to normal.")
fitted = initial(fitted)
if(!alt_covers_chest)
body_parts_covered |= CHEST
if(initial(mutantrace_variation) & USE_TAUR_CLIP_MASK)
mutantrace_variation |= USE_TAUR_CLIP_MASK
- return adjusted
+ return TRUE
/obj/item/clothing/under/rank
dying_key = DYE_REGISTRY_UNDER
diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm
index 505aa91775..2eabb0ce35 100644
--- a/code/modules/clothing/under/jobs/civilian/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -24,7 +24,7 @@
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/under/rank/civilian/util
- name = "generic utility uniform"
+ name = "utility uniform"
desc = "A utility uniform worn by various crew."
icon_state = "utilgen"
item_state = "utilgen"
diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
index 8a6c372272..cc07665063 100644
--- a/code/modules/clothing/under/jobs/command.dm
+++ b/code/modules/clothing/under/jobs/command.dm
@@ -3,11 +3,12 @@
name = "captain's jumpsuit"
icon_state = "captain"
item_state = "b_suit"
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 15)
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/captain/util
- name = "Command Utiltiy Uniform"
+ name = "command utility uniform"
desc = "A utility uniform for command personnel."
icon_state = "utilcom"
item_state = "utilcom"
@@ -26,7 +27,6 @@
/obj/item/clothing/under/rank/captain/suit
name = "captain's suit"
desc = "A green suit and yellow necktie. Exemplifies authority."
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 15)
icon_state = "green_suit"
item_state = "dg_suit"
can_adjust = FALSE
diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm
index de285b0470..20fd34f4a0 100644
--- a/code/modules/clothing/under/jobs/medical.dm
+++ b/code/modules/clothing/under/jobs/medical.dm
@@ -131,7 +131,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5)
/obj/item/clothing/under/rank/medical/doctor/util
- name = "Medical Utility Uniform"
+ name = "medical utility uniform"
desc = "Utility jumpsuit for medical personnel"
icon_state = "utilmed"
item_state = "utilmed"
diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm
index 7443cd9d39..d63e81a0a3 100644
--- a/code/modules/clothing/under/jobs/rnd.dm
+++ b/code/modules/clothing/under/jobs/rnd.dm
@@ -62,7 +62,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5)
/obj/item/clothing/under/rank/rnd/scientist/util
- name = "Science Utility Uniform"
+ name = "science utility uniform"
desc = "A utility uniform for science personnel"
icon_state = "utilsci"
item_state = "utilsci"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 2a5d6974ef..59e0832fef 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -172,11 +172,13 @@
body_parts_covered = CHEST|GROIN
/obj/item/clothing/under/misc/gear_harness/toggle_jumpsuit_adjust()
- adjusted = !adjusted
- if(adjusted)
- body_parts_covered = NONE
- else
+ if(!body_parts_covered)
+ to_chat(usr, "Your gear harness is now covering your chest and groin.")
body_parts_covered = CHEST|GROIN
+ else
+ to_chat(usr, "Your gear harness is no longer covering anything.")
+ body_parts_covered = NONE
+ return TRUE
/obj/item/clothing/under/misc/durathread
name = "durathread jumpsuit"
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 0d7c715654..3b133d8675 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -7,6 +7,12 @@
foodtype = GRAIN
dunkable = TRUE
+/obj/item/reagent_containers/food/snacks/store/bread/proc/bread_teleport()
+ // you did WHAT?
+ new /mob/living/simple_animal/hostile/bread(get_turf(src))
+ visible_message("[src] begins to deform and grow grotesque tumors!")
+ qdel(src)
+
/obj/item/reagent_containers/food/snacks/breadslice
icon = 'icons/obj/food/burgerbread.dmi'
bitesize = 2
@@ -228,3 +234,25 @@
/obj/item/reagent_containers/food/snacks/butterdog/ComponentInitialize()
. = ..()
AddComponent(/datum/component/slippery, 80)
+
+/obj/item/reagent_containers/food/snacks/store/bread/tumor_bread
+ name = "dead tumor bread"
+ desc = "It's still within its expiration date, right?."
+ icon_state = "tumorbread"
+ slice_path = /obj/item/reagent_containers/food/snacks/breadslice/tumor_bread
+ list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/toxin = 10)
+ foodtype = GROSS | GRAIN
+ tastes = list("wheat and tumors" = 10)
+
+//teleporting tumor bread kills it
+/obj/item/reagent_containers/food/snacks/store/bread/tumor_bread/bread_teleport()
+ visible_message(src, "[src] explodes in a horrible mess of tumor and flour!")
+ qdel(src)
+
+/obj/item/reagent_containers/food/snacks/breadslice/tumor_bread
+ name = "tumor bread slice"
+ desc = "A slice of bread filled with tumors!"
+ icon_state = "tumorbreadslice"
+ filling_color = "#B2D72C"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
+ foodtype = GROSS | GRAIN
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index d9e3bc6165..6bdf3cff8e 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -195,7 +195,7 @@
/obj/machinery/microwave/AltClick(mob/user)
. = ..()
if(user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- cook()
+ cook(user)
return TRUE
/obj/machinery/microwave/ui_interact(mob/user)
@@ -226,7 +226,7 @@
if("eject")
eject()
if("use")
- cook()
+ cook(user)
if("examine")
examine(user)
@@ -236,7 +236,7 @@
AM.forceMove(drop_location())
ingredients.Cut()
-/obj/machinery/microwave/proc/cook()
+/obj/machinery/microwave/proc/cook(mob/user)
if(stat & (NOPOWER|BROKEN))
return
if(operating || broken > 0 || panel_open || !anchored || dirty == 100)
@@ -257,7 +257,7 @@
start_can_fail()
return
break
- start()
+ start(user)
/obj/machinery/microwave/proc/turn_on()
visible_message("\The [src] turns on.", "You hear a microwave humming.")
@@ -277,9 +277,9 @@
#define MICROWAVE_MUCK 1
#define MICROWAVE_PRE 2
-/obj/machinery/microwave/proc/start()
+/obj/machinery/microwave/proc/start(mob/user)
turn_on()
- loop(MICROWAVE_NORMAL, 10)
+ loop(MICROWAVE_NORMAL, 10, user = user)
/obj/machinery/microwave/proc/start_can_fail()
turn_on()
@@ -292,7 +292,7 @@
update_icon()
loop(MICROWAVE_MUCK, 4)
-/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2)) // standard wait is 10
+/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2), mob/user) // standard wait is 10
if(stat & (NOPOWER|BROKEN))
if(type == MICROWAVE_PRE)
pre_fail()
@@ -300,7 +300,7 @@
if(!time)
switch(type)
if(MICROWAVE_NORMAL)
- loop_finish()
+ loop_finish(user)
if(MICROWAVE_MUCK)
muck_finish()
if(MICROWAVE_PRE)
@@ -308,16 +308,21 @@
return
time--
use_power(500)
- addtimer(CALLBACK(src, .proc/loop, type, time, wait), wait)
+ addtimer(CALLBACK(src, .proc/loop, type, time, wait, user), wait)
-/obj/machinery/microwave/proc/loop_finish()
+/obj/machinery/microwave/proc/loop_finish(mob/user)
operating = FALSE
var/metal = 0
+ var/cooked_food = 0
for(var/obj/item/O in ingredients)
- O.microwave_act(src)
+ var/cooked_result = O.microwave_act(src)
+ if(!istype(cooked_result, /obj/item/reagent_containers/food/snacks/badrecipe))
+ cooked_food += 1
if(O.custom_materials?.len)
metal += O.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)]
+ if(cooked_food && user.client)
+ user.client.increment_progress("cook", cooked_food)
if(metal)
spark()
@@ -336,8 +341,8 @@
spark()
after_finish_loop()
-/obj/machinery/microwave/proc/pre_success()
- loop(MICROWAVE_NORMAL, 10)
+/obj/machinery/microwave/proc/pre_success(mob/user)
+ loop(MICROWAVE_NORMAL, 10, user)
/obj/machinery/microwave/proc/muck_finish()
visible_message("\The [src] gets covered in muck!")
diff --git a/code/modules/mapping/map_config.dm b/code/modules/mapping/map_config.dm
index d18ca1e1e3..1f4b558e21 100644
--- a/code/modules/mapping/map_config.dm
+++ b/code/modules/mapping/map_config.dm
@@ -18,6 +18,8 @@
var/map_name = "Box Station"
var/map_path = "map_files/BoxStation"
var/map_file = "BoxStation.dmm"
+ /// Persistence key: Defaults to ckey(map_name). If set to "NO_PERSIST", this map will have NO persistence.
+ var/persistence_key
var/traits = null
var/space_ruin_levels = 4
@@ -99,6 +101,16 @@
map_path = json["map_path"]
map_file = json["map_file"]
+
+ persistence_key = ckey(map_name)
+
+ var/json_persistence_key = json["persistence_key"]
+ if(json_persistence_key)
+ if(json_persistence_key == "NO_PERSIST")
+ persistence_key = null
+ else
+ persistence_key = json_persistence_key
+
// "map_file": "BoxStation.dmm"
if (istext(map_file))
if (!fexists("_maps/[map_path]/[map_file]"))
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 8bc9cc4512..26a3ca1b70 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -397,6 +397,17 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
else
to_chat(user, "You need one length of cable to attach a string to the coin!")
return
+ else if(istype(W, /obj/item/card/id))
+ var/obj/item/card/id/ID = W
+ if(!ID.registered_account)
+ to_chat(user, "[ID] doesn't have a linked account to deposit into!")
+ return
+ for(var/obj/item/holochip/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/stack/spacecash/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/coin/money in src.loc.contents)
+ ID.attackby(money, user)
else
..()
diff --git a/code/modules/mining/point_bank.dm b/code/modules/mining/point_bank.dm
index 11f23a5d7c..f18b62635f 100644
--- a/code/modules/mining/point_bank.dm
+++ b/code/modules/mining/point_bank.dm
@@ -30,6 +30,8 @@
if(points)
if(I)
I.mining_points += points
+ if(usr.client)
+ usr.client.increment_progress("miner", points)
points = 0
else
to_chat(usr, "No ID detected.")
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index fb71bb483d..37ef2a7d19 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -138,6 +138,18 @@
name = "White Fly"
icon_state = "whitefly"
+/datum/sprite_accessory/deco_wings/oakworm
+ name = "Oak Worm"
+ icon_state = "oakworm"
+
+/datum/sprite_accessory/deco_wings/witchwing
+ name = "Witch Wing"
+ icon_state = "witchwing"
+
+/datum/sprite_accessory/deco_wings/jungle
+ name = "Jungle"
+ icon_state = "jungle"
+
//INSECT WINGS
/datum/sprite_accessory/insect_wings
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 9493d11792..dc53f9487f 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -380,6 +380,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/Move(NewLoc, direct)
+ if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, NewLoc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+ return
if(updatedir)
setDir(direct)//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
var/oldloc = loc
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 399efc4b29..28d311b034 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -68,7 +68,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/plant
name = "Plant Weeds"
- desc = "Plants some alien weeds."
+ desc = "Plants Alien weeds which spread resin which heals any alien. These weeds also regenerate plasma faster. Costs 50 Plasma."
plasma_cost = 50
check_turf = TRUE
action_icon_state = "alien_plant"
@@ -83,7 +83,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/whisper
name = "Whisper"
- desc = "Whisper to someone."
+ desc = "Whisper to someone through the hivemind. Costs 10 Plasma."
plasma_cost = 10
action_icon_state = "alien_whisper"
@@ -143,7 +143,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/acid
name = "Corrosive Acid"
- desc = "Drench an object in acid, destroying it over time."
+ desc = "Drench an object in acid, destroying it over time. Costs 200 Plasma."
plasma_cost = 200
action_icon_state = "alien_acid"
@@ -189,7 +189,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/neurotoxin
name = "Spit Neurotoxin"
- desc = "Spits neurotoxin at someone, paralyzing them for a short time."
+ desc = "Activates your Neurotoxin glands. You can shoot paralyzing shots. Each shot costs 50 Plasma."
action_icon_state = "alien_neurotoxin_0"
active = FALSE
@@ -254,7 +254,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/resin
name = "Secrete Resin"
- desc = "Secrete tough malleable resin."
+ desc = "Secrete tough malleable resin. Costs 55 Plasma."
plasma_cost = 55
check_turf = TRUE
var/list/structures = list(
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
index 4ec5780838..796a78d566 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
@@ -20,7 +20,7 @@
/obj/effect/proc_holder/alien/royal/praetorian/evolve
name = "Evolve"
- desc = "Produce an internal egg sac capable of spawning children. Only one queen can exist at a time."
+ desc = "Produce an internal egg sac capable of spawning children. Only one queen can exist at a time. Costs 500 Plasma."
plasma_cost = 500
action_icon_state = "alien_evolve_praetorian"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 1200220ce4..91a61efea6 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -57,7 +57,7 @@
//Queen verbs
/obj/effect/proc_holder/alien/lay_egg
name = "Lay Egg"
- desc = "Lay an egg to produce huggers to impregnate prey with."
+ desc = "Lay an egg to produce huggers to impregnate prey with. Costs 75 Plasma."
plasma_cost = 75
check_turf = TRUE
action_icon_state = "alien_egg"
@@ -77,7 +77,7 @@
//Button to let queen choose her praetorian.
/obj/effect/proc_holder/alien/royal/queen/promote
name = "Create Royal Parasite"
- desc = "Produce a royal parasite to grant one of your children the honor of being your Praetorian."
+ desc = "Produce a royal parasite to grant one of your children the honor of being your Praetorian. Costs 500 Plasma."
plasma_cost = 500 //Plasma cost used on promotion, not spawning the parasite.
action_icon_state = "alien_queen_promote"
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_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 341aa6a30f..a82151cc1d 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -15,6 +15,7 @@
block_parry_data = /datum/block_parry_data/unarmed/human
default_block_parry_data = /datum/block_parry_data/unarmed/human
+ causes_dirt_buildup_on_floor = TRUE
//Hair colour and style
var/hair_color = "000"
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 509633c0d5..440400f889 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -100,3 +100,8 @@
if(dna.species.space_move(src))
return TRUE
return ..()
+
+/mob/living/carbon/human/dirt_buildup(strength)
+ if(!shoes || !(shoes.body_parts_covered & FEET))
+ return // barefoot advantage
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/anthromorph.dm b/code/modules/mob/living/carbon/human/species_types/anthromorph.dm
index 95aec26d9f..d718db818c 100644
--- a/code/modules/mob/living/carbon/human/species_types/anthromorph.dm
+++ b/code/modules/mob/living/carbon/human/species_types/anthromorph.dm
@@ -18,3 +18,33 @@
species_category = SPECIES_CATEGORY_FURRY
allowed_limb_ids = list("mammal","aquatic","avian")
+
+/datum/species/mammal/synthetic
+ name = "Synthetic Anthromorph"
+ id = SPECIES_MAMMAL_SYNTHETIC
+
+ species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,ROBOTIC_LIMBS,HAS_FLESH,HAS_BONE,WINGCOLOR,HORNCOLOR)
+ inherent_traits = list(TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NO_PROCESS_FOOD, TRAIT_ROBOTIC_ORGANISM)
+ inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID|MOB_BEAST
+
+ meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+ gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
+ //Just robo looking parts.
+ mutant_heart = /obj/item/organ/heart/ipc
+ mutantlungs = /obj/item/organ/lungs/ipc
+ mutantliver = /obj/item/organ/liver/ipc
+ mutantstomach = /obj/item/organ/stomach/ipc
+ mutanteyes = /obj/item/organ/eyes/ipc
+ mutantears = /obj/item/organ/ears/ipc
+ mutanttongue = /obj/item/organ/tongue/robot/ipc
+ mutant_brain = /obj/item/organ/brain/ipc
+
+ //special cybernetic organ for getting power from apcs
+ mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
+
+
+ attack_verb = "claw"
+ attack_sound = 'sound/weapons/slash.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+
+ allowed_limb_ids = list("mammal","aquatic","avian", "human")
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/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 4806813c04..33a2a09b70 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -203,6 +203,15 @@
var/obj/item/I = AM
if(I.light_range && I.light_power)
disintegrate(I)
+ else if (isstructure(AM))
+ var/obj/structure/S = AM
+ if(istype(S, /obj/structure/glowshroom) || istype(S, /obj/structure/marker_beacon))
+ qdel(S)
+ visible_message("[S] is disintegrated by [src]!")
+ else if(AM.light_range && AM.light_power && !(istype(AM, /obj/machinery/power/apc) || istype(AM, /obj/machinery/airalarm)))
+ var/obj/target_object = AM
+ target_object.take_damage(force * 5, BRUTE, "melee", 0)
+
/obj/item/light_eater/proc/disintegrate(obj/item/O)
if(istype(O, /obj/item/pda))
diff --git a/code/modules/mob/living/carbon/human/species_types/xeno.dm b/code/modules/mob/living/carbon/human/species_types/xeno.dm
index 2757c624e7..f88ccc876f 100644
--- a/code/modules/mob/living/carbon/human/species_types/xeno.dm
+++ b/code/modules/mob/living/carbon/human/species_types/xeno.dm
@@ -5,7 +5,7 @@
say_mod = "hisses"
default_color = "00FF00"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR)
- mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
+ mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade","deco_wings"= "None")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 16855d6f22..8d1ee38de6 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -17,6 +17,9 @@
/mob/living/proc/initiate_parry_sequence()
if(parrying)
return // already parrying
+ if(!(mobility_flags & MOBILITY_USE))
+ to_chat(src, "You can't move your arms!")
+ return
if(!(combat_flags & COMBAT_FLAG_PARRY_CAPABLE))
to_chat(src, "You are not something that can parry attacks.")
return
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index d4ccc63b34..742d4d8624 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -63,6 +63,8 @@
//Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects.
var/incorporeal_move = FALSE //FALSE is off, INCORPOREAL_MOVE_BASIC is normal, INCORPOREAL_MOVE_SHADOW is for ninjas
//and INCORPOREAL_MOVE_JAUNT is blocked by holy water/salt
+ /// Do we make floors dirty as we move?
+ var/causes_dirt_buildup_on_floor = FALSE
var/list/roundstart_quirks = list()
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index c6166915d1..bafa38ec5e 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -102,6 +102,38 @@
if(lying && !buckled && prob(getBruteLoss()*200/maxHealth))
makeTrail(newloc, T, old_direction)
+ if(causes_dirt_buildup_on_floor && (movement_type & GROUND))
+ dirt_buildup()
+
+/**
+ * Attempts to make the floor dirty.
+ */
+/mob/living/proc/dirt_buildup(strength = 1)
+ var/turf/open/T = loc
+ if(!istype(T) || !T.dirt_buildup_allowed)
+ return
+ var/area/A = T.loc
+ if(!A.dirt_buildup_allowed)
+ return
+ var/multiplier = CONFIG_GET(number/turf_dirty_multiplier)
+ strength *= multiplier
+ var/obj/effect/decal/cleanable/dirt/D = locate() in T
+ if(D)
+ D.dirty(strength)
+ else
+ T.dirtyness += strength
+ if(T.dirtyness >= (isnull(T.dirt_spawn_threshold)? CONFIG_GET(number/turf_dirt_threshold) : T.dirt_spawn_threshold))
+ D = new /obj/effect/decal/cleanable/dirt(T)
+ D.dirty(T.dirt_spawn_threshold - T.dirtyness)
+ T.dirtyness = 0 // reset.
+
+/mob/living/Move_Pulled(atom/A)
+ . = ..()
+ if(!. || !isliving(A))
+ return
+ var/mob/living/L = A
+ set_pull_offsets(L, grab_state)
+
/mob/living/forceMove(atom/destination)
stop_pulling()
if(buckled)
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/hostile/bread.dm b/code/modules/mob/living/simple_animal/hostile/bread.dm
new file mode 100644
index 0000000000..317827028d
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/bread.dm
@@ -0,0 +1,69 @@
+//funny reference to the video 'Expiration Date'
+
+/mob/living/simple_animal/hostile/bread
+ name = "tumor bread"
+ desc = "I have done nothing but teleport bread for three days."
+ icon_state = "tumorbread"
+ health = 1
+ maxHealth = 1
+ turns_per_move = 5 //this isn't player speed =|
+ speed = 2 //this is player speed
+ melee_damage_lower = 1
+ melee_damage_upper = 2
+ obj_damage = 0
+ loot = list(/obj/item/reagent_containers/food/snacks/store/bread/tumor_bread)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 270
+ maxbodytemp = INFINITY
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+ mob_size = MOB_SIZE_TINY
+ response_help_continuous = "pokes"
+ response_help_simple = "poke"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
+ speak_emote = list("growls")
+ mouse_opacity = 2
+ density = TRUE
+ ventcrawler = VENTCRAWLER_ALWAYS
+ verb_say = "growls"
+ verb_ask = "growls inquisitively"
+ verb_exclaim = "growls loudly"
+ verb_yell = "growls loudly"
+ del_on_death = TRUE
+
+/mob/living/simple_animal/bread/hostile/Initialize()
+ . = ..()
+ var/area/A = get_area(src)
+ if(A)
+ notify_ghosts("A tumor bread has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_dnr_observers = TRUE)
+
+/mob/living/simple_animal/hostile/bread/attack_ghost(mob/user)
+ if(key) //please stop using src. without a good reason.
+ return
+ if(CONFIG_GET(flag/use_age_restriction_for_jobs))
+ if(!isnum(user.client.player_age))
+ return
+ if(isobserver(user))
+ var/mob/dead/observer/O = user
+ if(!O.can_reenter_round())
+ return
+ if(!SSticker.mode)
+ to_chat(user, "Can't become a tumor bread before the game has started.")
+ return
+ var/be_bread = alert("Become a tumor bread? (Warning, You can no longer be cloned!)",,"Yes","No")
+ if(be_bread == "No" || QDELETED(src) || !isobserver(user))
+ return
+ if(key)
+ to_chat(user, "Someone else already took this tumor bread.")
+ return
+ sentience_act()
+ user.transfer_ckey(src, FALSE)
+ density = TRUE
+
+/mob/living/simple_animal/hostile/bread/ex_act()
+ return
+
+/mob/living/simple_animal/hostile/bread/start_pulling()
+ return FALSE
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/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5fa6a0c22d..e9b97b3597 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -354,7 +354,7 @@
/mob/living/simple_animal/proc/drop_loot()
if(loot.len)
for(var/i in loot)
- new i(loc)
+ new i(loc, dir = src.dir)
/mob/living/simple_animal/death(gibbed)
movement_type &= ~FLYING
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 7a69026922..605f0a2d55 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -508,7 +508,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(LOG_EMOTE)
colored_message = "(EMOTE) [colored_message]"
- var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)]" = colored_message)
+ var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)] (Event #[LAZYLEN(logging[smessage_type])])" = colored_message)
logging[smessage_type] += timestamped_message
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 658d7e5874..c5c53dc876 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -148,8 +148,8 @@ proc/get_top_level_mob(var/mob/S)
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
+ for(var/i = 1; i <= processing.len; ++i)
+ var/obj/structure/table/T = processing[i]
if(safety-- <= 0)
to_chat(user, "Table scan aborted early, some people might have not received the message (max 25)")
break
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 13890ae69e..8863a098fc 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -182,8 +182,9 @@
if(..())
if(reagents.total_volume)
if(M.reagents)
+ log_combat(user, M, "injected with sleepypen", src, reagents.log_list())
reagents.reaction(M, INJECT)
- reagents.trans_to(M, reagents.total_volume)
+ reagents.trans_to(M, reagents.total_volume, log = "sleepypen inject")
/obj/item/pen/sleepy/Initialize()
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 8bf20fddc6..5b5292a020 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -78,6 +78,7 @@
set_security_level("delta")
SSshuttle.registerHostileEnvironment(src)
SSshuttle.lockdown = TRUE
+ SSpersistence.station_was_destroyed = TRUE
sleep(600)
if(resolved == FALSE)
resolved = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 32ac7cecba..89fdb52b2a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -257,9 +257,9 @@
var/amount = text2num(params["amount"])
if(amount == null)
amount = text2num(input(usr,
- "Max 10. Buffer content will be split evenly.",
+ "Max 20. Buffer content will be split evenly.",
"How many to make?", 1))
- amount = clamp(round(amount), 0, 10)
+ amount = clamp(round(amount), 0, 20)
if (amount <= 0)
return FALSE
// Get units per item
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 bf7b94483e..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)
diff --git a/code/modules/research/designs/machine_desings/machine_designs_engi.dm b/code/modules/research/designs/machine_desings/machine_designs_engi.dm
index 4f70b6ee78..8908241b83 100644
--- a/code/modules/research/designs/machine_desings/machine_designs_engi.dm
+++ b/code/modules/research/designs/machine_desings/machine_designs_engi.dm
@@ -104,3 +104,11 @@
build_path = /obj/item/circuitboard/machine/thermomachine
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/board/spaceship_navigation_beacon
+ name = "Machine Design (Bluespace Navigation Gigabeacon)"
+ desc = "The circuit board for a Bluespace Navigation Gigabeacon."
+ id = "spaceship_navigation_beacon"
+ build_path = /obj/item/circuitboard/machine/spaceship_navigation_beacon
+ category = list ("Teleportation Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
\ No newline at end of file
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 445ce39ce5..66ae54ae9c 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -726,6 +726,32 @@
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+/////////////////////
+/////Synth Organs////
+/////////////////////
+
+/datum/design/ipc_stomach
+ name = "IPC cell"
+ desc = "Effectively the robot equivalent of a stomach, handling power storage."
+ id = "ipc_stomach"
+ build_type = PROTOLATHE | MECHFAB
+ construction_time = 40
+ materials = list(/datum/material/iron = 1000, /datum/material/glass = 300, /datum/material/silver = 500, /datum/material/gold = 400)
+ build_path = /obj/item/organ/stomach/ipc
+ category = list("Misc", "Medical Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/datum/design/cyberimp_power_cord
+ name = "IPC power cord"
+ desc = "A implant for Robots designed to siphon power from APCs to recharge their own cell."
+ id = "ci-power-cord"
+ build_type = PROTOLATHE | MECHFAB
+ construction_time = 75
+ materials = list(/datum/material/iron = 4000, /datum/material/glass = 1500, /datum/material/silver = 1200, /datum/material/gold = 1600, /datum/material/plasma = 1000)
+ build_path = /obj/item/organ/cyberimp/arm/power_cord
+ category = list("Misc", "Medical Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
/////////////////////
///Surgery Designs///
/////////////////////
diff --git a/code/modules/research/techweb/nodes/biotech_nodes.dm b/code/modules/research/techweb/nodes/biotech_nodes.dm
index 977f8685d6..3c89f0bbab 100644
--- a/code/modules/research/techweb/nodes/biotech_nodes.dm
+++ b/code/modules/research/techweb/nodes/biotech_nodes.dm
@@ -5,7 +5,7 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
- design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack")
+ design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack", "portable_chem_mixer")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/adv_biotech
diff --git a/code/modules/research/techweb/nodes/bluespace_nodes.dm b/code/modules/research/techweb/nodes/bluespace_nodes.dm
index b0705a0b76..ae9fdd6485 100644
--- a/code/modules/research/techweb/nodes/bluespace_nodes.dm
+++ b/code/modules/research/techweb/nodes/bluespace_nodes.dm
@@ -70,7 +70,7 @@
display_name = "Basic Shuttle Research"
description = "Research the technology required to create and use basic shuttles."
prereq_ids = list("practical_bluespace", "adv_engi")
- design_ids = list("shuttle_creator", "engine_plasma", "engine_heater", "shuttle_control", "shuttle_docker")
+ design_ids = list("shuttle_creator", "engine_plasma", "engine_heater", "shuttle_control", "shuttle_docker","spaceship_navigation_beacon")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
/datum/techweb_node/shuttle_route_upgrade
diff --git a/code/modules/research/techweb/nodes/medical_nodes.dm b/code/modules/research/techweb/nodes/medical_nodes.dm
index 2c0240f1da..914a6174ab 100644
--- a/code/modules/research/techweb/nodes/medical_nodes.dm
+++ b/code/modules/research/techweb/nodes/medical_nodes.dm
@@ -80,7 +80,7 @@
display_name = "Upgraded Cybernetic Organs"
description = "We have the technology to upgrade him."
prereq_ids = list("cyber_organs")
- design_ids = list("cybernetic_ears_u", "cybernetic_heart_u", "cybernetic_liver_u", "cybernetic_lungs_u")
+ design_ids = list("cybernetic_ears_u", "cybernetic_heart_u", "cybernetic_liver_u", "cybernetic_lungs_u", "ipc_stomach")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
/datum/techweb_node/cyber_implants
@@ -88,7 +88,7 @@
display_name = "Cybernetic Implants"
description = "Electronic implants that improve humans."
prereq_ids = list("adv_biotech", "adv_datatheory")
- design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", "ci-medhud", "ci-sechud", "ci-service")
+ design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", "ci-medhud", "ci-sechud", "ci-service", "ci-power-cord")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/adv_cyber_implants
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 21a9c6c5d7..36abcb41dc 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -11,6 +11,7 @@
var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes
var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
+ var/list/locked_traits = list(ZTRAIT_RESERVED, ZTRAIT_CENTCOM, ZTRAIT_AWAY, ZTRAIT_REEBE) //traits forbided for custom docking
var/view_range = 0
var/x_offset = 0
var/y_offset = 0
@@ -186,7 +187,7 @@
var/turf/eyeturf = get_turf(the_eye)
if(!eyeturf)
return SHUTTLE_DOCKER_BLOCKED
- if(z_lock.len && !(eyeturf.z in z_lock))
+ if(!eyeturf.z || SSmapping.level_has_any_trait(eyeturf.z, locked_traits))
return SHUTTLE_DOCKER_BLOCKED
. = SHUTTLE_DOCKER_LANDING_CLEAR
@@ -224,9 +225,9 @@
if(hidden_turf_info)
. = SHUTTLE_DOCKER_BLOCKED_BY_HIDDEN_PORT
- if(space_turfs_only)
+ if(length(whitelist_turfs))
var/turf_type = hidden_turf_info ? hidden_turf_info[2] : T.type
- if(!ispath(turf_type, /turf/open/space))
+ if(!is_type_in_typecache(turf_type, whitelist_turfs))
return SHUTTLE_DOCKER_BLOCKED
if(length(whitelist_turfs))
@@ -324,12 +325,25 @@
var/list/L = list()
for(var/V in SSshuttle.stationary)
if(!V)
+ stack_trace("SSshuttle.stationary have null entry!")
continue
var/obj/docking_port/stationary/S = V
if(console.z_lock.len && !(S.z in console.z_lock))
continue
if(console.jumpto_ports[S.id])
- L[S.name] = S
+ L["([L.len])[S.name]"] = S
+
+ for(var/V in SSshuttle.beacons)
+ if(!V)
+ stack_trace("SSshuttle.beacons have null entry!")
+ continue
+ var/obj/machinery/spaceship_navigation_beacon/nav_beacon = V
+ if(!nav_beacon.z || SSmapping.level_has_any_trait(nav_beacon.z, console.locked_traits))
+ break
+ if(!nav_beacon.locked)
+ L["([L.len]) [nav_beacon.name] located: [nav_beacon.x] [nav_beacon.y] [nav_beacon.z]"] = nav_beacon
+ else
+ L["([L.len]) [nav_beacon.name] locked"] = null
playsound(console, 'sound/machines/terminal_prompt.ogg', 25, 0)
var/selected = input("Choose location to jump to", "Locations", null) as null|anything in L
diff --git a/code/modules/shuttle/spaceship_navigation_beacon.dm b/code/modules/shuttle/spaceship_navigation_beacon.dm
new file mode 100644
index 0000000000..f1861e0477
--- /dev/null
+++ b/code/modules/shuttle/spaceship_navigation_beacon.dm
@@ -0,0 +1,63 @@
+/obj/item/circuitboard/machine/spaceship_navigation_beacon
+ name = "Bluespace Navigation Gigabeacon (Machine Board)"
+ build_path = /obj/machinery/spaceship_navigation_beacon
+ req_components = list()
+
+
+/obj/machinery/spaceship_navigation_beacon
+ name = "Bluespace Navigation Gigabeacon"
+ desc = "A device that creates a bluespace anchor that allow ships jump near to it."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "core"
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 0
+ density = TRUE
+ circuit = /obj/item/circuitboard/machine/spaceship_navigation_beacon
+
+ var/locked = FALSE //Locked beacons don't allow to jump to it.
+
+
+/obj/machinery/spaceship_navigation_beacon/Initialize()
+ . = ..()
+ SSshuttle.beacons |= src
+
+obj/machinery/spaceship_navigation_beacon/emp_act()
+ locked = TRUE
+
+/obj/machinery/spaceship_navigation_beacon/Destroy()
+ SSshuttle.beacons -= src
+ return ..()
+
+// update the icon_state
+/obj/machinery/spaceship_navigation_beacon/update_icon()
+ if(powered())
+ icon_state = "core"
+ else
+ icon_state = "core-open"
+
+/obj/machinery/spaceship_navigation_beacon/power_change()
+ . = ..()
+ update_icon()
+
+/obj/machinery/spaceship_navigation_beacon/multitool_act(mob/living/user, obj/item/multitool/I)
+ if(panel_open)
+ var/new_name = "Beacon_[input("Enter the custom name for this beacon", "It be Beacon ..your input..") as text]"
+ if(new_name && Adjacent(user))
+ name = new_name
+ to_chat(user, "You change beacon name to [name].")
+ else
+ locked =!locked
+ to_chat(user, "You [locked ? "" : "un"]lock [src].")
+ return TRUE
+
+/obj/machinery/spaceship_navigation_beacon/examine()
+ .=..()
+ . += "Status: [locked ? "LOCKED" : "Stable"] "
+
+/obj/machinery/spaceship_navigation_beacon/attackby(obj/item/W, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "core-open", "core", W))
+ return
+ if(default_deconstruction_crowbar(W))
+ return
+
+ return ..()
\ No newline at end of file
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index cd0ac28daf..2ca7d07e73 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -394,11 +394,10 @@
var/datum/wound/new_wound
if(replaced_wound)
new_wound = replaced_wound.replace_wound(possible_wound)
- log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned
else
new_wound = new possible_wound
new_wound.apply_wound(src)
- log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll)
+ log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned
return new_wound
// try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart
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/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm
index b384106396..4edbe2f2c7 100644
--- a/code/modules/uplink/uplink_items/uplink_roles.dm
+++ b/code/modules/uplink/uplink_items/uplink_roles.dm
@@ -142,6 +142,14 @@
cost = 4 // Has syndie tools + gloves + a robust weapon
restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme
+/datum/uplink_item/role_restricted/oldtoolboxclean // this is the fourth item relating to toolboxes to be placed into this godforsaken bloated uplink
+ name = "Ancient Toolbox"
+ desc = "An iconic toolbox design notorious with Assistants everywhere, this design was especially made to become more robust the more telecrystals it has inside it! Tools and insulated gloves included."
+ item = /obj/item/storage/toolbox/mechanical/old/clean
+ cost = 2 // with eighteen telecrystals you are still weaker than a desword and without any of its defenses -- the scary part comes from collaborating with allies for a fifty eight force toolbox oh fuck
+ restricted_roles = list("Assistant")
+ surplus = 0
+
/datum/uplink_item/role_restricted/mimery
name = "Guide to Advanced Mimery Series"
desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
@@ -242,3 +250,11 @@
cost = 2
item = /obj/item/clothing/shoes/magboots/crushing
restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
+
+/datum/uplink_item/role_restricted/turretbox
+ name = "Disposable Sentry Gun"
+ desc = "A disposable sentry gun deployment system cleverly disguised as a toolbox, apply wrench for functionality."
+ item = /obj/item/storage/toolbox/emergency/turret
+ cost = 11
+ restricted_roles = list("Station Engineer")
+
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 7a7886e999..655ca21b93 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -18,14 +18,12 @@
. = ..()
initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE)
-
/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space
if(isspaceturf(get_step(src, direction)))
return FALSE
else
return ..()
-
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -138,3 +136,24 @@
/obj/vehicle/sealed/car/clowncar/proc/StopDroppingOil()
droppingoil = FALSE
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays
+ key_type = null
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays/Initialize()
+ . = ..()
+ AddComponent(/datum/component/twitch_plays/simple_movement)
+ START_PROCESSING(SSfastprocess, src)
+ GLOB.poi_list |= src
+ notify_ghosts("Twitch Plays: Clown Car")
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ GLOB.poi_list -= src
+ return ..()
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays/process()
+ var/dir = SEND_SIGNAL(src, COMSIG_TWITCH_PLAYS_MOVEMENT_DATA, TRUE)
+ if(!dir)
+ return
+ driver_move(null, dir)
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/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index e15e02f0d5..0b47c7218f 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -375,7 +375,7 @@
/obj/item/paint/paint_remover = 2,
/obj/item/melee/flyswatter = 2,
/obj/item/flashlight = 2,
- /obj/item/caution = 8,
+ /obj/item/clothing/suit/caution = 8,
/obj/item/holosign_creator = 2,
/obj/item/lightreplacer = 2,
/obj/item/soap = 2,
@@ -544,7 +544,7 @@
/obj/item/clothing/glasses/sunglasses/gar/supergar = 1,
/obj/item/clothing/gloves/color/captain = 1)
refill_canister = /obj/item/vending_refill/wardrobe/cap_wardrobe
- payment_department = ACCOUNT_CIV
+ payment_department = ACCOUNT_SEC
default_price = PRICE_ALMOST_EXPENSIVE
extra_price = PRICE_ABOVE_EXPENSIVE
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index 6c2bc8898f..8e74dd3c92 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/config.txt b/config/config.txt
index 72df74beb1..c7bb36af0e 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 persistence.txt
$include respawns.txt
# You can use the @ character at the beginning of a config option to lock it from being edited in-game
diff --git a/config/game_options.txt b/config/game_options.txt
index bc5fdf940e..3c53d9fecb 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -668,4 +668,10 @@ ALLOW_CUSTOM_SKINTONES
## Enables the FoV component, which hides objects and mobs behind the parent from their sight, unless they turn around, duh.
## Camera mobs, AIs, ghosts and some other are of course exempt from this. This also doesn't influence simplemob AI, for the best.
-#USE_FIELD_OF_VISION
\ No newline at end of file
+#USE_FIELD_OF_VISION
+
+## Default turf threshold to get dirt
+TURF_DIRT_THRESHOLD 100
+
+## Default alpha of dirt on spawn
+DIRT_ALPHA_STARTING 127
diff --git a/config/persistence.txt b/config/persistence.txt
new file mode 100644
index 0000000000..7d65a150e2
--- /dev/null
+++ b/config/persistence.txt
@@ -0,0 +1,14 @@
+### Whether or not cleanable object persistence is on
+PERSISTENT_DEBRIS
+
+### Whether or not ONLY persistent cleanable objects should be spawned, for supported objects
+PERSISTENT_DEBRIS_ONLY
+
+### Max objects to store, total
+PERSISTENT_DEBRIS_GLOBAL_MAX 10000
+
+### Max objects to store per type, total
+PERSISTENT_DEBRIS_TYPE_MAX 2000
+
+### Wipe objects on nuke for the above
+PERSISTENT_DEBRIS_WIPE_ON_NUKE
diff --git a/html/changelogs/AutoChangeLog-pr-13834.yml b/html/changelogs/AutoChangeLog-pr-13834.yml
new file mode 100644
index 0000000000..46cedff5d5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13834.yml
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - rscadd: "Traitor assistants can now purchase the patented POGBox! Put TC into it for even higher damage!"
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-13856.yml b/html/changelogs/AutoChangeLog-pr-13856.yml
new file mode 100644
index 0000000000..583fb38cc2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13856.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "gear harness alt-click is now sane"
+ - code_imp: "rolldown() and toggle_jumpsuit_adjust() now no longer mix behavior-that-should-be-overridden and behavior-that-shouldn't-be-overridden in ways that make no sense."
diff --git a/html/changelogs/AutoChangeLog-pr-13859.yml b/html/changelogs/AutoChangeLog-pr-13859.yml
new file mode 100644
index 0000000000..2d6dc5c25a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13859.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "adds unlockable loadout items, corresponding category in loadouts, etc"
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-13871.yml b/html/changelogs/AutoChangeLog-pr-13871.yml
new file mode 100644
index 0000000000..f667abe816
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13871.yml
@@ -0,0 +1,5 @@
+author: "NT Cleaning Crews On Break"
+delete-after: True
+changes:
+ - rscadd: "Most kinds of dirt, grime, and debris are now persistent. Get to work, jannies."
+ - rscadd: "Dirt can now be removed by tile replacements. Other cleanable decals can't, though."
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-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-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-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-13909.yml b/html/changelogs/AutoChangeLog-pr-13909.yml
new file mode 100644
index 0000000000..e4f0f1e401
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13909.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - rscadd: "Twitch Plays: Clown Car"
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-13924.yml b/html/changelogs/AutoChangeLog-pr-13924.yml
new file mode 100644
index 0000000000..71092c567d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13924.yml
@@ -0,0 +1,4 @@
+author: "SandPoot"
+delete-after: True
+changes:
+ - tweak: "You can attack a pile of money on the floor with your id to put it all in quickly."
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/changelogs/AutoChangeLog-pr-13930.yml b/html/changelogs/AutoChangeLog-pr-13930.yml
new file mode 100644
index 0000000000..282f3fa30a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13930.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Small fixes on security on boxstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13931.yml b/html/changelogs/AutoChangeLog-pr-13931.yml
new file mode 100644
index 0000000000..fd903f2d6e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13931.yml
@@ -0,0 +1,4 @@
+author: "shellspeed1"
+delete-after: True
+changes:
+ - rscadd: "Adds the disposable sentry gun from tg for 11tc each."
diff --git a/html/changelogs/AutoChangeLog-pr-13932.yml b/html/changelogs/AutoChangeLog-pr-13932.yml
new file mode 100644
index 0000000000..955d9f5741
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13932.yml
@@ -0,0 +1,4 @@
+author: "shellspeed1"
+delete-after: True
+changes:
+ - tweak: "Xenomorph powers now list plasma cost in their description."
diff --git a/html/changelogs/AutoChangeLog-pr-13934.yml b/html/changelogs/AutoChangeLog-pr-13934.yml
new file mode 100644
index 0000000000..74f8ece6fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13934.yml
@@ -0,0 +1,4 @@
+author: "shellspeed1"
+delete-after: True
+changes:
+ - rscadd: "The bluespace navigation gigabeacon design has been added to shuttle research for those wanting to take their ships around space more."
diff --git a/html/changelogs/AutoChangeLog-pr-13936.yml b/html/changelogs/AutoChangeLog-pr-13936.yml
new file mode 100644
index 0000000000..9b15d2232a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13936.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Polychromic hoodies that were obtained from the loadout have functional colorable hoods now."
diff --git a/html/changelogs/AutoChangeLog-pr-13938.yml b/html/changelogs/AutoChangeLog-pr-13938.yml
new file mode 100644
index 0000000000..34d76a190b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13938.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "anthromorphic synth species"
diff --git a/html/changelogs/AutoChangeLog-pr-13940.yml b/html/changelogs/AutoChangeLog-pr-13940.yml
new file mode 100644
index 0000000000..60cbcc9a19
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13940.yml
@@ -0,0 +1,4 @@
+author: "Chiirno"
+delete-after: True
+changes:
+ - rscadd: "Added the paramedics EVA suit as a purchase from the cargo console."
diff --git a/html/changelogs/AutoChangeLog-pr-13941.yml b/html/changelogs/AutoChangeLog-pr-13941.yml
new file mode 100644
index 0000000000..5a72376ebb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13941.yml
@@ -0,0 +1,4 @@
+author: "Chiirno"
+delete-after: True
+changes:
+ - bugfix: "Portable Chem Mixer now researchable from biotech node."
diff --git a/html/changelogs/AutoChangeLog-pr-13943.yml b/html/changelogs/AutoChangeLog-pr-13943.yml
new file mode 100644
index 0000000000..405d6b0d93
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13943.yml
@@ -0,0 +1,6 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - spellcheck: "Utility uniforms now comply with the \"nonproper equipment names\" thing."
+ - bugfix: "The CapDrobe now allows the captain to get his own clothes for free. Probably."
+ - tweak: "All captains' clothes now offer 15 woundarmor, up from the 5. Because apparently only the suit and tie and its suitskirt subtype have this wound armor, which is dumb."
diff --git a/html/changelogs/AutoChangeLog-pr-13945.yml b/html/changelogs/AutoChangeLog-pr-13945.yml
new file mode 100644
index 0000000000..91b8bb9498
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13945.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - rscadd: "IPC cells & power cords are now printable after they are researched."
diff --git a/html/changelogs/AutoChangeLog-pr-13946.yml b/html/changelogs/AutoChangeLog-pr-13946.yml
new file mode 100644
index 0000000000..d7f3e15024
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13946.yml
@@ -0,0 +1,4 @@
+author: "Ryll/Shaps"
+delete-after: True
+changes:
+ - admin: "Fixed an issue with player logs becoming confused when someone triggers multiple events within one second (like being attacked by two people at the same time) that would cause holes in the logs"
diff --git a/html/changelogs/AutoChangeLog-pr-13947.yml b/html/changelogs/AutoChangeLog-pr-13947.yml
new file mode 100644
index 0000000000..0388efc701
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13947.yml
@@ -0,0 +1,4 @@
+author: "Chiirno"
+delete-after: True
+changes:
+ - tweak: "Chem masters can now dispense 20 instances of its outputs instead of 10."
diff --git a/html/changelogs/AutoChangeLog-pr-13948.yml b/html/changelogs/AutoChangeLog-pr-13948.yml
new file mode 100644
index 0000000000..73c5ba6b1a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13948.yml
@@ -0,0 +1,11 @@
+author: "necromanceranne"
+delete-after: True
+changes:
+ - rscadd: "Bokken now come in two lengths; full and wakizashi, and two varieties: wood and ironwood. They have different stats for all four."
+ - rscadd: "Bokken require menu crafting and part construction, as well as more complicated materials."
+ - tweak: "Bokken (long and short) require wood, cloth and leather to craft with a hatchet and screwdriver."
+ - tweak: "Ironwood bokken (long and short) require ironcap logs, cloth and leather to craft with a hatchet, screwdriver and welder."
+ - balance: "Twin sheathes can only fit a pair of blades (longsword + shortsword) or they can fit two shortswords."
+ - bugfix: "Fixed a twin sheath runtime."
+ - imageadd: "A lot of bokken related sprites received an overhaul. Added overlay sprites for weapons sheathed in the twin sheathes."
+ - imageadd: "The extradimensional blade received improved sprites for inhands/back sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-13950.yml b/html/changelogs/AutoChangeLog-pr-13950.yml
new file mode 100644
index 0000000000..28affe7ebe
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13950.yml
@@ -0,0 +1,6 @@
+author: "TripleShades"
+delete-after: True
+changes:
+ - rscadd: "New Paramedic Office next to Genetics where the old Genetics Reception used to be
+change: Surgery, Surgery Observation, and Recovery Hall layout revamped drastically
+change: Maints below Surgery lowered by one tile to recover lost tile space from Surgery expansion"
diff --git a/html/changelogs/AutoChangeLog-pr-13951.yml b/html/changelogs/AutoChangeLog-pr-13951.yml
new file mode 100644
index 0000000000..fe3ac84523
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13951.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - tweak: "You can now have a max-roundstart-dicksize-config inch long johnson before you start suffering blood loss and slowdowns instead of a 20 inch one."
diff --git a/html/changelogs/AutoChangeLog-pr-13954.yml b/html/changelogs/AutoChangeLog-pr-13954.yml
new file mode 100644
index 0000000000..a8751d66ca
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13954.yml
@@ -0,0 +1,6 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - rscadd: "Adds a new \"Computer Core\" area designation for CogStation"
+ - bugfix: "Fixes some missing area strings"
+ - tweak: "Replaces some firelocks with directional ones as to ensure desks/counters can still be accessed"
diff --git a/html/changelogs/AutoChangeLog-pr-13955.yml b/html/changelogs/AutoChangeLog-pr-13955.yml
new file mode 100644
index 0000000000..1d43dd6b95
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13955.yml
@@ -0,0 +1,5 @@
+author: "Chiirno"
+delete-after: True
+changes:
+ - tweak: "Nightmare now deals additional damage to most light sources."
+ - bugfix: "Nightmare now one-shots miners beacons and glowshrooms"
diff --git a/html/changelogs/AutoChangeLog-pr-13959.yml b/html/changelogs/AutoChangeLog-pr-13959.yml
new file mode 100644
index 0000000000..1303768344
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13959.yml
@@ -0,0 +1,6 @@
+author: "necromanceranne"
+delete-after: True
+changes:
+ - bugfix: "You can now make all the variants of the bokken."
+ - bugfix: "Removes a duplicate sprite."
+ - tweak: "Renames all instances of 'ironwood' to 'steelwood'."
diff --git a/html/changelogs/AutoChangeLog-pr-13961.yml b/html/changelogs/AutoChangeLog-pr-13961.yml
new file mode 100644
index 0000000000..f0a6cc267d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13961.yml
@@ -0,0 +1,6 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Removed the wires connecting the AI from the rest of the station on cogstation."
+ - tweak: "Fixes experimenter on cogstation."
+ - tweak: "Less pipes in the overall area in toxins on cogstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13967.yml b/html/changelogs/AutoChangeLog-pr-13967.yml
new file mode 100644
index 0000000000..d2e580b531
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13967.yml
@@ -0,0 +1,6 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - balance: "Blob Resource Tower to 2 points per instead of 1 point per."
+ - balance: "Blob Factory Towers can be placed 5 tiles apart instead of 7."
+ - bugfix: "Fixes Blobbernaut Factories consuming Factories if no naut is chosen."
diff --git a/html/changelogs/AutoChangeLog-pr-13968.yml b/html/changelogs/AutoChangeLog-pr-13968.yml
new file mode 100644
index 0000000000..e3ce9e4615
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13968.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - tweak: "Prayers to admins now do a wee ding sound for all prayers, instead of just chaplains"
diff --git a/html/changelogs/AutoChangeLog-pr-13970.yml b/html/changelogs/AutoChangeLog-pr-13970.yml
new file mode 100644
index 0000000000..54d8d9992d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13970.yml
@@ -0,0 +1,8 @@
+author: "TripleShades"
+delete-after: True
+changes:
+ - rscadd: "Firelock to Surgery Bay drapes
+change: Swapped Nanomed and Fire Alarm button locations in both Surgery Bays
+change: Removes the double mirror in both Surgery Bays to be a singular mirror
+change: Moved an intercom to not be doorstuck below Paramedical Office
+remove: One Surgery Observation Fire Alarm button"
diff --git a/html/changelogs/AutoChangeLog-pr-13972.yml b/html/changelogs/AutoChangeLog-pr-13972.yml
new file mode 100644
index 0000000000..fdfdd4786d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13972.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Fixes maint area in boxstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13976.yml b/html/changelogs/AutoChangeLog-pr-13976.yml
new file mode 100644
index 0000000000..dac85f8e9a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13976.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "you can teleport bread"
diff --git a/html/changelogs/AutoChangeLog-pr-13978.yml b/html/changelogs/AutoChangeLog-pr-13978.yml
new file mode 100644
index 0000000000..94c19edec4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13978.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - balance: "c4 can no longer gib mobs"
diff --git a/html/changelogs/AutoChangeLog-pr-13980.yml b/html/changelogs/AutoChangeLog-pr-13980.yml
new file mode 100644
index 0000000000..6838ba48a2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13980.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - rscadd: "Makes gas sensors fireproof."
diff --git a/html/changelogs/AutoChangeLog-pr-13983.yml b/html/changelogs/AutoChangeLog-pr-13983.yml
new file mode 100644
index 0000000000..ba0bf62e6a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13983.yml
@@ -0,0 +1,6 @@
+author: "shellspeed1"
+delete-after: True
+changes:
+ - rscadd: "Xenomorph hybrids can now select wings
+~~add: Xenomorph hybrids can now speak xenomorph~~"
+ - rscadd: "Xenomorph tongues are available for customization."
diff --git a/html/changelogs/AutoChangeLog-pr-13988.yml b/html/changelogs/AutoChangeLog-pr-13988.yml
new file mode 100644
index 0000000000..262e5f804f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13988.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "Cargo packs marked as 'no private buying' now actually register as such."
diff --git a/html/changelogs/AutoChangeLog-pr-13996.yml b/html/changelogs/AutoChangeLog-pr-13996.yml
new file mode 100644
index 0000000000..5bea075460
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13996.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Bugfix of a morph becoming an AI eye"
diff --git a/html/changelogs/AutoChangeLog-pr-13997.yml b/html/changelogs/AutoChangeLog-pr-13997.yml
new file mode 100644
index 0000000000..354f66010a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13997.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Porting garbage collection tweak from /tg/"
diff --git a/html/changelogs/AutoChangeLog-pr-14001.yml b/html/changelogs/AutoChangeLog-pr-14001.yml
new file mode 100644
index 0000000000..31c9e560ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14001.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Fixes two chairs on one table"
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 50bf65b27f..68e6170969 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 8594af8ec2..caa901a9fd 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index f84e360179..c1404cb044 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 276b5c9458..084a2c3649 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index d4bb1224cc..21d2f872f1 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.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/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 5ff248de68..ed34177c7b 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 0332e60fb5..9f59dbed06 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi
index 05535334cf..f62dd34c66 100644
Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.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/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi
index cdb2567268..1178588ee7 100644
Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index c12720bc8b..935e9ead02 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.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/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
index 7ef3a7d418..c5bf88ab6e 100644
Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 9b73fa706b..119e612c40 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/smith.dmi b/icons/obj/smith.dmi
index a40b9a2b19..dcf4a77131 100644
Binary files a/icons/obj/smith.dmi and b/icons/obj/smith.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 1f1709a10c..b0e542f618 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/unlockable.dm b/modular_citadel/code/modules/client/loadout/unlockable.dm
new file mode 100644
index 0000000000..6e522812b8
--- /dev/null
+++ b/modular_citadel/code/modules/client/loadout/unlockable.dm
@@ -0,0 +1,30 @@
+/datum/gear/unlockable
+ category = LOADOUT_CATEGORY_UNLOCKABLE
+ slot = SLOT_NECK
+
+ var/progress_required //what does our progress need to be to unlock it
+ var/progress_key //what is the key used to retrieve existing progress for this unlockable
+
+/datum/gear/unlockable/janitor
+ name = "Janitor Bedsheet"
+ description = "Clean 100 messes with a mop to unlock this. It has a warning sign on!"
+ path = /obj/item/bedsheet/unlockable/janitor
+
+ progress_required = 100
+ progress_key = "janitor"
+
+/datum/gear/unlockable/cook
+ name = "Cook Bedsheet"
+ description = "Cook 250 items using the microwave to unlock this. It has a microwave on!"
+ path = /obj/item/bedsheet/unlockable/cook
+
+ progress_required = 250
+ progress_key = "cook"
+
+/datum/gear/unlockable/miner
+ name = "Miner Bedsheet"
+ description = "Redeem a total of 100,000 miner points to unlock this. It's made out of goliath hide!"
+ path = /obj/item/bedsheet/unlockable/miner
+
+ progress_required = 100000
+ progress_key = "miner"
\ No newline at end of file
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 7403de6215..ac3ef96505 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -232,7 +232,8 @@
P.Insert(H)
P.modify_size(0.1)
- if (ISINRANGE_EX(P.length, 20.5, 21) && (H.w_uniform || H.wear_suit))
+ var/max_D = CONFIG_GET(number/penis_max_inches_prefs)
+ if (ISINRANGE_EX(P.length, max_D + 0.5, max_D + 1) && (H.w_uniform || H.wear_suit))
var/target = H.get_bodypart(BODY_ZONE_CHEST)
if(!message_spam)
to_chat(H, "Your cock begin to strain against your clothes tightly!")
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index bbecd2f6f4..21f525088c 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -593,7 +593,6 @@
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 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/gold = 5)
//FermiChem vars:
OptimalTempMin = 500
OptimalTempMax = 750
@@ -604,7 +603,7 @@
//CatalystFact = 0
CurveSharpT = 1.5
CurveSharppH = 3
- ThermicConstant = 5
+ ThermicConstant = 1
HIonRelease = -0.15
RateUpLim = 4
PurityMin = 0.5 //Good luck!
diff --git a/sound/effects/ding.ogg b/sound/effects/ding.ogg
new file mode 100644
index 0000000000..33516f793f
Binary files /dev/null and b/sound/effects/ding.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index e07291373b..58901eecc4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -292,6 +292,7 @@
#include "code\controllers\configuration\entries\fail2topic.dm"
#include "code\controllers\configuration\entries\game_options.dm"
#include "code\controllers\configuration\entries\general.dm"
+#include "code\controllers\configuration\entries\persistence.dm"
#include "code\controllers\configuration\entries\plushies.dm"
#include "code\controllers\configuration\entries\policy.dm"
#include "code\controllers\configuration\entries\resources.dm"
@@ -340,7 +341,6 @@
#include "code\controllers\subsystem\pai.dm"
#include "code\controllers\subsystem\parallax.dm"
#include "code\controllers\subsystem\pathfinder.dm"
-#include "code\controllers\subsystem\persistence.dm"
#include "code\controllers\subsystem\profiler.dm"
#include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\radio.dm"
@@ -363,6 +363,13 @@
#include "code\controllers\subsystem\vis_overlays.dm"
#include "code\controllers\subsystem\vore.dm"
#include "code\controllers\subsystem\vote.dm"
+#include "code\controllers\subsystem\persistence\_persistence.dm"
+#include "code\controllers\subsystem\persistence\cleanable_debris.dm"
+#include "code\controllers\subsystem\persistence\panic_bunker.dm"
+#include "code\controllers\subsystem\persistence\poly_parrot.dm"
+#include "code\controllers\subsystem\persistence\recent_votes_etc.dm"
+#include "code\controllers\subsystem\persistence\secret_satchels.dm"
+#include "code\controllers\subsystem\persistence\trophies.dm"
#include "code\controllers\subsystem\processing\chemistry.dm"
#include "code\controllers\subsystem\processing\circuit.dm"
#include "code\controllers\subsystem\processing\fastprocess.dm"
@@ -492,6 +499,7 @@
#include "code\datums\components\swarming.dm"
#include "code\datums\components\tackle.dm"
#include "code\datums\components\thermite.dm"
+#include "code\datums\components\twitch_plays.dm"
#include "code\datums\components\twohanded.dm"
#include "code\datums\components\uplink.dm"
#include "code\datums\components\virtual_reality.dm"
@@ -2715,6 +2723,7 @@
#include "code\modules\mob\living\simple_animal\hostile\banana_spider.dm"
#include "code\modules\mob\living\simple_animal\hostile\bear.dm"
#include "code\modules\mob\living\simple_animal\hostile\bees.dm"
+#include "code\modules\mob\living\simple_animal\hostile\bread.dm"
#include "code\modules\mob\living\simple_animal\hostile\carp.dm"
#include "code\modules\mob\living\simple_animal\hostile\cat_butcher.dm"
#include "code\modules\mob\living\simple_animal\hostile\dark_wizard.dm"
@@ -3342,6 +3351,7 @@
#include "code\modules\shuttle\shuttle.dm"
#include "code\modules\shuttle\shuttle_rotate.dm"
#include "code\modules\shuttle\snaxi.dm"
+#include "code\modules\shuttle\spaceship_navigation_beacon.dm"
#include "code\modules\shuttle\special.dm"
#include "code\modules\shuttle\supply.dm"
#include "code\modules\shuttle\syndicate.dm"
@@ -3608,6 +3618,7 @@
#include "modular_citadel\code\modules\client\loadout\shoes.dm"
#include "modular_citadel\code\modules\client\loadout\suit.dm"
#include "modular_citadel\code\modules\client\loadout\uniform.dm"
+#include "modular_citadel\code\modules\client\loadout\unlockable.dm"
#include "modular_citadel\code\modules\client\verbs\who.dm"
#include "modular_citadel\code\modules\clothing\neck.dm"
#include "modular_citadel\code\modules\clothing\trek.dm"
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index f1ab17a264..f72ac63d1f 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -3,7 +3,7 @@
"name": "tgui-dev-server",
"version": "4.2.0",
"dependencies": {
- "axios": "^0.19.2",
+ "axios": "^0.21.1",
"common": "workspace:*",
"esm": "^3.2.25",
"glob": "^7.1.4",
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.js b/tgui/packages/tgui/interfaces/ChemMaster.js
index 9d16dc82e6..ddca187244 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.js
+++ b/tgui/packages/tgui/interfaces/ChemMaster.js
@@ -205,7 +205,7 @@ const PackagingControlsItem = props => {
stepPixelSize={15}
value={amount}
minValue={1}
- maxValue={10}
+ maxValue={20}
onChange={onChangeAmount} />