diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index d380d30d10..07d0575e83 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -718,8 +718,7 @@
},
/obj/machinery/firealarm{
dir = 4;
- pixel_x = -26;
- pixel_y = 0
+ pixel_x = -26
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
@@ -1167,8 +1166,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28;
- pixel_y = 0
+ pixel_x = 28
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
@@ -4085,8 +4083,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/camera{
c_tag = "Brig Infirmary";
- dir = 4;
- network = list("ss13")
+ dir = 4
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -4658,8 +4655,7 @@
},
/obj/machinery/camera{
c_tag = "Brig Central";
- dir = 8;
- network = list("ss13")
+ dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -4683,8 +4679,7 @@
/area/security/brig)
"aiK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/turf/open/floor/plasteel,
/area/security/processing)
@@ -5087,8 +5082,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -6516,8 +6510,7 @@
/area/security/brig)
"amU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/obj/structure/chair/office/dark{
dir = 8
@@ -6673,7 +6666,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
name = "Evidence Storage";
- req_access = null;
req_access_txt = "3"
},
/turf/open/floor/plasteel/showroomfloor,
@@ -6743,8 +6735,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -6830,8 +6821,7 @@
pixel_y = -36
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/obj/structure/bed,
/obj/item/bedsheet/blue,
@@ -7552,7 +7542,6 @@
normaldoorcontrol = 1;
pixel_x = -24;
pixel_y = -40;
- req_access = null;
req_access_txt = "2"
},
/obj/machinery/button/door{
@@ -7561,7 +7550,6 @@
normaldoorcontrol = 1;
pixel_x = -24;
pixel_y = -24;
- req_access = null;
req_access_txt = "2"
},
/turf/open/floor/plasteel/showroomfloor,
@@ -8324,9 +8312,7 @@
"ary" = (
/obj/machinery/power/apc{
areastring = "/area/security/warden";
- dir = 2;
name = "Brig Control APC";
- pixel_x = 0;
pixel_y = -24
},
/obj/machinery/button/door{
@@ -8334,7 +8320,6 @@
name = "Cell Shutters";
pixel_x = 6;
pixel_y = -40;
- req_access = null;
req_access_txt = "2"
},
/obj/machinery/button/door{
@@ -8392,8 +8377,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -8512,8 +8496,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -8580,8 +8563,7 @@
/area/hallway/primary/fore)
"asb" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/obj/machinery/camera{
c_tag = "Brig Evidence Storage";
@@ -8735,8 +8717,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28;
- pixel_y = 0
+ pixel_x = 28
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -8754,7 +8735,6 @@
name = "Brig Control Shutters";
pixel_x = 6;
pixel_y = -40;
- req_access = null;
req_access_txt = "2"
},
/obj/machinery/button/door{
@@ -8805,8 +8785,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28;
- pixel_y = 0
+ pixel_x = 28
},
/turf/open/floor/plasteel,
/area/security/processing)
@@ -33788,9 +33767,9 @@
"bCG" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/gun/syringe,
/obj/item/reagent_containers/dropper,
/obj/item/soap/nanotrasen,
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCH" = (
@@ -35592,6 +35571,7 @@
pixel_y = 2
},
/obj/item/clothing/neck/stethoscope,
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bGT" = (
@@ -54412,8 +54392,7 @@
/area/security/prison)
"eXz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/turf/open/floor/plasteel,
/area/security/processing)
@@ -54973,8 +54952,7 @@
"gDP" = (
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28;
- pixel_y = 0
+ pixel_x = 28
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -55524,6 +55502,11 @@
},
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
+"iLJ" = (
+/obj/item/reagent_containers/glass/bucket,
+/mob/living/simple_animal/pet/bumbles,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"iMv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -56598,8 +56581,7 @@
/obj/machinery/door/airlock/security/glass{
id_tag = "innerbrig";
name = "Brig Infirmary";
- req_access_txt = "2";
- req_one_access_txt = "0"
+ req_access_txt = "2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -56720,8 +56702,7 @@
pixel_y = -36
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/obj/structure/bed,
/obj/item/bedsheet/yellow,
@@ -57070,7 +57051,6 @@
"nEj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external{
- pixel_x = 0;
pixel_y = 32
},
/turf/open/floor/plating,
@@ -57287,8 +57267,7 @@
pixel_y = -36
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/obj/structure/bed,
/obj/item/bedsheet/green,
@@ -58087,8 +58066,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- pixel_x = 0
+ dir = 1
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -60615,7 +60593,6 @@
"xWq" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external{
- pixel_x = 0;
pixel_y = -32
},
/turf/open/floor/plating,
@@ -102207,7 +102184,7 @@ aSU
aXo
aXo
aXo
-aYO
+iLJ
bap
ikm
aYV
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 7a09da4347..9c4e05a862 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -90569,7 +90569,6 @@
pixel_y = 3
},
/obj/item/storage/box/syringes,
-/obj/item/gun/syringe,
/obj/machinery/status_display/evac{
pixel_x = -32
},
@@ -90581,6 +90580,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel,
/area/medical/storage)
"cWv" = (
@@ -99195,7 +99195,7 @@
/obj/structure/table/reinforced,
/obj/machinery/light/small,
/obj/structure/bedsheetbin,
-/obj/item/gun/syringe,
+/obj/item/gun/syringe/dart,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -106576,11 +106576,11 @@
/obj/item/clothing/mask/muzzle,
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/clothing/ears/earmuffs,
-/obj/item/gun/syringe,
/obj/item/clothing/glasses/eyepatch,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"dyE" = (
@@ -126360,6 +126360,20 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
+"jwo" = (
+/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
+ },
+/mob/living/simple_animal/pet/bumbles,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"jBE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -160698,7 +160712,7 @@ bjt
bli
bnk
boB
-bnj
+jwo
bnj
bnh
bvB
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 73386e6e1e..a18bb7cf97 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -22793,9 +22793,6 @@
pixel_y = 4
},
/obj/item/storage/box/beakers,
-/obj/item/gun/syringe{
- pixel_y = 5
- },
/obj/item/reagent_containers/spray/cleaner,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -22804,6 +22801,7 @@
/obj/machinery/light_switch{
pixel_y = 24
},
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/dark,
/area/medical/storage)
"aKZ" = (
@@ -43879,18 +43877,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/central)
-"bqG" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hydroponics)
"bqH" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -88232,6 +88218,19 @@
"whw" = (
/turf/closed/wall/rust,
/area/medical/surgery)
+"whZ" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/mob/living/simple_animal/pet/bumbles,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"wmX" = (
/turf/closed/wall/rust,
/area/quartermaster/qm)
@@ -122394,7 +122393,7 @@ aZd
bqh
bnJ
bpl
-bqG
+whZ
bsL
buw
bwH
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index 4ebe1650d6..445a0fdbce 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -4888,11 +4888,11 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
- name = "Research Maintenance";
+ name = "Xenobiology Maintenance";
req_access_txt = "47"
},
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/science/xenobiology)
"akh" = (
@@ -10868,12 +10868,12 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"auf" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
+ },
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aug" = (
@@ -21834,12 +21834,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ name = "Xenobiology Maintenance";
+ req_access_txt = "47"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plating,
-/area/maintenance/fore)
+/area/science/xenobiology)
"aMm" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -24354,17 +24355,14 @@
/area/maintenance/fore)
"aQC" = (
/obj/structure/cable{
- icon_state = "0-8"
+ icon_state = "1-2"
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/fore/secondary";
- dir = 4;
- name = "Fore Maintenance APC";
- pixel_x = 24;
- pixel_y = 0
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/plating,
-/area/maintenance/fore)
+/turf/open/floor/plasteel,
+/area/science/robotics/lab)
"aQD" = (
/turf/closed/wall,
/area/crew_quarters/heads/captain/private)
@@ -26324,15 +26322,15 @@
/turf/open/floor/plating,
/area/maintenance/central)
"aUr" = (
-/obj/machinery/door/airlock/maintenance{
- id_tag = "commissarydoor";
- req_one_access_txt = "12;63;48;50"
- },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/central)
+/area/maintenance/fore)
"aUs" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock{
@@ -27489,7 +27487,7 @@
"aWN" = (
/obj/machinery/door/airlock/command{
name = "Emergency Escape";
- req_access_txt = "20"
+ req_access_txt = "19"
},
/obj/machinery/door/poddoor/preopen{
id = "bridgedoors";
@@ -28938,7 +28936,7 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -29395,24 +29393,31 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"baf" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 4
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/obj/machinery/door/airlock/command{
- name = "Command Hallway"
+/obj/machinery/button{
+ id = "bridgespace";
+ name = "Bridge External Shutters";
+ pixel_x = -25;
+ pixel_y = 35
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/command)
+/obj/machinery/button{
+ id = "bridgespace";
+ name = "Bridge Access Shutters";
+ pixel_x = -25;
+ pixel_y = 26;
+ req_access_txt = "19"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
"bag" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -30213,17 +30218,36 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bbs" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "bridgedoors";
+ name = "Bridge Access Blast door"
+ },
+/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/machinery/door/airlock/command{
- name = "Command Hallway"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/door/airlock/command{
+ name = "Bridge";
+ req_access_txt = "19"
+ },
+/turf/open/floor/plasteel/dark,
/area/hallway/secondary/command)
"bbt" = (
/obj/machinery/light{
@@ -31020,15 +31044,25 @@
/turf/open/floor/carpet,
/area/bridge)
"bdh" = (
-/obj/structure/chair/comfy/black{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/button{
- pixel_x = 35;
- pixel_y = 30
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
},
-/turf/open/floor/carpet,
-/area/bridge)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/obj/machinery/door/airlock/command{
+ name = "Command Hallway";
+ req_access_txt = "19"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/command)
"bdi" = (
/obj/machinery/door/window/eastright,
/turf/open/floor/carpet,
@@ -31778,18 +31812,13 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bey" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/door/airlock/command{
- name = "Bridge"
+ name = "Bridge";
+ req_access_txt = "19"
},
/obj/machinery/door/poddoor/preopen{
id = "bridgedoors";
@@ -32273,6 +32302,7 @@
/area/quartermaster/sorting)
"bfB" = (
/obj/machinery/door/airlock/maintenance{
+ name = "Sorting Maintenance";
req_access_txt = "31"
},
/turf/open/floor/plating,
@@ -32961,29 +32991,18 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bgT" = (
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/command{
- name = "Bridge"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "bridgedoors";
- name = "Bridge Access Blast door"
- },
-/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command{
+ name = "Command Hallway";
+ req_access_txt = "19"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bgU" = (
/obj/structure/disposalpipe/segment,
@@ -34954,7 +34973,7 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
@@ -35254,7 +35273,10 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bla" = (
-/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/airlock/maintenance{
+ name = "Janitor Maintenance";
+ req_access_txt = "26"
+ },
/turf/open/floor/plating,
/area/maintenance/central)
"blb" = (
@@ -35810,15 +35832,15 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"blY" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/layer_manifold,
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/department/cargo)
+/area/maintenance/central)
"blZ" = (
/turf/closed/wall,
/area/hallway/secondary/exit/departure_lounge)
@@ -39637,11 +39659,11 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics/cloning)
"bsU" = (
-/obj/machinery/computer/scan_consolenew,
/obj/effect/turf_decal/trimline/blue/filled/line{
icon_state = "trimline_fill";
dir = 5
},
+/obj/machinery/computer/cloning,
/turf/open/floor/plasteel/white,
/area/medical/genetics/cloning)
"bsV" = (
@@ -39763,7 +39785,6 @@
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
-/obj/item/gun/syringe,
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
dir = 4;
@@ -41136,7 +41157,8 @@
/area/medical/storage)
"bvF" = (
/obj/machinery/door/airlock/grunge{
- name = "Virology Maintenance Access"
+ name = "Virology Maintenance Access";
+ req_access_txt = "39"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -41182,7 +41204,6 @@
/area/hallway/secondary/command)
"bvI" = (
/obj/structure/table,
-/obj/item/gun/syringe,
/obj/machinery/camera{
c_tag = "Chemistry";
dir = 4;
@@ -42157,14 +42178,15 @@
/turf/open/floor/plating/asteroid,
/area/maintenance/fore)
"bxx" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/starboard)
+/area/maintenance/department/cargo)
"bxy" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -46969,17 +46991,17 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
"bGf" = (
-/obj/item/radio/off,
-/obj/item/crowbar,
-/obj/item/screwdriver{
- pixel_y = 10
+/obj/machinery/power/apc{
+ areastring = "/area/science/robotics/lab";
+ dir = 1;
+ name = "Robotics Lab APC";
+ pixel_y = 25
},
-/obj/effect/turf_decal/trimline/red/filled/line{
- icon_state = "trimline_fill";
- dir = 9
+/obj/structure/cable{
+ icon_state = "0-8"
},
/turf/open/floor/plasteel,
-/area/security/checkpoint/customs)
+/area/science/robotics/lab)
"bGg" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -47396,21 +47418,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bGV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bGW" = (
@@ -48749,10 +48762,10 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/port)
+/area/maintenance/starboard)
"bJv" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50851,13 +50864,11 @@
/area/engine/transit_tube)
"bNa" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plating,
/area/maintenance/port)
"bNb" = (
@@ -53241,11 +53252,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/area/maintenance/port)
"bQy" = (
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
@@ -53286,10 +53299,10 @@
icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/department/crew_quarters/dorms)
+/area/maintenance/port/aft)
"bQG" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -54838,11 +54851,14 @@
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"bTE" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/crew_quarters/dorms)
+/area/maintenance/department/crew_quarters/dorms)
"bTF" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -55526,16 +55542,18 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bUO" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/door/window/westright,
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/trimline/blue/filled/end{
- icon_state = "trimline_end_fill";
- dir = 8
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel/dark,
-/area/aisat)
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/fore";
+ dir = 4;
+ name = "Fore Maintenance APC";
+ pixel_x = 24;
+ pixel_y = 0
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore)
"bUP" = (
/turf/closed/wall/r_wall,
/area/tcommsat/server)
@@ -55820,21 +55838,30 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"bVo" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/door/window/eastright,
-/obj/machinery/light/small{
+/obj/machinery/light{
dir = 1;
- light_color = "#ffc1c1";
- pixel_y = -5
+ light_color = "#706891"
},
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- icon_state = "trimline_fill";
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/turf/open/floor/plasteel/dark,
-/area/aisat)
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/structure/sign/directions/medical{
+ dir = 4;
+ icon_state = "direction_med";
+ pixel_y = 40
+ },
+/obj/structure/sign/directions/engineering{
+ dir = 4;
+ pixel_y = 32
+ },
+/obj/structure/sign/directions/evac{
+ dir = 4;
+ pixel_x = 0;
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"bVp" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
icon_state = "trimline_corner_fill";
@@ -57399,12 +57426,11 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bYc" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/maintenance/aft)
+/area/crew_quarters/dorms)
"bYd" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
dir = 4
@@ -57609,9 +57635,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bYt" = (
-/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
+ },
/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/area/hallway/primary/starboard)
"bYu" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -58146,13 +58180,11 @@
/area/crew_quarters/toilet)
"bZx" = (
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/structure/cable{
- icon_state = "4-8"
+ name = "Engineering Maintenance";
+ req_access_txt = "10"
},
/turf/open/floor/plating,
-/area/crew_quarters/toilet)
+/area/maintenance/starboard/aft)
"bZy" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -58334,15 +58366,14 @@
/turf/open/floor/plasteel,
/area/security/nuke_storage)
"bZM" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
},
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
-/area/maintenance/aft)
+/area/crew_quarters/toilet)
"bZN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -59146,17 +59177,18 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cbb" = (
-/obj/machinery/power/apc{
- areastring = "/area/";
- dir = 4;
- name = "Aft Port Maintenance APC";
- pixel_x = 24
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/door/window/westright{
+ req_one_access_txt = "32;19"
},
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/trimline/blue/filled/end{
+ icon_state = "trimline_end_fill";
+ dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/turf/open/floor/plasteel/dark,
+/area/aisat)
"cbc" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -59519,7 +59551,7 @@
/area/maintenance/port/aft)
"cbG" = (
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -60169,10 +60201,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"ccU" = (
-/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
+ },
/turf/open/floor/plating,
/area/maintenance/aft)
"ccV" = (
@@ -62403,15 +62437,23 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cic" = (
-/obj/structure/table,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/door/window/eastright{
+ req_one_access_txt = "32;19"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 4
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1";
+ pixel_y = -5
},
-/turf/open/floor/plasteel,
-/area/engine/break_room)
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ icon_state = "trimline_fill";
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/aisat)
"cid" = (
/obj/structure/chair{
dir = 8
@@ -63457,14 +63499,13 @@
/area/engine/atmos)
"cki" = (
/obj/machinery/power/apc{
- areastring = "/area/security/checkpoint/customs";
- dir = 2;
- name = "Customs APC";
- pixel_x = 1;
- pixel_y = -24
+ areastring = "/area/maintenance/port/aft";
+ dir = 4;
+ name = "Aft Port Maintenance APC";
+ pixel_x = 24
},
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -63566,22 +63607,15 @@
/turf/closed/wall/r_wall,
/area/engine/engine_smes)
"ckw" = (
-/obj/machinery/power/apc{
- areastring = "/area/engine/engine_smes";
- dir = 1;
- name = "SMES room APC";
- pixel_x = -26;
- pixel_y = 0
+/obj/machinery/door/airlock/maintenance{
+ name = "Atmospherics Maintenance";
+ req_access_txt = "24"
},
/obj/structure/cable{
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engine_smes)
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"ckx" = (
/obj/machinery/camera{
c_tag = "Atmospherics Tank - N2O";
@@ -63590,15 +63624,19 @@
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"cky" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+/obj/structure/table,
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/modular_computer/console/preset/engineering,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/engine/engine_smes)
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/twohanded/rcl/pre_loaded,
+/obj/item/twohanded/rcl/pre_loaded,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
"ckz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -63883,17 +63921,14 @@
/turf/closed/wall,
/area/security/vacantoffice/a)
"clb" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "Vacant Office APC";
- areastring = "/area/vacant_room/office";
- pixel_x = -25
- },
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "4-8"
},
-/turf/open/floor/wood,
-/area/security/vacantoffice/a)
+/obj/machinery/door/airlock/maintenance{
+ req_one_access_txt = "12;5;39;6"
+ },
+/turf/open/floor/plating,
+/area/maintenance/aft)
"clc" = (
/turf/open/floor/wood,
/area/security/vacantoffice/a)
@@ -63975,22 +64010,16 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"clm" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/yellow{
- icon_state = "0-8"
+/obj/machinery/power/apc{
+ areastring = "/area/engine/engine_smes";
+ dir = 1;
+ name = "SMES room APC";
+ pixel_x = -26;
+ pixel_y = 0
},
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
},
/turf/open/floor/plasteel/dark,
/area/engine/engine_smes)
@@ -64790,11 +64819,24 @@
/turf/open/floor/plating,
/area/chapel/main)
"cmT" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+/obj/structure/chair/comfy/black{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/recreation)
+/obj/machinery/button{
+ id = "bridgespace";
+ name = "Bridge External Shutters";
+ pixel_x = 36;
+ pixel_y = 30
+ },
+/obj/machinery/button{
+ id = "bridgespace";
+ name = "Bridge Access Shutters";
+ pixel_x = 26;
+ pixel_y = 30;
+ req_access_txt = "19"
+ },
+/turf/open/floor/carpet,
+/area/bridge)
"cmU" = (
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass,
@@ -65296,16 +65338,10 @@
/area/maintenance/central)
"cnU" = (
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 4
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
-/area/hallway/primary/starboard)
+/area/crew_quarters/fitness/recreation)
"cnV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -65354,6 +65390,14 @@
pixel_y = 3
},
/obj/effect/turf_decal/delivery,
+/obj/item/clothing/mask/gas{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/obj/item/clothing/mask/gas{
+ pixel_x = 5;
+ pixel_y = -2
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"coa" = (
@@ -65432,12 +65476,11 @@
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"cof" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
- dir = 6
- },
+/obj/structure/closet/secure_closet/atmospherics,
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel,
-/area/maintenance/disposal/incinerator)
+/area/engine/atmos)
"cog" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -65446,14 +65489,17 @@
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"coh" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "24"
+/obj/machinery/power/apc{
+ areastring = "/area/vacant_room/office/a";
+ dir = 8;
+ name = "Vacant Office APC";
+ pixel_x = -25
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-2"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/turf/open/floor/wood,
+/area/security/vacantoffice/a)
"coi" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -65533,9 +65579,6 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"cos" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
icon_state = "vent_map_on-1";
dir = 4
@@ -65549,6 +65592,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 9
},
+/obj/machinery/button/crematorium{
+ id = "crematoriumChapel";
+ pixel_x = -26;
+ pixel_y = -58;
+ req_access_txt = "27"
+ },
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cou" = (
@@ -65709,20 +65758,18 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"coK" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
},
-/obj/machinery/power/apc/highcap/fifteen_k{
- areastring = "/area/engine/engineering";
- dir = 1;
- name = "Engine Room APC";
- pixel_y = 27
+/obj/machinery/modular_computer/console/preset/engineering,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
},
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
+/turf/open/floor/plasteel/dark,
+/area/engine/engine_smes)
"coL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -66219,16 +66266,12 @@
/turf/open/floor/grass,
/area/hydroponics/garden)
"cpG" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/item/twohanded/required/kirbyplants/photosynthetic,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
- dir = 6
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/engine/break_room)
@@ -66300,12 +66343,9 @@
dir = 4
},
/obj/machinery/modular_computer/console/preset/engineering,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel/dark,
/area/engine/engine_smes)
"cpP" = (
@@ -66375,7 +66415,11 @@
/area/engine/atmos)
"cpV" = (
/obj/structure/closet/secure_closet/atmospherics,
+/obj/machinery/light{
+ dir = 1
+ },
/obj/effect/turf_decal/bot,
+/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cpW" = (
@@ -66560,7 +66604,7 @@
dir = 4
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_one_access_txt = "12;5;39;6"
},
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -66631,13 +66675,13 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"cqx" = (
-/obj/structure/closet/secure_closet/atmospherics,
-/obj/machinery/light{
- dir = 1
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+ dir = 6
},
-/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/maintenance/disposal/incinerator)
"cqy" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
@@ -66657,9 +66701,18 @@
/turf/open/floor/plasteel/dark,
/area/engine/engine_smes)
"cqA" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable/yellow{
- icon_state = "1-4"
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/power/apc/highcap/fifteen_k{
+ areastring = "/area/engine/engineering";
+ dir = 1;
+ name = "Engine Room APC";
+ pixel_y = 27
+ },
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -66677,9 +66730,26 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cqC" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/obj/machinery/power/terminal,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/cable/yellow,
+/turf/open/floor/plasteel/dark,
+/area/engine/engine_smes)
"cqD" = (
/obj/machinery/light,
/obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -66724,15 +66794,27 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cqH" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
+/obj/item/radio/off,
+/obj/item/crowbar,
+/obj/item/screwdriver{
+ pixel_y = 10
},
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/effect/turf_decal/trimline/red/filled/line{
+ icon_state = "trimline_fill";
+ dir = 9
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/customs";
+ dir = 1;
+ name = "Customs APC";
+ pixel_x = 1;
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/security/checkpoint/customs)
"cqI" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -67024,18 +67106,21 @@
/turf/closed/wall/r_wall,
/area/engine/storage)
"crt" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/red/filled/line{
+ icon_state = "trimline_fill";
dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
},
/turf/open/floor/plasteel,
-/area/engine/storage)
+/area/security/checkpoint/customs)
"cru" = (
/obj/effect/turf_decal/loading_area{
dir = 4
@@ -67581,33 +67666,33 @@
/turf/open/floor/plating,
/area/engine/storage)
"csu" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- icon_state = "trimline_fill";
- dir = 9
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"csv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- icon_state = "trimline_corner_fill";
- dir = 1
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
},
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
"csw" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- icon_state = "trimline_fill";
- dir = 8
+/obj/structure/cable{
+ icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/corner,
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/engine/break_room)
"csx" = (
/obj/machinery/suit_storage_unit/atmos,
/obj/effect/turf_decal/delivery,
@@ -68140,32 +68225,35 @@
/area/engine/break_room)
"cty" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+/obj/structure/disposalpipe/junction/flip{
dir = 8
},
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- icon_state = "trimline_fill";
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ icon_state = "trimline_corner_fill";
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/engine/break_room)
"ctz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 4
+/obj/item/twohanded/required/kirbyplants/photosynthetic,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
- dir = 1
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/engine/break_room)
"ctA" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -68173,17 +68261,18 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"ctB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/engine/break_room)
"ctC" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -68524,21 +68613,11 @@
/turf/open/floor/plating,
/area/engine/engineering)
"cur" = (
-/obj/effect/turf_decal/loading_area{
+/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 4
- },
-/obj/machinery/button/door{
- id = "Singularity";
- name = "Shutters Control";
- pixel_x = 5;
- pixel_y = 32;
- req_access_txt = "11"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -70161,17 +70240,18 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cyd" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/engine/break_room)
"cye" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -71303,15 +71383,18 @@
/turf/open/floor/plasteel/dark,
/area/security/armory)
"cAr" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/engine/engineering)
"cAs" = (
/obj/item/vending_refill/snack,
/turf/open/floor/plating,
@@ -71937,22 +72020,13 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"cBe" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/engine/engineering)
"cBf" = (
@@ -73200,16 +73274,16 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"cDp" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- icon_state = "trimline_fill";
- dir = 9
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
- icon_state = "vent_map_on-1";
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ icon_state = "trimline_corner_fill";
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/storage)
+/area/engine/engineering)
"cDq" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -73447,12 +73521,12 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"cDP" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ icon_state = "trimline_corner_fill";
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plasteel,
-/area/science/robotics/lab)
+/area/engine/break_room)
"cDQ" = (
/obj/effect/turf_decal/trimline/white/filled/line,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
@@ -75689,15 +75763,14 @@
/area/science/xenobiology)
"cHl" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
- name = "Research Maintenance";
- req_access_txt = "47"
+ name = "Garden Maintenance";
+ req_one_access_txt = "12;5;39;6"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plating,
-/area/science/xenobiology)
+/area/maintenance/aft)
"cHm" = (
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall,
@@ -76942,14 +77015,21 @@
/turf/open/floor/circuit/green,
/area/engine/engine_smes)
"cJo" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/engine/engineering)
"cJp" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/storage/box/lights/mixed,
@@ -77309,19 +77389,16 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cJZ" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/engine/storage)
"cKa" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -77332,38 +77409,40 @@
/area/engine/break_room)
"cKb" = (
/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
- dir = 10
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/plasteel,
-/area/engine/break_room)
-"cKc" = (
-/obj/effect/turf_decal/trimline/yellow/filled/corner,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/engine/break_room)
-"cKd" = (
+/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 4
},
-/obj/machinery/light{
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cKc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cKd" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
+ icon_state = "vent_map_on-1";
dir = 4
},
-/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/engine/storage)
"cKe" = (
/obj/structure/sink{
layer = 3;
@@ -77380,16 +77459,27 @@
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"cKf" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- icon_state = "trimline_fill";
- dir = 6
+/obj/effect/turf_decal/loading_area{
+ dir = 4
},
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "Singularity";
+ name = "Shutters Control";
+ pixel_x = 26;
+ pixel_y = 32;
+ req_access_txt = "11"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/engine/engineering)
"cKg" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -77453,15 +77543,22 @@
/turf/open/floor/plating,
/area/maintenance/central)
"cKl" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "Singularity";
+ name = "radiation shutters"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/open/floor/plating,
-/area/maintenance/central)
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cKm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -78068,17 +78165,18 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cLp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- icon_state = "trimline_corner_fill";
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cLq" = (
@@ -79781,12 +79879,24 @@
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation)
"cOi" = (
-/obj/item/poster/random_contraband,
-/turf/open/floor/plating,
-/turf/open/floor/plating{
- icon_state = "platingdmg2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 6
},
-/area/maintenance/aft)
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cOj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 10
@@ -81635,14 +81745,23 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cSe" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ icon_state = "trimline_corner_fill";
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cSf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light{
@@ -81828,12 +81947,20 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cSw" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
},
-/obj/machinery/door/airlock/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cSx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable{
@@ -82927,18 +83054,21 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cUZ" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
},
-/obj/effect/turf_decal/trimline/red/filled/line{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 1
},
-/obj/structure/cable{
- icon_state = "1-4"
- },
/turf/open/floor/plasteel,
-/area/security/checkpoint/customs)
+/area/engine/engineering)
"cVa" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/obj/structure/reagent_dispensers/peppertank{
@@ -83573,7 +83703,9 @@
/area/engine/engineering)
"cWC" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/tank/toxins,
+/obj/machinery/atmospherics/components/unary/tank/toxins{
+ dir = 4
+ },
/obj/effect/turf_decal/delivery,
/obj/structure/window/reinforced/spawner/north,
/obj/structure/sign/warning/nosmoking{
@@ -84402,6 +84534,62 @@
/turf/open/floor/plating,
/area/engine/storage)
"cYe" = (
+/obj/structure/chair/stool,
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical)
+"cYf" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Engineering Maintenance";
+ req_access_txt = "10"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/maintenance/aft)
+"cYg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ icon_state = "trimline_fill";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cYh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ icon_state = "trimline_corner_fill";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cYi" = (
+/obj/item/poster/random_contraband,
+/turf/open/floor/plating,
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/aft)
+"cYj" = (
/obj/structure/cable{
icon_state = "0-4"
},
@@ -84410,7 +84598,7 @@
icon_state = "platingdmg2"
},
/area/maintenance/department/electrical)
-"cYf" = (
+"cYk" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -84419,6 +84607,16 @@
icon_state = "platingdmg2"
},
/area/maintenance/aft)
+"cYl" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ req_access_txt = "13"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/maintenance/aft)
(1,1,1) = {"
aaa
@@ -94096,7 +94294,7 @@ aac
aac
aac
bNe
-bUO
+cbb
bPq
aac
aac
@@ -94353,7 +94551,7 @@ aaa
aaa
aac
bNf
-bVo
+cic
bPr
aac
aaa
@@ -101976,7 +102174,7 @@ apO
atB
ali
avt
-cHl
+aMl
axh
axG
axG
@@ -110494,7 +110692,7 @@ aab
aab
bba
bcg
-bdh
+cmT
bcg
bba
aab
@@ -111260,7 +111458,7 @@ acw
acw
aVM
aWN
-aZR
+baf
aZR
bcj
bfL
@@ -111767,7 +111965,7 @@ acw
acw
afB
acw
-aQC
+bUO
aGz
cSj
cdW
@@ -112547,8 +112745,8 @@ aYc
aMh
aaR
aYQ
+bbs
bey
-bgT
aXT
bdn
bez
@@ -114696,7 +114894,7 @@ ceF
cLR
bSn
cri
-bQx
+bQF
ctJ
cqk
cwG
@@ -115201,9 +115399,9 @@ aaA
aaA
bTf
bUb
-cki
+bQW
ckY
-bGf
+cqH
ccF
cVm
cdg
@@ -115460,7 +115658,7 @@ bTf
ciF
ckj
ckZ
-cUZ
+crt
clH
clH
cdL
@@ -115686,7 +115884,7 @@ boU
cJk
bOR
cLJ
-bQx
+bQF
bQX
bRF
bQW
@@ -115939,7 +116137,7 @@ aaA
bFH
cRh
bMp
-bNa
+bQx
cLB
bOS
cLK
@@ -115959,7 +116157,7 @@ cKt
cKE
cKt
boU
-cbb
+cki
cbF
cTw
bQW
@@ -116402,8 +116600,8 @@ bYi
bYi
aYe
aSt
-baf
-bbs
+bdh
+bgT
bcr
bcs
bcs
@@ -117515,7 +117713,7 @@ cjy
cfQ
cCG
cqg
-clb
+coh
clM
cWn
cnw
@@ -117673,7 +117871,7 @@ aIO
aKw
aKF
aUv
-aMl
+aUr
aNm
bis
bxw
@@ -118767,7 +118965,7 @@ bDK
bJr
bLS
boU
-cBK
+bVo
cCm
cbI
cfi
@@ -119698,7 +119896,7 @@ abp
bSy
cDN
cDO
-cDP
+aQC
anB
cDS
akK
@@ -119955,7 +120153,7 @@ abp
abc
cDL
afU
-ajH
+bGf
anC
alY
alX
@@ -124208,7 +124406,7 @@ bYa
bYa
bYa
bYa
-cOi
+cYi
bYa
bYa
ceG
@@ -124414,7 +124612,7 @@ boU
boU
boU
boU
-bJu
+bNa
boU
boU
boU
@@ -125474,7 +125672,7 @@ cSy
bSw
cSE
bQz
-cSw
+clb
cfo
cgi
cgi
@@ -125492,7 +125690,7 @@ cfo
ceG
ceG
ceG
-bYc
+cHl
ceG
ceG
ceG
@@ -126525,11 +126723,11 @@ cmd
aaA
cSc
cVT
-cYe
+cYj
cXu
cXz
ceG
-cYf
+cYk
cTU
cyo
aab
@@ -127020,7 +127218,7 @@ bTw
bVc
cfu
bQz
-cmT
+cnU
bQz
ciR
cjL
@@ -127495,7 +127693,7 @@ bEE
bDh
bCq
bwC
-bGV
+cOi
bJy
bJC
bJK
@@ -128540,7 +128738,7 @@ boU
bQB
bQB
bQB
-bTE
+bYc
bQB
bQB
bQB
@@ -128549,7 +128747,7 @@ bWB
bWB
bWB
bWB
-bZx
+bZM
bWB
bWB
bWB
@@ -128684,7 +128882,7 @@ aaa
aaS
abW
ayv
-acT
+aby
bsn
adI
acT
@@ -129028,7 +129226,7 @@ btb
bwy
bxi
byw
-bxg
+bGV
bxg
bCn
bCY
@@ -129050,7 +129248,7 @@ boU
ceT
bPh
bVl
-bQF
+bTE
bRz
bSa
cTM
@@ -129086,9 +129284,9 @@ cfv
ctx
cKa
cfE
-cku
-crt
-cDp
+cDP
+cJZ
+cKd
cBp
cCj
cHg
@@ -129101,7 +129299,7 @@ cHF
cHG
cHH
cHI
-bZM
+cYf
czl
bYa
cAX
@@ -129341,11 +129539,11 @@ cli
ciV
cfv
cNs
+csw
+ctB
+ctB
cKb
-cJo
-cAr
-cBe
-cty
+cSe
cso
cvh
cvh
@@ -129363,7 +129561,7 @@ bYa
cAW
cSd
cAW
-cSe
+cYl
acv
acv
aav
@@ -129461,11 +129659,11 @@ adK
aep
afp
aep
-aep
-aep
-aep
+adK
+adK
+adK
ajY
-aep
+adK
adK
amg
aok
@@ -129598,11 +129796,11 @@ cjN
ciV
cfv
ceU
-cKc
-cKd
-cKf
-cJZ
-ctz
+coJ
+cyd
+cyd
+cAr
+cUZ
cnR
col
col
@@ -129854,12 +130052,12 @@ ciV
ciV
bJn
cfv
-ceU
+cpG
coJ
-cjS
-cjS
-cjS
-ctz
+cAr
+cAr
+cAr
+cUZ
cxt
cmZ
cmZ
@@ -130113,10 +130311,10 @@ cfv
cfv
ceU
coJ
-cqC
-csu
-csw
-cLp
+cAr
+cAr
+cAr
+cYg
cxu
cmZ
cwT
@@ -130369,11 +130567,11 @@ cNm
ciZ
ciZ
cgs
-coJ
-cqC
-csv
-clr
-cqL
+cty
+cBe
+cJo
+cKc
+cYh
cxt
cmZ
cwU
@@ -130626,9 +130824,9 @@ ciX
cjb
cmn
cmn
-cpG
-cmZ
-cur
+ctz
+cDp
+cKf
cru
cnR
cyc
@@ -130841,7 +131039,7 @@ bHO
bFP
bKq
bKx
-bLd
+cYe
bMf
bKA
bCD
@@ -130885,7 +131083,7 @@ cmZ
cmZ
cmZ
cmZ
-cqJ
+cKl
crv
cmZ
cmZ
@@ -131142,7 +131340,7 @@ ckv
cqE
cpK
cqG
-cyd
+cLp
crw
cLq
ctA
@@ -131321,7 +131519,7 @@ bkZ
bqw
bLn
cKk
-cKl
+blY
cKm
cKn
bmq
@@ -131392,14 +131590,14 @@ chh
cia
cku
cjR
-ckw
+clm
coI
cqz
ckv
-coK
cqA
-coO
-ctB
+csu
+cur
+cSw
cLr
cOJ
cON
@@ -131654,7 +131852,7 @@ ctv
cJl
cjR
cnV
-cqH
+csv
csz
czb
cNu
@@ -131816,7 +132014,7 @@ aPY
bnl
cla
cla
-aUr
+aZu
cla
cla
cla
@@ -131906,8 +132104,8 @@ chj
cHX
cku
cjR
-cpO
-clm
+coK
+cqC
cJm
cjR
cnV
@@ -132163,7 +132361,7 @@ chk
cKi
cku
cjR
-cky
+cpO
cna
cJm
cjR
@@ -132417,7 +132615,7 @@ cNh
bYV
cgw
chl
-cic
+cky
clj
cjR
ckz
@@ -133909,7 +134107,7 @@ brA
brD
brD
brA
-bxx
+bJu
bpe
bpe
bpe
@@ -133938,13 +134136,13 @@ bpe
bpe
bpe
bpe
-cnU
-bpe
-bpe
-bpe
-bXe
-bXe
bYt
+bpe
+bpe
+bpe
+bXe
+bXe
+bZx
bXe
caN
cHK
@@ -135765,7 +135963,7 @@ cTG
cly
cni
cnf
-cpV
+cof
cKQ
cLg
chu
@@ -136022,7 +136220,7 @@ cdx
clz
cNp
cnf
-cpV
+cof
cKQ
cLe
coW
@@ -136279,7 +136477,7 @@ cmu
ckc
cnY
cnf
-cqx
+cpV
cKQ
cLe
coW
@@ -137489,7 +137687,7 @@ aaA
aQz
blj
blK
-blY
+bxx
bmM
bmM
boo
@@ -141153,7 +141351,7 @@ cAU
bQi
bQi
ccg
-coh
+ckw
cjt
cjt
clE
@@ -141676,7 +141874,7 @@ cTu
bQh
cRm
cnn
-cof
+cqx
cpf
cWC
crb
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 2f8d1a5eb9..ac651d7165 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -54133,7 +54133,6 @@
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
-/obj/item/gun/syringe,
/obj/structure/window/reinforced{
dir = 1
},
@@ -54146,6 +54145,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
/area/medical/storage)
"cds" = (
@@ -59207,13 +59207,13 @@
},
/obj/item/clothing/suit/straight_jacket,
/obj/item/clothing/mask/muzzle,
-/obj/item/gun/syringe,
/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,
/area/medical/surgery)
"cnu" = (
@@ -61843,7 +61843,7 @@
"csa" = (
/obj/structure/table,
/obj/item/restraints/handcuffs/cable/white,
-/obj/item/gun/syringe,
+/obj/item/gun/syringe/dart,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"csb" = (
@@ -82724,6 +82724,14 @@
/obj/structure/grille,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"soe" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/mob/living/simple_animal/pet/bumbles,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"soh" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -117831,7 +117839,7 @@ bSV
bUk
bVv
bWQ
-bWQ
+soe
bWQ
caL
ccv
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 151c459687..e8b6f238f3 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -27696,12 +27696,12 @@
pixel_y = 3
},
/obj/item/storage/box/syringes,
-/obj/item/gun/syringe,
/obj/item/reagent_containers/hypospray/CMO,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/clothing/neck/stethoscope,
/obj/item/clothing/neck/stethoscope,
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
"aXR" = (
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 77b44df636..04896d128e 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -22504,14 +22504,6 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
/area/hydroponics)
-"bbe" = (
-/obj/structure/chair/stool,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hydroponics)
"bbg" = (
/obj/effect/landmark/start/cook,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -39520,7 +39512,6 @@
"bMK" = (
/obj/item/soap/nanotrasen,
/obj/item/clothing/neck/stethoscope,
-/obj/item/gun/syringe,
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -39529,6 +39520,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/item/gun/syringe/dart,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bMM" = (
@@ -59851,6 +59843,15 @@
},
/turf/open/floor/plating,
/area/science/xenobiology)
+"ttS" = (
+/obj/structure/chair/stool,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/mob/living/simple_animal/pet/bumbles,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"tue" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -90071,7 +90072,7 @@ aRN
aXZ
aYQ
aXS
-bbe
+ttS
bcd
bdo
ben
diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm
index d8bfe2c35c..428f355c31 100644
--- a/code/datums/brain_damage/imaginary_friend.dm
+++ b/code/datums/brain_damage/imaginary_friend.dm
@@ -47,9 +47,9 @@
/datum/brain_trauma/special/imaginary_friend/proc/get_ghost()
set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s imaginary friend?", ROLE_PAI, null, null, 75, friend, POLL_IGNORE_IMAGINARYFRIEND)
+ var/list/candidates = pollCandidatesForMob("Do you want to play as [owner]'s imaginary friend?", ROLE_PAI, null, null, 75, friend, POLL_IGNORE_IMAGINARYFRIEND)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
C.transfer_ckey(friend, FALSE)
friend_initialized = TRUE
else
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index a1284319f1..6586a065d0 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -27,9 +27,9 @@
/datum/brain_trauma/severe/split_personality/proc/get_ghost()
set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s split personality?", ROLE_PAI, null, null, 75, stranger_backseat, POLL_IGNORE_SPLITPERSONALITY)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as [owner]'s split personality?", ROLE_PAI, null, null, 75, stranger_backseat, POLL_IGNORE_SPLITPERSONALITY)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
C.transfer_ckey(stranger_backseat, FALSE)
log_game("[key_name(stranger_backseat)] became [key_name(owner)]'s split personality.")
message_admins("[ADMIN_LOOKUPFLW(stranger_backseat)] became [ADMIN_LOOKUPFLW(owner)]'s split personality.")
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 430b7e07b0..1bb927aa12 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -76,9 +76,9 @@
/datum/disease/transformation/proc/replace_banned_player(var/mob/living/new_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed.
set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [affected_mob.name]?", bantype, null, bantype, 50, affected_mob)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as [affected_mob.name]?", bantype, null, bantype, 50, affected_mob)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
to_chat(affected_mob, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(affected_mob)]) to replace a jobbaned player.")
affected_mob.ghostize(0)
diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm
index 613f61dbec..3cc5bc4aa8 100644
--- a/code/game/gamemodes/objective_sabotage.dm
+++ b/code/game/gamemodes/objective_sabotage.dm
@@ -41,16 +41,9 @@
var/count = 0
/datum/sabotage_objective/processing/power_sink/check_condition_processing()
- count += 1
- if(count==10 || sink_found) // doesn't need to fire that often unless a sink exists
- var/sink_found_this_time = FALSE
- for(var/datum/powernet/PN in GLOB.powernets)
- for(var/obj/item/powersink/sink in PN.nodes)
- sink_found_this_time = TRUE
- won = max(won,sink.power_drained/1e8)
- sink_found = sink_found_this_time
- count = 0
- return FALSE
+ for(var/s in GLOB.power_sinks)
+ var/obj/item/powersink/sink = s
+ won = max(won,sink.power_drained/1e8)
/obj/item/paper/guides/antag/supermatter_sabotage
info = "Ways to sabotage a supermatter:
\
diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm
index a88cba851f..2c669aac80 100644
--- a/code/game/machinery/exp_cloner.dm
+++ b/code/game/machinery/exp_cloner.dm
@@ -51,7 +51,7 @@
var/list/candidates = pollCandidatesForMob("Do you want to play as [clonename]'s defective clone?", null, null, null, 100, H)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
H.key = C.key
if(grab_ghost_when == CLONER_FRESH_CLONE)
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 352c998699..5802909201 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -1,5 +1,7 @@
// Powersink - used to drain station power
+GLOBAL_LIST_EMPTY(power_sinks)
+
/obj/item/powersink
desc = "A nulling power sink which drains energy from electrical systems."
name = "power sink"
@@ -26,6 +28,14 @@
var/obj/structure/cable/attached // the attached cable
+/obj/item/powersink/Initialize()
+ . = ..()
+ GLOB.power_sinks += src
+
+/obj/item/powersink/Destroy()
+ GLOB.power_sinks -= src
+ . = ..()
+
/obj/item/powersink/update_icon_state()
icon_state = "powersink[mode == OPERATING]"
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 03b26a30f6..36c9de2da0 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -463,6 +463,16 @@
hitsound = 'sound/weapons/rapierhit.ogg'
var/possessed = FALSE
+/obj/item/nullrod/scythe/talking/process()
+ for(var/mob/living/simple_animal/shade/S in contents)
+ if(S.mind)
+ return
+ else
+ qdel(S)
+ possessed = FALSE
+ visible_message("The blade makes a short sigh. The spirit within seems to have passed on...")
+ return PROCESS_KILL
+
/obj/item/nullrod/scythe/talking/relaymove(mob/user)
return //stops buckled message spam for the ghost.
@@ -484,6 +494,8 @@
S.ckey = C.ckey
S.status_flags |= GODMODE
S.language_holder = user.language_holder.copy(S)
+ S.AddElement(/datum/element/ghost_role_eligibility)
+ START_PROCESSING(SSprocessing,src)
var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
if(src && input)
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index bdb9879d5b..735d3f75cc 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -282,7 +282,6 @@
throwforce = 5
stamforce = 25
hitcost = 1000
- knockdown = FALSE
throw_hit_chance = 10
slot_flags = ITEM_SLOT_BACK
var/obj/item/assembly/igniter/sparkler
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 81050e6eae..44dcfc0ae6 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -55,7 +55,7 @@
var/question = "Would you like to be [group_name]?"
var/list/candidates = pollCandidatesForMobs(question, ROLE_PAI, null, FALSE, 100, bodies)
while(LAZYLEN(candidates) && LAZYLEN(bodies))
- var/mob/dead/observer/C = pick_n_take(candidates)
+ var/mob/C = pick_n_take(candidates)
var/mob/living/body = pick_n_take(bodies)
to_chat(body, "Your mob has been taken over by a ghost!")
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 97a799824b..24149e7e6c 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -220,4 +220,17 @@
/proc/_instantiate_at(thing, location)
new thing(location)
+/// Locating turfs
+/proc/_turf_in_offset(s = usr, x = 0, y = 0, z = 0)
+ var/turf/T = get_turf(s)
+ return locate(clamp(T.x + x, 1, world.maxx), clamp(T.y + y, 1, world.maxy), clamp(T.z + z, 1, world.maxz))
+/proc/_random_turf_in_range(s = usr, r = 7)
+ return _turf_in_offset(s, rand(-r, r), rand(-r, r))
+
+/proc/_random_turf_in_view(s = usr, r = 7)
+ var/list/v = view(s, r)
+ . = list()
+ for(var/turf/T in v)
+ . += T
+ return pick(.)
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index e73c5de1aa..2e3626dd4c 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -84,9 +84,9 @@ GLOBAL_LIST_EMPTY(antagonists)
/datum/antagonist/proc/replace_banned_player()
set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [name]?", "[name]", null, job_rank, 50, owner.current)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as a [name]?", "[name]", null, job_rank, 50, owner.current)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
to_chat(owner, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(owner.current)]) to replace a jobbaned player.")
owner.current.ghostize(0)
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 51c8ceac44..edfa9caa22 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -248,7 +248,7 @@
if(used || QDELETED(src))
return
used = TRUE
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
spawn_antag(C.client, get_turf(src), initial(demon_type.name),user.mind)
to_chat(user, shatter_msg)
to_chat(user, veil_msg)
diff --git a/code/modules/antagonists/blob/blob/powers.dm b/code/modules/antagonists/blob/blob/powers.dm
index 73d0c97476..dff8e22552 100644
--- a/code/modules/antagonists/blob/blob/powers.dm
+++ b/code/modules/antagonists/blob/blob/powers.dm
@@ -169,7 +169,7 @@
B.naut = TRUE //temporary placeholder to prevent creation of more than one per factory.
to_chat(src, "You attempt to produce a blobbernaut.")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly
+ var/list/mob/candidates = pollGhostCandidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly
if(LAZYLEN(candidates)) //if we got at least one candidate, they're a blobbernaut now.
B.max_integrity = initial(B.max_integrity) * 0.25 //factories that produced a blobbernaut have much lower health
B.obj_integrity = min(B.obj_integrity, B.max_integrity)
diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
index 62382966f0..daa4e24c69 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
@@ -352,9 +352,9 @@
break
if(!L.client || L.client.is_afk())
set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", ROLE_SERVANT_OF_RATVAR, null, ROLE_SERVANT_OF_RATVAR, 50, L)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", ROLE_SERVANT_OF_RATVAR, null, ROLE_SERVANT_OF_RATVAR, 50, L)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(L)]) to replace an inactive clock cultist.")
L.ghostize(0)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 3d27fa942b..ec763a66d7 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -569,9 +569,9 @@ structure_check() searches for nearby cultist structures required for the invoca
mob_to_revive.grab_ghost()
if(!mob_to_revive.client || mob_to_revive.client.is_afk())
set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", ROLE_CULTIST, null, ROLE_CULTIST, 50, mob_to_revive)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", ROLE_CULTIST, null, ROLE_CULTIST, 50, mob_to_revive)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
to_chat(mob_to_revive.mind, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form.")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(mob_to_revive)]) to replace an AFK player.")
mob_to_revive.ghostize(0)
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index 26efb92bec..2638a6a8e3 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -397,7 +397,7 @@
inert = TRUE
visible_message("[src] settles down and seems lifeless.")
return
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
C.transfer_ckey(revenant.key, FALSE)
if(!revenant.key)
qdel(revenant)
diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm
index 8569f314d0..6c5d5766e4 100644
--- a/code/modules/antagonists/traitor/equipment/contractor.dm
+++ b/code/modules/antagonists/traitor/equipment/contractor.dm
@@ -127,7 +127,7 @@
. = ..()
if (.)
to_chat(user, "The uplink vibrates quietly, connecting to nearby agents...")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the Contractor Support Unit for [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_CONTRACTOR_SUPPORT)
+ var/list/mob/candidates = pollGhostCandidates("Do you want to play as the Contractor Support Unit for [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_CONTRACTOR_SUPPORT)
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
spawn_contractor_partner(user, C.key)
@@ -224,4 +224,4 @@
/obj/item/storage/box/contractor/fulton_extraction/PopulateContents()
new /obj/item/extraction_pack(src)
- new /obj/item/fulton_core(src)
\ No newline at end of file
+ new /obj/item/fulton_core(src)
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 594eae5d46..0d96c125a1 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -266,6 +266,7 @@
M.equipOutfit(ctf_gear)
M.dna.species.punchdamagehigh = 25
M.dna.species.punchdamagelow = 25
+ M.AddElement(/datum/element/ghost_role_eligibility)
spawned_mobs += M
/obj/machinery/capture_the_flag/Topic(href, href_list)
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index a1453f6aa1..12bd609ff5 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -127,10 +127,10 @@
if(!current_wizard)
return
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as Wizard Academy Defender?", ROLE_WIZARD, null, ROLE_WIZARD, 50, current_wizard)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as Wizard Academy Defender?", ROLE_WIZARD, null, ROLE_WIZARD, 50, current_wizard)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Wizard Academy Defender")
current_wizard.ghostize() // on the off chance braindead defender gets back in
C.transfer_ckey(current_wizard, FALSE)
@@ -269,9 +269,9 @@
A.setup_master(user)
servant_mind.transfer_to(H)
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", ROLE_WIZARD, null, ROLE_WIZARD, 50, H)
+ var/list/mob/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", ROLE_WIZARD, null, ROLE_WIZARD, 50, H)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant")
C.transfer_ckey(H, FALSE)
diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm
index 2d39e4270a..1a303ec4bc 100644
--- a/code/modules/events/sentience.dm
+++ b/code/modules/events/sentience.dm
@@ -44,7 +44,7 @@
var/spawned_animals = 0
while(spawned_animals < animals && candidates.len && potential.len)
var/mob/living/simple_animal/SA = pick_n_take(potential)
- var/mob/dead/observer/SG = pick_n_take(candidates)
+ var/mob/SG = pick_n_take(candidates)
spawned_animals++
@@ -59,7 +59,7 @@
SA.del_on_death = FALSE
spawned_mobs += SA
-
+ SA.AddElement(/datum/element/ghost_role_eligibility)
to_chat(SA, "Hello world!")
to_chat(SA, "Due to freak radiation and/or chemicals \
and/or lucky chance, you have gained human level intelligence \
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index c201f437e4..fb478355e8 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -653,6 +653,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 0
transfer_ckey(target, FALSE)
+ target.AddElement(/datum/element/ghost_role_eligibility)
target.faction = list("neutral")
return 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3c064d9525..b2691f4474 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -707,7 +707,7 @@
/mob/living/carbon/human/wash_cream()
if(creamed) //clean both to prevent a rare bug
- cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard"))
+ cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_snout"))
cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human"))
creamed = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
index 013bb31b63..9f9ee68813 100644
--- a/code/modules/mob/living/simple_animal/friendly/bumbles.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
@@ -5,10 +5,10 @@
icon_living = "bumbles"
icon_dead = "bumbles_dead"
turns_per_move = 1
- response_help = "shoos"
+ response_help = "pets"
response_disarm = "brushes aside"
response_harm = "squashes"
- speak_emote = list("bzzzs")
+ speak_emote = list("buzzes")
maxHealth = 100
health = 100
harm_intent_damage = 1
@@ -20,10 +20,12 @@
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
- verb_say = "bzzs"
- verb_ask = "bzzs inquisitively"
- verb_exclaim = "bzzs intensely"
- verb_yell = "bzzs intensely"
+ verb_say = "buzzs"
+ verb_ask = "buzzes inquisitively"
+ verb_exclaim = "buzzes intensely"
+ verb_yell = "buzzes intensely"
+ emote_see = list("buzzes.", "makes a loud buzz.", "rolls several times.", "buzzes happily.")
+ speak_chance = 1
/mob/living/simple_animal/pet/bumbles/Initialize()
. = ..()
@@ -44,3 +46,22 @@
/mob/living/simple_animal/pet/bumbles/bee_friendly()
return TRUE //treaty signed at the Beeneeva convention
+
+/mob/living/simple_animal/pet/bumbles/handle_automated_movement()
+ . = ..()
+ if(!isturf(loc) || !CHECK_MOBILITY(src, MOBILITY_MOVE) || buckled)
+ return
+ if(!resting && prob(1))
+ emote("me", EMOTE_VISIBLE, pick("curls up on the surface below ", "is looking very sleepy.", "buzzes softly ", "looks around for a flower nap "))
+ set_resting(TRUE)
+ else if (resting && prob(1))
+ emote("me", EMOTE_VISIBLE, pick("wakes up with a smiling buzz.", "rolls upside down before waking up.", "stops resting."))
+ set_resting(FALSE)
+/mob/living/simple_animal/pet/bumbles/update_mobility()
+ . = ..()
+ if(stat != DEAD)
+ if(!CHECK_MOBILITY(src, MOBILITY_STAND))
+ icon_state = "[icon_living]_rest"
+ else
+ icon_state = "[icon_living]"
+ regenerate_icons()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 576410fe8c..1156b11db3 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -161,7 +161,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
INVOKE_ASYNC(src, .proc/arena_checks)
if(TUMOR_INACTIVE)
activity = TUMOR_ACTIVE
- var/mob/dead/observer/elitemind = null
+ var/mob/elitemind = null
visible_message("[src] begins to convulse. Your instincts tell you to step back.")
activator = user
if(!boosted)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 12d74d2f8f..28ca97dc2b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -443,10 +443,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
var/datum/antagonist/A = M.mind.has_antag_datum(/datum/antagonist/)
if(A)
poll_message = "[poll_message] Status:[A.name]."
- var/list/mob/dead/observer/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M)
+ var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
to_chat(M, "Your mob has been taken over by a ghost!")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(M)])")
M.ghostize(FALSE, TRUE)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 2548620a7f..f91dc43990 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -339,7 +339,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
else
// Pass all the gas related code an empty gas container
removed = new()
- damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage)
damage_archived = damage
if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process
if(takes_damage)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 967f874a02..00e22742e5 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -680,7 +680,7 @@
var/list/candidates = pollCandidatesForMob("Do you want to play as [SM.name]?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, SM, POLL_IGNORE_SENTIENCE_POTION) // see poll_ignore.dm
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
C.transfer_ckey(SM, FALSE)
SM.mind.enslave_mind_to_creator(user)
SM.sentience_act()
diff --git a/html/changelogs/AutoChangeLog-pr-11543.yml b/html/changelogs/AutoChangeLog-pr-11543.yml
new file mode 100644
index 0000000000..8e3256289c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11543.yml
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - rscadd: "Bumbles is now actually in every station's hydroponics."
diff --git a/html/changelogs/AutoChangeLog-pr-11549.yml b/html/changelogs/AutoChangeLog-pr-11549.yml
new file mode 100644
index 0000000000..b306d5d05a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11549.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscadd: "CTF spawns, random animals and possessed blades can now be pinged for ghost roles."
+ - bugfix: "A bunch of polls now work with ghost role eligible non-observers."
diff --git a/html/changelogs/AutoChangeLog-pr-11559.yml b/html/changelogs/AutoChangeLog-pr-11559.yml
new file mode 100644
index 0000000000..c602a78388
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11559.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "stunprods knockdown again."
diff --git a/html/changelogs/AutoChangeLog-pr-11560.yml b/html/changelogs/AutoChangeLog-pr-11560.yml
new file mode 100644
index 0000000000..214cb4af67
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11560.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - balance: "Medical no longer spawns with syringe guns, Medical now spawns with medidart guns."
diff --git a/html/changelogs/AutoChangeLog-pr-11561.yml b/html/changelogs/AutoChangeLog-pr-11561.yml
new file mode 100644
index 0000000000..ba04bb12da
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11561.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Removes superfluous line in supermatter processing."
diff --git a/html/changelogs/AutoChangeLog-pr-11563.yml b/html/changelogs/AutoChangeLog-pr-11563.yml
new file mode 100644
index 0000000000..5fd384013e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11563.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - code_imp: "Power sink objective processing now makes sense."
diff --git a/html/changelogs/AutoChangeLog-pr-11564.yml b/html/changelogs/AutoChangeLog-pr-11564.yml
new file mode 100644
index 0000000000..dd0208835c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11564.yml
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - bugfix: "Bumbles will now actually rest, sit up, and buzz"
diff --git a/html/changelogs/AutoChangeLog-pr-11565.yml b/html/changelogs/AutoChangeLog-pr-11565.yml
new file mode 100644
index 0000000000..ce1f59aa61
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11565.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed permanent slapstick comedy pie'd overlay for snouted humanoids."
diff --git a/html/changelogs/AutoChangeLog-pr-11574.yml b/html/changelogs/AutoChangeLog-pr-11574.yml
new file mode 100644
index 0000000000..9d27cbe9d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11574.yml
@@ -0,0 +1,7 @@
+author: "dapnee"
+delete-after: True
+changes:
+ - rscadd: "Robotic's APC, a few missing buttons (bridge shutters and crematorium), paramedic has spawn locations now, two rapid cable deployers to engineering"
+ - tweak: "Renamed some doors and edited engineering to be a bit more open in one spot"
+ - bugfix: "a few APCs with bad area tags, access on maintenance doors fixed, engine APC is now connected to the grid instead of power created by the engine"
+ - rscdel: "the two syringe guns in medical were removed"
diff --git a/html/changelogs/AutoChangeLog-pr-11577.yml b/html/changelogs/AutoChangeLog-pr-11577.yml
new file mode 100644
index 0000000000..08dcc7e328
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11577.yml
@@ -0,0 +1,5 @@
+author: "dapnee"
+delete-after: True
+changes:
+ - rscadd: "couple gas masks around atmos"
+ - bugfix: "direction on turbine plasma pressure tank, cloning actually has a cloning console now"