diff --git a/.github/guides/HARDDELETES.md b/.github/guides/HARDDELETES.md
index defc09360af6..cdbdb2a126d6 100644
--- a/.github/guides/HARDDELETES.md
+++ b/.github/guides/HARDDELETES.md
@@ -243,7 +243,7 @@ So then, we want to temporarily remember to clear a reference when it's deleted
This is where I might lose you, but we're gonna use signals
-`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_PARENT_QDELETING`
+`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_QDELETING`
We can listen for that signal, and if we hear it clear whatever reference we may have
@@ -255,10 +255,10 @@ Here's an example
/somemob/proc/set_target(new_target)
if(target)
- UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared
+ UnregisterSignal(target, COMSIG_QDELETING) //We need to make sure any old signals are cleared
target = new_target
if(target)
- RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
+ RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
/somemob/proc/clear_target(datum/source)
SIGNAL_HANDLER
diff --git a/SpacemanDMM.toml b/SpacemanDMM.toml
index 5ed9edb2f5ce..dbe7c8efd0b0 100644
--- a/SpacemanDMM.toml
+++ b/SpacemanDMM.toml
@@ -12,3 +12,7 @@ use_typepath_names = true
[debugger]
engine = "auxtools"
+
+# monkestation edit
+[map_renderer.fancy_layers]
+"/obj/machinery/duct" = -4
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 48be608380c6..776b3c9f6a83 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -8,16 +8,6 @@
"ae" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_lava_base/testlab)
-"ag" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/main)
"ah" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
@@ -138,6 +128,27 @@
dir = 5
},
/area/ruin/syndicate_lava_base/medbay)
+"bD" = (
+/obj/structure/cable,
+/obj/machinery/computer/diseasesplicer,
+/turf/open/floor/iron/white/side{
+ dir = 8
+ },
+/area/ruin/syndicate_lava_base/virology)
+"bG" = (
+/obj/item/stack/sheet/mineral/gold{
+ amount = 10
+ },
+/obj/item/stack/sheet/mineral/uranium{
+ amount = 10
+ },
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 5
+ },
+/obj/machinery/reagentgrinder,
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/virology)
"bM" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -160,17 +171,6 @@
},
/turf/open/floor/engine,
/area/ruin/syndicate_lava_base/engineering)
-"bV" = (
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/dormitories)
"bY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
@@ -259,23 +259,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/bar)
-"cS" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
- dir = 4
- },
+"cN" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
+ dir = 8
},
/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/arrivals)
+/area/ruin/syndicate_lava_base/main)
"de" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -389,48 +384,6 @@
/obj/machinery/igniter/incinerator_syndicatelava,
/turf/open/floor/engine,
/area/ruin/syndicate_lava_base/engineering)
-"dL" = (
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/obj/structure/closet/crate,
-/obj/item/extinguisher{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/extinguisher{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/extinguisher{
- pixel_x = 1;
- pixel_y = -1
- },
-/obj/item/flashlight{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/flashlight{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/flashlight{
- pixel_x = 1;
- pixel_y = -1
- },
-/obj/item/radio/headset/syndicate/alt{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/radio/headset/syndicate/alt,
-/obj/item/radio/headset/syndicate/alt{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/ruin/syndicate_lava_base/cargo)
"dP" = (
/turf/closed/wall/mineral/plastitanium/explosive,
/area/ruin/syndicate_lava_base/cargo)
@@ -452,29 +405,6 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/chemistry)
-"dZ" = (
-/obj/machinery/light/small/directional/east,
-/obj/structure/table/glass,
-/obj/item/folder/white,
-/obj/item/reagent_containers/cup/beaker/large{
- pixel_x = -3
- },
-/obj/item/reagent_containers/cup/beaker/large{
- pixel_x = -3
- },
-/obj/item/reagent_containers/dropper,
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/screwdriver/nuke{
- pixel_y = 18
- },
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/ruin/syndicate_lava_base/chemistry)
"ee" = (
/obj/structure/rack,
/obj/item/flashlight{
@@ -514,6 +444,13 @@
"eh" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_lava_base/virology)
+"en" = (
+/obj/structure/table/wood,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/iron/grimy,
+/area/ruin/syndicate_lava_base/dormitories)
"es" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -612,6 +549,15 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
+"eN" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/l3closet,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/main)
"eS" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -707,46 +653,6 @@
dir = 10
},
/area/ruin/syndicate_lava_base/virology)
-"fi" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/storage/box/syringes,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/mapping_helpers/apc/syndicate_access,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/item/book/manual/wiki/infections{
- pixel_y = 7
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/syringe/antiviral,
-/turf/open/floor/iron/white/side{
- dir = 9
- },
-/area/ruin/syndicate_lava_base/virology)
-"fj" = (
-/obj/structure/table/glass,
-/obj/structure/reagent_dispensers/wall/virusfood/directional/north,
-/obj/item/clothing/gloves/latex,
-/obj/item/healthanalyzer,
-/obj/item/clothing/glasses/hud/health,
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/east,
-/obj/item/storage/box/vials,
-/obj/item/storage/box/vials,
-/obj/item/device/antibody_scanner,
-/obj/item/device/antibody_scanner,
-/obj/item/clothing/gloves/latex,
-/obj/item/clothing/gloves/latex,
-/turf/open/floor/iron/white/side{
- dir = 5
- },
-/area/ruin/syndicate_lava_base/virology)
"fn" = (
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/firedoor,
@@ -772,32 +678,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/chemistry)
-"fu" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/structure/table,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/soft{
- pixel_x = -8
- },
-/obj/item/clothing/head/soft{
- pixel_x = -8
- },
-/obj/item/radio{
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_x = 5
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/cargo)
"fw" = (
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/firealarm/directional/east,
@@ -808,13 +688,6 @@
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_lava_base/cargo)
-"fA" = (
-/obj/structure/cable,
-/obj/machinery/computer/diseasesplicer,
-/turf/open/floor/iron/white/side{
- dir = 8
- },
-/area/ruin/syndicate_lava_base/virology)
"fB" = (
/obj/structure/chair/stool/directional/south,
/obj/structure/disposalpipe/segment,
@@ -822,32 +695,10 @@
dir = 4
},
/area/ruin/syndicate_lava_base/virology)
-"fC" = (
-/obj/machinery/smartfridge/chemistry/virology/preloaded,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/virusdish/random,
-/obj/item/weapon/virusdish/random,
-/obj/item/weapon/virusdish/random,
-/turf/open/floor/iron/white/side{
- dir = 5
- },
-/area/ruin/syndicate_lava_base/virology)
"fD" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_lava_base/virology)
-"fE" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/l3closet,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/main)
"fF" = (
/obj/effect/turf_decal/bot,
/obj/machinery/shower/directional/south,
@@ -880,6 +731,17 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/cargo)
+"ga" = (
+/obj/machinery/smartfridge/chemistry/virology/preloaded,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/weapon/virusdish/random,
+/obj/item/weapon/virusdish/random,
+/obj/item/weapon/virusdish/random,
+/turf/open/floor/iron/white/side{
+ dir = 5
+ },
+/area/ruin/syndicate_lava_base/virology)
"gb" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -979,11 +841,9 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/cargo)
-"gU" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+"gT" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/structure/sink/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -993,9 +853,6 @@
dir = 8
},
/area/ruin/syndicate_lava_base/virology)
-"gV" = (
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/virology)
"gX" = (
/obj/machinery/door_buttons/airlock_controller{
idExterior = "lavaland_syndie_virology_exterior";
@@ -1117,45 +974,6 @@
dir = 5
},
/area/ruin/syndicate_lava_base/virology)
-"hs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door{
- id = "lavalandsyndi_virology";
- name = "Virology Blast Door Control";
- pixel_x = -26;
- req_access = list("syndicate")
- },
-/obj/machinery/disease2/incubator,
-/turf/open/floor/iron/white/side{
- dir = 10
- },
-/area/ruin/syndicate_lava_base/virology)
-"ht" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/office/light,
-/turf/open/floor/iron/white/side,
-/area/ruin/syndicate_lava_base/virology)
-"hu" = (
-/turf/open/floor/iron/white/side,
-/area/ruin/syndicate_lava_base/virology)
-"hv" = (
-/obj/structure/sign/warning/deathsposal/directional/east,
-/obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/pen/red,
-/obj/item/hand_labeler,
-/obj/item/restraints/handcuffs,
-/obj/item/clothing/glasses/science,
-/obj/item/storage/box/monkeycubes/mousecubes,
-/obj/item/storage/box/monkeycubes/mousecubes,
-/turf/open/floor/iron/white/side{
- dir = 6
- },
-/area/ruin/syndicate_lava_base/virology)
"hw" = (
/obj/machinery/door/airlock/external/ruin,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
@@ -1246,16 +1064,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/main)
-"hM" = (
-/obj/structure/table/wood,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/item/ammo_box/magazine/sniper_rounds,
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/iron/grimy,
-/area/ruin/syndicate_lava_base/dormitories)
"hN" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -1269,15 +1077,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron/grimy,
/area/ruin/syndicate_lava_base/dormitories)
-"hQ" = (
-/obj/structure/table/wood,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/iron/grimy,
-/area/ruin/syndicate_lava_base/dormitories)
"hS" = (
/obj/structure/table/reinforced,
/obj/item/folder,
@@ -1786,6 +1585,29 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/engineering)
+"kY" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/light/small/directional/west,
+/obj/structure/table,
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/obj/item/stack/sheet/mineral/plastitanium{
+ amount = 30
+ },
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/head/utility/welding,
+/obj/item/weldingtool/largetank,
+/obj/item/analyzer,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/engineering)
"lc" = (
/obj/machinery/power/rtg/lavaland,
/obj/structure/lattice/catwalk,
@@ -1940,31 +1762,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/medbay)
-"lL" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/stack/sheet/mineral/plastitanium{
- amount = 30
- },
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = 1;
- pixel_y = -1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/utility/welding,
-/obj/item/weldingtool/largetank,
-/obj/item/analyzer,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/engineering)
"lM" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -1996,6 +1793,30 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/ruin/syndicate_lava_base/bar)
+"lZ" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/structure/table,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/head/soft{
+ pixel_x = -8
+ },
+/obj/item/clothing/head/soft{
+ pixel_x = -8
+ },
+/obj/item/radio{
+ pixel_x = 5
+ },
+/obj/item/radio{
+ pixel_x = 5
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/cargo)
"md" = (
/obj/machinery/sleeper/syndie{
dir = 4
@@ -2097,20 +1918,6 @@
dir = 8
},
/area/ruin/syndicate_lava_base/medbay)
-"mE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/computer/operating{
- dir = 8
- },
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/ruin/syndicate_lava_base/medbay)
"mF" = (
/obj/machinery/atmospherics/components/unary/portables_connector,
/obj/effect/decal/cleanable/dirt,
@@ -2167,6 +1974,27 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
+"ng" = (
+/obj/structure/table/glass,
+/obj/item/storage/box/beakers{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/storage/box/syringes,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/book/manual/wiki/infections{
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/syringe/antiviral,
+/turf/open/floor/iron/white/side{
+ dir = 9
+ },
+/area/ruin/syndicate_lava_base/virology)
"no" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -2385,10 +2213,6 @@
/obj/effect/mapping_helpers/no_lava,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"pf" = (
-/obj/machinery/disease2/centrifuge,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/virology)
"pm" = (
/obj/structure/extinguisher_cabinet/directional/south,
/obj/effect/turf_decal/stripes/line,
@@ -2495,21 +2319,53 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/dormitories)
+"qT" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/light/small/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/engineering)
"qU" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/main)
-"qW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/turf/open/floor/iron/white/side,
-/area/ruin/syndicate_lava_base/main)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/main)
+"qW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/iron/white/side,
+/area/ruin/syndicate_lava_base/main)
+"re" = (
+/obj/structure/sign/warning/deathsposal/directional/east,
+/obj/structure/disposalpipe/segment,
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/item/pen/red,
+/obj/item/hand_labeler,
+/obj/item/restraints/handcuffs,
+/obj/item/clothing/glasses/science,
+/obj/item/storage/box/monkeycubes/mousecubes,
+/obj/item/storage/box/monkeycubes/mousecubes,
+/turf/open/floor/iron/white/side{
+ dir = 6
+ },
+/area/ruin/syndicate_lava_base/virology)
"rg" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/miner/nitrogen,
@@ -2535,15 +2391,6 @@
/obj/structure/disposalpipe/trunk,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/syndicate_lava_base/virology)
-"rv" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/structure/chair/stool/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/ruin/syndicate_lava_base/bar)
"ry" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
@@ -2568,20 +2415,6 @@
dir = 1
},
/area/ruin/syndicate_lava_base/chemistry)
-"rL" = (
-/obj/item/stack/sheet/mineral/gold{
- amount = 10
- },
-/obj/item/stack/sheet/mineral/uranium{
- amount = 10
- },
-/obj/item/stack/sheet/mineral/plasma{
- amount = 5
- },
-/obj/machinery/reagentgrinder,
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/virology)
"rO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/obj/structure/cable,
@@ -2618,6 +2451,29 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/main)
+"sG" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/iron/grimy,
+/area/ruin/syndicate_lava_base/dormitories)
+"sH" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/arrivals)
"sT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
@@ -2678,6 +2534,27 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/dormitories)
+"uM" = (
+/obj/machinery/light/small/directional/east,
+/obj/structure/table/glass,
+/obj/item/folder/white,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/dropper,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/screwdriver/nuke{
+ pixel_y = 18
+ },
+/turf/open/floor/iron/white/side{
+ dir = 4
+ },
+/area/ruin/syndicate_lava_base/chemistry)
"va" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
@@ -2771,6 +2648,25 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/cargo)
+"wa" = (
+/obj/structure/table/glass,
+/obj/structure/reagent_dispensers/wall/virusfood/directional/north,
+/obj/item/clothing/gloves/latex,
+/obj/item/healthanalyzer,
+/obj/item/clothing/glasses/hud/health,
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/east,
+/obj/item/storage/box/vials,
+/obj/item/storage/box/vials,
+/obj/item/device/antibody_scanner,
+/obj/item/device/antibody_scanner,
+/obj/item/clothing/gloves/latex,
+/obj/item/clothing/gloves/latex,
+/turf/open/floor/iron/white/side{
+ dir = 5
+ },
+/area/ruin/syndicate_lava_base/virology)
"wi" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
dir = 8;
@@ -3023,6 +2919,9 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
+"Ax" = (
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/virology)
"AB" = (
/obj/machinery/power/turbine/inlet_compressor{
dir = 4
@@ -3281,6 +3180,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
+"Ek" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/iron/grimy,
+/area/ruin/syndicate_lava_base/dormitories)
"Eo" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -3303,6 +3210,58 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/syndicate_lava_base/bar)
+"Ey" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/computer/operating{
+ dir = 8
+ },
+/turf/open/floor/iron/white/side{
+ dir = 4
+ },
+/area/ruin/syndicate_lava_base/medbay)
+"EP" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/structure/closet/crate,
+/obj/item/extinguisher{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/extinguisher{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/extinguisher{
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/obj/item/flashlight{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/flashlight{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/flashlight{
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/obj/item/radio/headset/syndicate/alt{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/radio/headset/syndicate/alt,
+/obj/item/radio/headset/syndicate/alt{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/ruin/syndicate_lava_base/cargo)
"ET" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/layer_manifold/orange/visible{
@@ -3403,6 +3362,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/main)
+"He" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/vending/coffee{
+ extended_inventory = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/ruin/syndicate_lava_base/bar)
"Hm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -3410,6 +3379,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/main)
+"HN" = (
+/obj/machinery/disease2/diseaseanalyser,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/virology)
"HP" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
@@ -3440,16 +3413,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/arrivals)
-"HX" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
- dir = 4
- },
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/iron/grimy,
-/area/ruin/syndicate_lava_base/dormitories)
"Ir" = (
/obj/machinery/washing_machine,
/obj/effect/decal/cleanable/dirt,
@@ -3672,6 +3635,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_lava_base/engineering)
+"Ls" = (
+/obj/structure/table/wood,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/sniper_rounds,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/iron/grimy,
+/area/ruin/syndicate_lava_base/dormitories)
"Ly" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
@@ -3681,22 +3652,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/main)
-"LG" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/light/small/directional/east,
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/engineering)
+"Lz" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/structure/chair/stool/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/ruin/syndicate_lava_base/bar)
"LS" = (
/turf/closed/wall/mineral/plastitanium/explosive,
/area/ruin/syndicate_lava_base/engineering)
@@ -3777,20 +3739,6 @@
},
/turf/open/floor/engine/o2,
/area/ruin/syndicate_lava_base/engineering)
-"Ob" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/main)
"Oq" = (
/obj/effect/spawner/random/vending/colavend{
hacked = 1
@@ -3862,18 +3810,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/main)
-"Pw" = (
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/vending/coffee{
- extended_inventory = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/ruin/syndicate_lava_base/bar)
"PE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer2,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -3881,6 +3817,10 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
+"PJ" = (
+/obj/machinery/disease2/centrifuge,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/virology)
"PR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 1
@@ -4059,6 +3999,19 @@
},
/turf/open/floor/engine/n2,
/area/ruin/syndicate_lava_base/engineering)
+"So" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/door{
+ id = "lavalandsyndi_virology";
+ name = "Virology Blast Door Control";
+ pixel_x = -26;
+ req_access = list("syndicate")
+ },
+/obj/machinery/disease2/incubator,
+/turf/open/floor/iron/white/side{
+ dir = 10
+ },
+/area/ruin/syndicate_lava_base/virology)
"St" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external/ruin,
@@ -4068,6 +4021,15 @@
},
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/arrivals)
+"Sv" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/dormitories)
"SA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer4{
@@ -4075,6 +4037,9 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
+"SQ" = (
+/turf/open/floor/iron/white/side,
+/area/ruin/syndicate_lava_base/virology)
"Tt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
@@ -4101,10 +4066,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron/white,
/area/ruin/syndicate_lava_base/virology)
-"Tz" = (
-/obj/machinery/disease2/diseaseanalyser,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/virology)
"TO" = (
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron,
@@ -4310,16 +4271,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
-"XA" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
- dir = 8
- },
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/iron/grimy,
-/area/ruin/syndicate_lava_base/dormitories)
"XK" = (
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/atmospherics/pipe/layer_manifold,
@@ -4387,6 +4338,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron/white,
/area/ruin/syndicate_lava_base/virology)
+"Yj" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/main)
+"Ym" = (
+/obj/machinery/disposal/bin,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/red/box,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/virology)
"Yn" = (
/obj/structure/chair/stool/bar/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -4429,15 +4397,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/cargo)
-"YT" = (
-/obj/machinery/disposal/bin,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/red/box,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/virology)
"YU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 1
@@ -4509,6 +4468,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/main)
+"ZP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/office/light,
+/turf/open/floor/iron/white/side,
+/area/ruin/syndicate_lava_base/virology)
"ZU" = (
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
@@ -5140,9 +5104,9 @@ eh
eI
eI
Cu
-gU
-hs
-Tz
+gT
+So
+HN
hH
ab
ab
@@ -5187,12 +5151,12 @@ ab
ab
si
eh
-fi
-fA
+ng
+bD
sd
-gV
-ht
-pf
+Ax
+ZP
+PJ
hH
ab
ab
@@ -5237,12 +5201,12 @@ ab
ab
rp
eJ
-fj
+wa
fB
KI
yp
-hu
-rL
+SQ
+bG
hH
ab
ab
@@ -5288,11 +5252,11 @@ pa
pa
ae
ae
-fC
+ga
tf
gX
-hv
-YT
+re
+Ym
hH
ab
ab
@@ -5356,7 +5320,7 @@ Ue
kH
xt
jZ
-rv
+Lz
mt
mU
np
@@ -5388,7 +5352,7 @@ pa
pa
pa
ae
-fE
+eN
Ny
QS
hw
@@ -5591,7 +5555,7 @@ pa
Wn
ZO
yO
-Ob
+cN
VT
TY
KR
@@ -5652,7 +5616,7 @@ hz
jy
jy
ka
-Pw
+He
kM
lk
lC
@@ -5660,7 +5624,7 @@ um
mx
jy
jy
-cS
+sH
oo
ox
ab
@@ -5698,7 +5662,7 @@ hz
iy
Uk
hz
-HX
+Ek
jA
jy
jy
@@ -5742,7 +5706,7 @@ vK
Mt
he
hz
-hM
+Ls
xf
hz
iz
@@ -5845,7 +5809,7 @@ hz
hz
hz
hz
-bV
+Sv
qq
HP
Hm
@@ -5984,7 +5948,7 @@ as
as
as
dI
-dZ
+uM
ew
as
as
@@ -5998,7 +5962,7 @@ Se
ZD
RH
hz
-XA
+sG
jA
hz
Ly
@@ -6042,7 +6006,7 @@ dy
Bb
he
hz
-hQ
+en
oK
hz
Ir
@@ -6133,7 +6097,7 @@ ab
ab
ab
dy
-dL
+EP
Ub
yl
Ci
@@ -6144,7 +6108,7 @@ Eo
hB
hB
hB
-ag
+Yj
iG
iZ
ji
@@ -6207,7 +6171,7 @@ kT
bC
KS
ap
-mE
+Ey
NR
nC
kQ
@@ -6305,7 +6269,7 @@ ju
Bu
kV
lp
-lL
+kY
mg
mF
Cj
@@ -6337,7 +6301,7 @@ dy
ee
aY
fb
-fu
+lZ
gb
gQ
hl
@@ -6399,7 +6363,7 @@ ou
Zz
ha
jw
-LG
+qT
Kf
bM
wX
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm
index fb12548b1f15..d35c31bdeba9 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm
@@ -117,10 +117,8 @@
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/telecomms)
"A" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm
index c1bcbddfed0e..0a50c12605c2 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm
@@ -111,10 +111,8 @@
/turf/open/floor/wood,
/area/ruin/syndicate_lava_base/telecomms)
"H" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/structure/filingcabinet/security,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm
index 2adc27c2f719..c0e3aba9a1c2 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm
@@ -114,10 +114,8 @@
/turf/open/floor/iron/grimy,
/area/ruin/syndicate_lava_base/telecomms)
"z" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/item/modular_computer/pda/chameleon/broken{
pixel_x = 5;
pixel_y = 4
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm
index ca428942e323..f7b1e1357178 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm
@@ -138,9 +138,8 @@
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/testlab)
"w" = (
-/obj/machinery/airalarm/syndicate{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
},
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 354f3c2398bf..d54121894fdf 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -153,17 +153,6 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
-"cY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/plating/airless,
-/area/shuttle/ruin/caravan/freighter2)
"dc" = (
/obj/item/shard,
/turf/template_noop,
@@ -267,6 +256,14 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
+"fv" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/engineering,
+/obj/item/organ/internal/cyberimp/arm/item_set,
+/obj/item/organ/internal/cyberimp/eyes/hud/medical,
+/obj/item/organ/internal/cyberimp/brain/anti_stun,
+/turf/open/floor/iron/dark/airless,
+/area/shuttle/ruin/caravan/freighter3)
"fy" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/light/small/directional/south,
@@ -300,6 +297,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
+"in" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/ruin/caravan/freighter2)
"iR" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
@@ -401,6 +407,12 @@
/obj/item/gun/energy/disabler,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter2)
+"mQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/airless,
+/area/shuttle/ruin/caravan/freighter2)
"mR" = (
/turf/closed/wall/mineral/plastitanium,
/area/ruin/space/has_grav)
@@ -559,14 +571,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
-"tL" = (
-/obj/effect/turf_decal/bot_white,
-/obj/structure/closet/crate/secure/engineering,
-/obj/item/organ/internal/cyberimp/arm/item_set,
-/obj/item/organ/internal/cyberimp/eyes/hud/medical,
-/obj/item/organ/internal/cyberimp/brain/anti_stun,
-/turf/open/floor/iron/dark/airless,
-/area/shuttle/ruin/caravan/freighter3)
"tO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -613,15 +617,6 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter3)
-"wc" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless,
-/area/shuttle/ruin/caravan/freighter3)
"wB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -723,6 +718,15 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
+"Bb" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/blood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/airless,
+/area/shuttle/ruin/caravan/freighter3)
"Bv" = (
/obj/structure/chair{
dir = 4
@@ -865,14 +869,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
-"IF" = (
+"HA" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
/turf/open/floor/iron/airless,
-/area/shuttle/ruin/caravan/freighter2)
+/area/shuttle/ruin/caravan/freighter3)
"IZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/meter,
@@ -958,17 +961,6 @@
/obj/item/gun/energy/e_gun/mini,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter2)
-"Nl" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/decal/cleanable/blood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/iron/dark/airless,
-/area/shuttle/ruin/caravan/freighter3)
"Nm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
@@ -3713,7 +3705,7 @@ JW
Sh
qX
Rf
-IF
+mQ
tx
eU
JW
@@ -3816,7 +3808,7 @@ aa
gA
WT
JE
-cY
+in
jf
sk
WC
@@ -5272,7 +5264,7 @@ PF
sR
wC
Je
-tL
+fv
wJ
aa
aa
@@ -5426,7 +5418,7 @@ rB
Vx
Sk
Qv
-wc
+HA
PE
fy
rB
@@ -5529,7 +5521,7 @@ aa
Ct
Oj
eO
-Nl
+Bb
mZ
ZX
oV
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 3ba6eec1dca0..cf216ba19ec5 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -161,21 +161,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/storage)
-"aI" = (
-/obj/structure/closet/cardboard,
-/obj/item/stack/sheet/cardboard,
-/obj/item/stack/cable_coil,
-/obj/item/stack/sheet/mineral/wood,
-/obj/item/stack/sheet/mineral/wood,
-/obj/item/stack/package_wrap,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/storage)
"aJ" = (
/obj/structure/closet/cardboard,
/obj/item/storage/box/mousetraps,
@@ -365,18 +350,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
-"aZ" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron/cafeteria,
-/area/ruin/space/has_grav/deepstorage/kitchen)
"ba" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
@@ -446,21 +419,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
-"bk" = (
-/obj/machinery/growing/tray,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/light,
-/area/ruin/space/has_grav/deepstorage/hydroponics)
-"bl" = (
-/obj/machinery/growing/tray,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 10
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/light,
-/area/ruin/space/has_grav/deepstorage/hydroponics)
"bm" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -663,10 +621,6 @@
/obj/structure/sink/directional/west,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
-"bS" = (
-/obj/machinery/growing/tray,
-/turf/open/floor/light,
-/area/ruin/space/has_grav/deepstorage/hydroponics)
"bT" = (
/obj/effect/turf_decal/delivery,
/obj/item/food/canned/beans{
@@ -784,15 +738,6 @@
/obj/effect/mapping_helpers/apc/away_general_access,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
-"ch" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/airalarm/away{
- dir = 4;
- pixel_x = 25
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/storage)
"cj" = (
/obj/structure/noticeboard/directional/north,
/obj/item/paper/fluff/ruins/deepstorage/water_concern,
@@ -822,18 +767,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage)
-"cm" = (
-/obj/structure/table,
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage)
"cn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -863,14 +796,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/deepstorage)
-"cs" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/iron/freezer,
-/area/ruin/space/has_grav/deepstorage)
"ct" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -923,20 +848,6 @@
/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
-"cz" = (
-/obj/machinery/growing/tray,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/light,
-/area/ruin/space/has_grav/deepstorage/hydroponics)
-"cA" = (
-/obj/machinery/growing/tray,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/light,
-/area/ruin/space/has_grav/deepstorage/hydroponics)
"cB" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate{
@@ -1384,21 +1295,6 @@
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/deepstorage/armory)
-"dP" = (
-/obj/structure/table,
-/obj/item/radio{
- pixel_x = -4
- },
-/obj/item/radio,
-/obj/item/radio{
- pixel_x = 4
- },
-/obj/machinery/airalarm/away{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/deepstorage/armory)
"dR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
@@ -1896,18 +1792,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/power)
-"fn" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/power)
"fo" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/effect/decal/cleanable/dirt,
@@ -1931,17 +1815,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
-"ft" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden{
- dir = 4
- },
-/obj/machinery/airalarm/away{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/airlock)
"fu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden{
dir = 4
@@ -2222,19 +2095,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/dorm)
-"gg" = (
-/obj/machinery/washing_machine,
-/obj/machinery/light/directional/east,
-/obj/machinery/airalarm/away{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/dorm)
"gh" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable,
@@ -2531,17 +2391,6 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
-"hf" = (
-/obj/machinery/growing/tray,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/light,
-/area/ruin/space/has_grav/deepstorage/hydroponics)
"hg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -2656,6 +2505,21 @@
/obj/effect/baseturf_helper/asteroid/airless,
/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
+"ie" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/airlock)
+"iA" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/turf/open/floor/iron/freezer,
+/area/ruin/space/has_grav/deepstorage)
"lf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/chemical,
@@ -2726,6 +2590,26 @@
/obj/item/storage/medkit/regular,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/deepstorage/armory)
+"wU" = (
+/obj/structure/closet/cardboard,
+/obj/item/stack/sheet/cardboard,
+/obj/item/stack/cable_coil,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/package_wrap,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"xg" = (
+/obj/machinery/growing/tray,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/light,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
"xI" = (
/obj/machinery/firealarm/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -2773,16 +2657,50 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
+"Cf" = (
+/obj/machinery/growing/tray,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/light,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
"Cp" = (
/obj/machinery/chem_heater/withbuffer,
/turf/open/floor/engine,
/area/ruin/space/has_grav/deepstorage/pharmacy)
+"Db" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/cafeteria,
+/area/ruin/space/has_grav/deepstorage/kitchen)
+"Em" = (
+/obj/machinery/growing/tray,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/light,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
"EP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden{
dir = 4
},
/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
+"FI" = (
+/obj/machinery/growing/tray,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/turf/open/floor/light,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
"Ht" = (
/obj/structure/table,
/obj/item/storage/medkit/toxin{
@@ -2818,6 +2736,16 @@
/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/engine,
/area/ruin/space/has_grav/deepstorage/pharmacy)
+"LB" = (
+/obj/structure/table,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage)
"Mp" = (
/obj/structure/table,
/obj/item/storage/medkit/brute{
@@ -2828,6 +2756,21 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/deepstorage/armory)
+"MJ" = (
+/obj/machinery/growing/tray,
+/turf/open/floor/light,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
+"Qt" = (
+/obj/machinery/washing_machine,
+/obj/machinery/light/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/dorm)
"Re" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -2835,6 +2778,16 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
+"Rj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/power)
"Rs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -2845,19 +2798,45 @@
/obj/structure/chair/office/light,
/turf/open/floor/engine,
/area/ruin/space/has_grav/deepstorage/pharmacy)
+"SJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"SR" = (
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/ruin/space/has_grav/deepstorage/pharmacy)
"Uj" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/turf/open/floor/engine,
/area/ruin/space/has_grav/deepstorage/pharmacy)
-"UQ" = (
-/obj/machinery/airalarm/away{
- pixel_y = -25
+"Yo" = (
+/obj/structure/table,
+/obj/item/radio{
+ pixel_x = -4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/ruin/space/has_grav/deepstorage/pharmacy)
+/obj/item/radio,
+/obj/item/radio{
+ pixel_x = 4
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/deepstorage/armory)
+"ZL" = (
+/obj/machinery/growing/tray,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/light,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
(1,1,1) = {"
aa
@@ -3555,7 +3534,7 @@ aR
bm
hU
bV
-ch
+SJ
cC
cQ
df
@@ -3654,7 +3633,7 @@ ab
ab
ab
hU
-aI
+wU
aT
bo
bE
@@ -3679,7 +3658,7 @@ gx
uG
mW
Il
-UQ
+SR
gF
ab
ab
@@ -3724,7 +3703,7 @@ cp
cp
cp
fP
-gg
+Qt
gm
gy
gG
@@ -3919,7 +3898,7 @@ aX
bs
bI
af
-cm
+LB
cJ
cU
fT
@@ -4019,7 +3998,7 @@ ah
ao
ax
af
-aZ
+Db
bu
bK
bZ
@@ -4085,7 +4064,7 @@ eq
eI
eU
fi
-ft
+ie
eq
hn
fV
@@ -4231,7 +4210,7 @@ bd
bx
bO
af
-cs
+iA
cO
cZ
dq
@@ -4448,7 +4427,7 @@ ee
da
da
fa
-fn
+Rj
fz
fI
ga
@@ -4599,7 +4578,7 @@ cy
aQ
Mp
dv
-dP
+Yo
eh
ex
eP
@@ -4643,11 +4622,11 @@ ab
ab
ab
aQ
-hf
+FI
bC
-bS
+MJ
sL
-cz
+xg
aQ
de
de
@@ -4695,11 +4674,11 @@ ab
ab
ab
aQ
-bk
+Cf
bC
-bS
+MJ
cf
-cA
+ZL
aQ
ab
ab
@@ -4747,11 +4726,11 @@ ab
ab
ab
aQ
-bl
+Em
bD
-bS
+MJ
cg
-bS
+MJ
aQ
ab
ab
diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
index fb7e04b2d32e..8740b5bc34e3 100644
--- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
@@ -571,10 +571,8 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"bP" = (
-/obj/machinery/airalarm/syndicate{
- pixel_y = 24;
- dir = 1
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"bQ" = (
diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
index 928aea5fb269..30a2c3c25a1d 100644
--- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
+++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -38,10 +38,8 @@
/area/template_noop)
"aI" = (
/obj/structure/cable,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/icecream_vat{
desc = "Waffle co. actually ordered these guys to steal one of these just to be sure."
},
@@ -426,9 +424,8 @@
"gi" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/spawner/random/exotic/languagebook,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/blood/gibs{
icon_state = "gib6-old"
},
@@ -1100,10 +1097,8 @@
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/infested_frigate)
"si" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/plastic,
/turf/open/floor/mineral/plastitanium,
@@ -2415,10 +2410,8 @@
"MB" = (
/obj/machinery/iv_drip,
/obj/item/clothing/mask/facehugger/dead,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal{
icon_state = "warningline_white";
dir = 1
@@ -3137,10 +3130,8 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/infested_frigate)
"YT" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/blood/gibs{
icon_state = "ltrails_1";
dir = 1
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index 3e2ebf4927da..c9ea1f34c7d7 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -6,14 +6,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/ruin/space/has_grav/listeningstation)
-"ad" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/structure/closet/crate/secure/freezer/commsagent,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/listeningstation)
"ae" = (
/obj/item/wallframe/button{
pixel_x = 7;
@@ -66,16 +58,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
-"bC" = (
-/obj/structure/table/wood,
-/obj/item/paper/fluff/ruins/listeningstation/reports/november,
-/obj/item/crowbar/red,
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/turf/open/floor/iron/grimy,
-/area/ruin/space/has_grav/listeningstation)
"ca" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -207,11 +189,6 @@
},
/turf/open/misc/asteroid/airless,
/area/ruin/space)
-"hK" = (
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/growing/soil,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/listeningstation)
"iU" = (
/obj/structure/toilet{
pixel_y = 18
@@ -356,25 +333,11 @@
/obj/structure/marker_beacon/cerulean,
/turf/open/floor/plating/airless,
/area/ruin/space)
-"tm" = (
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/computer/message_monitor{
- dir = 8
- },
-/obj/item/paper/monitorkey,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/listeningstation)
-"uI" = (
-/obj/machinery/airalarm/away{
- dir = 1;
- pixel_y = 23
- },
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
+"us" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/structure/closet/crate/secure/freezer/commsagent,
+/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"vC" = (
/obj/structure/cable,
@@ -396,6 +359,14 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/ruin/space/has_grav/listeningstation)
+"wj" = (
+/obj/structure/table/wood,
+/obj/item/paper/fluff/ruins/listeningstation/reports/november,
+/obj/item/crowbar/red,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/iron/grimy,
+/area/ruin/space/has_grav/listeningstation)
"wk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -780,6 +751,12 @@
/obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear,
/turf/open/misc/asteroid/airless,
/area/ruin/space)
+"Oh" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/listeningstation)
"Om" = (
/obj/effect/turf_decal/bot,
/obj/structure/cable,
@@ -804,6 +781,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/listeningstation)
+"OW" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/growing/soil,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/listeningstation)
"PZ" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/plating/airless,
@@ -967,6 +949,16 @@
/obj/effect/baseturf_helper/asteroid/airless,
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/listeningstation)
+"XM" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/computer/message_monitor{
+ dir = 8
+ },
+/obj/item/paper/monitorkey,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/listeningstation)
"XQ" = (
/obj/structure/sign/departments/medbay/alt/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -1180,7 +1172,7 @@ zp
vI
JB
gJ
-bC
+wj
Oo
JB
vI
@@ -1246,7 +1238,7 @@ vI
JB
Fy
Dp
-hK
+OW
JB
vI
Yz
@@ -1319,7 +1311,7 @@ vI
vI
vI
JB
-uI
+Oh
Eb
xn
kG
@@ -1352,7 +1344,7 @@ JB
lE
MS
It
-ad
+us
by
cj
db
@@ -1447,7 +1439,7 @@ JB
xp
SK
lk
-tm
+XM
TK
rG
Zj
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 62723cb48b21..a72535f9d09a 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -257,6 +257,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/rust,
/area/ruin/space/ancientstation/charlie/hall)
+"bd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/gun/energy/laser/retro/old{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/sec)
"be" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -1286,14 +1300,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/rnd)
-"eC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron/white,
-/area/ruin/space/ancientstation/delta/rnd)
"eD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
@@ -1676,18 +1682,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/sec)
-"fP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/bridge)
"fQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/shreds,
@@ -1776,18 +1770,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/hall)
-"gj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/decal/cleanable/generic,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/hydro)
"gk" = (
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/old,
@@ -1818,21 +1800,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hall)
-"gp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/hall)
"gt" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/material/glass,
@@ -1852,21 +1819,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/diagonal,
/area/ruin/space/ancientstation/beta/gravity)
-"gy" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/duct,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/hall)
"gz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2129,6 +2081,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
+"hD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/cafeteria,
+/area/ruin/space/ancientstation/charlie/kitchen)
"hE" = (
/mob/living/simple_animal/hostile/alien/drone,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -2440,22 +2398,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/medbay)
-"iz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/gun/energy/laser/retro/old{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/sec)
"iA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -2688,15 +2630,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
-"jy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/delta/hall)
"jB" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -2900,14 +2833,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white/textured,
/area/ruin/space/ancientstation/delta/proto)
-"kj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/iron/white/textured,
-/area/ruin/space/ancientstation/delta/proto)
"kk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -3362,17 +3287,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
-"lL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/delta/rnd)
"lM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -3413,17 +3327,6 @@
/obj/item/solar_assembly,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/charlie/hall)
-"lR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/machinery/light_switch/directional/north,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/dorms)
"lT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3544,22 +3447,6 @@
dir = 1
},
/area/ruin/space/ancientstation/delta/rnd)
-"mp" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/mining_scanner,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/beta/mining)
"mq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -3788,22 +3675,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/hall)
-"na" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- pixel_y = -22
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/beta/hall)
"nb" = (
/obj/machinery/door/airlock/command{
name = "Beta Station Access"
@@ -4283,17 +4154,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
-"oz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/delta/hall)
"oB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/glass,
@@ -4420,28 +4280,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ancientstation/beta/hall)
-"oW" = (
-/obj/item/shard{
- icon_state = "medium"
- },
-/obj/effect/decal/cleanable/glass,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating/airless,
-/area/ruin/space/ancientstation/beta/hall)
-"oX" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/delta/hall)
"oZ" = (
/obj/item/shard{
icon_state = "small"
@@ -4676,25 +4514,6 @@
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plating/rust,
/area/ruin/space/ancientstation/delta/hall)
-"rb" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/remains/human{
- pixel_y = -4;
- pixel_x = -4
- },
-/obj/item/paper/fluff/ruins/oldstation/survivor_note{
- pixel_x = 17;
- pixel_y = 12
- },
-/obj/item/organ/internal/cyberimp/arm/item_set/toolset{
- pixel_x = 6;
- pixel_y = 2
- },
-/obj/item/organ/internal/cyberimp/cyberlink/nt_high,
-/turf/open/floor/plating{
- initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15"
- },
-/area/ruin/space/ancientstation/delta/hall)
"rc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/energy_accumulator/grounding_rod,
@@ -4805,6 +4624,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hall)
+"rV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/delta/rnd)
"se" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced/spawner/directional/east{
@@ -4836,6 +4664,15 @@
state = 2
},
/area/ruin/space/ancientstation/charlie/bridge)
+"sr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light_switch/directional/north,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/dorms)
"ss" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -4919,6 +4756,14 @@
},
/turf/open/floor/engine/airless,
/area/ruin/space/ancientstation/beta/supermatter)
+"sU" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/diagonal,
+/area/ruin/space/ancientstation/beta/gravity)
"td" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
@@ -4938,16 +4783,6 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/beta/hall)
-"tw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
-/obj/machinery/meter,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/plating/rust,
-/area/ruin/space/ancientstation/charlie/hall)
"tz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -4958,6 +4793,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hall)
+"tA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/engie)
"tC" = (
/turf/closed/mineral/gold,
/area/space/nearstation)
@@ -5013,6 +4854,14 @@
/obj/structure/sign/warning/radiation/rad_area/directional/north,
/turf/open/floor/iron/diagonal,
/area/ruin/space/ancientstation/beta/gravity)
+"uo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
+/obj/machinery/meter,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/plating/rust,
+/area/ruin/space/ancientstation/charlie/hall)
"up" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -5083,6 +4932,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine/airless,
/area/ruin/space/ancientstation/beta/supermatter)
+"uJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/delta/hall)
"uP" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -5418,6 +5276,16 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ancientstation/beta/supermatter)
+"xb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/generic,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/hydro)
"xj" = (
/obj/machinery/door/airlock/science{
name = "Biolab"
@@ -5502,16 +5370,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/ancientstation/charlie/hall)
-"yp" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/turf/open/floor/iron/diagonal,
-/area/ruin/space/ancientstation/beta/gravity)
"yq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -5540,11 +5398,33 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/delta/hall)
+"yE" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/delta/hall)
"yF" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/rnd)
+"yO" = (
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/mining_scanner,
+/obj/item/mining_scanner,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/beta/mining)
"yQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/plasma/spawner,
@@ -5946,6 +5826,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating/airless,
/area/ruin/space/ancientstation/beta/hall)
+"BY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/bridge)
"Cc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -6029,6 +5919,25 @@
/obj/effect/spawner/structure/window/hollow/middle,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/charlie/kitchen)
+"Dd" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/remains/human{
+ pixel_y = -4;
+ pixel_x = -4
+ },
+/obj/item/paper/fluff/ruins/oldstation/survivor_note{
+ pixel_x = 17;
+ pixel_y = 12
+ },
+/obj/item/organ/internal/cyberimp/arm/item_set/toolset{
+ pixel_x = 6;
+ pixel_y = 2
+ },
+/obj/item/organ/internal/cyberimp/cyberlink/nt_high,
+/turf/open/floor/plating{
+ initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15"
+ },
+/area/ruin/space/ancientstation/delta/hall)
"Df" = (
/obj/structure/grille/broken,
/turf/open/floor/plating/airless,
@@ -6092,21 +6001,6 @@
/obj/structure/canister_frame/machine/unfinished_canister_frame,
/turf/open/floor/engine/airless,
/area/ruin/space/ancientstation/beta/supermatter)
-"DO" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/structure/table_frame,
-/obj/item/shard{
- icon_state = "medium"
- },
-/obj/item/defibrillator,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/airless,
-/area/ruin/space/ancientstation/beta/medbay)
"DR" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer,
@@ -6133,14 +6027,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
-"Eu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/engie)
"EB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair,
@@ -6499,6 +6385,16 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
+"Hi" = (
+/obj/item/shard{
+ icon_state = "medium"
+ },
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating/airless,
+/area/ruin/space/ancientstation/beta/hall)
"Hj" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine/airless,
@@ -6634,6 +6530,12 @@
},
/turf/open/floor/iron/white/textured,
/area/ruin/space/ancientstation/delta/proto)
+"Ii" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/white/textured,
+/area/ruin/space/ancientstation/delta/proto)
"Ij" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/maintenance,
@@ -6657,17 +6559,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white/side,
/area/ruin/space/ancientstation/delta/proto)
-"Iw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/delta/hall)
"Ix" = (
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
@@ -6731,6 +6622,19 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
+"IY" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/table_frame,
+/obj/item/shard{
+ icon_state = "medium"
+ },
+/obj/item/defibrillator,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/airless,
+/area/ruin/space/ancientstation/beta/medbay)
"Ja" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -6875,14 +6779,6 @@
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/engine/airless,
/area/ruin/space/ancientstation/beta/supermatter)
-"JM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron/cafeteria,
-/area/ruin/space/ancientstation/charlie/kitchen)
"JT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -6975,6 +6871,13 @@
/obj/structure/sign/warning/test_chamber/directional/south,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
+"KC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/beta/hall)
"KG" = (
/obj/machinery/light/directional/east,
/obj/structure/table/reinforced,
@@ -7089,6 +6992,12 @@
},
/turf/open/floor/plating,
/area/ruin/space/ancientstation/beta/supermatter)
+"Lv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/engine/airless,
+/area/ruin/space/ancientstation/beta/supermatter)
"Lx" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/plumbing/synthesizer{
@@ -7144,21 +7053,6 @@
/obj/effect/decal/cleanable/generic,
/turf/open/floor/iron/white/textured_large,
/area/ruin/space/ancientstation/delta/biolab)
-"LO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{
- dir = 5
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/beta/atmos)
"LP" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
@@ -7215,6 +7109,19 @@
/obj/effect/spawner/structure/window/hollow/middle,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/delta/rnd)
+"MB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/hall)
"MH" = (
/obj/structure/girder/displaced,
/turf/open/floor/plating/airless,
@@ -7369,20 +7276,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hall)
-"On" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper/crumpled,
-/obj/item/ph_booklet,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
-/obj/effect/spawner/random/maintenance,
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron/white/textured_edge{
- dir = 1
- },
-/area/ruin/space/ancientstation/delta/biolab)
"Os" = (
/obj/structure/door_assembly/door_assembly_eng,
/turf/open/floor/plating/airless,
@@ -7464,6 +7357,19 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/sec)
+"Pa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/hall)
"Pd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -7480,6 +7386,21 @@
},
/turf/open/floor/iron/white/textured_large,
/area/ruin/space/ancientstation/delta/biolab)
+"Ph" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/beta/hall)
"Pn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_switch/directional/west,
@@ -7629,14 +7550,6 @@
},
/turf/open/floor/iron/white/textured,
/area/ruin/space/ancientstation/delta/biolab)
-"Qb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/engine/airless,
-/area/ruin/space/ancientstation/beta/supermatter)
"Qh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8120,15 +8033,19 @@
/obj/effect/mapping_helpers/apc/no_charge,
/turf/open/floor/iron/white/textured,
/area/ruin/space/ancientstation/delta/proto)
-"UE" = (
-/obj/effect/decal/cleanable/dirt,
+"UG" = (
+/obj/structure/closet/crate/bin,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
+/obj/item/paper/crumpled,
+/obj/item/ph_booklet,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/turf_decal/tile/purple/half/contrasted,
+/turf/open/floor/iron/white/textured_edge{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/beta/hall)
+/area/ruin/space/ancientstation/delta/biolab)
"UI" = (
/turf/closed/mineral/random,
/area/ruin/space/ancientstation/beta/gravity)
@@ -8186,19 +8103,12 @@
},
/turf/open/floor/iron/diagonal,
/area/ruin/space/ancientstation/beta/gravity)
-"VH" = (
+"Vy" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/wrench,
-/obj/item/wirecutters,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/mapping_helpers/apc/no_charge,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/ruin/space/ancientstation/charlie/storage)
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/white,
+/area/ruin/space/ancientstation/delta/rnd)
"VT" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/shard/plasma{
@@ -8332,6 +8242,13 @@
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/engine,
/area/ruin/space/ancientstation/delta/biolab)
+"Xz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/delta/hall)
"XA" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
@@ -8370,6 +8287,15 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hydro)
+"XV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/delta/hall)
"XW" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -8555,6 +8481,17 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/space/ancientstation/delta/hall)
+"Zs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/wrench,
+/obj/item/wirecutters,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/mapping_helpers/apc/no_charge,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/ruin/space/ancientstation/charlie/storage)
"Zt" = (
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/rnd)
@@ -8588,6 +8525,19 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
+"ZY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/beta/atmos)
"ZZ" = (
/obj/structure/transit_tube{
dir = 4;
@@ -9945,7 +9895,7 @@ nQ
gO
AK
ow
-DO
+IY
NB
oE
nC
@@ -9964,7 +9914,7 @@ kK
Ln
ny
nz
-LO
+ZY
nB
nK
EV
@@ -10136,7 +10086,7 @@ Xt
MY
JU
EM
-yp
+sU
KV
sA
zJ
@@ -10273,7 +10223,7 @@ CR
sA
zJ
mY
-UE
+KC
nf
zJ
zJ
@@ -10285,7 +10235,7 @@ oO
Bz
Kw
oT
-oW
+Hi
oZ
pa
EL
@@ -10808,7 +10758,7 @@ Ix
Tu
tv
Vl
-Qb
+Lv
Fz
Hj
sR
@@ -10927,7 +10877,7 @@ aa
aa
iT
jV
-mp
+yO
mL
mN
WI
@@ -11328,7 +11278,7 @@ mE
mK
WI
zJ
-na
+Ph
kQ
aa
aa
@@ -11859,7 +11809,7 @@ zJ
mY
kQ
lJ
-Eu
+tA
en
eN
lK
@@ -11872,7 +11822,7 @@ Cc
RI
pz
Ox
-VH
+Zs
fI
ie
Ox
@@ -12062,7 +12012,7 @@ UV
eP
fh
cP
-gp
+Pa
tz
fh
UV
@@ -12075,7 +12025,7 @@ NE
JJ
XZ
Ga
-tw
+uo
yk
hT
aT
@@ -12192,7 +12142,7 @@ cQ
IB
qc
eQ
-gj
+xb
wF
gI
hr
@@ -12271,7 +12221,7 @@ CY
jJ
lC
aG
-lR
+sr
bN
bN
bN
@@ -12706,7 +12656,7 @@ aa
aa
as
as
-fP
+BY
hV
aX
hV
@@ -12724,7 +12674,7 @@ gF
lU
gY
Bf
-JM
+hD
ht
Sv
Fd
@@ -12854,7 +12804,7 @@ dt
dt
fn
fJ
-gy
+MB
up
iC
Qh
@@ -13057,7 +13007,7 @@ ha
Pn
hW
hz
-iz
+bd
eJ
cW
ia
@@ -13776,7 +13726,7 @@ bE
Yg
Fo
Hr
-rb
+Dd
Gz
Rt
bE
@@ -13971,7 +13921,7 @@ bE
FR
cA
dw
-oz
+XV
MS
EE
ft
@@ -13981,7 +13931,7 @@ yq
hC
Hb
oU
-oX
+yE
dw
cD
jr
@@ -14507,7 +14457,7 @@ nS
nS
ol
Ke
-lL
+rV
ir
lT
Ke
@@ -14581,7 +14531,7 @@ bD
ST
cD
uj
-kj
+Ii
UJ
Pu
kS
@@ -14765,7 +14715,7 @@ Ao
bD
eD
fw
-eC
+Vy
kw
jW
sJ
@@ -14961,7 +14911,7 @@ bE
ou
En
jx
-jy
+Xz
gD
nP
oK
@@ -14971,7 +14921,7 @@ MM
nT
Wk
Se
-Iw
+uJ
nW
nY
Yh
@@ -15161,7 +15111,7 @@ Fi
YO
wK
Jq
-On
+UG
GX
wq
TX
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 759bd7198736..6a8be5f8c6e2 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -534,11 +534,10 @@
},
/area/awaymission/moonoutpost19/syndicate)
"cd" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
+/obj/machinery/airalarm/directional/north{
req_access = list("syndicate")
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron{
dir = 8;
@@ -1629,11 +1628,10 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
+/obj/machinery/airalarm/directional/north{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/structure/cable,
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -1729,11 +1727,10 @@
/obj/structure/table,
/obj/item/stack/sheet/mineral/plasma,
/obj/machinery/light/small/broken/directional/north,
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
+/obj/machinery/airalarm/directional/north{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/structure/alien/weeds,
/turf/open/floor/iron{
heat_capacity = 1e+006
@@ -2029,11 +2026,10 @@
pixel_x = -3;
pixel_y = -2
},
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
+/obj/machinery/airalarm/directional/north{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
@@ -2491,11 +2487,10 @@
/area/awaymission/moonoutpost19/research)
"gS" = (
/obj/machinery/light/broken/directional/east,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23;
+/obj/machinery/airalarm/directional/east{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white{
heat_capacity = 1e+006
@@ -2685,11 +2680,10 @@
"hs" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/light/small/broken/directional/north,
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
+/obj/machinery/airalarm/directional/north{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald,
/turf/open/floor/iron/cafeteria{
dir = 5
@@ -3023,11 +3017,10 @@
},
/area/awaymission/moonoutpost19/research)
"ij" = (
-/obj/machinery/airalarm/unlocked{
- dir = 8;
- pixel_x = -23;
+/obj/machinery/airalarm/directional/west{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/freezer{
heat_capacity = 1e+006
@@ -3617,16 +3610,6 @@
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/arrivals)
-"jI" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
- req_access = null
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/moonoutpost19/arrivals)
"jJ" = (
/obj/structure/extinguisher_cabinet/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -3731,11 +3714,10 @@
/area/awaymission/moonoutpost19/arrivals)
"jY" = (
/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23;
+/obj/machinery/airalarm/directional/north{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -3893,11 +3875,10 @@
"ks" = (
/obj/machinery/light/directional/east,
/obj/machinery/processor,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23;
+/obj/machinery/airalarm/directional/east{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/cafeteria{
dir = 5
},
@@ -4271,11 +4252,10 @@
"lo" = (
/obj/machinery/light/small/directional/east,
/obj/structure/chair/wood,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23;
+/obj/machinery/airalarm/directional/east{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -4284,11 +4264,10 @@
/obj/machinery/light/small/directional/west,
/obj/structure/table,
/obj/item/storage/box,
-/obj/machinery/airalarm/unlocked{
- dir = 8;
- pixel_x = -23;
+/obj/machinery/airalarm/directional/west{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron{
heat_capacity = 1e+006
@@ -4862,11 +4841,10 @@
/area/awaymission/moonoutpost19/arrivals)
"mT" = (
/obj/machinery/light/small/directional/east,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23;
+/obj/machinery/airalarm/directional/east{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -5088,19 +5066,6 @@
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
-"ny" = (
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23;
- req_access = null
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron{
- heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
- temperature = 251
- },
-/area/awaymission/moonoutpost19/arrivals)
"nz" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/away/maintenance,
@@ -5612,6 +5577,18 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
+"uO" = (
+/obj/machinery/airalarm/directional/east{
+ req_access = null
+ },
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006;
+ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ temperature = 251
+ },
+/area/awaymission/moonoutpost19/arrivals)
"uR" = (
/obj/structure/alien/weeds,
/turf/open/misc/asteroid{
@@ -5945,11 +5922,10 @@
/obj/structure/table,
/obj/item/storage/medkit/regular,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23;
+/obj/machinery/airalarm/directional/east{
req_access = null
},
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/white/side{
dir = 8;
heat_capacity = 1e+006
@@ -6032,6 +6008,15 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
+"UR" = (
+/obj/machinery/airalarm/directional/north{
+ req_access = null
+ },
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/moonoutpost19/arrivals)
"UY" = (
/obj/structure/alien/weeds/node,
/turf/open/misc/asteroid{
@@ -39212,7 +39197,7 @@ mQ
kB
nj
mh
-ny
+uO
mx
nN
lJ
@@ -40999,7 +40984,7 @@ ik
im
im
hJ
-jI
+UR
jG
jF
kW
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 9ed55883ce32..850824bc4336 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -468,15 +468,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"bt" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/airalarm/all_access{
- pixel_y = -23
- },
-/turf/open/floor/iron/freezer{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"bu" = (
/turf/open/floor/iron/freezer{
heat_capacity = 1e+006
@@ -883,51 +874,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"cx" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 10
- },
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
-"cz" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/filingcabinet,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
-"cA" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 10
- },
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"cB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/obj/structure/table/wood,
@@ -1258,18 +1204,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/awaymission/undergroundoutpost45/central)
-"dw" = (
-/obj/machinery/light/blacklight/directional/west,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/iron{
- dir = 8;
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"dx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 5
@@ -1337,22 +1271,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"dE" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/light/blacklight/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"dF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1586,12 +1504,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"eb" = (
-/obj/machinery/growing/tray,
-/turf/open/floor/iron/dark{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"ec" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
@@ -2073,19 +1985,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"fs" = (
-/obj/machinery/light/blacklight/directional/east,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"ft" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
@@ -2255,19 +2154,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"fR" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/airalarm/all_access{
- pixel_y = -23
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/structure/dresser,
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/central)
"fS" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -2646,20 +2532,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
-"gY" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/light/small/directional/north,
-/obj/machinery/camera/directional/north{
- c_tag = "Research Lab";
- network = list("uo45","uo45r")
- },
-/turf/open/floor/iron/white{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/research)
"gZ" = (
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/white{
@@ -2698,15 +2570,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"hg" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"hh" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -2799,25 +2662,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"hs" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Kitchen";
- network = list("uo45")
- },
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_x = -3;
- pixel_y = 6
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5;
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"hu" = (
/obj/machinery/gateway/away{
calibrated = 0
@@ -3076,6 +2920,23 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
+"hY" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/camera/directional/east{
+ c_tag = "Kitchen";
+ network = list("uo45")
+ },
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/cafeteria{
+ dir = 5;
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"hZ" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -3098,19 +2959,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
-"ic" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
-/obj/structure/chair{
- dir = 8
- },
-/turf/open/floor/iron/dark{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/gateway)
"id" = (
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plating{
@@ -3504,17 +3352,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"jb" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"jc" = (
/obj/machinery/light/blacklight/directional/east,
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
@@ -3560,20 +3397,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"jg" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Gateway Chamber";
- network = list("uo45","uo45r")
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/gateway)
"jh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -3807,18 +3630,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
-"jK" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/iron/white{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/gateway)
"jM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/obj/effect/spawner/structure/window,
@@ -3844,6 +3655,14 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
+"jP" = (
+/obj/machinery/light/small/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"jQ" = (
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid{
@@ -4080,15 +3899,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"ko" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"kp" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -4273,22 +4083,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
-"kJ" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/turf/open/floor/iron/white{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/gateway)
"kK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 1
@@ -4382,22 +4176,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
-"kT" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/turf/open/floor/iron/white{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/research)
"kU" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -4537,21 +4315,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"lk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- pixel_y = -23
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"ll" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -4585,23 +4348,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
-"lr" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 4
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Gateway Ready Room";
- network = list("uo45","uo45r")
- },
-/obj/structure/cable,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/gateway)
"lt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -5108,16 +4854,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"ms" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"mt" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -5132,19 +4868,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"mv" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"mw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 4
@@ -5791,20 +5514,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
-"nO" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/table,
-/obj/item/radio/off,
-/obj/item/laser_pointer,
-/turf/open/floor/iron/cafeteria{
- dir = 5;
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/research)
"nP" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -5860,23 +5569,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
-"nT" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/machinery/light/blacklight/directional/west,
-/obj/item/radio/off,
-/obj/item/screwdriver{
- pixel_y = 10
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/research)
"nU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron{
@@ -5909,23 +5601,6 @@
},
/turf/closed/wall/r_wall/rust,
/area/awaymission/undergroundoutpost45/research)
-"nZ" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"oa" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -6033,26 +5708,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"oh" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"oi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -6464,22 +6119,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"oT" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/machinery/light/small/directional/east,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"oU" = (
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -7042,19 +6681,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
-"qp" = (
-/obj/structure/table,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
-/obj/item/hand_labeler,
-/obj/item/clothing/neck/stethoscope,
-/turf/open/floor/iron/white/side{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/research)
"qq" = (
/obj/machinery/vending/medical{
req_access = list("away_maintenance")
@@ -7077,16 +6703,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"qt" = (
-/obj/machinery/light/small/directional/east,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"qu" = (
/obj/machinery/light/small/directional/west,
/obj/structure/dresser,
@@ -7094,25 +6710,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"qv" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/turf/open/floor/carpet{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
-"qw" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/turf/open/floor/iron/freezer{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"qx" = (
/obj/structure/sink/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -7258,17 +6855,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
-"qP" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/server{
- dir = 8;
- pixel_x = -22
- },
-/obj/machinery/rnd/server{
- req_access = null
- },
-/turf/open/floor/circuit/telecomms/server,
-/area/awaymission/undergroundoutpost45/research)
"qQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
/turf/open/floor/iron/dark/telecomms,
@@ -7813,25 +7399,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"rT" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"rU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -8965,19 +8532,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
-"ul" = (
-/obj/machinery/light/blacklight/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
- dir = 5
- },
-/obj/machinery/airalarm/all_access{
- pixel_y = -23
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/engineering)
"um" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{
dir = 4
@@ -9319,20 +8873,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
-"uX" = (
-/obj/machinery/light/blacklight/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 23
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/engineering)
"uZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4
@@ -9929,16 +9469,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
-"wC" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/mining)
"wD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -10115,18 +9645,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/mining)
-"xp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/mining)
"xr" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating{
@@ -10415,17 +9933,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/mining)
-"xZ" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -23
- },
-/obj/structure/closet/emcloset,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/mining)
"ya" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -10487,19 +9994,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
-"yy" = (
-/obj/machinery/light/small/directional/east,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 23
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/engineering)
"yN" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -10644,6 +10138,14 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"Bd" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/mining)
"Bh" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -10765,6 +10267,16 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"CT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/mining)
"De" = (
/obj/machinery/computer/monitor{
name = "primary power monitoring console"
@@ -10836,6 +10348,17 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"DN" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"DU" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/cigarettes{
@@ -10871,6 +10394,18 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
+"EO" = (
+/obj/machinery/light/blacklight/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/engineering)
"EP" = (
/obj/structure/closet/secure_closet{
icon_state = "hydro";
@@ -10922,6 +10457,15 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"FG" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/closet/emcloset,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/mining)
"FS" = (
/obj/machinery/biogenerator,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -10974,6 +10518,20 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"GW" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/turf/open/floor/iron/white{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/gateway)
"HM" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/structure/bed{
@@ -11025,6 +10583,41 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"IW" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
+"JT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
+"Kl" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/turf/open/floor/iron/white{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/research)
"Km" = (
/obj/structure/table,
/obj/item/storage/medkit/toxin{
@@ -11065,6 +10658,17 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"KR" = (
+/obj/machinery/light/small/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/engineering)
"KU" = (
/obj/structure/closet/crate,
/turf/open/misc/asteroid{
@@ -11109,6 +10713,53 @@
temperature = 351.9
},
/area/awaymission/undergroundoutpost45/caves)
+"LB" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/iron/white{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/gateway)
+"LL" = (
+/obj/machinery/light/blacklight/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
+ dir = 5
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/engineering)
+"LO" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
+"LU" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/blacklight/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"LW" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark{
@@ -11171,6 +10822,18 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/central)
+"Ng" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/structure/dresser,
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"No" = (
/obj/machinery/door/firedoor,
/obj/structure/sign/warning/secure_area/directional/north,
@@ -11240,6 +10903,18 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/central)
+"Oe" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/camera/directional/north{
+ c_tag = "Research Lab";
+ network = list("uo45","uo45r")
+ },
+/turf/open/floor/iron/white{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/research)
"Oh" = (
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
@@ -11295,6 +10970,34 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"OY" = (
+/obj/structure/table,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
+/obj/item/hand_labeler,
+/obj/item/clothing/neck/stethoscope,
+/turf/open/floor/iron/white/side{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/research)
+"PS" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"Qm" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -11319,6 +11022,13 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"Qn" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"Qo" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -11344,6 +11054,20 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"QE" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/east,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
+/obj/structure/cable,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"QG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/sign/warning/secure_area/directional/west,
@@ -11363,6 +11087,24 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
+"Ra" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"Rb" = (
/obj/machinery/seed_extractor,
/obj/effect/decal/cleanable/dirt,
@@ -11371,6 +11113,18 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
+"Rn" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/camera/directional/west{
+ c_tag = "Gateway Chamber";
+ network = list("uo45","uo45r")
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/gateway)
"Rx" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -11378,6 +11132,18 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
+"Rz" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/directional/west,
+/obj/structure/table,
+/obj/item/radio/off,
+/obj/item/laser_pointer,
+/turf/open/floor/iron/cafeteria{
+ dir = 5;
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/research)
"RA" = (
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid{
@@ -11449,6 +11215,14 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
+"SB" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/freezer{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"SZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
@@ -11460,6 +11234,14 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
+"Tb" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"Tr" = (
/obj/structure/alien/resin/membrane,
/turf/open/misc/asteroid{
@@ -11487,6 +11269,15 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
+"TD" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"UG" = (
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
@@ -11517,6 +11308,40 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"UO" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
+"UY" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
+/obj/structure/chair{
+ dir = 8
+ },
+/turf/open/floor/iron/dark{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/gateway)
+"VG" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/freezer{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"VX" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 1;
@@ -11528,6 +11353,16 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"Wb" = (
+/obj/machinery/light/blacklight/directional/west,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/iron{
+ dir = 8;
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"Wd" = (
/obj/structure/alien/resin/wall,
/obj/structure/alien/weeds,
@@ -11583,6 +11418,26 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/research)
+"XA" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/structure/filingcabinet,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
+"XC" = (
+/obj/machinery/growing/tray,
+/turf/open/floor/iron/dark{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"XF" = (
/obj/structure/ore_box,
/turf/open/misc/asteroid{
@@ -11614,6 +11469,13 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"XP" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"XQ" = (
/obj/structure/glowshroom/single,
/turf/open/misc/asteroid{
@@ -11623,6 +11485,20 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"Ya" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 10
+ },
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/carpet{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"Yb" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
@@ -11684,6 +11560,36 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"Zl" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Gateway Ready Room";
+ network = list("uo45","uo45r")
+ },
+/obj/structure/cable,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/gateway)
+"Zr" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/blacklight/directional/west,
+/obj/item/radio/off,
+/obj/item/screwdriver{
+ pixel_y = 10
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/research)
"Zs" = (
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
@@ -11703,6 +11609,26 @@
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
+"ZK" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
+/obj/machinery/rnd/server{
+ req_access = null
+ },
+/turf/open/floor/circuit/telecomms/server,
+/area/awaymission/undergroundoutpost45/research)
+"ZM" = (
+/obj/machinery/light/blacklight/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/central)
"ZZ" = (
/obj/structure/table,
/obj/item/reagent_containers/spray/plantbgone{
@@ -30864,7 +30790,7 @@ gJ
gJ
is
QX
-jg
+Rn
jF
gv
gK
@@ -31896,7 +31822,7 @@ jk
jI
gv
gK
-lr
+Zl
iP
mE
gK
@@ -32660,7 +32586,7 @@ ad
gL
gW
hx
-ic
+UY
yh
iU
jn
@@ -33435,7 +33361,7 @@ ie
ix
iX
jq
-jK
+LB
kE
kE
lw
@@ -34979,7 +34905,7 @@ zq
zq
Mk
gw
-kJ
+GW
lA
gw
Oh
@@ -37027,7 +36953,7 @@ ad
ad
ad
gy
-gY
+Oe
hC
ih
iz
@@ -37045,7 +36971,7 @@ gz
gz
gz
KE
-qP
+ZK
qh
gz
nt
@@ -37297,7 +37223,7 @@ lH
gy
kd
Yk
-nO
+Rz
ox
pd
gy
@@ -38834,7 +38760,7 @@ zq
zq
Sf
gz
-kT
+Kl
lN
gx
gy
@@ -39096,7 +39022,7 @@ lM
hH
mR
no
-nT
+Zr
oC
ph
gy
@@ -39614,7 +39540,7 @@ nV
nV
lu
pL
-qp
+OY
qV
rH
sw
@@ -40614,7 +40540,7 @@ ce
ae
bf
eg
-cz
+XA
zG
eW
fo
@@ -40876,7 +40802,7 @@ bL
eX
fm
fB
-fR
+Ng
aC
ad
ad
@@ -41115,7 +41041,7 @@ ad
ad
aC
bj
-bt
+SB
aC
aC
bP
@@ -41639,7 +41565,7 @@ cw
cH
ae
aF
-dw
+Wb
aS
ej
ey
@@ -41892,7 +41818,7 @@ aF
bP
ce
aC
-cx
+DN
cI
cZ
dl
@@ -42180,7 +42106,7 @@ lP
QG
mV
nw
-nZ
+UO
oF
pl
gr
@@ -42424,7 +42350,7 @@ gl
gt
gA
gs
-hg
+XP
gA
gA
gA
@@ -42945,7 +42871,7 @@ zq
XQ
gg
gg
-ko
+IW
le
lR
mq
@@ -43691,7 +43617,7 @@ aS
bQ
ck
aC
-cA
+Ya
cI
db
bM
@@ -43719,14 +43645,14 @@ gr
gs
gs
fO
-ms
+Tb
mY
nB
of
oJ
fO
pR
-qt
+jP
mt
gg
zq
@@ -43958,7 +43884,7 @@ dB
dB
eP
fb
-fs
+ZM
fI
fY
an
@@ -44236,7 +44162,7 @@ fN
fN
fO
fN
-oh
+Ra
oL
fN
WQ
@@ -44484,7 +44410,7 @@ gg
hI
il
iF
-jb
+TD
jv
jS
hK
@@ -44497,7 +44423,7 @@ oi
oI
pq
pU
-qv
+Qn
qZ
fN
ad
@@ -44747,7 +44673,7 @@ jT
hK
iH
fO
-mv
+LO
mY
nC
of
@@ -45237,11 +45163,11 @@ ae
cN
de
aC
-dE
-eb
-eb
-eb
-eb
+LU
+XC
+XC
+XC
+XC
ff
aP
zq
@@ -45525,7 +45451,7 @@ ol
oP
pr
pX
-qw
+VG
pX
rL
pX
@@ -45752,10 +45678,10 @@ cN
de
Yn
dG
-eb
-eb
-eb
-eb
+XC
+XC
+XC
+XC
fe
aP
zq
@@ -46266,10 +46192,10 @@ cN
de
Rb
dG
-eb
-eb
-eb
-eb
+XC
+XC
+XC
+XC
fh
an
an
@@ -46308,7 +46234,7 @@ vp
vM
wf
ws
-wC
+Bd
wu
wX
vK
@@ -46544,7 +46470,7 @@ fO
fO
jV
ks
-lk
+JT
fO
fO
fO
@@ -46576,7 +46502,7 @@ xF
xN
xU
ww
-xZ
+FG
yc
ww
UM
@@ -46780,10 +46706,10 @@ cP
df
aC
dJ
-eb
-eb
-eb
-eb
+XC
+XC
+XC
+XC
fj
fu
fL
@@ -47064,7 +46990,7 @@ my
my
nI
or
-oT
+QE
my
my
my
@@ -47083,7 +47009,7 @@ wF
wF
xa
xh
-xp
+CT
wv
xz
xH
@@ -47821,7 +47747,7 @@ go
fN
gG
gP
-hs
+hY
hU
ir
Ar
@@ -48354,7 +48280,7 @@ zq
zq
RA
gg
-rT
+PS
sH
gg
UG
@@ -50929,13 +50855,13 @@ XJ
ln
ln
uE
-uX
+EO
vv
vT
Fd
Qo
Kt
-yy
+KR
YV
ln
ln
@@ -52983,7 +52909,7 @@ mZ
sk
sX
tF
-ul
+LL
ln
ln
ln
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 29dd851d37a5..0cb3dca7387e 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -778,6 +778,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall,
/area/station/maintenance/department/science)
+"apg" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"api" = (
/turf/open/floor/iron,
/area/station/cargo/sorting)
@@ -1149,6 +1153,15 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/lab)
+"auk" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/structure/chair,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/cargo/storage)
"auu" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -2767,13 +2780,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
-"aWR" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"aXb" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
@@ -3121,6 +3127,20 @@
/obj/structure/cable,
/turf/open/space,
/area/station/solars/starboard/fore)
+"bdb" = (
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"bde" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -5848,18 +5868,6 @@
/obj/structure/flora/bush/flowers_pp/style_random,
/turf/open/floor/grass,
/area/station/command/bridge)
-"bWS" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/mapping_helpers/apc/cell_10k,
-/obj/effect/mapping_helpers/apc/full_charge,
-/turf/open/floor/iron/dark/smooth_half{
- dir = 8
- },
-/area/station/bitrunning/den)
"bXc" = (
/obj/structure/window/reinforced{
dir = 8
@@ -7125,6 +7133,12 @@
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/station/service/library/lounge)
+"cru" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/chair/stool/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"crI" = (
/obj/effect/spawner/random/structure/table,
/obj/effect/spawner/random/bureaucracy/pen,
@@ -9078,6 +9092,20 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"cYe" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/requests_console/directional/north{
+ department = "Cargo Bay";
+ name = "Cargo Bay Requests Console";
+ supplies_requestable = 1
+ },
+/obj/machinery/vending/wardrobe/cargo_wardrobe,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/cargo/storage)
"cYh" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/turf/open/floor/iron/dark,
@@ -9944,16 +9972,6 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"dnd" = (
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/obj/machinery/airalarm/mixingchamber{
- pixel_x = 24;
- dir = 4
- },
-/obj/effect/turf_decal/box/red,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/freezerchamber)
"dnn" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/closet/secure_closet/psychology,
@@ -10116,6 +10134,22 @@
},
/turf/open/floor/iron/white,
/area/station/medical/break_room)
+"dpo" = (
+/obj/machinery/camera/autoname/directional/north,
+/obj/structure/table,
+/obj/item/book/manual/wiki/cooking_to_serve_man,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = -5
+ },
+/obj/item/storage/fancy/egg_box,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"dpu" = (
/obj/structure/table/wood,
/obj/item/cigbutt{
@@ -11108,10 +11142,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/exam_room)
-"dHX" = (
-/obj/structure/chair/stool/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"dIb" = (
/obj/machinery/mechpad,
/turf/open/floor/iron,
@@ -11722,10 +11752,6 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/secondary/entry)
-"dSd" = (
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"dSr" = (
/obj/structure/cable,
/turf/open/floor/iron/white,
@@ -12753,14 +12779,15 @@
/obj/structure/fireaxecabinet/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"elW" = (
+"emc" = (
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 1
},
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/quantum_server,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"emd" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/effect/turf_decal/delivery,
@@ -12923,10 +12950,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
-"eog" = (
-/obj/structure/chair/stool/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"eoo" = (
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
@@ -13092,6 +13115,12 @@
dir = 1
},
/area/station/commons/dorms)
+"erd" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/ballpit,
+/area/station/security/bitden)
"eri" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -13784,6 +13813,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
+"eCJ" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_y = 5
+ },
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"eCO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/table,
@@ -14410,6 +14448,11 @@
/obj/machinery/suit_storage_unit/standard_unit,
/turf/open/floor/iron/white/textured,
/area/station/science/auxlab)
+"ePv" = (
+/obj/machinery/grill,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"ePw" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
@@ -14691,19 +14734,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"eUc" = (
-/obj/machinery/camera/autoname/directional/north,
-/obj/structure/table,
-/obj/item/book/manual/wiki/cooking_to_serve_man,
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/condiment/flour,
-/obj/item/reagent_containers/condiment/rice,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"eUr" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -14948,20 +14978,6 @@
/obj/item/melee/baton,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"eYp" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/machinery/requests_console/directional/north{
- department = "Cargo Bay";
- name = "Cargo Bay Requests Console";
- supplies_requestable = 1
- },
-/obj/machinery/computer/order_console/bitrunning,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/cargo/storage)
"eYI" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/small/directional/south,
@@ -15095,12 +15111,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"fbw" = (
-/obj/machinery/modular_computer/preset/id{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/qm)
"fbx" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
@@ -16408,12 +16418,6 @@
/obj/item/reagent_containers/spray/cleaner,
/turf/open/floor/iron/white,
/area/station/medical/break_room)
-"fzK" = (
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/light/small/directional/west,
-/obj/structure/chair/stool/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"fzM" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -16671,18 +16675,6 @@
/obj/effect/landmark/start/prisoner,
/turf/open/floor/wood/large,
/area/station/security/prison/safe)
-"fFi" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"fFr" = (
/obj/structure/cable,
/obj/machinery/duct,
@@ -17346,14 +17338,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
-"fRi" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/netpod,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"fRp" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -17443,6 +17427,16 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark/textured,
/area/station/security/prison/workout)
+"fSs" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/mess)
"fSw" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
dir = 6
@@ -18158,6 +18152,12 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
+"gfF" = (
+/obj/structure/closet/secure_closet/freezer/meat{
+ req_access = null
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"gfI" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
@@ -18185,20 +18185,6 @@
/obj/structure/sign/warning/rad_shelter/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/prison)
-"ggo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/prison/mess)
"ggp" = (
/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/iron/dark/corner,
@@ -19120,6 +19106,13 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"gvR" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 1
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"gvW" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/effect/turf_decal/trimline/yellow/line{
@@ -19490,11 +19483,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible,
/turf/closed/wall/r_wall,
/area/station/maintenance/department/engine/atmos)
-"gAW" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"gAX" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood,
@@ -19506,10 +19494,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/restrooms)
-"gBr" = (
-/obj/structure/table,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"gBF" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -20724,6 +20708,11 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"gSB" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"gSE" = (
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
@@ -20792,16 +20781,6 @@
/obj/machinery/duct,
/turf/open/floor/stone,
/area/station/science/xenobiology)
-"gUf" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/structure/chair,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/cargo/storage)
"gUl" = (
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/dark,
@@ -21812,6 +21791,16 @@
/obj/machinery/bci_implanter,
/turf/open/floor/iron/white,
/area/station/science/circuits)
+"hmF" = (
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"hnr" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22072,11 +22061,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/pumproom)
-"hrL" = (
-/obj/machinery/light/small/directional/east,
-/obj/structure/chair/stool/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"hrT" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -22532,6 +22516,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"hyb" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal/incinerator)
"hyd" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -22902,6 +22896,11 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
+"hFr" = (
+/obj/machinery/griddle,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"hFF" = (
/obj/structure/table,
/obj/item/pai_card,
@@ -24162,14 +24161,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"idF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/light_switch/directional/east,
-/obj/machinery/netpod,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"idJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark/side{
@@ -26064,16 +26055,6 @@
/obj/item/camera,
/turf/open/floor/iron/vaporwave,
/area/station/service/library/printer)
-"iHv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/dark/smooth_half{
- dir = 8
- },
-/area/station/bitrunning/den)
"iHC" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -27353,9 +27334,6 @@
},
/turf/open/floor/wood,
/area/station/security/prison/rec)
-"jcF" = (
-/turf/closed/wall/r_wall,
-/area/station/security/prison/shower)
"jcG" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -27583,6 +27561,16 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"jhR" = (
+/obj/machinery/duct,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark_red/arrow_cw{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison/shower)
"jic" = (
/obj/effect/decal/cleanable/cobweb,
/obj/item/radio/intercom/directional/west,
@@ -28774,6 +28762,13 @@
/obj/machinery/computer/security/telescreen/research,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
+"jEI" = (
+/obj/structure/table,
+/obj/item/kitchen/fork/plastic,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"jEW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -29092,10 +29087,6 @@
/obj/structure/closet/emcloset/anchored,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"jJt" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"jJz" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -29931,13 +29922,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
-"jXi" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "bitrunner_den"
- },
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"jXr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/closet/secure_closet/personal/patient,
@@ -31488,6 +31472,15 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
+"kzh" = (
+/obj/machinery/computer/quantum_console,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera/autoname/directional/north,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"kzi" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -31779,6 +31772,9 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"kFk" = (
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"kFu" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 4
@@ -32987,6 +32983,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
+"kXK" = (
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/seed_extractor,
+/obj/machinery/camera/autoname/directional/south,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"kXL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -33616,6 +33619,16 @@
/obj/machinery/suit_storage_unit/standard_unit,
/turf/open/floor/iron/textured,
/area/station/ai_monitored/command/storage/eva)
+"liD" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"liE" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
@@ -33805,16 +33818,6 @@
},
/turf/open/floor/plating,
/area/station/security/detectives_office)
-"lnc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/prison/mess)
"lng" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -34098,6 +34101,26 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"lsx" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/closet/crate/hydroponics,
+/obj/item/botanical_lexicon,
+/obj/item/seeds/tree,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/seeds/pumpkin,
+/obj/item/seeds/wheat,
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/grass,
+/obj/item/seeds/carrot,
+/obj/item/seeds/tomato,
+/obj/item/seeds/potato,
+/obj/item/seeds/garlic,
+/obj/item/seeds/onion,
+/obj/item/paper/guides/jobs/hydroponics,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"lsC" = (
/obj/structure/chair/wood{
dir = 4
@@ -34722,6 +34745,11 @@
/obj/item/storage/box/silver_ids,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"lCo" = (
+/obj/machinery/oven/range,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"lCs" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -34815,6 +34843,11 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"lEa" = (
+/obj/structure/cable,
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"lEf" = (
/obj/item/radio/intercom/directional/east,
/turf/open/floor/carpet/blue,
@@ -35084,6 +35117,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"lIO" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"lIQ" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -35754,6 +35795,11 @@
/obj/item/key/janitor,
/turf/open/floor/iron/dark/side,
/area/station/service/janitor)
+"lVd" = (
+/obj/structure/cable,
+/obj/structure/chair/stool/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"lVh" = (
/obj/machinery/light/directional/south,
/turf/open/floor/carpet/royalblue,
@@ -36237,18 +36283,17 @@
/obj/item/clothing/mask/gas,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"mcP" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+"mcU" = (
+/obj/machinery/shower/directional/east,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/soap/homemade,
+/obj/effect/turf_decal/trimline/dark_red/arrow_cw{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison/shower)
"mcY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -36379,6 +36424,10 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"mfE" = (
+/obj/machinery/growing/soil,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"mgd" = (
/obj/machinery/conveyor{
dir = 4;
@@ -36461,10 +36510,6 @@
/obj/machinery/power/energy_accumulator/tesla_coil,
/turf/open/floor/plating,
/area/station/engineering/main)
-"mij" = (
-/obj/machinery/grill,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"min" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -36637,19 +36682,6 @@
"mkG" = (
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"mkI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Prison Garden"
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/security/prison/garden)
"mkR" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -37204,6 +37236,16 @@
},
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/engineering/transit_tube)
+"mtq" = (
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/door/airlock/grunge{
+ name = "Bitrunner Den"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/bitden)
"mtH" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{
dir = 5
@@ -37712,6 +37754,9 @@
/obj/structure/railing,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
+"mDi" = (
+/turf/closed/wall,
+/area/station/security/bitden)
"mDv" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/engine)
@@ -37815,25 +37860,6 @@
"mGb" = (
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"mGg" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/structure/closet/crate/hydroponics,
-/obj/machinery/light/small/directional/south,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/seeds/onion,
-/obj/item/seeds/garlic,
-/obj/item/seeds/potato,
-/obj/item/seeds/tomato,
-/obj/item/seeds/carrot,
-/obj/item/seeds/grass,
-/obj/item/seeds/ambrosia,
-/obj/item/seeds/wheat,
-/obj/item/seeds/pumpkin,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/seeds/tree,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"mGu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37890,22 +37916,6 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron,
/area/station/construction)
-"mHA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining/glass{
- name = "Bitrunning Den"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/effect/landmark/navigate_destination/common/bitrunner,
-/turf/open/floor/iron/dark/textured,
-/area/station/bitrunning/den)
"mHO" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -38360,6 +38370,14 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron/white,
/area/station/maintenance/department/science)
+"mQx" = (
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"mQA" = (
/obj/structure/chair/sofa/corp{
color = "#7fb3d5";
@@ -39031,6 +39049,12 @@
dir = 1
},
/area/station/cargo/miningoffice)
+"ncG" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/composters,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"ndh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -39228,14 +39252,6 @@
/obj/item/toy/plush/nukeplushie,
/turf/open/floor/wood,
/area/station/maintenance/starboard/fore)
-"nfv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "bitrunner_den";
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"nfw" = (
/obj/machinery/camera/autoname/directional/west{
dir = 10
@@ -39820,6 +39836,14 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"noQ" = (
+/obj/machinery/duct,
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 1
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"npa" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -40010,6 +40034,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/main)
+"nsw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/duct,
+/obj/effect/turf_decal/trimline/dark_red/arrow_cw,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison/shower)
"nsA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -40707,34 +40739,11 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
-"nDD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/light/small/directional/west,
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo - Bitrunner's Den";
- name = "cargo camera"
- },
-/obj/machinery/button/door/directional/west{
- id = "bitrunner_den";
- name = "Bit Den Shutters Control";
- req_access = list("bit_den")
- },
-/obj/machinery/computer/quantum_console{
- dir = 4
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"nDK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"nDV" = (
-/obj/machinery/oven/range,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"nEn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41115,6 +41124,17 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/turret_protected/ai)
+"nKe" = (
+/obj/machinery/light/dim/directional/east,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/end{
+ dir = 4
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"nKf" = (
/obj/machinery/firealarm/directional/south,
/obj/machinery/light/small/directional/south,
@@ -41760,6 +41780,14 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"nWh" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/soup_pot{
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"nWp" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
@@ -42019,6 +42047,35 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
+"oaa" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/drinkingglasses,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"oak" = (
/obj/machinery/corral_corner{
mapping_id = "6"
@@ -42359,6 +42416,19 @@
},
/turf/open/floor/iron,
/area/station/service/janitor)
+"ogz" = (
+/obj/structure/table/reinforced,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/obj/item/food/grown/tomato{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"ogH" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
@@ -42766,10 +42836,6 @@
/obj/machinery/computer/crew,
/turf/open/floor/iron/white,
/area/station/medical/break_room)
-"omV" = (
-/obj/machinery/duct,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"omZ" = (
/obj/machinery/firealarm/directional/north,
/obj/machinery/light_switch/directional/north{
@@ -43497,6 +43563,17 @@
},
/turf/open/floor/iron/white,
/area/station/hallway/secondary/exit/departure_lounge)
+"oyI" = (
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 9
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/burnchamber)
"oyN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table,
@@ -44447,6 +44524,19 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
+"oPP" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/soup_pot{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"oPX" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/machinery/computer/aifixer,
@@ -45326,6 +45416,14 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/construction/mining/aux_base)
+"phd" = (
+/obj/structure/table/reinforced,
+/obj/item/food/flatdough,
+/obj/item/food/flatdough{
+ pixel_x = 4
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"phj" = (
/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/effect/turf_decal/trimline/blue/warning{
@@ -45414,6 +45512,10 @@
},
/turf/open/floor/plating,
/area/station/medical/patients_rooms/room_b)
+"piY" = (
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"pji" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/structure/reagent_dispensers/water_cooler,
@@ -46590,6 +46692,19 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark/side,
/area/station/commons/dorms)
+"pBC" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = -5
+ },
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"pBK" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/camera/autoname/directional/south{
@@ -46790,11 +46905,6 @@
"pEY" = (
/turf/closed/wall,
/area/station/service/hydroponics)
-"pFc" = (
-/obj/machinery/light/small/directional/east,
-/obj/machinery/light_switch/directional/east,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"pFJ" = (
/obj/effect/spawner/random/structure/chair_maintenance{
dir = 1
@@ -47276,17 +47386,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"pOe" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 9
- },
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
-/obj/machinery/space_heater,
-/turf/open/floor/iron/dark,
-/area/station/security/execution)
"pOj" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/structure/rack,
@@ -49106,34 +49205,6 @@
/obj/structure/cable,
/turf/open/space,
/area/station/solars/starboard/aft)
-"qxd" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"qxl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -49564,10 +49635,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"qFe" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"qFf" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -49973,11 +50040,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/engine/telecomms,
/area/station/tcommsat/server)
-"qNz" = (
-/obj/machinery/biogenerator,
-/obj/item/radio/intercom/prison/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"qNB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -50158,10 +50220,6 @@
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/open/floor/iron/dark,
/area/station/security/execution)
-"qPN" = (
-/obj/machinery/smartfridge,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"qPP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50756,6 +50814,15 @@
},
/turf/open/floor/iron/dark/side,
/area/station/cargo/storage)
+"rbf" = (
+/obj/machinery/light/small/directional/west,
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/machinery/processor{
+ pixel_y = 6
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"rbo" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -50886,6 +50953,13 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/iron/dark,
/area/station/security/prison)
+"rdr" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/structure/cable,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"rdt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50912,10 +50986,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
-"rdT" = (
-/obj/machinery/griddle,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"ref" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -52207,6 +52277,16 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"rzs" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/status_display/evac/directional/north,
+/obj/structure/chair,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/cargo/storage)
"rzG" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
dir = 4
@@ -52343,6 +52423,14 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
+"rBk" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"rBF" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -53175,13 +53263,6 @@
/obj/item/assembly/flash/handheld,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
-"rOQ" = (
-/obj/machinery/duct,
-/obj/structure/table/reinforced,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/structure/reagent_dispensers/servingdish,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"rOR" = (
/obj/structure/sign/painting/library{
pixel_y = -32
@@ -53744,6 +53825,14 @@
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
+"rZw" = (
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/effect/turf_decal/box/red,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/freezerchamber)
"rZy" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -54379,6 +54468,16 @@
/obj/machinery/meter/layer4,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"sli" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/mess)
"slq" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -55481,12 +55580,6 @@
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"sHk" = (
-/obj/machinery/camera/autoname/directional/south,
-/obj/item/radio/intercom/prison/directional/south,
-/obj/structure/table,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"sHl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -55745,6 +55838,16 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/wood,
/area/station/service/library/lounge)
+"sLA" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"sLG" = (
/obj/structure/cable,
/turf/open/floor/carpet,
@@ -55801,6 +55904,17 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
+"sMI" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Garden"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/garden)
"sMN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -57476,9 +57590,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"tpm" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"tpn" = (
/obj/structure/sink/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -57703,10 +57814,6 @@
/obj/structure/sink/directional/east,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
-"tsn" = (
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"tsv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -58141,6 +58248,14 @@
},
/turf/open/floor/iron/white,
/area/station/hallway/secondary/exit/departure_lounge)
+"tyX" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"tzc" = (
/obj/effect/spawner/random/engineering/tank,
/turf/open/floor/plating,
@@ -58579,6 +58694,11 @@
/obj/structure/table,
/turf/open/floor/iron/white,
/area/station/medical/patients_rooms/room_a)
+"tHM" = (
+/obj/structure/chair/stool/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"tIp" = (
/obj/structure/flora/rock/pile/jungle/style_random,
/mob/living/carbon/human/species/monkey,
@@ -59156,14 +59276,6 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"tSx" = (
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_y = 5
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"tSE" = (
/obj/structure/cable/layer1,
/turf/open/floor/iron/dark/smooth_large,
@@ -60707,6 +60819,14 @@
/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"urV" = (
+/obj/structure/table/reinforced,
+/obj/item/food/piedough,
+/obj/item/food/piedough{
+ pixel_y = 4
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"urW" = (
/turf/open/floor/iron/dark,
/area/station/security/prison/workout)
@@ -60827,17 +60947,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"utW" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/machinery/status_display/evac/directional/north,
-/obj/structure/chair,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/cargo/storage)
"uuh" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/guillotine,
@@ -60907,11 +61016,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/wood,
/area/station/service/library/private)
-"uvP" = (
-/obj/structure/table,
-/obj/item/kitchen/fork/plastic,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"uvU" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -61001,12 +61105,6 @@
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/iron,
/area/station/maintenance/port)
-"uwZ" = (
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/seed_extractor,
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"uxh" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/structure/chair/office/light{
@@ -61088,6 +61186,15 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
+"uza" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/space_heater,
+/turf/open/floor/iron/dark,
+/area/station/security/execution)
"uze" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61184,10 +61291,6 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
-"uBI" = (
-/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"uBL" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -61218,6 +61321,20 @@
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/iron/dark,
/area/station/security/execution)
+"uCk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/duct,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/mess)
"uCp" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 4
@@ -61234,10 +61351,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/office)
-"uCx" = (
-/obj/machinery/camera/autoname/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"uCB" = (
/obj/machinery/light/small/directional/north,
/obj/structure/disposalpipe/segment{
@@ -61927,11 +62040,6 @@
/obj/item/hand_labeler,
/turf/open/floor/iron/white/textured,
/area/station/medical/chemistry)
-"uNU" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/composters,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"uNX" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron/dark,
@@ -62061,6 +62169,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"uQv" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/navigate_destination/common/bitrunner,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"uQP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
@@ -62523,14 +62639,6 @@
dir = 1
},
/area/station/engineering/break_room)
-"uXU" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/byteforge,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"uYe" = (
/obj/effect/landmark/blobstart,
/obj/effect/decal/cleanable/dirt,
@@ -64667,6 +64775,17 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/security/execution)
+"vIP" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"vIQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
@@ -65222,10 +65341,6 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"vSd" = (
-/obj/machinery/hydroponics/soil,
-/turf/open/floor/grass,
-/area/station/security/prison/garden)
"vSj" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -65982,6 +66097,10 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark,
/area/station/security/prison/shower)
+"wgw" = (
+/obj/machinery/smartfridge,
+/turf/closed/wall,
+/area/station/security/prison/garden)
"wgM" = (
/obj/effect/turf_decal/stripes/end{
dir = 1
@@ -66577,10 +66696,6 @@
/obj/structure/table/reinforced/plasmarglass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"wrx" = (
-/obj/machinery/vending/sustenance,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/mess)
"wrA" = (
/obj/item/kirbyplants/random,
/turf/open/floor/wood,
@@ -66696,6 +66811,16 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"wtv" = (
+/obj/structure/table,
+/obj/item/secateurs,
+/obj/item/secateurs{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"wtF" = (
/turf/closed/wall/r_wall,
/area/station/science/xenobiology)
@@ -67433,6 +67558,18 @@
/obj/item/radio/off,
/turf/open/floor/iron,
/area/station/engineering/storage_shared)
+"wGs" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"wGw" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -67456,6 +67593,10 @@
/obj/machinery/growing/tray,
/turf/open/floor/iron/dark/side,
/area/station/service/hydroponics)
+"wGI" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"wGN" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/decal/cleanable/dirt,
@@ -67899,13 +68040,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
-"wOe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/brown/filled/warning,
-/turf/open/floor/iron/dark/side,
-/area/station/cargo/storage)
"wOt" = (
/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/machinery/duct,
@@ -67917,6 +68051,11 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/engine_smes)
+"wOy" = (
+/obj/effect/spawner/random/vending/snackvend,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"wOC" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
@@ -67963,13 +68102,6 @@
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
-"wPb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/netpod,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"wPA" = (
/obj/structure/chair{
dir = 1
@@ -68363,6 +68495,12 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
+"wWZ" = (
+/obj/machinery/biogenerator,
+/obj/item/radio/intercom/prison/directional/south,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"wXi" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -69815,19 +69953,6 @@
/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/iron/white,
/area/station/science/research)
-"xxr" = (
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 9
- },
-/obj/machinery/airalarm/mixingchamber{
- pixel_x = 24;
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/burnchamber)
"xxB" = (
/obj/structure/table,
/obj/structure/cable,
@@ -70698,13 +70823,6 @@
},
/turf/open/floor/iron/white/textured,
/area/station/medical/exam_room)
-"xMX" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_y = 9
- },
-/turf/open/floor/iron/kitchen,
-/area/station/security/prison/mess)
"xMY" = (
/obj/structure/fireaxecabinet/directional/south,
/obj/machinery/light/small/directional/south,
@@ -70811,6 +70929,12 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/iron/cafeteria,
/area/station/maintenance/starboard/aft)
+"xOK" = (
+/obj/machinery/vending/sustenance,
+/obj/machinery/camera/autoname/directional/south,
+/obj/item/radio/intercom/prison/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"xOV" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
@@ -71445,6 +71569,11 @@
dir = 10
},
/area/station/commons/fitness/recreation)
+"xZo" = (
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"xZp" = (
/obj/structure/closet/secure_closet/captains,
/turf/open/floor/carpet/royalblue,
@@ -71592,6 +71721,16 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"ybm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/duct,
+/obj/effect/turf_decal/trimline/dark_red/arrow_cw{
+ dir = 10
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison/shower)
"ybw" = (
/obj/machinery/status_display/evac/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -82982,7 +83121,7 @@ hxi
cpv
tkC
gJY
-eYp
+cYe
vaP
aim
nxh
@@ -84528,7 +84667,7 @@ suW
boe
wAR
qhu
-gUf
+auk
jTs
tEB
tEB
@@ -85551,12 +85690,12 @@ fUs
jEi
bnl
qJD
-fbw
+pHx
qqU
xeM
aKM
qhu
-gUf
+auk
jTs
ggp
iZd
@@ -85813,14 +85952,14 @@ tMU
tMU
qhu
qhu
-utW
+rzs
jTs
sdf
-tpm
-tpm
-tpm
-tpm
-tpm
+gJY
+gJY
+gJY
+gJY
+uoo
ksa
ksa
ksa
@@ -86073,11 +86212,11 @@ ffH
jga
jTs
fEr
-jXi
-uXU
-nDD
-elW
-nfv
+gJY
+uoo
+uoo
+uoo
+uoo
uoo
uoo
uoo
@@ -86329,12 +86468,12 @@ rLs
rLs
rLs
iYk
-wOe
-mHA
-iHv
-aWR
-bWS
-tpm
+fEr
+xGG
+ksa
+ksa
+ksa
+uoo
ksa
ksa
ksa
@@ -86587,11 +86726,11 @@ wcC
tKL
uWB
dUd
-jXi
-idF
-fRi
-wPb
-nfv
+gJY
+uoo
+uoo
+uoo
+uoo
uoo
uoo
uoo
@@ -86844,11 +86983,11 @@ rDR
rCj
nYQ
rCj
-tpm
-tpm
-tpm
-tpm
-tpm
+lRD
+lRD
+lRD
+uoo
+uoo
ksa
ksa
ksa
@@ -94188,9 +94327,9 @@ uoo
uoo
uoo
uoo
-uoo
-ksa
-ksa
+fEP
+fEP
+fEP
fEP
ksa
aeM
@@ -94445,12 +94584,12 @@ ksa
uoo
ksa
ksa
-uoo
-ksa
-ksa
fEP
-uoo
-jcF
+kFk
+kFk
+kFk
+kFk
+kFk
cCf
cCf
chZ
@@ -94702,12 +94841,12 @@ ksa
ksa
ksa
ksa
-uoo
-ksa
-ksa
fEP
-ksa
-jcF
+kFk
+apg
+bdb
+hmF
+mDi
mKE
vyJ
mEQ
@@ -94728,7 +94867,7 @@ qgq
lMT
qgq
pSA
-pOe
+uza
jNJ
iOi
pSA
@@ -94959,12 +95098,12 @@ ksa
ksa
ksa
ksa
-ksa
-ksa
-ksa
fEP
-ksa
-jcF
+kFk
+apg
+wGs
+rdr
+mDi
cCf
lBH
mEQ
@@ -95216,15 +95355,15 @@ uoo
uoo
ksa
ksa
-ksa
-ksa
-ksa
fEP
-ksa
-jcF
-mKE
-vyJ
-mEQ
+kFk
+apg
+vIP
+uQv
+mtq
+mcU
+jhR
+ybm
vyJ
vez
cCf
@@ -95473,15 +95612,15 @@ uoo
ksa
ksa
ksa
-ksa
-ksa
-ksa
fEP
-ksa
-jcF
+kFk
+kzh
+emc
+tyX
+mDi
cCf
nCu
-mEQ
+nsw
xCo
cCf
cCf
@@ -95731,11 +95870,11 @@ ksa
ksa
fEP
fEP
-fEP
-fEP
-fEP
-uoo
-jcF
+kFk
+gSB
+lIO
+liD
+mDi
mKE
vyJ
mEQ
@@ -95988,11 +96127,11 @@ ksa
fEP
fEP
ksa
-uoo
-ksa
-uoo
-ksa
-jcF
+kFk
+xZo
+nKe
+erd
+mDi
cCf
lBH
mEQ
@@ -96245,11 +96384,11 @@ ksa
fEP
ksa
ksa
-xta
-xta
-xta
-xta
-jcF
+kFk
+mDi
+mDi
+mDi
+mDi
mKE
vyJ
mEQ
@@ -98058,10 +98197,10 @@ vhu
ajn
ajn
ajn
-lnc
-ggo
-lnc
ajn
+uCk
+sli
+fSs
ajn
ajn
ajn
@@ -98312,14 +98451,14 @@ dNt
tvc
iFo
vhu
-rdT
+hFr
ltj
-gAW
-dxW
+rbf
+gvR
gEt
dxW
-fzK
-uvP
+wzI
+jEI
qQq
rhW
aBX
@@ -98569,10 +98708,10 @@ oER
dix
oER
oER
-mij
+ePv
lhg
-rOQ
-omV
+lhg
+noQ
gEt
rHR
dxW
@@ -98820,17 +98959,17 @@ xta
xta
xta
tFK
-vSd
-vSd
+piY
+piY
vQY
dZe
kxu
oER
-nDV
+lCo
tLo
-aiw
-dxW
-wAd
+tLo
+pBC
+cru
dxW
wzI
qDj
@@ -99083,10 +99222,10 @@ ipY
dZe
fch
oER
-tSx
+eCJ
tLo
-fFi
-dxW
+tLo
+aiw
vdj
fuS
fuS
@@ -99334,21 +99473,21 @@ fEP
fEP
uoo
rHA
-vSd
-vSd
+piY
+piY
xWj
iwL
-uNU
+ncG
oER
-xMX
+rBk
tLo
-qFe
-dxW
-wAd
+tLo
+nWh
+cru
dxW
wzI
qDj
-qQq
+tHM
rhW
giM
giM
@@ -99595,18 +99734,18 @@ nDq
nDq
mRL
iwL
-uwZ
+kXK
oER
-eUc
+dpo
tLo
-qxd
-dxW
+tLo
+urV
wAd
wxY
dxW
dxW
-dxW
-rhW
+fuS
+gJM
ksa
xXP
ksa
@@ -99848,22 +99987,22 @@ ksa
fEP
uoo
rHA
-vSd
-vSd
+mfE
+mfE
xWj
ipb
-qNz
+wWZ
oER
xUs
tLo
-pFc
-dxW
-fuS
+tLo
+ogz
+lVd
dxW
-hrL
+wzI
qDj
qQq
-rhW
+gJM
ksa
xXP
ksa
@@ -100109,15 +100248,15 @@ yaX
yaX
gJK
vTX
-mGg
-oER
-oER
-mkI
+sLA
oER
-dKa
+gfF
+tLo
+tLo
+phd
fuS
-dHX
-rhW
+dxW
+dKa
rhW
rhW
rhW
@@ -100362,21 +100501,21 @@ ksa
fEP
uoo
rHA
-vSd
-vSd
+mfE
+mfE
xWj
bMw
sJm
-sJm
-uCx
-tsn
-oER
-wrx
+wgw
+tLo
+tLo
+tLo
+oPP
qnN
-sHk
+dxW
+xOK
rhW
-ksa
-xXP
+uoo
ksa
ksa
xXP
@@ -100624,18 +100763,18 @@ yaX
pHz
bMw
sJm
-sJm
-sJm
-dSd
-oER
-uBI
+sMI
+tLo
+tLo
+wGI
+tLo
fuS
-eog
+dxW
+wOy
rhW
uoo
+xXP
uoo
-uoo
-fEP
xXP
xXP
vFa
@@ -100876,23 +101015,23 @@ ksa
fEP
ksa
tFK
-vSd
-vSd
-xWj
-bMw
-jJt
-gBr
-gBr
-qPN
-tFK
+mfE
+mfE
+lsx
+lEa
+wtv
+oER
+mQx
+oaa
+rhW
gJM
gJM
gJM
rhW
+rhW
+uoo
ksa
-xXP
-ksa
-fEP
+uoo
ksa
xXP
vFa
@@ -101139,9 +101278,9 @@ rHA
rHA
rHA
tFK
-tFK
-tFK
-tFK
+rhW
+rhW
+rhW
ksa
uoo
ksa
@@ -101149,7 +101288,7 @@ uoo
ksa
xXP
ksa
-fEP
+uoo
ksa
xXP
jLu
@@ -101406,7 +101545,7 @@ uoo
ksa
xXP
ksa
-fEP
+uoo
ksa
xXP
jLu
@@ -111816,7 +111955,7 @@ vHU
vHU
oqK
rHp
-mcP
+hyb
efB
qHq
enE
@@ -113526,9 +113665,9 @@ lgB
uzn
dQx
uzn
-xxr
+oyI
mri
-dnd
+rZw
ntc
ntB
ntc
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b125592a6e23..b8f907ec0910 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -345,12 +345,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
-"adU" = (
-/obj/effect/landmark/start/prisoner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"aej" = (
/obj/structure/chair/stool/directional/east,
/obj/structure/sign/poster/random/directional/west,
@@ -410,14 +404,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
-"aeM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/prisoner,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"aeQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/mech_bay_power_console{
@@ -661,6 +647,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"agI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"agJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -716,6 +706,12 @@
/obj/effect/turf_decal/tile/yellow/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/main)
+"ahD" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"ahI" = (
/obj/structure/closet/crate/freezer/blood,
/obj/effect/decal/cleanable/dirt,
@@ -1117,21 +1113,6 @@
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"amU" = (
-/obj/machinery/computer/security/telescreen{
- dir = 8;
- name = "Prisoner Telescreen";
- network = list("prison");
- pixel_x = 27
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"amW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1145,6 +1126,18 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"anl" = (
+/obj/structure/cable,
+/obj/machinery/light/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/machinery/atmospherics/components/unary/thermomachine/heater{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/disposal/incinerator)
"anp" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table/reinforced,
@@ -1443,6 +1436,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/cargo/storage)
+"aqa" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"aqc" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
@@ -1576,15 +1575,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"arw" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "brigprison";
- name = "Prison Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"arz" = (
/obj/machinery/door/airlock/external{
name = "Security External Airlock"
@@ -1643,16 +1633,6 @@
/obj/effect/landmark/start/botanist,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"arS" = (
-/obj/machinery/growing/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/ambrosia_vulgaris{
- pixel_x = -30
- },
-/obj/machinery/light/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"arU" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
@@ -2042,21 +2022,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
-"avl" = (
-/obj/structure/bed,
-/obj/item/bedsheet/orange,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Cell 1";
- network = list("ss13","prison")
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"avB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -2094,6 +2059,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"avV" = (
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"avX" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
dir = 4
@@ -2177,10 +2145,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
-"awT" = (
-/obj/structure/chair/stool/directional/east,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"axa" = (
/obj/item/radio/intercom/prison/directional/north,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -2205,6 +2169,13 @@
/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"axn" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"axq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2253,6 +2224,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"axZ" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"ayh" = (
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/ce)
@@ -2266,26 +2241,12 @@
/mob/living/basic/cockroach,
/turf/open/floor/iron,
/area/station/medical/abandoned)
-"ayH" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Permabrig - Central";
- network = list("ss13","prison")
- },
-/obj/item/radio/intercom/prison/directional/west,
-/turf/open/floor/iron,
-/area/station/security/prison)
"ayJ" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 6
},
/turf/open/floor/iron/white,
/area/station/science/lab)
-"ayM" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"ayQ" = (
/obj/effect/turf_decal/trimline/green/end,
/obj/machinery/growing/tray,
@@ -2319,6 +2280,11 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/engineering/main)
+"azk" = (
+/turf/open/floor/iron/dark/side{
+ dir = 5
+ },
+/area/station/security/prison/workout)
"azm" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/bot,
@@ -2377,6 +2343,15 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"azI" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"azR" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
/turf/closed/wall/r_wall,
@@ -2387,6 +2362,10 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port)
+"azT" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
"azW" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -2397,6 +2376,12 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
+"azX" = (
+/obj/machinery/composters,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"aAh" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2406,16 +2391,6 @@
"aAj" = (
/turf/closed/wall,
/area/station/science/breakroom)
-"aAr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/flasher/directional/south{
- id = "Cell 1"
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"aAu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2676,6 +2651,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"aDG" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"aDR" = (
/obj/machinery/corral_corner{
mapping_id = "1"
@@ -2729,6 +2709,13 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/station/service/library)
+"aEl" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/safe)
"aEs" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -2786,6 +2773,13 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
+"aEU" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/chair/sofa/bench/right{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"aEV" = (
/obj/effect/landmark/start/hangover/closet,
/obj/effect/spawner/random/structure/closet_private,
@@ -2829,6 +2823,12 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall/r_wall,
/area/station/command/teleporter)
+"aFM" = (
+/obj/structure/window/spawner/directional/south,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"aFU" = (
/obj/effect/landmark/blobstart,
/obj/structure/disposalpipe/segment{
@@ -2951,6 +2951,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"aGH" = (
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 4;
+ pixel_x = -9
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"aGI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2965,6 +2976,12 @@
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
+"aGN" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"aGW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -3214,6 +3231,13 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet/green,
/area/station/service/library)
+"aJJ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/safe)
"aJK" = (
/obj/structure/urinal/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -3269,6 +3293,10 @@
},
/turf/open/floor/engine,
/area/station/science/explab)
+"aKi" = (
+/obj/structure/cable,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"aKn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
@@ -3295,6 +3323,17 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/service/library/private)
+"aKB" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/donkpockets{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"aKJ" = (
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3464,13 +3503,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"aNd" = (
-/obj/structure/chair/stool/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"aNq" = (
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
@@ -3487,12 +3519,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"aNz" = (
-/obj/structure/table,
-/obj/item/trash/popcorn,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"aND" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral,
@@ -3813,14 +3839,6 @@
dir = 1
},
/area/station/service/bar)
-"aRn" = (
-/obj/machinery/growing/soil,
-/obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"aRr" = (
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai_upload)
@@ -3833,22 +3851,36 @@
/obj/effect/turf_decal/tile/purple/full,
/turf/open/floor/iron/large,
/area/station/science/research)
-"aRS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/prisoner,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/flasher/directional/south{
- id = "Cell 5"
+"aRC" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
+/obj/structure/table,
+/obj/machinery/processor{
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"aRZ" = (
/obj/structure/dresser,
/obj/item/radio/intercom/directional/east,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"aSh" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Work Area"
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"aSi" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -3914,27 +3946,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/aft)
-"aSW" = (
-/obj/structure/cable,
-/obj/machinery/button/flasher{
- id = "Cell 3";
- name = "Prisoner Flash";
- pixel_x = 25;
- pixel_y = 7
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/east{
- id = "permashut3";
- name = "Cell Lockdown Button";
- pixel_y = -6;
- req_access = list("brig")
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"aTz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4010,6 +4021,12 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"aUU" = (
+/obj/effect/spawner/random/vending/snackvend,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"aVo" = (
/obj/machinery/computer/security/hos{
dir = 1
@@ -4055,6 +4072,17 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/dark,
/area/station/service/chapel/storage)
+"aVV" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"aVW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4477,6 +4505,12 @@
/obj/machinery/duct,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"bbq" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"bbr" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -4687,12 +4721,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
-"bez" = (
-/obj/structure/curtain,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
"beG" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
@@ -4755,11 +4783,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/break_room)
-"bfs" = (
-/obj/structure/chair/stool/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"bfw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -4857,10 +4880,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/library/private)
-"bgE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/security/prison/mess)
"bgG" = (
/obj/machinery/door/airlock/security/glass{
name = "Security Checkpoint"
@@ -4927,6 +4946,13 @@
/obj/machinery/meter,
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
+"bha" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"bhg" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -4955,15 +4981,6 @@
"bhw" = (
/turf/closed/wall,
/area/station/maintenance/department/medical/morgue)
-"bhz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"bhJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/north,
@@ -5017,19 +5034,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"bii" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 8
- },
-/obj/machinery/status_display/evac/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Hall";
- network = list("ss13","prison")
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"bij" = (
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/plating,
@@ -5066,6 +5070,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/cryo)
+"biw" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
+"biz" = (
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"biH" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -5187,6 +5200,15 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"bjQ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 10
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"bjR" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5273,6 +5295,13 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"bkX" = (
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"bla" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -5341,12 +5370,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"blB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"blC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5356,6 +5379,13 @@
},
/turf/open/floor/iron,
/area/station/maintenance/fore)
+"blI" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"blJ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
@@ -5482,6 +5512,17 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron,
/area/station/command/gateway)
+"bnb" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/prison)
+"bne" = (
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"bnt" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -5528,15 +5569,6 @@
name = "Holodeck Projector Floor"
},
/area/station/holodeck/rec_center)
-"bnU" = (
-/obj/structure/chair/stool/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"boe" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -5611,6 +5643,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"bpn" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"bpr" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 4
@@ -5710,6 +5750,16 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white/smooth_large,
/area/station/science/robotics/lab)
+"bqb" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/chair/wood,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"bqf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6081,6 +6131,13 @@
dir = 1
},
/area/station/hallway/primary/central/aft)
+"buS" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"bvb" = (
/obj/machinery/duct,
/turf/open/floor/iron/dark,
@@ -6247,6 +6304,19 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"bwV" = (
+/obj/effect/turf_decal/siding/dark,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
+"bwX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"bxc" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -6289,6 +6359,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"bxm" = (
+/obj/effect/turf_decal/trimline/green,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"bxp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/shard,
@@ -6296,6 +6371,15 @@
/mob/living/basic/cockroach,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"bxA" = (
+/obj/effect/turf_decal/trimline/hot_pink/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/hot_pink/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"bxT" = (
/obj/structure/table/reinforced,
/obj/item/stack/cable_coil,
@@ -6329,20 +6413,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/theater)
-"byr" = (
-/obj/structure/cable,
-/obj/machinery/light/directional/north,
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/atmospherics/components/unary/thermomachine/heater{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/disposal/incinerator)
"byy" = (
/obj/machinery/newscaster/directional/east,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -6465,6 +6535,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"bAn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"bAA" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -6760,12 +6835,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/exit/departure_lounge)
-"bDw" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/security/prison)
"bDy" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/camera/directional/north{
@@ -7041,11 +7110,6 @@
/obj/item/pen,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"bGi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"bGj" = (
/obj/structure/closet,
/obj/item/stack/sheet/glass{
@@ -7205,6 +7269,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"bHC" = (
+/obj/machinery/netpod,
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"bHP" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
@@ -7573,14 +7644,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"bLP" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Kitchen Entrance";
- network = list("ss13","prison")
- },
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison)
"bLR" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -7652,6 +7715,9 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"bMU" = (
+/turf/closed/wall,
+/area/station/security/prison/garden)
"bMV" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
@@ -8005,6 +8071,15 @@
},
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"bRB" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/food_or_drink/soup,
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 8
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"bRC" = (
/obj/machinery/cell_charger,
/obj/structure/table/reinforced,
@@ -8120,14 +8195,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"bSl" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Security - Prison"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"bSn" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -8191,6 +8258,11 @@
/obj/machinery/meter,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"bSB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"bSN" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -8347,27 +8419,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment,
/turf/open/floor/iron,
/area/station/engineering/storage)
-"bUc" = (
-/obj/machinery/button/flasher{
- id = "Cell 5";
- name = "Prisoner Flash";
- pixel_x = 25;
- pixel_y = 7
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/east{
- id = "permashut5";
- name = "Cell Lockdown Button";
- pixel_y = -6;
- req_one_access = list("brig", "permabrig")
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"bUd" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -8549,6 +8600,16 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"bWi" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/carpet/royalblack,
+/area/station/security/prison/safe)
"bWn" = (
/obj/structure/sign/poster/party_game{
pixel_x = -32
@@ -8571,17 +8632,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"bWw" = (
-/obj/machinery/button/flasher{
- id = "Cell 6";
- name = "Prisoner Flash";
- pixel_x = -25
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"bWH" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/item/stack/sheet/glass{
@@ -8621,6 +8671,14 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"bXc" = (
+/obj/structure/chair/sofa/bench{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"bXl" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/rack,
@@ -8912,11 +8970,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"caH" = (
-/obj/effect/decal/remains/human,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"caW" = (
/obj/structure/sign/poster/random/directional/west,
/obj/effect/turf_decal/siding/wood{
@@ -9154,6 +9207,13 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"ceB" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/random/directional/north,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"ceC" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/candle_box,
@@ -9305,6 +9365,11 @@
},
/turf/open/floor/iron,
/area/station/security/lockers)
+"che" = (
+/obj/machinery/newscaster/directional/west,
+/obj/machinery/light/directional/west,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"chi" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -9338,6 +9403,10 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
+"chu" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"chv" = (
/obj/structure/cable,
/obj/machinery/power/smes{
@@ -9378,6 +9447,14 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter)
+"cic" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"cij" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -9459,6 +9536,10 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"ciQ" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"cjj" = (
/obj/structure/cable,
/obj/machinery/door/firedoor,
@@ -9636,14 +9717,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
-"ckH" = (
-/obj/machinery/growing/soil,
-/obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/warning/electric_shock/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"ckP" = (
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
@@ -9963,21 +10036,6 @@
},
/turf/open/floor/iron,
/area/station/tcommsat/server)
-"cnz" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/holopad,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"cnE" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -10042,6 +10100,11 @@
/obj/item/shard,
/turf/open/floor/iron,
/area/station/medical/abandoned)
+"coa" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"coj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10150,15 +10213,6 @@
},
/turf/open/floor/iron,
/area/station/security/range)
-"cpE" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/cup/bottle/morphine,
-/obj/item/reagent_containers/syringe,
-/obj/machinery/status_display/evac/directional/east,
-/obj/machinery/vending/wallmed/directional/north,
-/obj/effect/turf_decal/siding/dark_red,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
"cpH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -10177,6 +10231,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"cpN" = (
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
+"cpR" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"cpT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10206,6 +10272,17 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
+"cqq" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"cqt" = (
/obj/structure/table/wood,
/obj/item/clipboard,
@@ -10373,6 +10450,11 @@
dir = 8
},
/area/station/hallway/primary/port)
+"csQ" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"csR" = (
/obj/machinery/shieldgen,
/obj/effect/decal/cleanable/dirt,
@@ -10432,14 +10514,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/engineering/main)
-"cul" = (
-/obj/machinery/plate_press,
-/obj/structure/sign/warning/electric_shock/directional/east,
-/obj/effect/turf_decal/tile/yellow,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"cun" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/stripes/line{
@@ -10472,11 +10546,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
-"cuB" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"cuM" = (
/obj/machinery/camera/directional/west{
c_tag = "Chapel - Fore Port";
@@ -10604,6 +10673,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"cwW" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/effect/turf_decal/siding/purple/corner,
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/freezerchamber)
"cwY" = (
/turf/closed/wall,
/area/station/engineering/atmos/storage)
@@ -10704,11 +10783,6 @@
},
/turf/open/floor/iron,
/area/station/medical/treatment_center)
-"cyc" = (
-/obj/machinery/netpod,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"cyq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10757,6 +10831,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"cyL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"cyR" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 4
@@ -10897,6 +10977,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/auxlab/firing_range)
+"cAR" = (
+/obj/effect/mapping_helpers/airalarm/engine_access,
+/obj/structure/sign/delamination_counter/directional/west,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "Gas to Chamber"
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter)
"cAU" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{
dir = 4
@@ -11017,6 +11107,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage)
+"cCi" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/carpet/stellar,
+/area/station/security/prison/safe)
"cCn" = (
/obj/structure/table/reinforced,
/obj/item/stack/package_wrap,
@@ -11331,6 +11428,20 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
+"cFi" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Cryogenics"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/safe)
"cFq" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8
@@ -11367,6 +11478,11 @@
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"cFB" = (
+/obj/structure/table/wood,
+/obj/structure/displaycase/forsale/kitchen,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"cFF" = (
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
@@ -11567,6 +11683,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"cHZ" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"cIa" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -11639,6 +11762,11 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
+"cJh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"cJw" = (
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -11669,15 +11797,6 @@
/obj/effect/spawner/random/food_or_drink/snack,
/turf/open/floor/wood,
/area/station/engineering/break_room)
-"cKa" = (
-/obj/structure/toilet/greyscale,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"cKp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood{
@@ -11691,15 +11810,6 @@
/obj/item/storage/book/bible,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
-"cKx" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"cKE" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -11740,6 +11850,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/mix)
+"cKW" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/griddle,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"cKZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11773,6 +11892,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"cLH" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soup_pot{
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"cLM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11824,17 +11954,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
-"cMf" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"cMn" = (
/obj/machinery/duct,
/obj/effect/turf_decal/trimline/purple/filled/corner,
@@ -11937,6 +12056,13 @@
/obj/item/storage/secure/safe/directional/east,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain/private)
+"cND" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/hot_pink/corner,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"cNH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12307,6 +12433,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"cSC" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 9
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"cSD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12402,11 +12536,28 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"cTG" = (
+/obj/structure/closet/crate,
+/obj/item/clothing/head/collectable/pirate,
+/obj/item/clothing/head/collectable/pirate,
+/obj/item/clothing/suit/costume/pirate,
+/obj/item/clothing/suit/costume/pirate,
+/obj/structure/cable,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"cTO" = (
/obj/machinery/duct,
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"cTR" = (
+/obj/structure/statue/bronze/marx{
+ pixel_y = 8;
+ pixel_x = 2
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"cTW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
@@ -12581,14 +12732,19 @@
},
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"cVV" = (
-/obj/machinery/door/window/right/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
+"cWe" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/execution/transfer)
+"cWf" = (
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"cWA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12936,21 +13092,28 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"dax" = (
-/obj/structure/window/spawner/directional/south,
-/obj/structure/sink/directional/south,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/cup/watering_can,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
+"day" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/obj/structure/sign/poster/random/directional/east,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"daB" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/grimy,
/area/station/service/chapel)
+"daD" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_corner,
+/area/station/security/prison/workout)
"daF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12998,6 +13161,10 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"dbM" = (
+/obj/effect/spawner/structure/window/hollow/directional,
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"dbO" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair/sofa/bench/right{
@@ -13128,12 +13295,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
-"ddw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/security/prison)
"ddC" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
@@ -13189,6 +13350,10 @@
/obj/structure/chair/stool/bar/directional/east,
/turf/open/floor/carpet/green,
/area/station/commons/lounge)
+"dek" = (
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"den" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown/half/contrasted{
@@ -13306,6 +13471,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"dfu" = (
+/obj/structure/window/spawner/directional/west,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"dfv" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -13487,13 +13656,13 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/department/science)
-"diC" = (
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/security/prison)
"diL" = (
/turf/closed/wall/r_wall,
/area/station/command/bridge)
+"diO" = (
+/obj/item/radio/intercom/prison/directional/east,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"djd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13592,6 +13761,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"djS" = (
+/obj/structure/cable,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"djT" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral/full,
@@ -13626,6 +13799,9 @@
"dki" = (
/turf/closed/wall,
/area/station/medical/psychology)
+"dko" = (
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"dkp" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/bottle/multiver{
@@ -14079,6 +14255,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"drq" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/trimline/hot_pink/filled,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"drr" = (
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
@@ -14149,6 +14330,15 @@
},
/turf/open/floor/iron,
/area/station/science/lobby)
+"dsk" = (
+/obj/structure/table,
+/obj/item/shovel/spade,
+/obj/item/plant_analyzer,
+/obj/item/cultivator,
+/obj/item/reagent_containers/cup/watering_can,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"dso" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/obj/machinery/rnd/server,
@@ -14506,6 +14696,10 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"dwh" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"dwr" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
@@ -14531,34 +14725,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron,
/area/station/engineering/main)
-"dwC" = (
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/cup/bowl,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"dwI" = (
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/random/maintenance/two,
@@ -14718,6 +14884,10 @@
"dyx" = (
/turf/open/floor/iron/white,
/area/station/science/research)
+"dyW" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"dzl" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -14783,6 +14953,10 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/commons/toilet/restrooms)
+"dAP" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"dAX" = (
/obj/machinery/light/small/directional/west,
/obj/structure/sign/poster/official/work_for_a_future{
@@ -15146,6 +15320,14 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
+"dFd" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"dFg" = (
/turf/open/floor/iron/chapel{
dir = 9
@@ -15165,6 +15347,13 @@
/obj/item/airlock_painter/decal,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"dFn" = (
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"dFw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -15196,6 +15385,18 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark/textured_large,
/area/station/security/execution/transfer)
+"dFH" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"dFI" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
@@ -15998,6 +16199,10 @@
/obj/structure/sign/warning/secure_area/directional/east,
/turf/open/space/basic,
/area/space/nearstation)
+"dPP" = (
+/obj/structure/cable,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"dPR" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/port/aft)
@@ -16207,6 +16412,15 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/storage)
+"dTo" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"dTu" = (
/obj/machinery/light/directional/west,
/obj/structure/extinguisher_cabinet/directional/west,
@@ -16325,6 +16539,10 @@
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
+"dUI" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison)
"dVa" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -16440,6 +16658,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
+"dWr" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = 9
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"dWt" = (
/obj/structure/cable,
/turf/open/floor/carpet/blue,
@@ -16629,6 +16855,10 @@
},
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"dZq" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"dZr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -16974,12 +17204,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
-"edb" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"edd" = (
/turf/closed/wall,
/area/station/service/chapel/storage)
@@ -17121,6 +17345,33 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/command/gateway)
+"eeN" = (
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/effect/spawner/random/trash/soap{
+ spawn_scatter_radius = 1
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"eeZ" = (
/obj/item/exodrone,
/obj/machinery/exodrone_launcher,
@@ -17162,6 +17413,11 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"efn" = (
+/obj/machinery/biogenerator,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"efC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -17227,6 +17483,10 @@
/obj/structure/chair/stool/bar/directional/south,
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"egv" = (
+/obj/structure/cable,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"egE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -17305,6 +17565,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"ehH" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Mess Hall"
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/mess)
"ehJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random/directional/south,
@@ -17343,6 +17617,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/bar)
+"eip" = (
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"eir" = (
/obj/structure/cable,
/obj/machinery/light/directional/west,
@@ -17378,12 +17659,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
/area/station/medical/storage)
-"eiC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"eiK" = (
/obj/structure/sign/warning/secure_area/directional/east,
/turf/closed/wall/r_wall,
@@ -17522,13 +17797,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/maintenance/port)
-"ekR" = (
-/obj/machinery/growing/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/shovel/spade,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"ekZ" = (
/obj/effect/turf_decal/box/white{
color = "#52B4E9"
@@ -17585,6 +17853,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
+"elG" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"elH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/broken_floor,
@@ -17706,6 +17978,14 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"eng" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"enq" = (
/obj/item/folder/yellow,
/obj/item/multitool,
@@ -17761,6 +18041,16 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"eoa" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison/mess)
+"eob" = (
+/obj/structure/chair/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"eos" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
@@ -17808,6 +18098,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
+"eoI" = (
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"eoO" = (
/obj/structure/disposalpipe/segment,
/obj/structure/urinal/directional/west,
@@ -17861,6 +18158,13 @@
/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
+"epq" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 9
+ },
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark/textured_corner,
+/area/station/security/prison/workout)
"epy" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -17937,14 +18241,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
-"eqa" = (
-/obj/machinery/vending/sustenance,
-/obj/machinery/camera/directional/south{
- c_tag = "Permabrig - Kitchen";
- network = list("ss13","prison")
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"eqg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -18461,6 +18757,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
+"evd" = (
+/obj/machinery/firealarm/directional/south,
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"evj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -18506,6 +18810,13 @@
},
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"evN" = (
+/mob/living/carbon/human/species/monkey/dukeman,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"ewb" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -18545,20 +18856,6 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"ewL" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/contraband/prison,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/stack/license_plates/empty/fifty,
-/obj/item/stack/license_plates/empty/fifty,
-/obj/item/stack/license_plates/empty/fifty,
-/obj/item/stack/license_plates/empty/fifty,
-/obj/item/stack/license_plates/empty/fifty,
-/obj/item/stack/license_plates/empty/fifty,
-/obj/machinery/light/directional/south,
-/obj/item/radio/intercom/prison/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"ewQ" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
dir = 4
@@ -18724,6 +19021,29 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
+"eyB" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Wing"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison)
+"eyF" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"eyH" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -18796,6 +19116,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"eAg" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/royalblack,
+/area/station/security/prison/safe)
"eAi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -19076,18 +19403,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
-"eEi" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 8
- },
-/area/station/security/execution/transfer)
"eEm" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -19233,6 +19548,20 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
+"eGu" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
+"eGv" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"eGy" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -19444,10 +19773,6 @@
/obj/effect/turf_decal/bot/left,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"eIs" = (
-/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"eIt" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -19667,6 +19992,20 @@
/obj/machinery/air_sensor/plasma_tank,
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
+"eLj" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Wing"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison)
"eLk" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -19866,19 +20205,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
-"eOn" = (
-/obj/structure/cable,
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"eOs" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
@@ -19963,6 +20289,15 @@
/obj/effect/spawner/random/trash/moisture_trap,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
+"eOT" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/item/plate/large,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"ePa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -20050,6 +20385,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"ePO" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"ePP" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -20093,6 +20434,12 @@
/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"eQg" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"eQi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -20291,13 +20638,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"eTv" = (
-/obj/structure/closet/crate/trashcart,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison)
"eTy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -20551,19 +20891,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
-"eWc" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
-"eWh" = (
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_y = 7
- },
-/turf/open/floor/plating,
-/area/station/security/prison/mess)
"eWi" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -20619,6 +20946,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/auxlab/firing_range)
+"eWG" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"eWL" = (
/obj/structure/closet/secure_closet/brig{
name = "Prisoner Locker"
@@ -20796,13 +21134,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"eYK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"eYN" = (
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
/turf/open/floor/iron,
@@ -20896,6 +21227,12 @@
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"fag" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"fak" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -20922,13 +21259,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/diagonal,
/area/station/science/breakroom)
-"faZ" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"fbg" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -21367,6 +21697,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"ffh" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/sign/poster/random/directional/east,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"ffi" = (
/obj/structure/cable,
/obj/machinery/power/solar_control{
@@ -21434,6 +21773,22 @@
/obj/machinery/barsign/all_access/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/electronic_marketing_den)
+"ffv" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
+"ffB" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/chair/sofa/bench{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"ffH" = (
/obj/structure/table,
/obj/item/disk/holodisk{
@@ -21523,6 +21878,11 @@
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
/turf/open/space/basic,
/area/space/nearstation)
+"fgI" = (
+/obj/effect/spawner/random/trash/soap,
+/obj/effect/spawner/random/trash/botanical_waste,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"fgK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -21612,6 +21972,20 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
+"fib" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Bitrunner Den"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
"fih" = (
/obj/structure/noticeboard/directional/east,
/obj/machinery/camera/directional/east{
@@ -21640,6 +22014,14 @@
/mob/living/basic/cockroach,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
+"fiy" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/structure/sign/poster/random/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"fiB" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -21712,6 +22094,11 @@
/obj/item/pen,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"fjE" = (
+/obj/effect/decal/cleanable/oil/streak,
+/obj/effect/spawner/random/structure/crate,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"fjQ" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -21849,6 +22236,11 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
+"fly" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"flB" = (
/obj/machinery/status_display/evac/directional/north,
/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
@@ -21983,6 +22375,13 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"fne" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"fno" = (
/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -21995,6 +22394,11 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"fnt" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/spawner/random/structure/crate,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"fnx" = (
/obj/effect/landmark/secequipment,
/obj/effect/turf_decal/bot,
@@ -22059,6 +22463,19 @@
/obj/machinery/light/directional/north,
/turf/open/floor/wood/large,
/area/station/service/library)
+"foz" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"foI" = (
/obj/docking_port/stationary{
dwidth = 2;
@@ -22764,14 +23181,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"fwL" = (
-/obj/effect/decal/cleanable/blood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison/toilet)
"fwU" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -22906,27 +23315,6 @@
/obj/effect/spawner/random/trash/cigbutt,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
-"fyB" = (
-/obj/structure/cable,
-/obj/machinery/button/flasher{
- id = "Cell 4";
- name = "Prisoner Flash";
- pixel_x = 25;
- pixel_y = 7
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/east{
- id = "permashut4";
- name = "Cell Lockdown Button";
- pixel_y = -6;
- req_one_access = list("brig", "permabrig")
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"fyH" = (
/obj/machinery/keycard_auth/directional/south{
pixel_x = 6
@@ -23065,16 +23453,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/engineering/storage)
-"fAj" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/herringbone,
-/area/station/cargo/miningoffice)
"fAn" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -23281,28 +23659,6 @@
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/circuit,
/area/station/science/research/abandoned)
-"fDm" = (
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt2";
- name = "Cell 2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/poddoor/preopen{
- id = "permashut2"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"fDF" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/office)
@@ -23686,12 +24042,6 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
-"fIW" = (
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"fIX" = (
/obj/structure/table/reinforced,
/obj/structure/extinguisher_cabinet/directional/north,
@@ -23728,12 +24078,6 @@
/obj/machinery/nanite_chamber,
/turf/open/floor/iron/dark,
/area/station/science/circuits)
-"fJG" = (
-/obj/structure/window/spawner/directional/south,
-/obj/machinery/biogenerator,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"fJZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23952,6 +24296,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"fMI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"fMK" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 8
@@ -24050,6 +24398,22 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"fOc" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/obj/item/food/grown/tomato{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"fOp" = (
/obj/machinery/corral_corner{
mapping_id = "3"
@@ -24353,14 +24717,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/interrogation)
-"fSd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/growing/tray,
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"fSg" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
@@ -24445,6 +24801,11 @@
"fSW" = (
/turf/closed/indestructible/opshuttle,
/area/station/science/ordnance/bomb)
+"fTa" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison/rec)
"fTw" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -24512,9 +24873,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"fTS" = (
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"fUf" = (
/obj/structure/table/wood/poker,
/obj/effect/spawner/random/maintenance,
@@ -24628,17 +24986,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"fVW" = (
-/obj/machinery/growing/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/plant_analyzer,
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Garden";
- network = list("ss13","prison")
- },
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"fWc" = (
/obj/structure/chair/pew/left,
/turf/open/floor/iron/chapel{
@@ -24765,6 +25112,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"fXq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/old{
+ name = "Cell 3"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/safe)
"fXs" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -24883,11 +25243,17 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"fYO" = (
+"fYL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/storage/dice,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
+"fYN" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"fYR" = (
/turf/closed/wall,
/area/station/service/abandoned_gambling_den)
@@ -25004,6 +25370,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"gab" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"gao" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -25394,6 +25767,16 @@
},
/turf/open/floor/iron,
/area/station/medical/pathology)
+"geV" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/structure/sign/poster/random/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"geX" = (
/obj/machinery/status_display/evac/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -25556,6 +25939,12 @@
/obj/structure/table/reinforced/rglass,
/turf/open/floor/iron,
/area/station/medical/pathology)
+"ggI" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"ggS" = (
/obj/effect/turf_decal/siding/white,
/turf/open/floor/iron,
@@ -25742,15 +26131,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/paramedic)
-"gjX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/growing/tray,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"gkp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25859,6 +26239,13 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"glR" = (
+/obj/structure/chair/sofa/bench{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"glW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -25891,13 +26278,6 @@
/obj/item/pai_card,
/turf/open/floor/carpet/red,
/area/station/hallway/secondary/service)
-"gml" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"gmo" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -26423,6 +26803,21 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"gro" = (
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "perma-entrance"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Wing"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/execution/transfer)
"grp" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red,
@@ -26697,16 +27092,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"gur" = (
-/obj/machinery/door/window/left/directional/north,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"guz" = (
/obj/machinery/light/directional/north,
/obj/item/kirbyplants/random,
@@ -26920,6 +27305,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"gwz" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"gwE" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -26935,6 +27327,13 @@
/obj/structure/sign/directions/ptl/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"gwL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"gwM" = (
/obj/effect/turf_decal/arrows/white,
/turf/open/floor/iron/dark,
@@ -27070,11 +27469,21 @@
/obj/effect/mapping_helpers/mail_sorting/service/law_office,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"gzj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/prisoner,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
+"gzd" = (
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/poddoor/massdriver_trash,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal)
+"gzq" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"gzu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer5,
@@ -27409,6 +27818,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"gDc" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"gDq" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/turf_decal/trimline/yellow/filled/corner{
@@ -27416,6 +27829,11 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"gDO" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"gDP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27501,13 +27919,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"gER" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/contraband/prison,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison)
"gEW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27534,6 +27945,14 @@
},
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"gFk" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/griddle,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"gFo" = (
/obj/structure/chair/wood{
dir = 8
@@ -27621,12 +28040,6 @@
/obj/item/storage/secure/briefcase,
/turf/open/floor/wood,
/area/station/command/meeting_room/council)
-"gGv" = (
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"gGw" = (
/obj/effect/landmark/start/hangover,
/obj/structure/chair/sofa/bench/right{
@@ -27647,6 +28060,15 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"gGK" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"gGT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/toilet{
@@ -28019,6 +28441,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"gLg" = (
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"gLv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral{
@@ -28063,6 +28490,17 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
+"gMr" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/pina_colada{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla{
+ pixel_x = -4;
+ pixel_y = 9
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"gMt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28133,6 +28571,13 @@
},
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"gMO" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/sink/kitchen/directional/south,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"gMR" = (
/obj/structure/chair{
dir = 4
@@ -28232,12 +28677,6 @@
/obj/effect/turf_decal/siding/dark_red,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
-"gOo" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"gOA" = (
/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
@@ -28351,22 +28790,12 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"gPG" = (
-/obj/structure/weightmachine/weightlifter,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/security/prison)
"gPO" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/lamp/green,
/obj/effect/spawner/random/entertainment/money_small,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"gQa" = (
-/obj/effect/decal/cleanable/dirt,
-/mob/living/basic/mouse/brown/tom,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"gQd" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/vending/colavend,
@@ -28409,6 +28838,13 @@
},
/turf/open/floor/iron,
/area/station/maintenance/central)
+"gQw" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"gQz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -28440,6 +28876,15 @@
/obj/item/reagent_containers/spray/cleaner,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
+"gQJ" = (
+/mob/living/simple_animal/pet/cat{
+ name = "Kattail"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"gQK" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -28451,9 +28896,6 @@
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/ce)
-"gQZ" = (
-/turf/closed/wall,
-/area/station/security/prison/work)
"gRb" = (
/obj/item/chair/plastic,
/obj/effect/decal/cleanable/dirt,
@@ -28500,6 +28942,20 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"gRq" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
+"gRy" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"gRE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28553,6 +29009,18 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"gSq" = (
+/obj/structure/table/wood,
+/obj/item/wrench{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/effect/spawner/random/bureaucracy/folder{
+ pixel_y = 5;
+ pixel_x = 3
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"gSs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -28621,16 +29089,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/medical/cryo)
-"gTH" = (
-/obj/machinery/flasher/directional/south{
- id = "Cell 6"
- },
-/obj/machinery/light/small/broken/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"gTZ" = (
/obj/machinery/duct,
/turf/open/floor/iron/dark,
@@ -28943,6 +29401,13 @@
/obj/structure/cable,
/turf/closed/wall/r_wall,
/area/station/maintenance/port)
+"gXz" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"gXM" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red{
@@ -29046,6 +29511,11 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
+"gZc" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"gZv" = (
/obj/docking_port/stationary{
dir = 4;
@@ -29111,6 +29581,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"hak" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"haq" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
@@ -29122,6 +29601,12 @@
},
/turf/open/floor/iron,
/area/station/cargo/quartermaster)
+"hau" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"haw" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -29419,6 +29904,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"heM" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"heN" = (
/obj/machinery/power/solar_control{
dir = 8;
@@ -29626,6 +30117,14 @@
},
/turf/open/floor/iron,
/area/station/science/lab)
+"hgQ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"hgS" = (
/obj/structure/table/reinforced,
/obj/item/folder/red,
@@ -29926,6 +30425,12 @@
/obj/effect/spawner/random/engineering/tank,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
+"hku" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"hkC" = (
/obj/structure/cable/layer3,
/turf/open/floor/circuit/green,
@@ -29948,6 +30453,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"hkL" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"hkQ" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
@@ -29985,13 +30499,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs/aft)
-"hlr" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"hlv" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -30091,12 +30598,10 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"hmr" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clipboard,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
+"hmm" = (
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"hms" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -30115,13 +30620,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_large,
/area/station/engineering/atmos/storage/gas)
-"hmO" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Permabrig - Workroom";
- network = list("ss13","prison")
- },
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"hmS" = (
/obj/structure/cable,
/obj/structure/table/reinforced,
@@ -30273,6 +30771,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/medical/cryo)
+"hoo" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"hoz" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/decal/cleanable/dirt,
@@ -30331,6 +30833,30 @@
dir = 1
},
/area/station/security/medical)
+"hpk" = (
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/clothing/under/rank/prisoner/skirt{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"hps" = (
/obj/structure/table/reinforced,
/obj/item/clothing/shoes/magboots{
@@ -30380,14 +30906,6 @@
},
/turf/open/floor/iron,
/area/station/command/teleporter)
-"hpN" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"hqj" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/light_switch/directional/north{
@@ -30434,6 +30952,10 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"hrh" = (
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"hrq" = (
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment{
@@ -30533,6 +31055,18 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
+"hsh" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/obj/item/radio/intercom/prison/directional/east,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"hsm" = (
/obj/machinery/newscaster/directional/south,
/obj/machinery/computer/mecha{
@@ -30578,6 +31112,9 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"hsN" = (
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"hsQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -30779,6 +31316,16 @@
},
/turf/open/floor/iron,
/area/station/maintenance/fore)
+"hvr" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"hvu" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31056,10 +31603,6 @@
},
/turf/open/floor/glass/reinforced,
/area/station/maintenance/department/science/xenobiology)
-"hzs" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/closed/wall,
-/area/station/bitrunning/den)
"hzA" = (
/obj/item/kirbyplants/random,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -31102,6 +31645,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"hAf" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"hAo" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -31140,6 +31689,37 @@
/obj/structure/railing,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"hAI" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/drinkingglasses,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"hAN" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -31276,6 +31856,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"hCI" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"hCM" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -31795,6 +32383,15 @@
/obj/effect/landmark/start/bartender,
/turf/open/floor/iron/grimy,
/area/station/service/bar/backroom)
+"hKh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"hKC" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -31835,15 +32432,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/office)
-"hLe" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "brigprison";
- name = "Prison Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/security/prison)
"hLf" = (
/obj/structure/chair/stool/directional/north,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -31901,13 +32489,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal)
-"hMx" = (
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/radio/intercom/prison/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison)
"hMI" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -32047,6 +32628,14 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/vacant_room/commissary)
+"hOy" = (
+/obj/structure/chair/sofa/bench{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/item/radio/intercom/prison/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"hOz" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -32063,6 +32652,10 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/engine,
/area/station/science/research)
+"hOR" = (
+/obj/structure/chair/stool/bar/directional/west,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"hOY" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32162,6 +32755,28 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/department/security)
+"hPB" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/botanical_lexicon,
+/obj/item/seeds/tree,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/seeds/pumpkin,
+/obj/item/seeds/wheat,
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/grass,
+/obj/item/seeds/carrot,
+/obj/item/seeds/tomato,
+/obj/item/seeds/potato,
+/obj/item/seeds/garlic,
+/obj/item/seeds/onion,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"hPJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 8
@@ -32169,16 +32784,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"hPN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"hPO" = (
/obj/machinery/light/small/directional/south,
/obj/structure/sign/warning/vacuum/directional/west,
@@ -32480,6 +33085,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"hUk" = (
+/obj/machinery/netpod,
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"hUm" = (
/obj/structure/lattice/catwalk,
/obj/machinery/vending/coffee,
@@ -32878,6 +33491,9 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/iron,
/area/station/engineering/atmos/mix)
+"hYF" = (
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"hYK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -32991,19 +33607,6 @@
},
/turf/open/floor/iron,
/area/station/medical/pathology)
-"hZL" = (
-/obj/structure/closet/crate,
-/obj/item/toy/dodgeball,
-/obj/item/toy/dodgeball,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/instrument/harmonica,
-/obj/item/storage/dice,
-/obj/item/toy/cards/deck/tarot,
-/obj/machinery/light/directional/south,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison)
"hZT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner{
@@ -33029,6 +33632,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
+"iaq" = (
+/obj/machinery/camera/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"iaC" = (
/obj/effect/turf_decal/siding/wood,
/obj/effect/landmark/generic_maintenance_landmark,
@@ -33129,12 +33740,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"ibb" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"ibh" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -33150,6 +33755,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/commons/locker)
+"ibl" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/pina_colada{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/champagne{
+ pixel_y = 4;
+ pixel_x = 8
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"ibn" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -33208,6 +33825,17 @@
},
/turf/open/floor/wood,
/area/station/commons/dorms)
+"ibT" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/freezer/meat{
+ req_access = null
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"icb" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -33486,6 +34114,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"idE" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"idF" = (
/obj/structure/sign/warning/secure_area/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -33691,6 +34324,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"ifW" = (
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"iga" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
@@ -33782,6 +34420,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office/private_investigators_office)
+"ihy" = (
+/obj/structure/fermenting_barrel,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"ihF" = (
/obj/structure/flora/bush/fullgrass/style_random,
/obj/structure/flora/bush/flowers_yw/style_random,
@@ -33789,6 +34432,13 @@
/obj/structure/flora/rock/pile/style_random,
/turf/open/misc/grass,
/area/station/hallway/primary/fore)
+"ihH" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"ihN" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -33823,6 +34473,12 @@
},
/turf/open/floor/plating,
/area/station/medical/pathology)
+"iie" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"iio" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/loading_area{
@@ -33831,9 +34487,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"iiy" = (
-/obj/structure/easel,
-/turf/open/floor/iron,
+"iiB" = (
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/item/radio/intercom/prison/directional/east,
+/turf/open/floor/iron/dark/herringbone,
/area/station/security/prison)
"iiK" = (
/obj/structure/disposalpipe/segment,
@@ -33858,15 +34520,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"iiR" = (
-/obj/structure/table/glass,
-/obj/item/folder/blue,
-/obj/item/healthanalyzer,
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/light/cold/directional/north,
-/obj/effect/turf_decal/siding/dark_red,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
"ijm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -34102,6 +34755,13 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"ilS" = (
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"ilU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
@@ -34345,13 +35005,6 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"ioT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"ipk" = (
/obj/effect/turf_decal/box/corners{
dir = 4
@@ -34406,6 +35059,13 @@
"ipQ" = (
/turf/closed/wall,
/area/station/command/bridge)
+"ipS" = (
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"iqa" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/machinery/airalarm/directional/east,
@@ -34552,6 +35212,9 @@
},
/turf/open/floor/iron,
/area/station/medical/treatment_center)
+"irH" = (
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"irJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34647,19 +35310,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
-"itp" = (
-/obj/effect/turf_decal/tile/brown/half{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/computer/order_console/bitrunning,
-/obj/effect/turf_decal/stripes/end,
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/cargo/miningoffice)
"itF" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 6
@@ -34715,13 +35365,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
-"itW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"itY" = (
/obj/structure/chair/office/light,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -34759,12 +35402,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"iuk" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"iut" = (
/obj/machinery/door/poddoor/preopen{
id = "justicechamber";
@@ -34874,15 +35511,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/security/brig)
-"ivM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "brigprison";
- name = "Prison Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/security/prison/work)
"ivR" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
dir = 4
@@ -34996,14 +35624,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/fore)
-"ixG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"ixN" = (
/obj/structure/toilet{
dir = 4
@@ -35040,6 +35660,17 @@
/obj/structure/transit_tube/station/dispenser/reverse/flipped,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"iyj" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"iyk" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -35089,6 +35720,17 @@
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
+"iyT" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"iyX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/generic_maintenance_landmark,
@@ -35171,17 +35813,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/wood,
/area/station/service/electronic_marketing_den)
-"izM" = (
-/obj/structure/closet/crate/trashcart/laundry,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"izW" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -35268,6 +35899,13 @@
/obj/item/hand_labeler,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"iAC" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"iAM" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
@@ -35449,13 +36087,6 @@
"iDq" = (
/turf/closed/wall/r_wall,
/area/station/security/range)
-"iDC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
"iDG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35730,6 +36361,13 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"iGy" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"iGI" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -35837,6 +36475,15 @@
/obj/structure/sign/warning/electric_shock/directional/north,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"iIp" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/chair/sofa/corp/left{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"iIz" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/electric_shock/directional/west,
@@ -35987,16 +36634,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"iKL" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"iKM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36058,6 +36695,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
+"iMc" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/carpet/donk,
+/area/station/security/prison/safe)
"iMf" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/turf/open/floor/iron,
@@ -36072,6 +36716,12 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"iMu" = (
+/obj/machinery/plate_press,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"iME" = (
/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - Mix Cell";
@@ -36261,9 +36911,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"iOc" = (
-/turf/closed/wall,
-/area/station/security/prison/toilet)
"iOe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36308,6 +36955,12 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/grimy,
/area/station/command/bridge)
+"iOU" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"iOX" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/random/trash/mess,
@@ -36338,6 +36991,24 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"iPj" = (
+/obj/structure/closet/secure_closet/freezer/kitchen{
+ req_access = null
+ },
+/obj/item/food/breadslice/plain,
+/obj/item/food/breadslice/plain,
+/obj/item/food/breadslice/plain,
+/obj/item/food/grown/potato,
+/obj/item/food/grown/potato,
+/obj/item/food/grown/onion,
+/obj/item/food/grown/onion,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"iPJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -36346,13 +37017,17 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/fore)
-"iPK" = (
-/obj/structure/toilet/greyscale,
-/obj/effect/turf_decal/tile/red/half/contrasted{
+"iPT" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench/left{
dir = 8
},
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"iQf" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/wood/corner,
@@ -36513,6 +37188,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"iSG" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"iSI" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -36602,6 +37289,13 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/coldroom)
+"iUc" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/donk,
+/area/station/security/prison/safe)
"iUg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36714,6 +37408,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"iVR" = (
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"iVT" = (
/obj/machinery/photocopier,
/obj/structure/sign/poster/official/work_for_a_future{
@@ -36949,6 +37646,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"iYO" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"iYP" = (
/obj/effect/landmark/start/hangover,
/obj/effect/decal/cleanable/dirt,
@@ -36994,6 +37699,9 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
+"iZr" = (
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"iZt" = (
/obj/structure/table/reinforced,
/obj/machinery/airalarm/directional/west,
@@ -37014,15 +37722,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"iZG" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"iZN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -37182,16 +37881,6 @@
/obj/item/pen,
/turf/open/floor/iron,
/area/station/medical/chemistry)
-"jbn" = (
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen{
- dir = 8;
- name = "Prisoner Telescreen";
- network = list("prison");
- pixel_x = 27
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"jbr" = (
/obj/structure/curtain/cloth/fancy/mechanical/start_closed{
desc = "A set of curtains serving as a fancy theater backdrop. They can only be opened by a button.";
@@ -37326,6 +38015,11 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"jcq" = (
+/obj/item/toy/basketball,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"jcv" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/red{
@@ -37423,12 +38117,6 @@
"jdL" = (
/turf/closed/wall,
/area/station/maintenance/fore)
-"jdT" = (
-/obj/structure/chair/stool/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/security/prison)
"jeg" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
@@ -37517,6 +38205,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"jeH" = (
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"jeI" = (
/obj/structure/sign/nanotrasen{
pixel_x = -32;
@@ -38071,20 +38763,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/main)
-"jkS" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Permabrig Visitation"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/visit)
"jkZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38224,6 +38902,12 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/iron,
/area/station/maintenance/department/engine/atmos)
+"jmo" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"jmp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38440,12 +39124,41 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron,
/area/station/maintenance/fore)
+"joR" = (
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"joU" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/turf/open/floor/iron/checker,
/area/station/hallway/secondary/service)
+"jpl" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
+"jpt" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Work Area"
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"jpA" = (
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office/private_investigators_office)
@@ -38513,6 +39226,11 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"jqo" = (
+/obj/effect/spawner/random/vending/colavend,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"jqr" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -38812,6 +39530,10 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"jup" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/closed/wall,
+/area/station/maintenance/starboard/fore)
"juC" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -38873,6 +39595,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"jvj" = (
+/obj/effect/spawner/random/structure/crate,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"jvm" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -39077,15 +39803,26 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/space,
/area/space/nearstation)
+"jyj" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"jym" = (
/turf/closed/wall/r_wall,
/area/station/smithing)
-"jyp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison)
+"jyo" = (
+/obj/machinery/growing/soil,
+/obj/machinery/camera/directional/west,
+/obj/item/radio/intercom/prison/directional/west,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"jys" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -39169,6 +39906,14 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/evidence)
+"jyW" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"jzb" = (
/obj/machinery/door/poddoor/shutters{
dir = 4;
@@ -39183,6 +39928,15 @@
},
/turf/open/floor/iron/textured,
/area/station/commons/vacant_room)
+"jzo" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -7
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"jzp" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
@@ -39542,6 +40296,10 @@
/obj/structure/sign/warning/electric_shock/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"jCx" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"jCI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39837,6 +40595,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
+"jGi" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"jGl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
@@ -39959,19 +40725,14 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"jHw" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+"jHu" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 6
},
-/obj/item/pen,
-/obj/item/pen,
-/obj/item/pen,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"jHH" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -40029,6 +40790,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"jIi" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"jIs" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -40090,6 +40866,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"jJV" = (
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"jKb" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/white{
@@ -40219,25 +41002,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jLj" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Permabrig Cell 1"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"jLm" = (
/obj/machinery/door/airlock/security/glass{
name = "Security E.V.A. Storage"
@@ -40310,6 +41074,10 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"jLX" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"jMk" = (
/obj/machinery/door/window/right/directional/east{
base_state = "left";
@@ -40352,10 +41120,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
-"jMs" = (
-/obj/structure/bookcase/random,
-/turf/open/floor/iron,
-/area/station/security/prison)
"jMz" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -40432,6 +41196,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"jNI" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"jNM" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -40452,6 +41221,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"jNZ" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Mess Hall"
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/mess)
"jOo" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/stripes/line{
@@ -40462,11 +41242,6 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"jOw" = (
-/obj/structure/chair/stool/directional/south,
-/obj/item/radio/intercom/prison/directional/west,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"jOD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40928,6 +41703,14 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
+"jSZ" = (
+/obj/machinery/cryopod/prison,
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"jTa" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/white,
@@ -40993,6 +41776,26 @@
/obj/item/clothing/head/beret,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"jTL" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 8
+ },
+/area/station/security/prison/workout)
+"jTP" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/firealarm/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"jTY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41528,6 +42331,21 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/commons/locker)
+"kaJ" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/food/flatdough{
+ pixel_x = 1;
+ pixel_y = 1
+ },
+/obj/item/food/flatdough{
+ pixel_y = 5;
+ pixel_x = 3
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"kaL" = (
/obj/effect/decal/cleanable/glass,
/obj/effect/decal/cleanable/dirt,
@@ -41753,6 +42571,17 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
+"kcU" = (
+/obj/structure/sink/directional/south{
+ dir = 8;
+ pixel_x = 14;
+ pixel_y = 0
+ },
+/obj/structure/mirror/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"kdd" = (
/obj/structure/cable,
/obj/structure/table/reinforced,
@@ -41824,6 +42653,12 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/aft)
+"kdI" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"kdL" = (
/obj/machinery/cell_charger,
/obj/structure/table/reinforced,
@@ -41844,6 +42679,12 @@
/obj/effect/decal/cleanable/greenglow,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"kdQ" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"kdX" = (
/obj/machinery/piratepad/civilian,
/obj/effect/turf_decal/trimline/yellow,
@@ -41981,6 +42822,15 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/medical/pathology)
+"kfm" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench/left{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"kfC" = (
/obj/machinery/telecomms/processor/preset_two,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
@@ -42022,6 +42872,12 @@
/obj/effect/landmark/observer_start,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"kfK" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"kfL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42206,13 +43062,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
-"kho" = (
-/obj/effect/landmark/start/prisoner,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"khq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -42223,6 +43072,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"khz" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"khE" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -42265,14 +43123,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/library)
-"kia" = (
-/obj/structure/table,
-/obj/structure/window/spawner/directional/west,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/item/clothing/head/utility/chefhat,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"kic" = (
/turf/closed/wall,
/area/station/maintenance/disposal)
@@ -42457,6 +43307,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"kkf" = (
+/obj/machinery/smartfridge,
+/turf/closed/wall,
+/area/station/security/prison/mess)
"kkh" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
@@ -42480,6 +43334,11 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
+"kkv" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"kkx" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 4
@@ -42516,6 +43375,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
+"kkY" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"klb" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 4
@@ -42680,6 +43545,22 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"knw" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Delivery Office"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"knE" = (
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/wood,
@@ -42698,6 +43579,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"knL" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/carpet/stellar,
+/area/station/security/prison/safe)
"knP" = (
/obj/structure/chair{
dir = 8
@@ -42725,6 +43616,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"koc" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"kod" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -42795,6 +43695,16 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"kpp" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"kpw" = (
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
@@ -42895,24 +43805,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
-"krt" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Permabrig Cell 2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"krx" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42968,20 +43860,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/port)
-"kse" = (
-/obj/machinery/airalarm/mixingchamber{
- dir = 8;
- pixel_x = -26
- },
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/burnchamber)
"ksf" = (
/obj/structure/sign/departments/court/directional/east,
/obj/effect/turf_decal/tile/neutral,
@@ -43044,6 +43922,12 @@
/obj/effect/turf_decal/trimline/yellow/filled/corner,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"ktt" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"ktv" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/command{
@@ -43279,6 +44163,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"kvS" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/pen{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/effect/spawner/random/bureaucracy/folder{
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"kvW" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask,
@@ -43302,6 +44201,16 @@
/obj/machinery/light/small/red/directional/east,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/science/xenobiology)
+"kwl" = (
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"kws" = (
/obj/structure/sign/poster/official/work_for_a_future{
pixel_y = -32
@@ -43340,18 +44249,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"kxj" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
-"kxm" = (
-/obj/machinery/light/directional/east,
-/mob/living/basic/mouse/white,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"kxs" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral{
@@ -43376,13 +44273,6 @@
/obj/machinery/status_display/ai/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
-"kxA" = (
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"kxG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -43512,24 +44402,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/large,
/area/station/ai_monitored/command/storage/eva)
-"kzi" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Permabrig Cell 3"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"kzm" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -43852,6 +44724,18 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"kCZ" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Hydroponics"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"kDd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
@@ -43899,18 +44783,6 @@
/obj/machinery/shower/directional/west,
/turf/open/floor/iron/textured,
/area/station/medical/cryo)
-"kDE" = (
-/obj/machinery/airalarm/engine{
- dir = 1;
- pixel_y = 23
- },
-/obj/structure/sign/delamination_counter/directional/west,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8;
- name = "Gas to Chamber"
- },
-/turf/open/floor/engine,
-/area/station/engineering/supermatter)
"kDL" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -43918,6 +44790,24 @@
/obj/effect/landmark/start/captain,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain)
+"kDQ" = (
+/obj/structure/toilet,
+/obj/machinery/shower/directional/south,
+/obj/effect/spawner/random/trash/soap{
+ spawn_scatter_radius = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
+"kDS" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/execution/transfer)
"kDY" = (
/obj/effect/turf_decal/siding/green{
dir = 9
@@ -44286,6 +45176,13 @@
/obj/effect/landmark/navigate_destination/delta/evamaint,
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
+"kIL" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/chair/sofa/bench/left{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"kIM" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/beaker/large{
@@ -44332,6 +45229,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"kJo" = (
+/obj/structure/sign/clock/directional/north,
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"kJr" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
@@ -44411,6 +45316,11 @@
},
/turf/open/floor/iron/dark,
/area/station/service/theater)
+"kKB" = (
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"kKK" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -44435,21 +45345,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"kKZ" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"kLa" = (
/obj/effect/spawner/random/engineering/tank,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/maintenance/port)
-"kLh" = (
-/obj/effect/landmark/start/prisoner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/flasher/directional/south{
- id = "Cell 3"
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"kLi" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
@@ -44515,6 +45423,9 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"kLP" = (
+/turf/closed/wall/r_wall,
+/area/station/security/prison/mess)
"kMg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -44555,6 +45466,12 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
+"kME" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"kMI" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -44751,6 +45668,13 @@
"kOA" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/hos)
+"kOQ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"kOR" = (
/obj/structure/closet/firecloset,
/obj/effect/decal/cleanable/dirt,
@@ -44763,11 +45687,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lobby)
-"kPs" = (
-/obj/machinery/light/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison)
"kPu" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/navbeacon{
@@ -44881,6 +45800,12 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/checker,
/area/station/hallway/secondary/service)
+"kQZ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"kRi" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -44902,15 +45827,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"kRw" = (
-/obj/machinery/washing_machine,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"kRz" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -44937,13 +45853,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"kRM" = (
-/obj/structure/table,
-/obj/item/kitchen/fork/plastic,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"kRN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -45051,6 +45960,14 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/large,
/area/station/medical/pathology)
+"kTc" = (
+/obj/structure/hoop{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"kTd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45066,6 +45983,11 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"kTr" = (
+/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"kTy" = (
/obj/structure/chair/office{
dir = 8
@@ -45719,6 +46641,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"lbG" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison/rec)
"lbR" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -45854,20 +46780,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/theater/abandoned)
-"lcY" = (
-/obj/structure/bed,
-/obj/item/bedsheet/orange,
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Cell 2";
- network = list("ss13","prison")
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"lde" = (
/obj/item/paper_bin{
pixel_x = -7
@@ -46033,21 +46945,6 @@
"leE" = (
/turf/closed/wall/r_wall,
/area/station/engineering/storage_shared)
-"leS" = (
-/obj/structure/bed,
-/obj/item/bedsheet/orange,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Cell 3";
- network = list("ss13","prison")
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"leU" = (
/obj/machinery/duct,
/obj/effect/decal/cleanable/dirt,
@@ -46234,6 +47131,15 @@
},
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"lhv" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/hot_pink/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"lhC" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -46281,14 +47187,6 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
-"liv" = (
-/obj/machinery/plate_press,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"liC" = (
/obj/structure/closet/secure_closet/exile,
/obj/effect/decal/cleanable/dirt,
@@ -46518,6 +47416,18 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"lkT" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/bot,
+/obj/item/radio/intercom/prison/directional/west,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"lle" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/sparsegrass/style_random,
@@ -46568,6 +47478,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"lmb" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
+"lmc" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"lml" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -46703,13 +47626,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"lnX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"lnY" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46725,12 +47641,6 @@
"loe" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/cmo)
-"log" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/white/side,
-/area/station/security/execution/transfer)
"loi" = (
/obj/structure/grille/broken,
/obj/effect/spawner/random/trash/caution_sign,
@@ -46870,6 +47780,14 @@
/obj/item/clothing/mask/gas/sechailer,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"lpU" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"lpY" = (
/obj/structure/table/reinforced,
/obj/machinery/light_switch/directional/east,
@@ -46906,6 +47824,12 @@
},
/turf/open/floor/iron/dark,
/area/station/service/library)
+"lqD" = (
+/obj/structure/fermenting_barrel,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"lqO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -47029,6 +47953,13 @@
dir = 4
},
/area/station/hallway/secondary/exit/departure_lounge)
+"lsC" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/effect/turf_decal/trimline/hot_pink/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"lsG" = (
/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
@@ -47376,6 +48307,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/medical/storage)
+"lws" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"lwE" = (
/obj/machinery/light/small/directional/north,
/obj/machinery/seed_extractor,
@@ -47586,6 +48523,11 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/engineering/main)
+"lzD" = (
+/turf/open/floor/iron/dark/side{
+ dir = 6
+ },
+/area/station/security/prison/workout)
"lzH" = (
/obj/structure/chair{
dir = 8
@@ -47694,6 +48636,12 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"lAO" = (
+/obj/structure/chair/sofa/corp{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"lAV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/duct,
@@ -48045,6 +48993,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"lEw" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/random/entertainment/musical_instrument,
+/obj/effect/spawner/random/entertainment/musical_instrument{
+ pixel_y = 7
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"lEH" = (
/obj/machinery/duct,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48155,6 +49111,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"lFV" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 1
+ },
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"lFX" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48193,9 +49155,6 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
/area/station/commons/lounge)
-"lGv" = (
-/turf/closed/wall/r_wall,
-/area/station/security/prison/work)
"lGE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48560,14 +49519,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"lKr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/flasher/directional/south{
- id = "Cell 2"
- },
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"lKw" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -48615,6 +49566,15 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
+"lKA" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"lKC" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
@@ -48639,6 +49599,14 @@
/obj/structure/cable/layer3,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"lKJ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/prison/workout)
"lKK" = (
/obj/structure/cable,
/obj/effect/landmark/event_spawn,
@@ -48741,26 +49709,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"lMN" = (
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt1";
- name = "Cell 1"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/poddoor/preopen{
- id = "permashut1"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"lMO" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -48876,6 +49824,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
+"lOr" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/pen{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/storage/dice{
+ pixel_y = 1;
+ pixel_x = -2
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"lOw" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{
dir = 4
@@ -49020,19 +49984,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
-"lQj" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/blindfold,
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/white/corner,
-/area/station/security/execution/transfer)
"lQk" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -49193,6 +50144,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"lRy" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"lRH" = (
/obj/structure/closet/crate/science{
anchored = 1
@@ -49436,6 +50396,25 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"lUJ" = (
+/obj/machinery/camera/autoname/directional/north,
+/obj/structure/table,
+/obj/item/book/manual/wiki/cooking_to_serve_man,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = -5
+ },
+/obj/item/storage/fancy/egg_box,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"lUK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -49627,15 +50606,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"lYv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"lYJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -49721,6 +50691,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured_large,
/area/station/science/xenobiology)
+"lZM" = (
+/obj/structure/toilet,
+/obj/machinery/shower/directional/south,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"lZX" = (
/obj/effect/turf_decal/tile/blue,
/obj/structure/cable,
@@ -49988,9 +50964,6 @@
/obj/structure/sign/poster/official/random/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/fore)
-"mdR" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"mef" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/meter,
@@ -50086,6 +51059,15 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"mfc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
+"mft" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"mfC" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -50298,6 +51280,13 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"mhB" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/stellar,
+/area/station/security/prison/safe)
"mhE" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -50389,6 +51378,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"mjh" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"mjo" = (
/obj/machinery/recharge_station,
/obj/effect/decal/cleanable/dirt,
@@ -50455,6 +51457,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"mkH" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/food_or_drink/soup,
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"mkM" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
@@ -50480,6 +51490,10 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
+"mlj" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/side,
+/area/station/security/prison/workout)
"mlt" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/siding/wood{
@@ -50512,15 +51526,6 @@
"mlE" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/command/storage/eva)
-"mlF" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 8
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/machinery/computer/quantum_console,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/dark/smooth_corner,
-/area/station/bitrunning/den)
"mlT" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -50841,6 +51846,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"mph" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"mpj" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/door/firedoor,
@@ -50900,26 +51911,11 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
-"mpO" = (
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt3";
- name = "Cell 3"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/poddoor/preopen{
- id = "permashut3"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
+"mpW" = (
+/obj/effect/turf_decal/trimline/green,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"mqb" = (
/obj/machinery/door/morgue{
name = "Confession Booth";
@@ -51253,6 +52249,11 @@
},
/turf/open/floor/iron/dark,
/area/station/security/evidence)
+"mug" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"muh" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/cable_coil,
@@ -51410,10 +52411,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"mvF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"mvG" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -51630,10 +52627,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"mze" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"mzi" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/reagent_dispensers/water_cooler,
@@ -51761,10 +52754,11 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/station/solars/starboard/aft)
-"mAA" = (
-/obj/structure/sink/kitchen/directional/west,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
+"mAw" = (
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"mAC" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -51971,13 +52965,6 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
-"mDm" = (
-/obj/machinery/quantum_server,
-/obj/effect/turf_decal/bot/left,
-/turf/open/floor/iron/dark/smooth_corner{
- dir = 4
- },
-/area/station/bitrunning/den)
"mDo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown{
@@ -52227,6 +53214,15 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
+"mGb" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"mGi" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52386,6 +53382,22 @@
},
/turf/open/floor/iron/dark,
/area/station/science/research)
+"mHv" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = -5
+ },
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"mHw" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall5";
@@ -52839,6 +53851,11 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
+"mLR" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/bitden)
"mLV" = (
/obj/machinery/computer/crew{
dir = 8
@@ -53005,6 +54022,14 @@
dir = 1
},
/area/station/engineering/atmos/pumproom)
+"mOu" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"mOv" = (
/obj/machinery/holopad,
/obj/structure/cable,
@@ -53078,18 +54103,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"mOT" = (
-/obj/effect/decal/cleanable/oil/streak,
-/obj/machinery/camera/directional/south,
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
- pixel_y = 7
- },
-/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
- pixel_x = 5
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"mPg" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
@@ -53134,6 +54147,18 @@
/obj/structure/filingcabinet/security,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
+"mPx" = (
+/obj/docking_port/stationary{
+ dheight = 1;
+ dir = 8;
+ dwidth = 12;
+ height = 17;
+ name = "northeast of station";
+ shuttle_id = "syndicate_ne";
+ width = 23
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"mPA" = (
/obj/structure/table/reinforced,
/obj/item/assembly/timer,
@@ -53200,17 +54225,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"mQz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/structure/sign/poster/official/work_for_a_future{
- pixel_y = -32
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"mQA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool/bar/directional/west,
@@ -53270,6 +54284,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/medical/pathology)
+"mRe" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"mRf" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53449,13 +54468,6 @@
dir = 8
},
/area/station/science/lobby)
-"mUJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison)
"mUL" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -53656,22 +54668,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"mXg" = (
-/obj/structure/table/glass,
-/obj/item/storage/medkit/regular,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/machinery/light_switch/directional/west{
- pixel_x = -24
- },
-/obj/machinery/firealarm/directional/west{
- pixel_x = -36
- },
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/security/execution/transfer)
"mXh" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
@@ -53777,6 +54773,20 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/large,
/area/station/science/research)
+"mYx" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Wing"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison)
"mYy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -53837,6 +54847,12 @@
/obj/effect/landmark/navigate_destination/delta/abandgameroom,
/turf/open/floor/iron,
/area/station/service/abandoned_gambling_den/gaming)
+"mZp" = (
+/obj/machinery/firealarm/directional/south,
+/obj/item/kirbyplants/random,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"mZr" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8;
@@ -53907,6 +54923,10 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
+"nad" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"nae" = (
/obj/structure/table/wood,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -53919,6 +54939,17 @@
},
/turf/open/floor/iron/grimy,
/area/station/command/bridge)
+"naj" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/hot_pink/corner{
+ dir = 4
+ },
+/obj/item/kirbyplants/random,
+/obj/item/radio/intercom/prison/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"nal" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/girder,
@@ -53978,14 +55009,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
-"nbw" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"nbx" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -53994,6 +55017,17 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"nbC" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"nbI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/obj/machinery/meter,
@@ -54118,6 +55152,12 @@
/obj/effect/turf_decal/bot_red,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"ndp" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"ndJ" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/item/kirbyplants/random,
@@ -54354,6 +55394,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"nhJ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"nhQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54461,6 +55510,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"nja" = (
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"njg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54785,11 +55841,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"nnW" = (
-/obj/machinery/shower/directional/west,
-/obj/item/soap/homemade,
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
+"nnC" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"nnZ" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line,
@@ -54849,6 +55912,10 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"noF" = (
+/obj/item/radio/intercom/prison/directional/east,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"noK" = (
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder{
@@ -55096,21 +56163,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
-"ntc" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Prisoner Workroom"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"ntd" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -55251,6 +56303,24 @@
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
+"nuN" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/atm,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
+"nuQ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/effect/turf_decal/trimline/hot_pink/line{
+ dir = 1
+ },
+/obj/structure/sign/poster/random/directional/south,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"nuS" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/bot,
@@ -55349,28 +56419,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"nwt" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Sanitarium"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/security/brig,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
-"nwN" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"nwW" = (
/obj/structure/sign/nanotrasen{
pixel_x = -32
@@ -55606,6 +56654,15 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"nyX" = (
+/obj/structure/chair/sofa/bench{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"nza" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56100,12 +57157,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/maintenance/port)
-"nEE" = (
-/obj/machinery/netpod,
-/obj/structure/sign/poster/random/directional/north,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"nEJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/yellow/line,
@@ -56147,6 +57198,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"nFk" = (
+/obj/item/storage/photo_album/prison,
+/obj/structure/table/wood,
+/obj/item/camera{
+ pixel_y = -5
+ },
+/obj/item/camera{
+ pixel_x = 6
+ },
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
+"nFm" = (
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"nFq" = (
/obj/machinery/computer/warrant{
dir = 1
@@ -56386,11 +57453,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"nIr" = (
-/obj/machinery/computer/security/telescreen/entertainment/directional/east,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison)
"nIz" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -56448,14 +57510,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/science/research/abandoned)
-"nJg" = (
-/obj/structure/table,
-/obj/structure/cable,
-/obj/item/toy/cards/deck,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"nJj" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -56549,6 +57603,15 @@
/obj/item/pillow/random,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"nKo" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"nKA" = (
/obj/effect/spawner/structure/window,
/obj/machinery/door/poddoor/preopen{
@@ -56573,6 +57636,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"nKX" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"nLt" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 4
@@ -56805,13 +57877,6 @@
/obj/machinery/photocopier,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
-"nOr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"nOv" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/disposalpipe/segment{
@@ -56882,6 +57947,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"nPf" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"nPo" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56907,6 +57978,13 @@
/obj/machinery/oven,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"nPD" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/donk,
+/area/station/security/prison/safe)
"nPF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -57028,6 +58106,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
+"nQW" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"nQY" = (
/obj/structure/chair/sofa/bench/left{
dir = 1
@@ -57449,15 +58533,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/medical/pathology)
-"nWw" = (
-/mob/living/basic/mouse/gray,
-/obj/machinery/computer/cryopod/directional/west{
- pixel_x = -23;
- dir = 4;
- max_integrity = 10000
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"nWI" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/red{
@@ -57519,6 +58594,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4,
/turf/open/floor/iron/dark/corner,
/area/station/maintenance/disposal/incinerator)
+"nXG" = (
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"nXH" = (
/turf/closed/wall,
/area/station/maintenance/starboard/aft)
@@ -57566,6 +58647,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"nYi" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/green,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"nYn" = (
/obj/structure/table/reinforced,
/obj/machinery/status_display/ai/directional/north,
@@ -57573,6 +58662,12 @@
/obj/item/assembly/flash/handheld,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"nYq" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"nYt" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -57716,6 +58811,9 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"nZV" = (
+/turf/closed/wall/r_wall,
+/area/station/security/prison/rec)
"nZW" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -57775,6 +58873,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"oaP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"oaU" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
@@ -58002,24 +59105,20 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"odQ" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"oec" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"oel" = (
-/obj/structure/bed,
-/obj/item/bedsheet/orange,
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Cell 4";
- network = list("ss13","prison")
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"oez" = (
/obj/machinery/recharge_station,
/obj/effect/landmark/start/hangover,
@@ -58373,6 +59472,15 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/storage)
+"oiQ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/chair/sofa/corp{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"oiW" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/duct,
@@ -58535,28 +59643,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"okK" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
-"okN" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/start/bitrunner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"okV" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/plumbed{
@@ -58742,20 +59828,6 @@
/obj/effect/landmark/navigate_destination/janitor,
/turf/open/floor/iron/checker,
/area/station/service/janitor)
-"omW" = (
-/obj/structure/bed,
-/obj/item/bedsheet/orange,
-/obj/structure/sign/poster/official/obey{
- pixel_x = 30
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Permabrig - Cell 5";
- network = list("ss13","prison")
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"omY" = (
/obj/machinery/status_display/evac/directional/south,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -58819,11 +59891,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"onT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/security/execution/transfer)
"ooa" = (
/obj/machinery/modular_computer/preset/cargochat/engineering{
dir = 1
@@ -59167,16 +60234,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"ouc" = (
-/obj/structure/sign/warning/electric_shock{
- pixel_y = -30
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Permabrig - Fitness";
- network = list("ss13","prison")
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"oup" = (
/obj/structure/cable,
/obj/machinery/corral_corner{
@@ -59207,6 +60264,13 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
+"ouH" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/station/security/prison/safe)
"ouT" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -59663,28 +60727,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/main)
-"oAV" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/corner{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"oAW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59805,6 +60847,15 @@
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/aft)
+"oCH" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 6
+ },
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"oCJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -60002,6 +61053,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"oFb" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"oFh" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60053,18 +61112,6 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"oFv" = (
-/obj/docking_port/stationary{
- dheight = 1;
- dir = 8;
- dwidth = 12;
- height = 17;
- name = "northeast of station";
- shuttle_id = "syndicate_ne";
- width = 23
- },
-/turf/open/space,
-/area/space/nearstation)
"oFC" = (
/obj/machinery/airalarm/directional/west,
/obj/structure/tank_dispenser,
@@ -60445,6 +61492,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
+"oLN" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"oLO" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
@@ -61046,6 +62102,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"oTw" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/food/piedough,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"oTB" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/siding/white,
@@ -61296,6 +62361,12 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"oXM" = (
+/obj/structure/chair/sofa/corp{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"oXR" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -61440,6 +62511,14 @@
/obj/effect/turf_decal/siding/purple/end,
/turf/open/floor/iron,
/area/station/science/lab)
+"oZE" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"oZL" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -61462,6 +62541,12 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"pan" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"paq" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/wood,
@@ -61485,6 +62570,17 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
+"paH" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"paQ" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/turf/open/floor/iron/white,
@@ -61648,12 +62744,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/science/research/abandoned)
-"pcA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"pcC" = (
/obj/structure/table/wood,
/obj/item/coin/antagtoken,
@@ -61831,6 +62921,12 @@
dir = 1
},
/area/station/commons/fitness/recreation)
+"pek" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/prison/workout)
"peo" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table/reinforced,
@@ -61971,16 +63067,6 @@
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/plating,
/area/station/service/chapel/storage)
-"pgn" = (
-/obj/structure/window/spawner/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
-"pgo" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
"pgr" = (
/obj/machinery/duct,
/obj/effect/turf_decal/stripes/line{
@@ -62164,6 +63250,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"phA" = (
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"phB" = (
/obj/structure/sign/poster/official/cleanliness{
pixel_y = 32
@@ -62747,6 +63841,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"ppX" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/execution/transfer)
"pqm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -62880,17 +63985,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/library/printer)
-"prB" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/camera/directional/north{
- c_tag = "Permabrig - Isolation";
- network = list("ss13","prison")
- },
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"prJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -63050,6 +64144,22 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"ptQ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Recreation Area"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/rec)
"ptY" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -63103,6 +64213,11 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
+"pvo" = (
+/obj/machinery/media/jukebox,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"pvu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63339,21 +64454,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
-"pxS" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/cargo/miningoffice)
"pxT" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -63476,6 +64576,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"pzv" = (
+/obj/machinery/vending/sustenance,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"pzz" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/cup/bucket,
@@ -63577,12 +64684,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
-"pAx" = (
-/obj/structure/window/spawner/directional/south,
-/obj/machinery/seed_extractor,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"pAy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63721,6 +64822,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"pCc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"pCf" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -63995,6 +65101,16 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron,
/area/station/engineering/lobby)
+"pEZ" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"pFk" = (
/obj/machinery/conveyor/inverted{
dir = 10;
@@ -64060,6 +65176,14 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"pFI" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"pFO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -64083,16 +65207,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
-"pGj" = (
-/obj/structure/table,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/storage/crayons,
-/turf/open/floor/iron,
-/area/station/security/prison)
"pGk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -64113,6 +65227,16 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain/private)
+"pGs" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/effect/turf_decal/trimline/hot_pink/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"pGt" = (
/obj/machinery/computer/turbine_computer{
dir = 1;
@@ -64159,6 +65283,14 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
+"pGX" = (
+/obj/structure/table,
+/obj/item/shovel/spade,
+/obj/item/plant_analyzer,
+/obj/item/cultivator,
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"pHa" = (
/obj/structure/lattice,
/obj/structure/sign/warning/directional/west,
@@ -64269,6 +65401,10 @@
/obj/effect/decal/cleanable/plastic,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"pIL" = (
+/obj/machinery/growing/soil,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"pIR" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -64332,21 +65468,14 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/engineering/main)
-"pJo" = (
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen{
- dir = 8;
- name = "Prisoner Telescreen";
- network = list("prison");
- pixel_x = 27
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
+"pJn" = (
+/obj/machinery/netpod,
+/obj/machinery/light/neon_lining{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
+/obj/item/radio/intercom/prison/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"pJp" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/power/apc/auto_name/directional/south,
@@ -64458,6 +65587,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"pKv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"pKD" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/corner{
@@ -64623,11 +65759,6 @@
/obj/item/paper/fluff/ids_for_dummies,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
-"pMa" = (
-/obj/item/reagent_containers/cup/bucket,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"pMh" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
@@ -64650,6 +65781,12 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"pMr" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"pMw" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -64763,6 +65900,13 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"pNS" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"pOf" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4
@@ -65018,12 +66162,6 @@
},
/turf/open/floor/wood,
/area/station/service/electronic_marketing_den)
-"pQU" = (
-/obj/machinery/light/directional/south,
-/obj/machinery/byteforge,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"pRk" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -65354,18 +66492,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/pumproom)
-"pUs" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/machinery/door/airlock/mining/glass{
- name = "Bitrunning Den"
- },
-/obj/effect/landmark/navigate_destination/common/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"pUw" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -65519,6 +66645,12 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"pVT" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"pVY" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -65535,15 +66667,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"pWb" = (
-/obj/machinery/washing_machine,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/sign/warning/electric_shock/directional/west,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+"pWa" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 6
},
-/turf/open/floor/iron,
-/area/station/security/prison/work)
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"pWd" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -65761,6 +66890,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"pYD" = (
+/obj/machinery/camera/directional/west,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"pYE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -65871,6 +67005,15 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"pZY" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"qam" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -66124,6 +67267,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"qcX" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison/mess)
"qdc" = (
/obj/effect/landmark/start/hangover,
/obj/structure/chair/sofa/bench{
@@ -66132,15 +67280,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"qdg" = (
-/obj/machinery/door/airlock{
- name = "Permabrig Showers"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
"qdl" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -66216,6 +67355,14 @@
/obj/effect/spawner/random/decoration/paint,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"qdZ" = (
+/obj/structure/hoop{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"qeg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66242,6 +67389,16 @@
},
/turf/open/floor/iron,
/area/station/science/research/abandoned)
+"qet" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/carpet/donk,
+/area/station/security/prison/safe)
"qev" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -66316,6 +67473,11 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"qfD" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"qfH" = (
/obj/structure/dresser,
/obj/item/radio/intercom/directional/south,
@@ -66409,6 +67571,12 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"qhq" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"qhy" = (
/obj/structure/cable,
/obj/effect/landmark/navigate_destination/common/cryogenics,
@@ -66463,6 +67631,17 @@
/obj/effect/turf_decal/delivery/white,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"qhR" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"qhS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66481,6 +67660,11 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"qie" = (
+/obj/structure/chair/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"qij" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible,
@@ -66508,6 +67692,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"qiw" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"qiM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -66651,10 +67841,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/theater)
-"qkJ" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"qkS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66961,6 +68147,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
+"qon" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"qoo" = (
/obj/structure/table/wood,
/obj/item/pai_card,
@@ -67034,11 +68228,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/security/lockers)
-"qpB" = (
-/obj/machinery/door/window/left/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"qpD" = (
/obj/structure/table/wood,
/obj/item/toy/plush/carpplushie{
@@ -67147,6 +68336,15 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"qre" = (
+/obj/machinery/growing/soil,
+/obj/machinery/light/directional/south,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
+"qrj" = (
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"qrt" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67222,22 +68420,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"qsF" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"qsN" = (
/obj/structure/chair{
dir = 4
@@ -67560,6 +68742,16 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
+"qxn" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"qxu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -67706,6 +68898,16 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/engineering/main)
+"qzD" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"qzK" = (
/obj/structure/sign/warning/secure_area/directional/south,
/obj/structure/table/reinforced,
@@ -67813,6 +69015,12 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"qAU" = (
+/obj/effect/spawner/structure/window/hollow/directional{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"qAV" = (
/turf/closed/wall,
/area/station/maintenance/department/crew_quarters/bar)
@@ -67905,16 +69113,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/textured,
/area/station/engineering/storage)
-"qBS" = (
-/obj/structure/closet/wardrobe/miner,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/bot,
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/netpod,
-/obj/effect/decal/cleanable/robot_debris,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"qBY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -68019,6 +69217,12 @@
/obj/machinery/status_display/evac/directional/west,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"qDm" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"qDo" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -68151,9 +69355,13 @@
/obj/item/book/manual/wiki/medicine,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
-"qEw" = (
-/turf/open/floor/plating,
-/area/station/security/prison/work)
+"qEl" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/execution/transfer)
"qEB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -68164,6 +69372,12 @@
/obj/item/toy/gun,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"qED" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"qEV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68479,6 +69693,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/security/detectives_office/private_investigators_office)
+"qIn" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"qIE" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -68563,6 +69785,9 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"qJu" = (
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"qJy" = (
/obj/effect/turf_decal/siding/yellow{
dir = 1
@@ -68613,6 +69838,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"qJW" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"qJZ" = (
/turf/closed/wall,
/area/station/security/holding_cell)
@@ -68706,6 +69935,12 @@
dir = 8
},
/area/station/science/auxlab/firing_range)
+"qKK" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"qKL" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -68855,6 +70090,13 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/engineering)
+"qLO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/royalblue,
+/area/station/security/prison/safe)
"qLQ" = (
/obj/machinery/atmospherics/components/unary/passive_vent/layer2{
dir = 4
@@ -69097,6 +70339,12 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"qOJ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"qOK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -69238,6 +70486,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
+"qPY" = (
+/obj/structure/table/wood,
+/obj/item/radio/intercom/prison,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"qQa" = (
/obj/effect/turf_decal/siding/blue,
/obj/structure/disposalpipe/segment{
@@ -69364,18 +70617,6 @@
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
-"qRZ" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/turf/open/floor/plating,
-/area/station/security/prison/mess)
"qSa" = (
/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe/antiviral,
@@ -69452,6 +70693,13 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"qSY" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/royalblue,
+/area/station/security/prison/safe)
"qTb" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -69717,6 +70965,16 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"qXZ" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/safe)
"qYj" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -69798,6 +71056,15 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"qZa" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 5
+ },
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 8
+ },
+/area/station/security/prison/workout)
"qZb" = (
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/r_wall,
@@ -69921,6 +71188,23 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
+"raX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/airlock/mining/glass{
+ name = "Delivery Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"rbj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/barricade/wooden,
@@ -69976,6 +71260,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"rbX" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/security/prison/garden)
"rcw" = (
/obj/structure/fireaxecabinet/directional/east,
/turf/open/floor/iron/dark,
@@ -70232,6 +71521,11 @@
/obj/effect/landmark/navigate_destination/dockescpod1,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"rfV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/side,
+/area/station/security/prison/workout)
"rgf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -70264,6 +71558,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"rgp" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"rgA" = (
/obj/structure/chair,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -70366,6 +71667,18 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"rhl" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/execution/transfer)
+"rhv" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"rhw" = (
/obj/structure/chair/office/light{
dir = 8
@@ -70528,6 +71841,13 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
+"riT" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"rjd" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
@@ -70701,6 +72021,15 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/fore)
+"rkQ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/hot_pink/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"rkS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -71012,14 +72341,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/storage)
-"rnA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"rnM" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -71073,6 +72394,12 @@
},
/turf/open/floor/iron/white,
/area/station/medical/cryo)
+"roT" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"roZ" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral,
@@ -71178,6 +72505,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port)
+"rqT" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/stellar,
+/area/station/security/prison/safe)
"rqV" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
@@ -71217,6 +72551,20 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
+"rrv" = (
+/obj/structure/cable,
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"rrw" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -71293,6 +72641,9 @@
/obj/effect/turf_decal/trimline/blue/filled/warning,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"rtf" = (
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"rtj" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -71582,6 +72933,11 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
+"rwg" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/prison/garden)
"rwh" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -71590,10 +72946,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"rwn" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron,
-/area/station/security/prison)
"rwu" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -71791,12 +73143,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/chapel/funeral)
-"ryY" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"rza" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -72409,6 +73755,16 @@
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"rHN" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/carpet/royalblue,
+/area/station/security/prison/safe)
"rHQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -72479,12 +73835,29 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"rIz" = (
+/obj/machinery/computer/quantum_console{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"rID" = (
/obj/effect/turf_decal/tile/green{
dir = 8
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"rIG" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblue,
+/area/station/security/prison/safe)
"rIN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/yellow/fourcorners,
@@ -72635,6 +74008,20 @@
dir = 1
},
/area/station/engineering/atmos)
+"rKx" = (
+/obj/machinery/button/door/directional/north{
+ id = "iso_cell_hall_bolt";
+ name = "Isolation Cell Hall Bolt Control";
+ req_access = list("brig");
+ normaldoorcontrol = 1;
+ specialfunctions = 4;
+ pixel_x = -6
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"rKy" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -72697,14 +74084,11 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/pathology)
-"rKW" = (
-/obj/machinery/door/poddoor/massdriver_trash,
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+"rKR" = (
+/turf/open/floor/iron/dark/side{
+ dir = 10
},
-/turf/open/floor/iron,
-/area/station/maintenance/disposal)
+/area/station/security/prison/workout)
"rLc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -72777,6 +74161,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/chapel)
+"rMd" = (
+/obj/structure/table/wood,
+/obj/item/radio/intercom/prison,
+/obj/effect/spawner/random/bureaucracy/folder{
+ pixel_y = -3;
+ pixel_x = -6
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"rMf" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/machinery/holopad,
@@ -72887,6 +74280,13 @@
/obj/effect/turf_decal/box/red,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
+"rNk" = (
+/obj/machinery/light/neon_lining,
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"rNo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -73293,11 +74693,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/storage)
-"rRm" = (
-/obj/structure/window/spawner/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"rRr" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -73342,13 +74737,6 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay)
-"rRL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/prisoner,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"rRR" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
@@ -73775,26 +75163,10 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/commons/toilet/locker)
-"rXh" = (
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt3";
- name = "Cell 4"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/poddoor/preopen{
- id = "permashut4"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
+"rXc" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"rXr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -74452,39 +75824,11 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
-"shc" = (
-/obj/effect/landmark/start/prisoner,
-/turf/open/floor/plating,
-/area/station/security/prison/work)
"shm" = (
/obj/effect/spawner/random/structure/table_or_rack,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"shF" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "brigprison";
- name = "Prison Blast Door"
- },
-/obj/machinery/button/flasher{
- id = "Cell 1";
- name = "Prisoner Flash";
- pixel_x = 25;
- pixel_y = 7
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/east{
- id = "permashut1";
- name = "Cell Lockdown Button";
- pixel_y = -6;
- req_one_access = list("brig", "permabrig")
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"shJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{
dir = 4
@@ -74510,6 +75854,18 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"shX" = (
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"shZ" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
@@ -74614,20 +75970,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/commons/locker)
-"sjg" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/kitchen_cold_room{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"sjh" = (
/obj/structure/statue/sandstone/venus{
name = "Justice"
@@ -74663,6 +76005,12 @@
"sjt" = (
/turf/closed/wall,
/area/station/hallway/secondary/entry)
+"sjy" = (
+/obj/structure/window/spawner/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"sjz" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/white{
@@ -74714,6 +76062,14 @@
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"sku" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"skv" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 4
@@ -74877,6 +76233,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"smC" = (
+/obj/machinery/cryopod/prison,
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"smF" = (
/obj/structure/chair{
dir = 8;
@@ -75027,6 +76391,13 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"soO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/safe)
"soU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/tile/neutral/full,
@@ -75102,6 +76473,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/space/basic,
/area/space/nearstation)
+"spX" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/obj/item/radio/intercom/prison/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"sqd" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -75417,6 +76797,10 @@
},
/turf/open/floor/iron/dark,
/area/station/service/theater/abandoned)
+"sud" = (
+/obj/structure/sign/warning/rad_shelter/directional/west,
+/turf/closed/wall,
+/area/station/security/prison/safe)
"suj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -75545,6 +76929,13 @@
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"svB" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"svI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -75596,6 +76987,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
+"svY" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 10
+ },
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"swf" = (
/obj/machinery/door/window/brigdoor/left/directional/south{
id = "medsci-cell";
@@ -75656,6 +77054,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
+"swS" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"swY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -75699,6 +77102,10 @@
/obj/item/assembly/signaler,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"sxs" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"sxB" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -75789,6 +77196,21 @@
dir = 8
},
/area/station/engineering/lobby)
+"syw" = (
+/obj/structure/table,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/storage/crayons,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"syE" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
@@ -75821,9 +77243,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"sze" = (
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"szg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -75933,6 +77352,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"szZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/window/right/directional/south,
+/turf/open/floor/plating,
+/area/station/security/prison/workout)
"sAh" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -76115,28 +77540,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/half,
/area/station/service/hydroponics)
-"sCW" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/mining/glass{
- name = "Delivery Office"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"sCY" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/port/fore)
+"sDb" = (
+/obj/effect/turf_decal/trimline/hot_pink/line,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"sDd" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -76299,6 +77711,11 @@
},
/turf/open/floor/iron/dark,
/area/station/command/corporate_showroom)
+"sFH" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"sFR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -76356,6 +77773,10 @@
/mob/living/basic/chicken/brown,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
+"sGs" = (
+/obj/structure/window/spawner/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"sGx" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -76467,6 +77888,12 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"sIa" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"sIb" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -76556,11 +77983,6 @@
/obj/machinery/power/port_gen/pacman/pre_loaded,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"sIR" = (
-/obj/machinery/shower/directional/west,
-/obj/effect/spawner/random/contraband/prison,
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
"sIX" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/rd)
@@ -76947,16 +78369,6 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/wood/tile,
/area/station/service/library/artgallery)
-"sMN" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"sMQ" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
@@ -77106,15 +78518,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"sON" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/iron,
-/area/station/security/prison)
-"sOS" = (
-/obj/structure/table,
-/obj/item/trash/raisins,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"sOX" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -77487,6 +78890,11 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical/medsci)
+"sTy" = (
+/obj/machinery/light/floor/has_bulb,
+/obj/effect/turf_decal/trimline/green,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"sTE" = (
/obj/machinery/firealarm/directional/south,
/obj/structure/table/reinforced,
@@ -77579,6 +78987,16 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
+"sUs" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/hot_pink/corner{
+ dir = 1
+ },
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"sUz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -77607,6 +79025,10 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"sUG" = (
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"sUH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -77628,13 +79050,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"sUS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"sVb" = (
/obj/effect/spawner/random/vending/snackvend,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -77724,6 +79139,15 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"sWm" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/displaycase/forsale/kitchen,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"sWo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -77981,15 +79405,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/research)
-"sYM" = (
-/obj/machinery/door/poddoor/preopen{
- id = "brigprison";
- name = "Prison Blast Door"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"sYN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -78017,6 +79432,14 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
+"sZh" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"sZi" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -78137,6 +79560,13 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"tbj" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/execution/transfer)
"tbs" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -78170,6 +79600,9 @@
/obj/structure/closet/crate/wooden,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
+"tbV" = (
+/turf/closed/wall/r_wall,
+/area/station/security/prison/workout)
"tbZ" = (
/obj/item/kirbyplants/random,
/obj/machinery/status_display/door_timer{
@@ -78365,6 +79798,12 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
+"tec" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"teo" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -78613,12 +80052,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
-"thI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"thN" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -78670,6 +80103,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/service/kitchen)
+"tiW" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"tjf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -78696,6 +80135,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
+"tjD" = (
+/obj/structure/bookcase/random,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"tjI" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/effect/turf_decal/stripes/line{
@@ -78823,6 +80266,14 @@
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"tlQ" = (
+/obj/machinery/computer/cryopod/directional/west,
+/obj/structure/chair/comfy/black,
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 1
+ },
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"tlU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -78886,6 +80337,12 @@
/obj/item/stock_parts/cell/high,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"tmI" = (
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"tmO" = (
/obj/machinery/cryopod{
dir = 1
@@ -78893,6 +80350,14 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/freezer,
/area/station/maintenance/department/medical/morgue)
+"tmZ" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/stack/license_plates/empty/fifty,
+/obj/item/stack/license_plates/empty/fifty,
+/obj/item/stack/license_plates/empty/fifty,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"tnm" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/recharge_station,
@@ -79303,9 +80768,6 @@
},
/turf/open/floor/carpet/blue,
/area/station/commons/dorms)
-"tse" = (
-/turf/open/floor/plating,
-/area/station/security/prison/mess)
"tsg" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -79442,6 +80904,18 @@
dir = 4
},
/area/station/science/ordnance/storage)
+"ttd" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/obj/item/radio/intercom/prison/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"tte" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/iron/fifty,
@@ -79757,6 +81231,16 @@
dir = 8
},
/area/station/commons/fitness/recreation)
+"twQ" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"twZ" = (
/obj/machinery/computer/message_monitor{
dir = 4
@@ -79841,6 +81325,15 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"tys" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"tyx" = (
/obj/structure/chair/office{
dir = 8
@@ -79899,6 +81392,18 @@
/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden,
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
+"tzN" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/burnchamber)
"tzT" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -79962,6 +81467,12 @@
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"tAD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"tAJ" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/stripes/line,
@@ -80310,6 +81821,15 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
+"tDO" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"tEd" = (
/obj/machinery/flasher/directional/south{
id = "AI";
@@ -80428,6 +81948,15 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
+"tFq" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"tFs" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -80498,6 +82027,20 @@
/obj/item/mod/module/magboot,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"tGp" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/food/dough{
+ pixel_x = 2
+ },
+/obj/item/food/dough{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"tGq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -80540,6 +82083,12 @@
},
/turf/open/floor/wood/large,
/area/station/command/corporate_showroom)
+"tGX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"tHc" = (
/obj/structure/table/wood/fancy,
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -80558,14 +82107,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
-"tHs" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/west,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"tHu" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -80645,18 +82186,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/maintenance/port)
-"tIh" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/machinery/airalarm/mixingchamber{
- dir = 4;
- pixel_x = 25
- },
-/obj/effect/turf_decal/siding/purple/corner,
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/freezerchamber)
"tIK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -80911,6 +82440,14 @@
/obj/effect/spawner/random/trash/bin,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"tMc" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/grill,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"tMe" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -81194,6 +82731,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"tOF" = (
+/obj/machinery/mass_driver/trash{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/disposal)
"tOK" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -81247,12 +82795,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/service/chapel/office)
-"tOY" = (
-/obj/structure/weightmachine/weightlifter,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/security/prison)
"tPc" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -81280,6 +82822,15 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
+"tPs" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/chair/wood,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"tPv" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -81315,6 +82866,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"tPL" = (
+/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"tPQ" = (
/obj/machinery/computer/records/medical{
dir = 4
@@ -81515,6 +83072,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"tSF" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ layer = 3.1;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
+"tSG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"tSH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/event_spawn,
@@ -81633,17 +83213,6 @@
/obj/structure/table/wood,
/turf/open/floor/iron/vaporwave,
/area/station/service/library/printer)
-"tTQ" = (
-/obj/structure/sign/poster/ripped{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"tTU" = (
/obj/structure/table/wood/fancy,
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -81670,9 +83239,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"tUB" = (
-/turf/open/floor/plating,
-/area/station/security/prison)
"tUG" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -81693,6 +83259,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"tVb" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
+"tVk" = (
+/obj/machinery/light/neon_lining,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"tVl" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 8
@@ -81734,6 +83308,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay)
+"tVQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"tVR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -81787,6 +83366,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"tWq" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/oven/range,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/kitchen,
+/area/station/security/prison/mess)
"tWv" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -81821,10 +83408,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"tWG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison)
"tWI" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -81935,12 +83518,6 @@
dir = 10
},
/area/station/security/office)
-"tXL" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"tXN" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -82262,20 +83839,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/medical/abandoned)
-"ubL" = (
-/obj/structure/table,
-/obj/item/book/manual/chef_recipes,
-/obj/item/reagent_containers/condiment/peppermill{
- pixel_x = 2
- },
-/obj/item/reagent_containers/condiment/saltshaker{
- pixel_x = -8;
- pixel_y = 5
- },
-/obj/item/reagent_containers/condiment/enzyme,
-/obj/item/storage/fancy/egg_box,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"ubM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -82337,6 +83900,17 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"ucp" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"ucu" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -82415,25 +83989,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/research)
-"ucR" = (
-/obj/structure/window/spawner/directional/west,
-/obj/structure/closet/secure_closet/freezer/kitchen{
- req_access = null
- },
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/onion,
-/obj/item/food/grown/onion,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/sign/poster/ripped{
- pixel_y = 32
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"ucW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -82638,6 +84193,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/commons/toilet/locker)
+"ueX" = (
+/obj/machinery/smartfridge,
+/turf/closed/wall,
+/area/station/security/prison/garden)
"ufz" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/bot_white,
@@ -82672,6 +84231,13 @@
"ufR" = (
/turf/closed/wall/r_wall,
/area/station/security/warden)
+"ugb" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"ugc" = (
/obj/effect/spawner/random/engineering/atmospherics_portable,
/obj/structure/sign/poster/random/directional/north,
@@ -82691,6 +84257,15 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
+"ugf" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"ugh" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -82831,6 +84406,15 @@
/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"uif" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/effect/spawner/random/entertainment/arcade,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"uin" = (
/obj/machinery/light/directional/east,
/obj/structure/cable,
@@ -82872,6 +84456,10 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"uiO" = (
+/obj/structure/window/spawner/directional/north,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"uiP" = (
/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible,
/obj/effect/turf_decal/stripes/line{
@@ -83057,6 +84645,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"ukP" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"ukR" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -83144,6 +84741,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
+"umr" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/chair/stool/bar/directional/east,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"umu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -83411,13 +85015,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"upM" = (
-/obj/structure/table,
-/obj/item/storage/photo_album/prison,
-/obj/item/camera,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"upX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -83427,6 +85024,11 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"upY" = (
+/turf/open/floor/iron/dark/side{
+ dir = 9
+ },
+/area/station/security/prison/workout)
"uqk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral,
@@ -83530,6 +85132,18 @@
/obj/effect/landmark/navigate_destination/delta/abandgambling,
/turf/open/floor/iron,
/area/station/service/abandoned_gambling_den)
+"urT" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/easel,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
+"urU" = (
+/turf/closed/wall,
+/area/station/security/prison/rec)
"urV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -83549,6 +85163,14 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/library)
+"usj" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"usy" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -83663,14 +85285,6 @@
/obj/machinery/iv_drip,
/turf/open/floor/iron,
/area/station/medical/surgery/theatre)
-"uuf" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"uui" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -83781,14 +85395,6 @@
/obj/effect/turf_decal/siding/green,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/hydroponics)
-"uvo" = (
-/obj/machinery/growing/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/east,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/garden)
"uvr" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -84263,6 +85869,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
+"uAy" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"uAA" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/table/reinforced,
@@ -84273,12 +85886,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"uAD" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"uAI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/depsec/engineering,
@@ -84288,6 +85895,11 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
+"uAJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"uAK" = (
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
@@ -84333,6 +85945,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"uBk" = (
+/obj/structure/table/wood,
+/obj/item/storage/dice,
+/obj/effect/spawner/random/entertainment/deck{
+ pixel_x = -7
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"uBn" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -84811,6 +86431,10 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/commons/fitness/recreation)
+"uIc" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/safe)
"uIg" = (
/obj/structure/lattice/catwalk,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -84889,6 +86513,20 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"uJB" = (
+/obj/structure/table,
+/obj/item/secateurs{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/secateurs,
+/obj/item/radio/intercom/prison/directional/east,
+/obj/item/reagent_containers/cup/bottle/ammonia{
+ pixel_x = -3;
+ pixel_y = 12
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"uJH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
@@ -85087,6 +86725,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"uMG" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"uMH" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -85496,6 +87140,13 @@
/obj/structure/cable/layer3,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"uRb" = (
+/obj/structure/window/spawner/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"uRe" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 10
@@ -85551,14 +87202,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"uRz" = (
-/obj/structure/chair/stool/directional/south,
-/obj/structure/window/spawner/directional/north,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"uRF" = (
/obj/structure/closet,
/obj/effect/spawner/random/food_or_drink/condiment,
@@ -85623,6 +87266,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"uSq" = (
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
+/area/station/security/prison/mess)
"uSs" = (
/mob/living/basic/slime,
/obj/machinery/plumbing/ooze_sucker{
@@ -85976,10 +87626,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/main)
-"uWT" = (
-/obj/structure/punching_bag,
-/turf/open/floor/plating,
-/area/station/security/prison)
"uWU" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -86131,6 +87777,13 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"uZc" = (
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"uZf" = (
/obj/structure/flora/bush/flowers_br/style_random,
/obj/structure/flora/bush/lavendergrass,
@@ -86149,6 +87802,14 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/port)
+"uZk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light/directional/east,
+/turf/open/floor/carpet/black,
+/area/station/security/bitden)
"uZs" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -86411,11 +88072,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain/private)
-"vcf" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
-/area/station/security/prison)
"vcj" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -86459,14 +88115,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
-"vda" = (
-/obj/structure/table,
-/obj/machinery/computer/libraryconsole/bookmanagement{
- dir = 1
- },
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison)
"vdd" = (
/obj/item/radio/intercom/directional/north,
/obj/structure/cable,
@@ -86800,24 +88448,6 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"vhZ" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Permabrig Cell 4"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"vii" = (
/turf/open/floor/iron/white/side{
dir = 4
@@ -86875,6 +88505,20 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"viE" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"viI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -87098,15 +88742,6 @@
/obj/effect/spawner/random/trash/food_packaging,
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
-"vmo" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/cup/bottle/morphine,
-/obj/item/reagent_containers/syringe,
-/obj/machinery/status_display/ai/directional/west,
-/obj/machinery/newscaster/directional/north,
-/obj/effect/turf_decal/siding/dark_red,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
"vmr" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/airalarm/directional/west,
@@ -87305,6 +88940,13 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"von" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"vop" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -87558,6 +89200,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
+"vrt" = (
+/obj/machinery/seed_extractor,
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera/directional/north,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"vry" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/vending/wardrobe/chem_wardrobe,
@@ -87703,16 +89352,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/research/abandoned)
-"vtt" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/white/side{
- dir = 8
- },
-/area/station/security/execution/transfer)
"vty" = (
/obj/structure/chair/office,
/turf/open/floor/carpet/orange,
@@ -87789,6 +89428,13 @@
},
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"vug" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"vur" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -87808,6 +89454,11 @@
/obj/structure/sign/clock/directional/north,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"vuF" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"vuJ" = (
/obj/structure/chair/office/light{
dir = 8
@@ -87871,6 +89522,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"vvk" = (
+/obj/machinery/washing_machine,
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"vvp" = (
/obj/machinery/door/poddoor/preopen{
id = "engielock";
@@ -88042,6 +89700,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
+"vwN" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"vwO" = (
/obj/structure/chair{
dir = 4
@@ -88099,9 +89765,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"vxr" = (
-/turf/open/floor/iron,
-/area/station/security/prison)
"vxs" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/visit)
@@ -88179,6 +89842,11 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"vyo" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"vys" = (
/obj/structure/flora/bush/jungle/c/style_random,
/obj/structure/railing{
@@ -88197,6 +89865,11 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/auxlab/firing_range)
+"vyE" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled,
+/obj/structure/weightmachine/stacklifter,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"vyG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -88209,10 +89882,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
-"vyM" = (
-/mob/living/carbon/human/species/monkey/dukeman,
-/turf/open/floor/iron,
-/area/station/security/prison)
"vyO" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red,
@@ -88314,6 +89983,11 @@
},
/turf/open/floor/iron/dark/textured_half,
/area/station/service/chapel/storage)
+"vzU" = (
+/obj/structure/bookcase/random,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"vAc" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{
dir = 4
@@ -88472,11 +90146,6 @@
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/iron/dark,
/area/station/service/janitor)
-"vBu" = (
-/obj/structure/cable,
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"vBx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -88679,13 +90348,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/grimy,
/area/station/service/bar/backroom)
-"vDX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/growing/tray,
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"vEg" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -88904,6 +90566,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"vGq" = (
+/obj/structure/sign/clock/directional/west,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"vGy" = (
/turf/closed/wall/mineral/plastitanium,
/area/station/commons/fitness/recreation)
@@ -88981,6 +90647,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"vHG" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"vHT" = (
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
@@ -88988,23 +90660,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"vId" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 8
- },
-/obj/item/radio/intercom/directional/south,
-/obj/effect/decal/cleanable/oil,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"vIq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -89023,12 +90678,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/science/research)
-"vII" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"vIQ" = (
/turf/closed/wall/r_wall,
/area/station/command/teleporter)
@@ -89049,27 +90698,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/checker,
/area/station/service/theater)
-"vJh" = (
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt3";
- name = "Cell 5"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/poddoor/preopen{
- id = "permashut5"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"vJj" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -89095,6 +90723,23 @@
dir = 1
},
/area/station/medical/pathology)
+"vJA" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Mess Hall"
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/mess)
"vJD" = (
/obj/structure/table/wood,
/obj/machinery/newscaster/directional/west,
@@ -89261,18 +90906,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"vMZ" = (
-/obj/structure/sink/directional/west,
-/obj/item/trash/sosjerky,
-/obj/structure/sign/poster/official/cleanliness{
- pixel_x = 32
- },
-/obj/machinery/light/small/directional/north,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
"vNa" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/aft)
@@ -89303,6 +90936,15 @@
},
/turf/open/floor/engine,
/area/station/science/research)
+"vNw" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/hot_pink/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"vNF" = (
/turf/open/floor/plating,
/area/station/maintenance/department/security)
@@ -89323,22 +90965,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
-"vNV" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/cargo/miningoffice)
"vOh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -89478,6 +91104,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"vPB" = (
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"vPF" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -89571,13 +91208,6 @@
/obj/effect/turf_decal/siding/white/corner,
/turf/open/floor/iron/dark/corner,
/area/station/commons/fitness/recreation)
-"vRo" = (
-/obj/structure/window/spawner/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/machinery/composters,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"vRB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -89587,6 +91217,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
+"vRP" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/pen{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/storage/dice{
+ pixel_y = 5;
+ pixel_x = -2
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"vRU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -89625,11 +91271,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
-"vSK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"vSM" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -89760,12 +91401,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
-"vTP" = (
-/obj/structure/chair/stool/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"vTX" = (
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
@@ -89871,6 +91506,20 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
+"vVn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Visitation"
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/visit)
"vVt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -89973,15 +91622,19 @@
/obj/effect/turf_decal/tile/yellow/diagonal_edge,
/turf/open/floor/iron/diagonal,
/area/station/science/breakroom)
-"vXr" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "brigprison";
- name = "Prison Blast Door"
+"vXo" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
+"vXw" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/station/security/execution/transfer)
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"vXF" = (
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -90184,6 +91837,11 @@
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"vZp" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled,
+/obj/structure/weightmachine/weightlifter,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"vZq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -90240,6 +91898,13 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"vZW" = (
+/obj/effect/turf_decal/trimline/hot_pink/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/hot_pink/corner,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"vZX" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -90289,6 +91954,19 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
+"was" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/old{
+ name = "Cell 4"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/safe)
"wav" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -90320,6 +91998,22 @@
/obj/item/lighter,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office/private_investigators_office)
+"waU" = (
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "perma-entrance"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Wing"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/execution/transfer)
"waV" = (
/obj/structure/chair,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
@@ -90332,19 +92026,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
-"waZ" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/cryopod{
- dir = 8;
- max_integrity = 10000
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"wbb" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -90463,6 +92144,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"wcQ" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"wda" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -90499,6 +92189,14 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
+"wdz" = (
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/landmark/navigate_destination/common/bitrunner,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/vaporwave,
+/area/station/security/bitden)
"wdD" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -90531,6 +92229,23 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/detectives_office)
+"wdX" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
+"wdY" = (
+/turf/open/floor/iron/dark/side,
+/area/station/security/prison/workout)
+"wea" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"web" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -90590,27 +92305,13 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"weH" = (
-/obj/structure/cable,
-/obj/machinery/button/flasher{
- id = "Cell 2";
- name = "Prisoner Flash";
- pixel_x = 25;
- pixel_y = 7
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
+"weK" = (
+/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/east{
- id = "permashut2";
- name = "Cell Lockdown Button";
- pixel_y = -6;
- req_one_access = list("brig", "permabrig")
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"weM" = (
/obj/effect/turf_decal/tile/neutral/half{
dir = 1
@@ -90746,17 +92447,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"wfV" = (
-/obj/machinery/mass_driver/trash{
- dir = 4
- },
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/disposal)
"wgb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -90873,24 +92563,6 @@
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron/large,
/area/station/security/checkpoint/medical/medsci)
-"whb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/airlock/mining/glass{
- name = "Delivery Office"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"whc" = (
/obj/structure/sign/poster/official/fruit_bowl{
pixel_x = -32
@@ -91114,6 +92786,17 @@
/obj/effect/decal/cleanable/generic,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"wjK" = (
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"wjO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -91173,6 +92856,17 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"wko" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/prison/workout)
"wkp" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -91460,6 +93154,11 @@
dir = 5
},
/area/station/service/chapel)
+"wns" = (
+/obj/effect/decal/cleanable/robot_debris,
+/obj/effect/spawner/random/structure/crate,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"wnt" = (
/obj/structure/table,
/obj/item/stack/cable_coil,
@@ -91955,6 +93654,19 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/service/kitchen/coldroom)
+"wrU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/old{
+ name = "Cell 1"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/safe)
"wrZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -92128,14 +93840,6 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"wtJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/growing/tray,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"wtS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -92183,6 +93887,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"wuc" = (
+/obj/structure/window/spawner/directional/north,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"wuh" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/border_only{
@@ -92285,6 +93993,10 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/cargo/office)
+"wvd" = (
+/obj/structure/window/spawner/directional/east,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"wvf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -92453,6 +94165,14 @@
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"wwW" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"wxa" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -92862,6 +94582,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"wBD" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"wBF" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -92881,6 +94607,16 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
/area/station/medical/medbay)
+"wBR" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
+"wBU" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"wBV" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -93109,12 +94845,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
-"wDX" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"wEj" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -93216,6 +94946,11 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
+"wFD" = (
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"wFE" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -93341,6 +95076,11 @@
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"wGX" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/camera/directional/east,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"wHa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -93423,6 +95163,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmos/storage)
+"wIn" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/royalblack,
+/area/station/security/prison/safe)
"wIs" = (
/obj/effect/turf_decal/plaque{
icon_state = "L11"
@@ -93517,6 +95264,10 @@
},
/turf/open/floor/iron/chapel,
/area/station/service/chapel)
+"wKf" = (
+/obj/structure/chair/comfy/black,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison/safe)
"wKm" = (
/obj/structure/sign/nanotrasen{
pixel_x = 32
@@ -93675,6 +95426,12 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"wMK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"wMU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -93736,6 +95493,12 @@
/obj/effect/turf_decal/trimline/green/filled/warning,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
+"wOG" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"wOP" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
@@ -93923,12 +95686,23 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"wRg" = (
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"wRj" = (
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"wRl" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"wRm" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
@@ -93995,6 +95769,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"wRY" = (
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"wSh" = (
/obj/structure/sign/poster/official/here_for_your_safety{
pixel_x = 30
@@ -94374,6 +96155,9 @@
/obj/structure/sign/poster/contraband/random/directional/west,
/turf/open/floor/iron/grimy,
/area/station/service/abandoned_gambling_den)
+"wXD" = (
+/turf/closed/wall,
+/area/station/security/prison/mess)
"wXH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -94476,6 +96260,14 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
+"wZm" = (
+/obj/effect/turf_decal/tile/hot_pink{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"wZo" = (
/obj/machinery/growing/tray,
/obj/effect/turf_decal/trimline/green/end{
@@ -94513,6 +96305,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
+"wZD" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"wZE" = (
/turf/closed/wall,
/area/station/maintenance/department/electrical)
@@ -94841,13 +96642,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"xdP" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"xdY" = (
/obj/structure/cable,
/obj/machinery/computer/cargo/request,
@@ -94894,6 +96688,10 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
+"xew" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"xex" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/line,
@@ -95040,6 +96838,14 @@
/obj/item/assembly/flash/handheld,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"xgm" = (
+/obj/structure/table/wood,
+/obj/item/instrument/harmonica{
+ pixel_y = 4;
+ pixel_x = 3
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"xgt" = (
/obj/structure/cable,
/obj/structure/table/wood,
@@ -95358,6 +97164,13 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/storage_shared)
+"xkS" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"xkU" = (
/obj/effect/turf_decal/bot_white{
color = "#435a88"
@@ -95448,12 +97261,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"xmk" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/stool/directional/north,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"xmm" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters{
@@ -95515,6 +97322,15 @@
/obj/machinery/vending/wardrobe/gene_wardrobe,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"xmZ" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 9
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"xna" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -95598,19 +97414,23 @@
},
/turf/open/floor/carpet/purple,
/area/station/commons/dorms)
-"xnM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/flasher/directional/south{
- id = "Cell 4"
- },
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
+"xnR" = (
+/obj/effect/spawner/random/vending/snackvend,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"xnT" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/theater/abandoned)
+"xnU" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"xoa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -95720,18 +97540,6 @@
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"xqc" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/blindfold,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/white/corner{
- dir = 8
- },
-/area/station/security/execution/transfer)
"xqe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -95939,6 +97747,11 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"xsI" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/vaporwave,
+/area/station/security/prison/mess)
"xsN" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -96091,24 +97904,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"xvn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/structure/closet/crate/hydroponics,
-/obj/item/seeds/tree,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/seeds/pumpkin,
-/obj/item/seeds/wheat,
-/obj/item/seeds/ambrosia,
-/obj/item/seeds/grass,
-/obj/item/seeds/carrot,
-/obj/item/seeds/tomato,
-/obj/item/seeds/potato,
-/obj/item/seeds/garlic,
-/obj/item/seeds/onion,
-/obj/item/paper/guides/jobs/hydroponics,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"xvo" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -96212,6 +98007,12 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
+"xwM" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"xwN" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/plasticflaps/opaque,
@@ -96259,10 +98060,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
-"xxf" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
-/area/station/security/prison)
"xxj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -96284,6 +98081,16 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/space/basic,
/area/space/nearstation)
+"xxl" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"xxp" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -96682,6 +98489,10 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/textured_large,
/area/station/engineering/atmos/project)
+"xAI" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood,
+/area/station/security/prison/rec)
"xAK" = (
/obj/structure/chair/wood{
dir = 8
@@ -96748,20 +98559,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"xBD" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/structure/sign/departments/medbay/alt{
- pixel_x = -32
- },
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/security/execution/transfer)
"xBK" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -96896,6 +98693,14 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"xDI" = (
+/obj/structure/closet/crate/trashcart,
+/obj/effect/spawner/random/contraband/prison,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"xDU" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/grimy,
@@ -97073,6 +98878,11 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"xFE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison/workout)
"xFI" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -97156,25 +98966,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/research)
-"xGr" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Permabrig Cell 5"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/iron,
-/area/station/security/prison/safe)
"xGu" = (
/obj/structure/frame/machine{
anchored = 1
@@ -97321,15 +99112,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/command/corporate_showroom)
-"xIl" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"xIp" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/newscaster/directional/west,
@@ -97414,6 +99196,11 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"xJi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison/workout)
"xJn" = (
/obj/structure/table/reinforced,
/obj/item/airlock_painter/decal,
@@ -97439,6 +99226,16 @@
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"xJr" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Prison"
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison)
"xJF" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
@@ -97529,6 +99326,20 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/service/kitchen)
+"xKV" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/old{
+ name = "Cell 5";
+ id_tag = "iso_cell_hall_bolt"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/safe)
"xKX" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/dark,
@@ -97653,10 +99464,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
-"xMZ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"xNe" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -97718,13 +99525,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"xNU" = (
-/obj/machinery/status_display/evac/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"xOn" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
@@ -97847,13 +99647,6 @@
/obj/effect/landmark/navigate_destination/vault,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central/fore)
-"xPz" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/toy/figure/syndie,
-/obj/machinery/light/directional/east,
-/turf/open/floor/plating,
-/area/station/security/prison)
"xPE" = (
/obj/structure/bed/dogbed,
/mob/living/basic/pet/dog/bullterrier{
@@ -98080,6 +99873,29 @@
dir = 1
},
/area/station/maintenance/department/electrical)
+"xTh" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Hydroponics"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
+"xTi" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp/right{
+ dir = 8
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/carpet/black,
+/area/station/security/prison/mess)
"xTk" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/tile/red/fourcorners,
@@ -98103,6 +99919,16 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"xTA" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 1
+ },
+/obj/structure/sign/poster/random/directional/north,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/prison/workout)
"xTC" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
@@ -98157,6 +99983,24 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/grimy,
/area/station/service/lawoffice)
+"xUa" = (
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "perma-entrance"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Prison Wing"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/execution/transfer)
"xUi" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -98255,6 +100099,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"xVA" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/hot_pink/filled/line,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"xVI" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -98927,6 +100779,19 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"yen" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/old{
+ name = "Cell 2"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/safe)
"yeo" = (
/obj/structure/table,
/obj/effect/spawner/random/entertainment/drugs{
@@ -99133,18 +100998,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"ygY" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/structure/sign/directions/engineering{
- desc = "A sign that shows there are doors here. There are doors everywhere!";
- icon_state = "doors";
- name = "WARNING: BLAST DOORS";
- pixel_x = -32
- },
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"yhh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -99290,6 +101143,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"yji" = (
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"yjn" = (
/obj/structure/extinguisher_cabinet/directional/north{
pixel_x = 6;
@@ -99297,6 +101153,12 @@
},
/turf/open/floor/stone,
/area/station/command/corporate_showroom)
+"yjy" = (
+/obj/effect/turf_decal/trimline/hot_pink/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/security/prison)
"yjF" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -99366,14 +101228,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
-"ykr" = (
-/obj/machinery/door/airlock/security{
- name = "Isolation Cell"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/plating,
-/area/station/security/execution/transfer)
"yks" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/half,
@@ -99466,17 +101320,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"ylB" = (
-/obj/machinery/light/small/directional/west,
-/obj/item/clothing/suit/caution,
-/obj/structure/sign/poster/official/no_erp{
- pixel_x = -30
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/toilet)
"ylM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -121519,7 +123362,7 @@ eHy
qJs
cxp
sHT
-kDE
+cAR
tsa
bPI
sHT
@@ -121965,7 +123808,7 @@ aaa
qYo
aaa
edx
-byr
+anl
rhC
dnM
gFb
@@ -129683,7 +131526,7 @@ oYs
oYs
oYs
phI
-eOn
+rrv
pvR
knu
sCF
@@ -130478,7 +132321,7 @@ xtp
xtp
xtp
nFX
-sjg
+nnC
thz
ydg
xbO
@@ -132356,7 +134199,7 @@ pdH
qLq
hGI
esH
-kse
+tzN
asW
nSb
nSb
@@ -132870,7 +134713,7 @@ kVF
fWx
lzo
vbO
-tIh
+cwW
eqB
eyH
eyH
@@ -141529,7 +143372,7 @@ hoC
yfI
bGf
kGo
-sCW
+knw
nxl
ygL
xhW
@@ -142230,16 +144073,16 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
aac
aac
aad
+aac
+aac
+aad
+aac
+qYo
aad
-csz
+xrr
jSE
gOH
wFz
@@ -142483,18 +144326,18 @@ aaa
aaa
aaa
aaa
+aac
+aac
+aad
+aac
+aac
aaa
aaa
+aad
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
+aac
+aac
aad
xrr
mSG
@@ -142552,7 +144395,7 @@ mOe
yhh
liD
mZU
-whb
+raX
uBZ
pso
sqW
@@ -142740,19 +144583,19 @@ aaa
aaa
aaa
aaa
+aac
aaa
aaa
+aad
aaa
aaa
+pAJ
+aoP
+pAJ
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aac
aad
+aaa
csz
csz
hSd
@@ -142997,20 +144840,20 @@ aaa
aaa
aaa
aaa
+aad
aaa
+pAJ
+aoP
+pAJ
aaa
+pAJ
+aoP
+pAJ
aaa
+pAJ
+aoP
+pAJ
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-aad
csz
kfV
csz
@@ -143254,19 +145097,19 @@ aaa
aaa
aaa
aaa
+aac
aaa
+pAJ
+aoP
+pAJ
aaa
+pAJ
+aoP
+pAJ
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+pAJ
+aoP
+pAJ
aaa
csz
ljP
@@ -143327,11 +145170,11 @@ xhW
xhW
nPo
rCK
-mdR
-mdR
-mdR
-mdR
-mdR
+tpZ
+tpZ
+tpZ
+tpZ
+tpZ
uBd
mKN
vPp
@@ -143511,19 +145354,19 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aac
aac
aad
-aac
-aac
+pAJ
+aoP
+pAJ
aad
-aac
-aaa
+pAJ
+aoP
+pAJ
aad
+pAJ
+aoP
+pAJ
aad
aad
aoP
@@ -143582,13 +145425,13 @@ oSv
cFz
rWo
qko
-vNV
-pxS
-xMZ
-mlF
-qsF
-mOT
-mdR
+jIi
+viE
+tpZ
+fgI
+jvj
+fjE
+tpZ
lDY
tpZ
kOj
@@ -143768,20 +145611,20 @@ aaa
aaa
aaa
aaa
-aac
-aac
aad
-aac
-aac
aaa
+pAJ
+aoP
+pAJ
aaa
-aad
+pAJ
+aoP
+pAJ
aaa
+pAJ
+aoP
+pAJ
aaa
-aac
-aac
-aad
-aac
aad
aoP
aad
@@ -143841,11 +145684,11 @@ aPD
stf
llj
rer
-xMZ
-mDm
-cnz
-pQU
-mdR
+tpZ
+joR
+joR
+joR
+tpZ
qmT
tpZ
aaa
@@ -144022,22 +145865,22 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
aac
-aaa
-aaa
aad
-aaa
-aaa
+aac
+aac
+aad
pAJ
aoP
pAJ
aaa
-aaa
+aad
+aoP
aad
aaa
+pAJ
+aoP
+pAJ
aaa
aad
aoP
@@ -144097,12 +145940,12 @@ tQP
rmH
toy
izj
-fAj
-pUs
-okN
-oAV
-vId
-mdR
+wwW
+wRY
+tVb
+joR
+elG
+eoI
uND
tpZ
aaa
@@ -144279,23 +146122,23 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+aac
aaa
aad
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
+aad
aoP
-pAJ
-aaa
-pAJ
+aad
+aad
+aad
+fjf
+aad
+aad
+aad
aoP
-pAJ
-aaa
+aad
+aad
aad
aoP
aad
@@ -144352,14 +146195,14 @@ fya
cSK
pok
rWo
-itp
+vPB
kKx
dux
-mdR
-nEE
-cyc
-qBS
-mdR
+tpZ
+fnt
+jvj
+wns
+tpZ
uND
tpZ
aad
@@ -144509,28 +146352,21 @@ aaa
aaa
aaa
aaa
-"}
-(176,1,1) = {"
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+"}
+(176,1,1) = {"
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -144539,21 +146375,28 @@ aaa
aaa
aaa
aaa
-aac
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
-aoP
-pAJ
aaa
aad
+aad
+lEh
+aoP
+aoP
+fjf
+fjf
+fjf
+fjf
+rMz
+fjf
+fjf
+fjf
+xcd
+fjf
+fjf
+fjf
+fjf
aoP
aaa
aad
@@ -144612,11 +146455,11 @@ aJE
mtL
bSR
iXd
-mdR
-hzs
-mdR
-mdR
-mdR
+tpZ
+jup
+tpZ
+tpZ
+tpZ
jRc
tpZ
aaa
@@ -144793,25 +146636,25 @@ aaa
aaa
aaa
aaa
+aac
aaa
+aad
aaa
aaa
-aac
aad
-pAJ
aoP
-pAJ
aad
-pAJ
-aoP
-pAJ
aad
-pAJ
-aoP
-pAJ
+aad
+fjf
+aad
aad
aad
aoP
+aad
+aad
+aad
+eqU
aaa
aac
eqU
@@ -145050,25 +146893,25 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+aac
+aac
+aac
+aac
aad
-aaa
pAJ
aoP
pAJ
aaa
-pAJ
+aad
aoP
-pAJ
+aad
aaa
pAJ
aoP
pAJ
-aaa
aad
-aoP
+aad
+eqU
aad
aac
qYo
@@ -145307,25 +147150,25 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
aac
-aad
-aac
-aac
-aad
+aaa
pAJ
aoP
pAJ
aaa
-aad
+pAJ
aoP
-aad
+pAJ
aaa
pAJ
aoP
pAJ
aaa
aad
-fjf
+aad
aaa
aac
aaa
@@ -145564,25 +147407,25 @@ aaa
aaa
aaa
aaa
-aac
aaa
-aad
aaa
aaa
aad
-aoP
-aad
-aad
-aad
-fjf
aad
+pAJ
+aoP
+pAJ
aad
+pAJ
+aoP
+pAJ
aad
+pAJ
aoP
+pAJ
aad
aad
aad
-fjf
aad
aac
aad
@@ -145821,25 +147664,25 @@ aaa
aaa
aaa
aaa
-aad
-aad
-lEh
+aaa
+aaa
+aaa
+aac
+aaa
+pAJ
aoP
+pAJ
+aaa
+pAJ
aoP
-fjf
-fjf
-fjf
-fjf
-rMz
-fjf
-fjf
-fjf
-xcd
-fjf
-fjf
-fjf
-fjf
-fjf
+pAJ
+aaa
+pAJ
+aoP
+pAJ
+aaa
+aad
+aad
aaa
aad
aaa
@@ -146078,23 +147921,23 @@ aaa
aaa
aaa
aaa
-aac
aaa
-aad
aaa
aaa
-aad
+aac
+aaa
+pAJ
aoP
-aad
-aad
-aad
-fjf
-aad
-aad
-aad
+pAJ
+aaa
+pAJ
aoP
-aad
-aad
+pAJ
+aaa
+pAJ
+aoP
+pAJ
+aaa
aad
aad
aad
@@ -146335,23 +148178,23 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
aac
-aac
-aac
-aac
-aad
-pAJ
-aoP
-pAJ
+aaa
aaa
aad
-aoP
-aad
+aaa
aaa
pAJ
aoP
pAJ
+aaa
+aaa
aad
+aaa
+aaa
aac
aad
aac
@@ -146594,22 +148437,22 @@ aaa
aaa
aaa
aaa
+qYo
+aad
+aad
+aad
+aad
+aad
aaa
-aac
aaa
-pAJ
-aoP
-pAJ
-aaa
-pAJ
-aoP
-pAJ
+aad
aaa
-pAJ
-aoP
-pAJ
aaa
-aac
+aad
+aad
+aad
+aad
+aad
aad
aad
aaa
@@ -146635,8 +148478,8 @@ aaa
aaa
aac
aad
-kic
-wfV
+gzd
+tOF
qye
hMn
ocO
@@ -146851,23 +148694,23 @@ aaa
aaa
aaa
aaa
-aaa
-aad
-aad
-pAJ
-aoP
-pAJ
-aad
-pAJ
-aoP
-pAJ
+qYo
+uHd
+uHd
+uHd
+qYo
+aac
+aac
aad
-pAJ
-aoP
-pAJ
+aac
+aac
aad
aac
aaa
+uHd
+qYo
+aac
+aaa
aaa
aaa
aaa
@@ -146893,7 +148736,7 @@ aaa
aac
aad
kic
-rKW
+kic
kic
kic
oeX
@@ -147109,19 +148952,19 @@ aaa
aaa
aaa
aaa
-aac
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
-aoP
-pAJ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aac
aaa
@@ -147366,19 +149209,19 @@ aaa
aaa
aaa
aaa
-aac
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
-aoP
-pAJ
aaa
-pAJ
-aoP
-pAJ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aad
aaa
@@ -147623,18 +149466,18 @@ aaa
aaa
aaa
aaa
-aac
aaa
aaa
-aad
aaa
aaa
-pAJ
-aoP
-pAJ
aaa
aaa
-aad
+aaa
+aaa
+aaa
+aaa
+aaa
+uHd
aaa
aaa
aac
@@ -147880,20 +149723,20 @@ aaa
aaa
aaa
aaa
-aac
-aac
-aad
-aac
-aac
aaa
aaa
-aad
aaa
aaa
-aac
-aac
-aad
-aac
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+uHd
+uHd
+qYo
aac
aaa
aaa
@@ -147930,15 +149773,15 @@ aaa
aaa
aaa
aaa
-abj
-abj
-abj
-abj
-abj
-abj
-abj
-abj
-abj
+aaa
+aaa
+aaa
+aaa
+eqU
+aaa
+eqU
+eqU
+aaa
aaa
aaa
aaa
@@ -148141,13 +149984,6 @@ aaa
aaa
aaa
aaa
-aac
-aac
-aad
-aac
-aac
-aad
-aac
aaa
aaa
aaa
@@ -148190,9 +150026,16 @@ aaa
aaa
aaa
aaa
-aad
+uHd
+lvw
+aaa
+lvw
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
-aad
aaa
aaa
aaa
@@ -148439,6 +150282,15 @@ aaa
aaa
aaa
aaa
+uHd
+uHd
+qYo
+uHd
+uHd
+lvw
+lvw
+lvw
+qYo
aaa
aaa
aaa
@@ -148447,18 +150299,9 @@ aaa
aaa
aaa
aaa
-aad
-aaa
-aad
-aaa
-aaa
-aaa
-aaa
-aaa
+qYo
aaa
-aac
aaa
-aad
aaa
aaa
aad
@@ -148696,28 +150539,28 @@ aaa
aaa
aaa
aaa
+qYo
+qYo
+qYo
aaa
aaa
aaa
-aaa
-aaa
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aac
-aaa
-aac
-aad
-aad
+qYo
+qYo
+lvw
+uHd
+uHd
+uHd
+qYo
+uHd
+uHd
+uHd
+qYo
+qYo
+uHd
+uHd
+uHd
+uHd
aad
aad
aad
@@ -148931,26 +150774,46 @@ aaa
aaa
aaa
aaa
+lvw
+qYo
aaa
aaa
aaa
+lvw
+lvw
+uHd
aaa
aaa
aaa
+lvw
+uHd
+uHd
+uHd
+uHd
+uHd
aaa
aaa
aaa
aaa
aaa
+lvw
+qYo
+qWZ
+bnb
+bnb
+bnb
+qWZ
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
@@ -148959,26 +150822,6 @@ aaa
aaa
aaa
aad
-aaa
-aaa
-aad
-aaa
-aad
-aaa
-aaa
-aac
-aaa
-aaa
-aaa
-aad
-aaa
-aad
-aaa
-aaa
-aad
-aaa
-aaa
-aad
vgQ
vgQ
vgQ
@@ -149186,56 +151029,56 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-aaa
-aaa
-aad
-aad
-aac
-aac
-aad
-aad
-aaa
-aaa
-aaa
-qIH
-qIH
-qIH
-qIH
-qIH
-qIH
+uHd
+lvw
+qYo
+uHd
+uHd
+uHd
+qYo
+qYo
+uHd
+uHd
+uHd
+uHd
+uHd
+qYo
+qYo
+qYo
+qYo
+qYo
+qYo
+lvw
+uHd
+uHd
+uHd
+lvw
+lvw
+qYo
+qWZ
+xmZ
+mjh
+svY
+qWZ
+tbV
+kkv
+kkv
+kkv
+tbV
+tbV
+jNI
+jNI
+jNI
+tbV
+tbV
+kkv
+kkv
+kkv
+tbV
+tbV
+jrA
jrA
jrA
-qIH
vgQ
hYa
nHx
@@ -149443,53 +151286,53 @@ aaa
aaa
aaa
aaa
+uHd
+qYo
+qYo
+qYo
aaa
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
-aaa
-aaa
-abj
-aaa
-aad
-aaa
-aaa
-aad
-mSe
-mSe
-mSe
-mSe
-vmo
-lQj
-xBD
-mXg
-jrA
+qWZ
+bpn
+gQJ
+riT
+fiO
+epq
+dFd
+dFd
+gzq
+qzD
+geV
+gzq
+gzq
+gzq
+qzD
+geV
+gzq
+dFd
+aVV
+bjQ
+jNI
qfM
xzJ
hXi
@@ -149700,54 +151543,54 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
-aaa
-aaa
-abj
-aad
-aad
-aad
+lvw
qYo
qYo
-mSe
-prB
-gTH
-mSe
-iiR
-log
-onT
-onT
-nwt
-gGv
+idT
+idT
+rbX
+rbX
+rbX
+idT
+idT
+kLP
+kLP
+kLP
+kLP
+kLP
+kLP
+kLP
+kLP
+qWZ
+qWZ
+bnb
+bnb
+bnb
+bnb
+qWZ
+qWZ
+qWZ
+bbq
+vHG
+aDG
+fiO
+xTA
+hYF
+wvd
+wvd
+wvd
+wvd
+wvd
+wvd
+wvd
+hYF
+hYF
+iOU
+uAJ
+kKZ
+hoo
+jNI
+qfM
krO
oaO
dwV
@@ -149955,55 +151798,55 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
-aaa
-nET
-aad
-aaa
-aaa
qYo
-aaa
-aaa
-mSe
-pMa
-caH
-mSe
-cpE
-xqc
-eEi
-vtt
-jrA
+uHd
+qYo
+qYo
+qYo
+idT
+jyo
+pIL
+hPB
+pIL
+pIL
+bMU
+cKW
+gFk
+tWq
+iSG
+lkT
+lUJ
+oTw
+wXD
+gab
+uMG
+uMG
+uMG
+kpp
+uMG
+jpl
+gRq
+paH
+roT
+pKv
+mug
+fiO
+ttd
+sGs
+mft
+eGu
+eGu
+eGu
+eGu
+eGu
+mph
+uiO
+hYF
+uAy
+hgQ
+wko
+jHu
+jNI
xPo
krO
tPF
@@ -150213,53 +152056,53 @@ aaa
aaa
aaa
aaa
+uHd
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
-aad
-qIH
-qIH
-vXr
-vXr
-vXr
-vXr
-qIH
-qIH
-qIH
-ykr
-qIH
-qIH
-vXr
-qIH
+idT
+idT
+idT
+fag
+fag
+cqq
+hkL
+hkL
+bMU
+gMO
+hku
+svB
+hku
+hku
+hku
+tGp
+wXD
+ceB
+vHG
+pKv
+vHG
+vHG
+vHG
+vHG
+vHG
+wjK
+vHG
+vHG
+vuF
+dUI
+pFI
+sGs
+hoo
+upY
+kKB
+qdZ
+kKB
+rKR
+qiw
+sjy
+gLg
+jTP
qIH
+jrA
+jrA
qIH
hws
jss
@@ -150470,55 +152313,55 @@ aaa
aaa
aaa
aaa
+uHd
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-efQ
-qYo
-qYo
-qYo
-aaa
-vXr
-vBu
-cKx
-wDX
-hlr
-wDX
-tHs
-iZG
-bWw
-kxj
-wDX
-xNU
-faZ
-cMf
-ygY
-sYM
-vyO
+idT
+qrj
+qrj
+wBU
+gDc
+mRe
+pIL
+qre
+bMU
+aRC
+hku
+hku
+hku
+hku
+hku
+kaJ
+eoa
+bbq
+vHG
+sxs
+lRy
+iiB
+kwl
+nyX
+kfm
+iyT
+qDm
+vHG
+kIL
+dUI
+pFI
+sGs
+hoo
+kME
+iVR
+bxm
+iVR
+wdY
+pek
+wuc
+irH
+wZD
+xUa
+kDS
+ppX
+xUa
+odQ
yiA
olQ
ybk
@@ -150726,56 +152569,56 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-efQ
-aaa
-aaa
uHd
-aaa
-vXr
-jbn
-xIl
-bUc
-amU
-xIl
-fyB
-pJo
-xIl
-aSW
-pJo
-xIl
-weH
-pJo
-ayM
-shF
-iKL
+uHd
+qYo
+idT
+iyj
+hkL
+hak
+yji
+gXz
+hkL
+hkL
+bMU
+iPj
+hku
+cLH
+mHv
+lKA
+hku
+fOc
+eoa
+bbq
+vHG
+aDG
+lTv
+lTv
+lTv
+lTv
+lTv
+lTv
+ipS
+vHG
+ffB
+dUI
+uif
+sGs
+hoo
+cWf
+iVR
+kdI
+iVR
+wdY
+pek
+wuc
+irH
+lws
+jrA
+rhl
+qEl
+qIH
+jGi
krO
jrA
dFG
@@ -150934,36 +152777,8 @@ aaa
aaa
aaa
aaa
-"}
-(201,1,1) = {"
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+"}
+(201,1,1) = {"
aaa
aaa
aaa
@@ -151011,28 +152826,56 @@ aaa
aaa
aaa
aaa
+lvw
uHd
-qYo
-qYo
-uHd
-qYo
-mSe
-mSe
-xGr
-mSe
-mSe
-vhZ
-mSe
-mSe
-kzi
-mSe
-mSe
-krt
-mSe
-mSe
-jLj
-mSe
-hpN
+aaa
+rwg
+qrj
+qrj
+wBU
+gDc
+mRe
+qrj
+qrj
+bMU
+ibT
+hku
+lmb
+lmb
+sku
+sku
+hAI
+eoa
+bbq
+vHG
+rXc
+azT
+uIc
+ilS
+iUc
+qet
+lTv
+rKx
+vHG
+ffB
+dUI
+uif
+hYF
+hoo
+cWf
+iVR
+jcq
+iVR
+wdY
+pek
+irH
+irH
+kOQ
+waU
+tbj
+cWe
+gro
+vyO
krO
hAo
pEH
@@ -151240,56 +153083,56 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-aaa
-aaa
+lvw
uHd
aaa
-mSe
-cKa
-bhz
-lTv
-iPK
-lYv
-lTv
-iPK
-mQz
-lTv
-iPK
-tTQ
+rwg
+fag
+fag
+pNS
+fly
+xxl
+fag
+fag
+ueX
+tMc
+hku
+hku
+hku
+twQ
+sku
+hku
+wXD
+koc
+vHG
+rXc
+azT
+axZ
+hAf
+nPD
+iMc
lTv
-cKa
-nOr
-mSe
-uAD
+bbq
+vHG
+aEU
+dUI
+urT
+hYF
+hoo
+cWf
+iVR
+gDO
+gDO
+rfV
+lKJ
+xFE
+xFE
+ugf
+qIH
+jrA
+jrA
+qIH
+pZY
krO
lET
lET
@@ -151497,55 +153340,55 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-aaa
-aaa
-uHd
+lvw
qYo
-mSe
-eWc
-aRS
-lTv
-eiC
-xnM
-lTv
-eiC
-kLh
-lTv
-cuB
-lKr
+aaa
+rwg
+qfD
+wBR
+wBR
+fYN
+bha
+weK
+fly
+xTh
+iYO
+iYO
+iYO
+iYO
+iYO
+sku
+hku
+wXD
+bbq
+vHG
+cic
lTv
-lnX
-aAr
-mSe
+lZM
+kcU
+oaP
+oaP
+xKV
+vwN
+vHG
+vuF
+dUI
+syw
+sGs
+hoo
+cWf
+iVR
+nYq
+iVR
+wdY
+pek
+wuc
+irH
+dTo
+cND
+rkQ
+naj
+tbV
iCo
nYt
lET
@@ -151754,56 +153597,56 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
-aaa
-aaa
qYo
+uHd
aaa
-mSe
-omW
-nbw
+rwg
+uZc
+yji
+wBR
+pGX
+bMU
+bMU
+bMU
+bMU
+sWm
+tSF
+eOT
+eOT
+qon
+tDO
+wXD
+wXD
+bbq
+vHG
+bXc
lTv
-oel
-ixG
lTv
-leS
-sUS
lTv
-lcY
-rnA
lTv
-avl
-hPN
-mSe
-iuk
+lTv
+lTv
+koc
+vHG
+rXc
+fiO
+nuN
+sGs
+hoo
+cWf
+iVR
+bxm
+iVR
+mlj
+pek
+wuc
+irH
+wMK
+sDb
+drq
+nuQ
+tbV
+tys
puN
lET
keC
@@ -152011,55 +153854,55 @@ aaa
aaa
aaa
aaa
+uHd
+uHd
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
-vVc
-vVc
-qYo
-aaa
-mSe
-lTv
-vJh
-lTv
-lTv
-rXh
-lTv
-lTv
-mpO
-lTv
-lTv
-fDm
-lTv
-lTv
-lMN
-mSe
+rwg
+efn
+yji
+wBR
+dsk
+bMU
+xew
+vGq
+pYD
+hOR
+hOR
+hOR
+hOR
+hOR
+tec
+wXD
+cSC
+roT
+vHG
+glR
+azT
+uIc
+ilS
+soO
+qXZ
+sud
+ihH
+vHG
+wdX
+fiO
+xTA
+sGs
+hoo
+azk
+mAw
+kTc
+mAw
+lzD
+pek
+wuc
+mpW
+wMK
+vZW
+bxA
+pGs
+kkv
iCo
spB
lET
@@ -152269,54 +154112,54 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
-aaa
-aaa
+uHd
qYo
idT
-idT
-uWT
-qkJ
-ayH
-kPs
-tWG
-nWw
-diC
-rwn
-kho
-vcf
-ddw
-tUB
-pcA
-ouc
-qWZ
+vrt
+yji
+wBR
+wBR
+kCZ
+dPP
+pan
+pan
+pan
+pan
+pan
+pan
+dPP
+tVQ
+wXD
+dFn
+dwh
+vHG
+glR
+azT
+axZ
+hAf
+aJJ
+aEl
+lTv
+bbq
+vHG
+rXc
+fiO
+jTL
+aFM
+usj
+eng
+eng
+eng
+eng
+eng
+jyW
+wuc
+irH
+wMK
+sDb
+vyE
+lsC
+kkv
iCo
krO
qyK
@@ -152476,33 +154319,8 @@ aaa
aaa
aaa
aaa
-"}
-(207,1,1) = {"
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+"}
+(207,1,1) = {"
aaa
aaa
aaa
@@ -152551,30 +154369,55 @@ aaa
aaa
aaa
aaa
+uHd
aaa
-qYo
-qYo
idT
-idT
-idT
-idT
-dax
-sON
-qkJ
-xdP
-gml
-jyp
-waZ
-jyp
-eTv
-bii
-nwN
-hMx
-bGi
-adU
-tOY
-hLe
-bSl
+azX
+yji
+wBR
+uJB
+bMU
+dek
+tSG
+qhq
+iIp
+oiQ
+qxn
+xnU
+pan
+pan
+ehH
+nKX
+vHG
+vHG
+hOy
+lTv
+kDQ
+kcU
+bAn
+bAn
+was
+hCI
+vHG
+aGN
+eyB
+pVT
+irH
+dfu
+dfu
+dfu
+uRb
+dfu
+dfu
+dfu
+irH
+irH
+wMK
+vZW
+bxA
+pGs
+kkv
+iCo
krO
bqE
lET
@@ -152783,54 +154626,54 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
uHd
aaa
-arw
-ckH
-arS
-ekR
-pgn
-gOo
-bfs
-jdT
-vxr
-vda
-iOc
-qdg
-iOc
-iOc
-iOc
-fiO
-kxA
-vII
-gPG
-hLe
+idT
+idT
+rbX
+rbX
+idT
+idT
+aUU
+tSG
+kfK
+vRP
+rMd
+xgm
+kdQ
+cpN
+cpN
+jNZ
+nPf
+rtf
+vHG
+xVA
+lTv
+lTv
+lTv
+lTv
+lTv
+lTv
+bbq
+vHG
+vHG
+mYx
+wMK
+wMK
+wMK
+wMK
+evN
+wMK
+nYi
+wMK
+wMK
+wMK
+wMK
+wMK
+sDb
+vZp
+nuQ
+tbV
iCo
krO
xXI
@@ -153039,55 +154882,55 @@ aaa
aaa
aaa
aaa
+lvw
+qYo
aaa
aaa
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-qYo
-uHd
-aaa
-arw
-xvn
-rRL
-ioT
-cVV
-itW
-nJg
-jHw
-vyM
-jMs
-iOc
-fwL
-bez
-iDC
-ylB
-fiO
-uuf
-bGi
-xPz
-qWZ
+kLP
+pzv
+tSG
+kfK
+jmo
+oXM
+gQw
+kdQ
+cpN
+mZp
+wXD
+cHZ
+rtf
+vHG
+xDI
+azT
+uIc
+ilS
+wIn
+bWi
+sud
+blI
+vHG
+sxs
+eLj
+kQZ
+irH
+irH
+irH
+irH
+qED
+irH
+irH
+irH
+eQg
+vXo
+xwM
+vNw
+lhv
+sUs
+tbV
sgh
lTJ
gJk
@@ -153295,54 +155138,54 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-aaa
uHd
-aaa
-arw
-fSd
-mze
-gjX
-fJG
-vxr
-upM
-ibb
-bDw
-jMs
-iOc
-vMZ
-iOc
-sIR
-nnW
+qYo
+qYo
+iZr
+iZr
+iZr
+mLR
+mLR
+iZr
+kLP
+jqo
+tSG
+kfK
+dyW
+sIa
+cJh
+qIn
+cpN
+jqo
+eoa
+nPf
+rtf
+vHG
+tFq
+azT
+axZ
+hAf
+eAg
+ouH
+lTv
+bbq
+vHG
+vyo
+fiO
+daD
+ifW
+mOu
+eGv
+eGv
+eGv
+eGv
+eGv
+oFb
+lpU
+iGy
lAj
lAj
-jkS
+vVn
lAj
vxs
kiB
@@ -153552,51 +155395,51 @@ aaa
aaa
aaa
aaa
+uHd
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-efQ
-aaa
-qYo
-aaa
-arw
-wtJ
-mze
-vDX
-pAx
-diC
-vTP
-aNd
-qkJ
-hZL
-iOc
-iOc
-iOc
-iOc
-iOc
+iZr
+iZr
+aGH
+shX
+egv
+dko
+nja
+eoa
+cpN
+tSG
+kfK
+ePO
+lAO
+ggI
+dAP
+cpN
+pvo
+eoa
+nPf
+fMI
+vHG
+sZh
+lTv
+lZM
+kcU
+bAn
+bAn
+fXq
+hCI
+vHG
+nQW
+fiO
+eyF
+hYF
+ndp
+nXG
+wOG
+wOG
+wOG
+tPL
+dbM
+bwX
+hoo
lAj
dsw
cSF
@@ -153809,51 +155652,51 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-aaa
uHd
aaa
-arw
-gQa
-okK
-aeM
-qpB
-edb
-rwn
-ryY
-vxr
-xxf
-uRz
-hmr
-jOw
-aNz
-xmk
+iZr
+bHC
+hKh
+vXw
+ugb
+von
+dko
+eoa
+cpN
+tSG
+kfK
+gSq
+qPY
+lOr
+dAP
+cpN
+xnR
+eoa
+nPf
+rtf
+vHG
+wcQ
+lTv
+lTv
+lTv
+lTv
+lTv
+lTv
+bbq
+vHG
+jzo
+fiO
+bqb
+hYF
+ndp
+wOG
+jLX
+qOJ
+hYF
+iie
+dbM
+bwX
+iAC
lAj
axa
fgj
@@ -154066,51 +155909,51 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-qYo
uHd
aaa
-arw
-aRn
-uvo
-fVW
-rRm
-iiy
-tUB
-ryY
-mUJ
-blB
-gur
-thI
-thI
-tse
-awT
+iZr
+hUk
+gGK
+biz
+djS
+wdz
+tVk
+wXD
+csQ
+tSG
+qKK
+xTi
+khz
+cpR
+kkY
+cpN
+xsI
+wXD
+eWG
+rtf
+vHG
+glR
+azT
+uIc
+ilS
+qLO
+rHN
+sud
+bbq
+vHG
+kIL
+dUI
+tPs
+hYF
+ndp
+wOG
+sTy
+axn
+xJi
+wZm
+szZ
+bwX
+spX
lAj
sVe
wSh
@@ -154322,52 +156165,52 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
qYo
-idT
-idT
-idT
-idT
-vRo
-pGj
-nIr
-sMN
-bLP
-gER
-uRz
-sOS
-bnU
-vSK
-kRM
+uHd
+aaa
+iZr
+pJn
+mGb
+ffv
+nbC
+bwV
+tiW
+fib
+pan
+pan
+dPP
+dPP
+dPP
+dPP
+dPP
+dPP
+dPP
+jNZ
+nPf
+rtf
+vHG
+glR
+azT
+axZ
+hAf
+qSY
+rIG
+lTv
+bbq
+vHG
+ffB
+dUI
+tPs
+hYF
+ndp
+wOG
+hYF
+tAD
+hYF
+iie
+dbM
+hYF
+fiy
lAj
xmm
lAj
@@ -154532,39 +156375,8 @@ aaa
aaa
aaa
aaa
-"}
-(215,1,1) = {"
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+"}
+(215,1,1) = {"
aaa
aaa
aaa
@@ -154608,23 +156420,54 @@ aaa
aaa
aaa
aaa
-aad
-aaa
aaa
aaa
+uHd
+uHd
aaa
-idT
-idT
-gQZ
-gQZ
-ntc
-gQZ
-gQZ
-gQZ
-eIs
-mvF
-sze
-eqa
+iZr
+iZr
+rIz
+idE
+gGK
+hrh
+rNk
+wXD
+jeH
+nad
+umr
+umr
+umr
+umr
+umr
+umr
+oLN
+vJA
+nKX
+pKv
+vHG
+hOy
+lTv
+kDQ
+kcU
+bAn
+bAn
+yen
+hCI
+vHG
+aEU
+dUI
+pFI
+hYF
+ndp
+tmI
+lmc
+lmc
+lmc
+nFm
+dbM
+hYF
+hoo
lAj
imE
uyU
@@ -154836,52 +156679,52 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-vVc
qYo
uHd
-uHd
-uHd
-uHd
-qYo
qYo
-ivM
-pWb
-shc
-eYK
-hmO
-liv
-gQZ
-ucR
-bgE
-gzj
-kia
+aad
+iZr
+iZr
+iZr
+foz
+nKo
+rNk
+wXD
+wFD
+qJW
+swS
+jJV
+uSq
+ibl
+gMr
+cFB
+ahD
+wXD
+nPf
+rtf
+vHG
+bXc
+lTv
+lTv
+lTv
+lTv
+lTv
+lTv
+koc
+vHG
+aKB
+fiO
+qhR
+hYF
+qAU
+aqa
+aqa
+aqa
+aqa
+aqa
+pWa
+hYF
+hoo
lAj
wCs
iNf
@@ -155079,37 +156922,7 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-oFv
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+mPx
aaa
aaa
aaa
@@ -155128,17 +156941,47 @@ qYo
aaa
aaa
aaa
-ivM
-fIW
-fYO
-eYK
-qEw
-ewL
-gQZ
-eWh
-tXL
-sze
-qRZ
+aaa
+iZr
+phA
+uZk
+rNk
+wXD
+xew
+wGX
+dWr
+avV
+avV
+agI
+coa
+ahD
+gwL
+wXD
+vug
+qDm
+vHG
+xkS
+azT
+uIc
+ilS
+mhB
+knL
+sud
+ihH
+vHG
+nhJ
+fiO
+eyF
+hYF
+hYF
+hYF
+hYF
+hYF
+hYF
+hYF
+hYF
+hYF
+hoo
eHO
eHO
eHO
@@ -155351,51 +157194,51 @@ aaa
aaa
aaa
aaa
+lvw
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-wVj
-aaa
-uHd
-aaa
-aaa
-aaa
-ivM
-kRw
-fTS
-izM
-pgo
-cul
-gQZ
-ubL
-mAA
-kxm
-dwC
+iZr
+iZr
+iZr
+iZr
+kLP
+kLP
+kLP
+kLP
+lqD
+ihy
+eip
+cTG
+iaq
+noF
+kkf
+wXD
+pMr
+ukP
+yjy
+azT
+axZ
+hAf
+rqT
+cCi
+lTv
+bbq
+vHG
+rXc
+fiO
+qZa
+ffh
+ucp
+jyj
+hsh
+dFH
+day
+jyj
+iPT
+hgQ
+oCH
eHO
bJx
mor
@@ -155608,47 +157451,47 @@ aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
+qYo
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-uHd
-qYo
-uHd
-qYo
-lGv
-lGv
-ivM
-ivM
-ivM
-lGv
-lGv
+kLP
+kLP
+qcX
+qcX
+qcX
+kLP
+kLP
+wXD
+wXD
+aSh
+jpt
+aSh
+lTv
+lZM
+kcU
+bAn
+bAn
+wrU
+oZE
+ukP
+evd
+urU
+urU
+urU
+urU
+urU
+urU
+nZV
+nZV
eHO
eHO
eHO
@@ -155865,46 +157708,46 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
uHd
+uHd
+uHd
+uHd
+uHd
+qYo
+qYo
+uHd
+uHd
+qYo
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
+qWZ
+hpk
+hmm
+qJu
+cyL
+chu
+lTv
+lTv
+lTv
+lTv
+lTv
+lTv
+lbG
+ptQ
+lbG
+urU
+tjD
+wea
+dZq
+wea
+tjD
+nZV
aaa
bCC
nOz
@@ -156074,60 +157917,31 @@ aaa
aaa
aaa
aaa
-"}
-(221,1,1) = {"
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+"}
+(221,1,1) = {"
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -156155,13 +157969,42 @@ aaa
aaa
aaa
uHd
+uHd
+lvw
+aaa
+aaa
+aaa
qYo
-vVc
-vVc
-vVc
+lvw
+uHd
+uHd
+qYo
+uHd
+uHd
qYo
qYo
-aaa
+qWZ
+vvk
+wRl
+heM
+fne
+iMu
+lTv
+jSZ
+lFV
+tlQ
+mkH
+lTv
+vzU
+wBD
+xAI
+che
+fYL
+hau
+hsN
+hsN
+hsN
+nZV
aaa
bCC
hhn
@@ -156393,32 +158236,32 @@ aaa
aaa
aaa
aaa
+uHd
+uHd
+lvw
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-aaa
+qWZ
+xJr
+aKi
+cyL
+cyL
+tmZ
+lTv
+kJo
+buS
+wKf
+bRB
+lTv
+tjD
+wBD
+hsN
+ciQ
+qie
+lEw
+uBk
+bne
+rhv
+nZV
aaa
bCC
xFh
@@ -156652,31 +158495,31 @@ aaa
aaa
aaa
aaa
+lvw
aaa
+qWZ
+vvk
+qJu
+ktt
+qJu
+iMu
+lTv
+azI
+tGX
+pCc
+gRy
+lTv
+tjD
+wBD
+bSB
+bSB
+eob
+jCx
+kvS
+bne
+cTR
+nZV
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
-uHd
-uHd
-uHd
-qYo
-aFo
-aad
-aad
-aad
eHO
eHO
eHO
@@ -156909,30 +158752,30 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-efQ
-efQ
-efQ
+uHd
+qYo
+qWZ
+eeN
+qJu
+sFH
+diO
+tmZ
+lTv
+smC
+hvr
+pEZ
+bkX
+cFi
+rgp
+wBD
+nFk
+gZc
+mfc
+gwz
+ciQ
+hsN
+sUG
+nZV
aaa
qYo
qYo
@@ -157166,31 +159009,31 @@ aaa
aaa
aaa
aaa
+uHd
aaa
+qWZ
+qWZ
+qWZ
+qWZ
+qWZ
+qWZ
+mSe
+mSe
+mSe
+mSe
+mSe
+mSe
+nZV
+fTa
+fTa
+nZV
+kTr
+wRg
+hsN
+biw
+tjD
+nZV
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qYo
-qYo
efQ
efQ
efQ
@@ -157422,8 +159265,11 @@ aaa
aaa
aaa
aaa
+qYo
+qYo
aaa
aaa
+qYo
aaa
aaa
aaa
@@ -157431,25 +159277,22 @@ aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
aaa
aaa
+nZV
+nZV
+fTa
+fTa
+fTa
+nZV
+nZV
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-vVc
-vVc
-aaa
-aaa
qYo
qYo
qYo
@@ -157680,33 +159523,33 @@ aaa
aaa
aaa
aaa
+lvw
+qYo
+uHd
+uHd
+uHd
+uHd
+qYo
+qYo
+uHd
+uHd
+uHd
+uHd
+uHd
+qYo
aaa
aaa
aaa
aaa
+qYo
aaa
aaa
aaa
+qYo
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+qYo
+uHd
+qYo
vVc
vVc
vVc
@@ -157942,26 +159785,26 @@ aaa
aaa
aaa
aaa
+qYo
+uHd
aaa
aaa
aaa
+qYo
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+lvw
+qYo
+uHd
+uHd
+uHd
+qYo
+qYo
+uHd
+qYo
+uHd
+uHd
+qYo
aaa
aaa
aaa
@@ -158211,11 +160054,11 @@ aaa
aaa
aaa
aaa
+qYo
+lvw
aaa
aaa
-aaa
-aaa
-aaa
+qYo
aaa
aaa
aaa
@@ -158990,7 +160833,7 @@ aaa
aaa
aaa
aaa
-aab
+aaa
aaa
aaa
aaa
@@ -162330,7 +164173,7 @@ aaa
aaa
aaa
aaa
-aaa
+wVj
aaa
aaa
aaa
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 3b830e5af0cb..2b83e55fcd36 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -1363,15 +1363,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
-"axb" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/sign/warning/gas_mask/directional/north{
- desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."
- },
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"axc" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/poddoor/preopen{
@@ -1650,18 +1641,37 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"aCr" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/item/seeds/onion,
+/obj/item/seeds/garlic,
+/obj/item/seeds/potato,
+/obj/item/seeds/tomato,
+/obj/item/seeds/carrot,
+/obj/item/seeds/grass,
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/wheat,
+/obj/item/seeds/pumpkin,
+/obj/effect/spawner/random/contraband/prison,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 1
+ },
+/obj/item/seeds/tree,
+/obj/effect/spawner/random/food_or_drink/seed{
+ spawn_all_loot = 1;
+ spawn_random_offset = 1
+ },
+/obj/item/botanical_lexicon,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"aCA" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"aCH" = (
-/obj/item/toy/plush/space_lizard_plushie{
- name = "Ruins-The-Analog"
- },
-/turf/open/misc/asteroid/snow/icemoon,
-/area/icemoon/underground/explored)
"aCJ" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -1810,12 +1820,30 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock)
+"aFC" = (
+/obj/machinery/light/warm/directional/south,
+/obj/effect/turf_decal/tile/red,
+/obj/structure/chair/sofa/bench/left{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"aFJ" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"aFM" = (
+/obj/item/plant_analyzer,
+/obj/item/plant_analyzer{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/station/security/prison/garden)
"aGj" = (
/obj/machinery/door/airlock/security/glass{
name = "Permabrig Visitation"
@@ -2064,10 +2092,6 @@
},
/turf/open/floor/plating,
/area/station/engineering/transit_tube)
-"aKb" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"aKf" = (
/obj/machinery/light_switch/directional/south,
/obj/structure/chair/comfy/brown{
@@ -2765,13 +2789,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"aVE" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 4
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/cargo/miningdock)
"aVH" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/tile/blue/half/contrasted,
@@ -3071,6 +3088,13 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"baq" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/light/warm/directional/west,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"baA" = (
/obj/structure/cable,
/obj/machinery/camera/directional/east{
@@ -3226,6 +3250,15 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"bdm" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"bdo" = (
/obj/structure/table/wood,
/obj/item/food/grown/poppy{
@@ -3645,6 +3678,10 @@
/obj/item/clothing/head/beanie/orange,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"biu" = (
+/obj/item/toy/plush/lizard_plushie,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/underground/explored)
"biI" = (
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Test Chamber";
@@ -3861,6 +3898,10 @@
/mob/living/basic/lizard/wags_his_tail,
/turf/open/floor/iron,
/area/station/service/janitor)
+"blx" = (
+/obj/structure/table,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"blO" = (
/obj/structure/girder,
/turf/open/floor/plating,
@@ -5852,6 +5893,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"bQH" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla{
+ pixel_x = -2
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"bQN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -6269,6 +6317,13 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark,
/area/mine/mechbay)
+"bYk" = (
+/obj/item/food/pie/cream,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/directional/east,
+/obj/structure/table,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"bYm" = (
/obj/structure/chair/pew{
dir = 1
@@ -6481,6 +6536,15 @@
/obj/effect/turf_decal/tile/blue/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/cmo)
+"caL" = (
+/obj/machinery/light/warm/directional/west,
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"caS" = (
/obj/machinery/light/directional/east,
/obj/machinery/status_display/evac/directional/east,
@@ -7192,6 +7256,12 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"cmh" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating/snowed/icemoon,
+/area/icemoon/underground/explored)
"cmm" = (
/obj/structure/chair/office,
/obj/effect/turf_decal/tile/red/half/contrasted,
@@ -7344,6 +7414,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"cnS" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/hollow/reinforced/middle{
+ dir = 1
+ },
+/turf/open/floor/plating/icemoon,
+/area/station/security/execution/education)
"cnU" = (
/obj/machinery/computer/security/telescreen/vault{
pixel_y = 30
@@ -7720,6 +7797,14 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
+"cvp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/closet/crate,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"cvr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
@@ -7864,6 +7949,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"cxC" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/engine_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1;
+ name = "Gas to Filter"
+ },
+/turf/open/floor/engine,
+/area/station/engineering/supermatter)
"cxO" = (
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
@@ -8349,6 +8444,13 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"cDr" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"cDw" = (
/obj/effect/mapping_helpers/airlock/abandoned,
/obj/machinery/door/airlock/glass{
@@ -8465,12 +8567,6 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/smooth_edge,
/area/station/security/lockers)
-"cFc" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/contraband/permabrig_gear,
-/obj/structure/sign/warning/cold_temp/directional/west,
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"cFl" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -8829,6 +8925,13 @@
/obj/structure/bookcase/random/reference,
/turf/open/floor/carpet/blue,
/area/station/medical/psychology)
+"cKG" = (
+/obj/effect/turf_decal/tile/red,
+/obj/structure/chair/sofa/bench/right{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"cKM" = (
/obj/structure/cable,
/obj/structure/sign/poster/random/directional/south,
@@ -9477,6 +9580,12 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"cUD" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor,
+/area/icemoon/underground/explored)
"cVa" = (
/obj/machinery/camera/directional/north{
c_tag = "Fitness Room North"
@@ -9568,6 +9677,11 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"cXa" = (
+/obj/structure/chair,
+/obj/effect/landmark/start/shaft_miner,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"cXc" = (
/obj/effect/turf_decal/arrows,
/turf/open/floor/iron,
@@ -9809,6 +9923,35 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"day" = (
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/cup/bowl,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"daE" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/cafeteria,
@@ -10239,6 +10382,13 @@
/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
+"dhl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/bot,
+/obj/machinery/grill,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"dho" = (
/obj/structure/table/reinforced,
/obj/item/storage/secure/briefcase,
@@ -10680,6 +10830,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"doH" = (
+/obj/structure/statue/snow/snowman{
+ name = "John Syndicate"
+ },
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
"doT" = (
/obj/item/hand_labeler,
/obj/item/assembly/timer,
@@ -10932,19 +11088,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"dsp" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"dsA" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/components/tank/air{
@@ -11004,13 +11147,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment,
/turf/open/floor/iron,
/area/station/engineering/engine_smes)
-"dtn" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light_switch/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"dtr" = (
/obj/machinery/computer/records/medical,
/obj/effect/turf_decal/tile/green/anticorner/contrasted,
@@ -11737,12 +11873,6 @@
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
-"dFF" = (
-/obj/structure/chair{
- dir = 8
- },
-/turf/open/floor/plating/snowed/icemoon,
-/area/icemoon/underground/explored)
"dFG" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
@@ -11783,11 +11913,6 @@
/obj/effect/decal/cleanable/food/egg_smudge,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"dGi" = (
-/obj/machinery/netpod,
-/obj/machinery/camera/directional/south,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"dGK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11912,6 +12037,10 @@
/obj/machinery/air_sensor/ordnance_freezer_chamber,
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
+"dJP" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"dJZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -12032,6 +12161,10 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"dLA" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"dLH" = (
/obj/structure/fence{
dir = 1
@@ -12510,11 +12643,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/freezer,
/area/mine/laborcamp)
-"dUK" = (
-/obj/machinery/netpod,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"dUL" = (
/obj/machinery/door/poddoor/preopen{
id = "maint1"
@@ -13221,9 +13349,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/commons/locker)
-"ehu" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"ehy" = (
/obj/machinery/keycard_auth/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -13575,13 +13700,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"emT" = (
-/obj/machinery/light/small/directional/east,
-/obj/machinery/computer/order_console/bitrunning{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"ena" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -14480,6 +14598,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/engineering)
+"eCf" = (
+/obj/effect/turf_decal/tile/red,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"eCn" = (
/obj/structure/disposalpipe/trunk/multiz{
dir = 1
@@ -14614,17 +14737,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/smooth_large,
/area/station/command/heads_quarters/hos)
-"eDX" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/effect/turf_decal/box/red,
-/obj/machinery/airalarm/mixingchamber{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/burnchamber)
"eEb" = (
/obj/machinery/computer/security/telescreen{
name = "Test Chamber Monitor";
@@ -14877,6 +14989,11 @@
},
/turf/closed/wall,
/area/station/commons/storage/tools)
+"eIB" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"eIC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -15344,11 +15461,6 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"eQA" = (
-/obj/item/kitchen/rollingpin,
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"eQN" = (
/obj/machinery/door/airlock{
name = "Unisex Showers"
@@ -15393,6 +15505,12 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"eRF" = (
+/obj/effect/turf_decal/tile/red,
+/obj/item/plate,
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"eRH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -15651,6 +15769,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"eVL" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"eVO" = (
/obj/machinery/door/airlock/external{
glass = 1;
@@ -15851,6 +15974,19 @@
"eYC" = (
/turf/open/floor/iron/smooth,
/area/mine/laborcamp/security)
+"eYD" = (
+/obj/machinery/door/airlock{
+ name = "Perma Overlook Entrance"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "perma-overlook"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/fans/tiny,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"eYH" = (
/obj/machinery/power/smes{
charge = 5e+006
@@ -16215,11 +16351,6 @@
/obj/machinery/smartfridge/chemistry/virology/preloaded,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
-"ffY" = (
-/obj/machinery/growing/soil,
-/obj/item/plant_analyzer,
-/turf/open/floor/grass,
-/area/station/security/prison/garden)
"ffZ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -16322,14 +16453,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"fhU" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"fhV" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/camera/directional/north{
@@ -16450,6 +16573,19 @@
/obj/machinery/smartfridge,
/turf/closed/wall,
/area/station/service/hydroponics)
+"fjy" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/clothing/suit/costume/snowman,
+/obj/item/clothing/head/costume/snowman{
+ pixel_x = -1;
+ pixel_y = 7
+ },
+/obj/machinery/light_switch/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"fjD" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/effect/turf_decal/bot,
@@ -16539,15 +16675,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"flq" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/quantum_server,
-/obj/effect/decal/cleanable/oil/streak,
-/turf/open/floor/iron/dark/smooth_corner{
- dir = 4
- },
-/area/station/bitrunning/den)
"flx" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=HOP";
@@ -17184,11 +17311,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"fwL" = (
-/obj/structure/sink/kitchen/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"fwO" = (
/obj/machinery/space_heater,
/obj/structure/cable,
@@ -17324,6 +17446,19 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"fzf" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Security - Permabrig Observation Prep";
+ network = list("ss13","prison")
+ },
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = -32
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"fzo" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -17621,6 +17756,17 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
+"fFp" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/service/hydroponics)
"fFv" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Port Mix to West Ports"
@@ -17703,12 +17849,6 @@
/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
-"fHn" = (
-/obj/machinery/firealarm/directional/north,
-/obj/structure/chair,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"fHo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/dark_green{
@@ -17787,6 +17927,12 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"fIq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"fIs" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -17829,6 +17975,12 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"fIQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"fJe" = (
/obj/machinery/door/airlock/external{
name = "Atmospherics External Airlock"
@@ -18320,19 +18472,6 @@
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/turf/open/floor/wood,
/area/station/command/meeting_room)
-"fTo" = (
-/obj/item/reagent_containers/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/condiment/peppermill{
- pixel_x = 3
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/knife/plastic,
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom/prison/directional/north,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"fTq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -18389,6 +18528,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
+"fTN" = (
+/obj/effect/turf_decal/tile/red,
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"fTR" = (
/obj/machinery/light/directional/north,
/obj/structure/sign/warning/electric_shock/directional/north,
@@ -18867,11 +19013,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/checkpoint/customs/auxiliary)
-"gbu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"gbv" = (
/obj/machinery/conveyor{
dir = 8;
@@ -19054,11 +19195,12 @@
},
/turf/open/floor/glass/reinforced,
/area/station/engineering/atmos/pumproom)
-"gcZ" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray,
-/obj/item/food/piedough,
-/turf/open/floor/iron/cafeteria,
+"gcY" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/middle{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
/area/station/security/prison/mess)
"gdf" = (
/obj/machinery/plumbing/ooze_sucker{
@@ -19703,6 +19845,13 @@
/obj/effect/turf_decal/tile/green/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pathology)
+"goS" = (
+/obj/effect/landmark/navigate_destination/common/bitrunner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/hammerandsickle,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"gpj" = (
/obj/structure/chair/sofa/corp/right{
dir = 8
@@ -19882,6 +20031,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"grJ" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"grN" = (
/obj/structure/chair{
dir = 8
@@ -20086,21 +20241,10 @@
"gwK" = (
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/engineering)
-"gxb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
+"gwW" = (
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"gxn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
@@ -20231,6 +20375,15 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
+"gzm" = (
+/obj/structure/sign/warning/gas_mask/directional/north{
+ desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"gzv" = (
/turf/open/floor/iron,
/area/mine/production)
@@ -20601,6 +20754,12 @@
"gEE" = (
/turf/open/openspace,
/area/station/service/chapel)
+"gEI" = (
+/obj/machinery/flasher/directional/east{
+ id = "executionflash"
+ },
+/turf/open/genturf/orange,
+/area/icemoon/underground/unexplored/no_rivers)
"gEL" = (
/obj/structure/table/glass,
/obj/item/hand_labeler,
@@ -21111,10 +21270,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"gNP" = (
-/obj/machinery/oven/range,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"gNT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -21172,6 +21327,11 @@
/obj/machinery/light/directional/west,
/turf/open/openspace,
/area/station/science/xenobiology)
+"gOQ" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/middle,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/evidence)
"gOR" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
@@ -21444,6 +21604,13 @@
"gTK" = (
/turf/closed/wall,
/area/station/engineering/engine_smes)
+"gTS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"gTW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22150,12 +22317,6 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"hfv" = (
-/obj/machinery/processor{
- pixel_y = 6
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/security/prison/mess)
"hfA" = (
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 2
@@ -22295,6 +22456,15 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/service/hydroponics/garden)
+"hjy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
+ dir = 4
+ },
+/obj/machinery/meter,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/freezerchamber)
"hjE" = (
/turf/closed/wall/r_wall,
/area/station/science/explab)
@@ -22622,6 +22792,20 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"hpP" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"hpR" = (
/obj/effect/spawner/random/entertainment/arcade{
dir = 4
@@ -22868,10 +23052,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/plating/snowed/coldroom,
/area/station/service/kitchen/coldroom)
-"hux" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"huB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23290,13 +23470,6 @@
dir = 4
},
/area/mine/eva)
-"hCv" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"hCx" = (
/obj/structure/table,
/obj/item/binoculars,
@@ -24060,6 +24233,10 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"hQR" = (
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"hRw" = (
/obj/structure/chair/wood{
dir = 8
@@ -24463,6 +24640,11 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness)
+"hYO" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/griddle,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"hYP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24886,6 +25068,11 @@
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"ieE" = (
+/obj/item/radio/intercom/directional/east,
+/obj/structure/closet/crate,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"ieF" = (
/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{
color = "#0000ff";
@@ -24958,6 +25145,12 @@
/obj/structure/sign/warning/cold_temp,
/turf/open/floor/plating/icemoon,
/area/station/maintenance/solars/port/aft)
+"ifW" = (
+/obj/structure/cable,
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"ifY" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
@@ -25516,6 +25709,16 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
+"ioZ" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"ipa" = (
/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{
color = "#ff0000";
@@ -26194,6 +26397,23 @@
dir = 4
},
/area/station/service/chapel)
+"iAZ" = (
+/obj/machinery/light/directional/north,
+/obj/structure/cable,
+/obj/item/radio/intercom/prison/directional/north,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 1
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_x = 7;
+ pixel_y = 9
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"iBd" = (
/obj/structure/fireplace{
pixel_x = -32
@@ -26532,6 +26752,10 @@
"iHp" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai)
+"iHu" = (
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"iHz" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -26688,20 +26912,6 @@
},
/turf/open/floor/plating/icemoon,
/area/station/science/ordnance/bomb)
-"iKe" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/landmark/start/bitrunner,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"iKl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -26983,6 +27193,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/mine/eva)
+"iOx" = (
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"iOA" = (
/obj/structure/fence{
dir = 4
@@ -28327,6 +28544,22 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory/upper)
+"jkt" = (
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/prison/directional/north,
+/obj/item/reagent_containers/cup/soup_pot{
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"jkH" = (
/obj/structure/training_machine,
/obj/effect/landmark/blobstart,
@@ -28582,6 +28815,11 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"jpv" = (
+/obj/effect/turf_decal/trimline/yellow,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"jpy" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -29176,6 +29414,14 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"jAr" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/modular_computer/laptop,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"jAu" = (
/obj/structure/rack,
/obj/structure/cable,
@@ -29313,6 +29559,15 @@
/obj/effect/turf_decal/tile/brown/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/break_room)
+"jDf" = (
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/coffeemaker,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"jDi" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
@@ -29344,6 +29599,12 @@
},
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hos)
+"jDz" = (
+/obj/item/cultivator,
+/obj/item/cultivator,
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"jDG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -29729,6 +29990,14 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/engine,
/area/station/science/genetics)
+"jKn" = (
+/obj/structure/table,
+/obj/item/storage/bag/tray,
+/obj/item/storage/bag/tray,
+/obj/item/food/piedough,
+/obj/machinery/light/warm/directional/east,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"jKr" = (
/obj/structure/railing{
dir = 8
@@ -30058,6 +30327,14 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"jOS" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"jOY" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/reagent_dispensers/plumbed{
@@ -30531,6 +30808,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"jWB" = (
+/obj/structure/statue/snow/snowman,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
"jWD" = (
/obj/structure/sign/directions/medical{
dir = 4;
@@ -30681,14 +30962,6 @@
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/fore/lesser)
-"jZg" = (
-/obj/machinery/airalarm/kitchen_cold_room{
- dir = 8;
- pixel_x = -24
- },
-/obj/structure/flora/bush/snow/style_random,
-/turf/open/misc/asteroid/snow/coldroom,
-/area/station/service/kitchen/coldroom)
"jZi" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/public/glass{
@@ -31321,10 +31594,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"kit" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"kix" = (
/obj/machinery/door/airlock/mining/glass{
name = "Mining Base"
@@ -31748,6 +32017,16 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp)
+"kpK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/grunge{
+ name = "Bitrunner Den"
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"kpM" = (
/obj/machinery/status_display/ai/directional/north,
/obj/machinery/light/directional/north,
@@ -31896,12 +32175,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/medical/cryo)
-"kry" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/start/prisoner,
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"krC" = (
/obj/machinery/atmospherics/components/tank/air{
dir = 8
@@ -31951,13 +32224,6 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"kse" = (
-/obj/structure/chair/sofa/bench/left{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"ksf" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
@@ -32119,10 +32385,6 @@
/obj/item/reagent_containers/cup/glass/waterbottle/empty,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
-"kuu" = (
-/obj/item/kirbyplants/dead,
-/turf/open/floor/plating/snowed/icemoon,
-/area/icemoon/underground/explored)
"kuy" = (
/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{
pixel_x = 28
@@ -32368,20 +32630,6 @@
"kzw" = (
/turf/closed/wall/r_wall,
/area/station/security/medical)
-"kzx" = (
-/obj/structure/closet/crate,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/onion,
-/obj/item/food/grown/onion,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/spawner/random/contraband/prison,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"kzA" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -32739,6 +32987,11 @@
/obj/structure/cable,
/turf/open/floor/carpet/red,
/area/station/security/prison/work)
+"kEk" = (
+/obj/structure/table,
+/obj/item/plate/large,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"kEn" = (
/obj/machinery/camera/directional/south{
c_tag = "Security - Visitation South";
@@ -32786,14 +33039,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"kFx" = (
-/obj/machinery/door/window/brigdoor/left/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"kFG" = (
/obj/structure/table/wood,
/obj/machinery/microwave,
@@ -32806,13 +33051,6 @@
},
/turf/open/floor/glass/reinforced,
/area/station/engineering/atmos/pumproom)
-"kFN" = (
-/obj/structure/chair/sofa/bench/right{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"kFO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32918,15 +33156,6 @@
/obj/structure/flora/bush/jungle/a/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics)
-"kIi" = (
-/obj/machinery/door/airlock{
- name = "Perma Overlook Entrance"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "perma-overlook"
- },
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"kIl" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8
@@ -32934,12 +33163,6 @@
/obj/effect/mapping_helpers/mail_sorting/service/library,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"kIo" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/hooded/wintercoat,
-/obj/item/clothing/suit/hooded/wintercoat,
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"kIt" = (
/obj/effect/turf_decal/siding/yellow{
dir = 4
@@ -33332,6 +33555,11 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"kOM" = (
+/obj/machinery/deepfryer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"kON" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
@@ -33470,12 +33698,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"kQL" = (
-/obj/structure/cable,
-/obj/structure/chair,
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"kQM" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
@@ -33547,15 +33769,6 @@
/obj/item/crowbar/red,
/turf/open/floor/glass/reinforced,
/area/station/science/xenobiology)
-"kRm" = (
-/obj/machinery/light/directional/north,
-/obj/structure/cable,
-/obj/item/radio/intercom/prison/directional/north,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"kRr" = (
/obj/machinery/door/airlock/engineering{
name = "Port Quarter Solar Access"
@@ -34067,12 +34280,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
-"kZI" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/contraband/permabrig_weapon,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"kZQ" = (
/obj/structure/rack,
/obj/item/pickaxe,
@@ -34303,6 +34510,10 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"ldq" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"ldr" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -34568,9 +34779,6 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
-/obj/machinery/modular_computer/preset/civilian{
- dir = 8
- },
/turf/open/floor/iron,
/area/station/cargo/quartermaster)
"lix" = (
@@ -34695,6 +34903,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/janitor)
+"lkf" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"lkj" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34709,6 +34927,9 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"lkA" = (
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"lkH" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/bodybags{
@@ -35034,6 +35255,13 @@
},
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"lpz" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/prisoner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"lpH" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -35601,12 +35829,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"lzx" = (
-/obj/machinery/flasher/directional/east{
- id = "executionflash"
- },
-/turf/open/openspace/icemoon/keep_below,
-/area/icemoon/underground/explored)
"lzy" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -35693,6 +35915,12 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
+"lAO" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
+/obj/structure/flora/bush/snow/style_random,
+/turf/open/misc/asteroid/snow/coldroom,
+/area/station/service/kitchen/coldroom)
"lBb" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -36052,6 +36280,16 @@
/obj/item/storage/toolbox/emergency,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"lGA" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/lava/plasma/ice_moon,
+/area/icemoon/underground/explored)
"lGB" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -36490,6 +36728,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/textured,
/area/mine/mechbay)
+"lQm" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"lQq" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36877,6 +37119,11 @@
},
/turf/closed/wall,
/area/station/commons/dorms/laundry)
+"lWw" = (
+/obj/machinery/firealarm/directional/north,
+/obj/structure/chair,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"lWI" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -37601,6 +37848,12 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"mkP" = (
+/obj/machinery/light/small/directional/east,
+/obj/machinery/computer/order_console/bitrunning,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"mla" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
@@ -37831,6 +38084,12 @@
/obj/structure/lattice/catwalk,
/turf/open/openspace/icemoon,
/area/station/science/server)
+"mpc" = (
+/obj/item/toy/plush/space_lizard_plushie{
+ name = "Ruins-The-Analog"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/underground/explored)
"mpf" = (
/obj/structure/cable,
/obj/structure/table/wood,
@@ -38269,17 +38528,6 @@
/obj/machinery/flasher/portable,
/turf/open/floor/glass/reinforced,
/area/station/ai_monitored/security/armory/upper)
-"mwK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
- dir = 4
- },
-/obj/machinery/meter,
-/obj/machinery/airalarm/mixingchamber{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/freezerchamber)
"mwQ" = (
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/plating,
@@ -38456,6 +38704,11 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"mzY" = (
+/obj/machinery/oven/range,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"mAc" = (
/obj/machinery/door/airlock/maintenance{
name = "Mining Maintenance"
@@ -38708,6 +38961,15 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
+"mET" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"mEU" = (
/obj/structure/chair/office/light{
dir = 4
@@ -38947,6 +39209,14 @@
dir = 4
},
/area/station/service/chapel)
+"mJy" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/pina_colada{
+ pixel_x = 2;
+ pixel_y = 7
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"mJD" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral{
@@ -39768,12 +40038,6 @@
/obj/structure/sign/poster/official/random/directional/east,
/turf/open/floor/iron/smooth,
/area/mine/mechbay)
-"mXK" = (
-/obj/structure/table,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"mXP" = (
/obj/structure/showcase/cyborg/old{
dir = 4;
@@ -39972,6 +40236,11 @@
},
/turf/open/floor/wood,
/area/station/service/library)
+"naT" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/middle,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/prison/mess)
"naW" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/white/side{
@@ -40337,11 +40606,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"nfV" = (
-/obj/machinery/netpod,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"ngj" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 9
@@ -40678,6 +40942,22 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/closed/wall/r_wall,
/area/station/maintenance/department/medical/central)
+"nlk" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"nll" = (
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty{
@@ -41316,11 +41596,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/wood,
/area/station/security/courtroom)
-"nub" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"nuj" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
@@ -41468,6 +41743,19 @@
dir = 9
},
/area/station/science/research)
+"nxb" = (
+/obj/item/secateurs{
+ pixel_x = 4;
+ pixel_y = 7
+ },
+/obj/item/secateurs{
+ pixel_x = -4;
+ pixel_y = -7
+ },
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/station/security/prison/garden)
"nxf" = (
/obj/effect/turf_decal/plaque{
icon_state = "L13"
@@ -41550,6 +41838,10 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"nyo" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"nyy" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -41725,6 +42017,21 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"nAu" = (
+/obj/machinery/button/flasher{
+ id = "executionflash";
+ pixel_x = -24;
+ pixel_y = 5
+ },
+/obj/machinery/button/door/directional/west{
+ id = "executionfireblast";
+ name = "Transfer Area Lockdown";
+ pixel_y = -6;
+ req_access = list("brig")
+ },
+/obj/structure/cable,
+/turf/open/floor/plating/icemoon,
+/area/station/security/execution/education)
"nAv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41838,6 +42145,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"nBH" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/underground/explored)
"nBN" = (
/obj/machinery/computer/nanite_cloud_controller,
/turf/open/floor/iron,
@@ -43249,16 +43560,6 @@
},
/turf/open/floor/carpet,
/area/station/service/library)
-"nVz" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/service/hydroponics)
"nVA" = (
/obj/structure/sign/directions/cryo/directional/east,
/turf/open/floor/iron,
@@ -44044,17 +44345,16 @@
/obj/machinery/pdapainter/medbay,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"oiZ" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/plating/snowed/icemoon,
+/area/icemoon/underground/explored)
"ojf" = (
/obj/structure/lattice/catwalk,
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
-"ojk" = (
-/obj/item/stack/ore/iron,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"ojv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -44239,13 +44539,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"omJ" = (
-/obj/machinery/door/airlock{
- name = "Perma Overlook Closet"
- },
-/obj/effect/mapping_helpers/airlock/abandoned,
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"omN" = (
/obj/machinery/light/directional/east,
/obj/machinery/status_display/evac/directional/east,
@@ -44481,13 +44774,6 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
-"opI" = (
-/obj/machinery/microwave{
- pixel_y = 7
- },
-/obj/structure/table,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"opN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -45544,6 +45830,11 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"oGt" = (
+/obj/machinery/light_switch/directional/west,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/cargo/storage)
"oGB" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -46372,6 +46663,19 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
+"oUP" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/storage/medkit/regular{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"oVn" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
@@ -46618,18 +46922,6 @@
dir = 4
},
/area/station/security/prison)
-"oZA" = (
-/obj/machinery/airalarm/engine{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Gas to Filter"
- },
-/turf/open/floor/engine,
-/area/station/engineering/supermatter)
"oZR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -46932,13 +47224,6 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
-"pfc" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"pfe" = (
/turf/closed/wall,
/area/station/hallway/primary/fore)
@@ -47211,10 +47496,6 @@
/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/freezerchamber)
-"pjj" = (
-/obj/structure/chair,
-/turf/open/floor/plating/snowed/icemoon,
-/area/icemoon/underground/explored)
"pjl" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/engineering_all,
@@ -47272,14 +47553,6 @@
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"pkv" = (
-/obj/machinery/light_switch/directional/west,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/byteforge,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"pkz" = (
/obj/structure/sign/directions/cryo/directional/south{
pixel_y = 32
@@ -47326,6 +47599,11 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/greater)
+"plC" = (
+/obj/machinery/netpod,
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"plN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
@@ -47640,6 +47918,10 @@
"prg" = (
/turf/open/floor/wood,
/area/station/service/library)
+"pri" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"pry" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -48126,10 +48408,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white/smooth_large,
/area/station/service/kitchen/diner)
-"pyr" = (
-/obj/machinery/griddle,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"pyu" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -48282,10 +48560,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/primary/central)
-"pBb" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"pBk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -48539,6 +48813,14 @@
/obj/structure/sign/poster/contraband/random/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"pFQ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/station/security/prison/garden)
"pFV" = (
/turf/open/floor/iron/smooth,
/area/station/maintenance/fore/lesser)
@@ -49719,12 +50001,6 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/visit)
-"pYa" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"pYg" = (
/obj/effect/turf_decal/siding/yellow{
dir = 8
@@ -49809,6 +50085,20 @@
},
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
+"qac" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"qai" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/plating/snowed/icemoon,
@@ -49951,6 +50241,10 @@
/obj/machinery/vending/modularpc,
/turf/open/floor/iron,
/area/station/commons/locker)
+"qdb" = (
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"qde" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -50146,6 +50440,17 @@
/mob/living/basic/bot/cleanbot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/service)
+"qhg" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/coffee_cartridge/fancy,
+/obj/item/coffee_cartridge/fancy{
+ pixel_y = 5
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"qhy" = (
/obj/machinery/firealarm/directional/east,
/obj/effect/decal/cleanable/dirt,
@@ -50780,6 +51085,13 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"qrR" = (
+/obj/machinery/door/airlock{
+ name = "Perma Overlook Closet"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"qsk" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light/directional/east,
@@ -51672,34 +51984,15 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"qHR" = (
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"qIf" = (
/obj/machinery/power/smes,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
-"qIo" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/seeds/onion,
-/obj/item/seeds/garlic,
-/obj/item/seeds/potato,
-/obj/item/seeds/tomato,
-/obj/item/seeds/carrot,
-/obj/item/seeds/grass,
-/obj/item/seeds/ambrosia,
-/obj/item/seeds/wheat,
-/obj/item/seeds/pumpkin,
-/obj/effect/spawner/random/contraband/prison,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/spawner/random/food_or_drink/seed{
- spawn_all_loot = 1;
- spawn_random_offset = 1
- },
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"qIv" = (
/obj/machinery/icecream_vat,
/obj/effect/turf_decal/tile/brown/diagonal_edge,
@@ -51756,6 +52049,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/storage/art)
+"qIZ" = (
+/obj/structure/rack,
+/obj/item/toy/snowball,
+/obj/item/toy/snowball,
+/obj/item/toy/snowball,
+/obj/item/toy/snowball,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
"qJh" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -51798,18 +52099,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"qKk" = (
-/obj/machinery/door/airlock/mining/glass{
- id_tag = "innercargo";
- name = "Bitrunning Den"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/effect/landmark/navigate_destination/common/bitrunner,
-/turf/open/floor/iron,
-/area/station/bitrunning/den)
"qKq" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -51986,6 +52275,13 @@
},
/turf/open/floor/plating,
/area/station/commons/dorms/laundry)
+"qMw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"qMz" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron/white,
@@ -52152,6 +52448,10 @@
},
/turf/open/floor/iron/textured_half,
/area/station/ai_monitored/command/storage/eva)
+"qOE" = (
+/obj/structure/sink/kitchen/directional/west,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"qOH" = (
/obj/effect/landmark/blobstart,
/obj/structure/lattice/catwalk,
@@ -53257,6 +53557,10 @@
"rgE" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/hfr_room)
+"rgH" = (
+/obj/structure/barricade/sandbags,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
"rhf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -53728,6 +54032,15 @@
dir = 1
},
/area/station/science/explab)
+"rqe" = (
+/obj/machinery/firealarm/directional/north,
+/obj/structure/table,
+/obj/machinery/processor{
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"rqq" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54467,12 +54780,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
-"rCE" = (
-/obj/structure/table,
-/obj/item/plate/large,
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"rCT" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -55404,6 +55711,12 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"rTU" = (
+/obj/structure/chair/office{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"rTV" = (
/obj/structure/gulag_beacon,
/turf/open/floor/iron,
@@ -55509,10 +55822,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"rVt" = (
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"rVy" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark/textured,
@@ -55968,6 +56277,18 @@
/obj/structure/sign/departments/cargo,
/turf/closed/wall/r_wall,
/area/mine/eva)
+"sdd" = (
+/obj/machinery/computer/quantum_console,
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Permabrig Observation North";
+ network = list("ss13","prison")
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"sde" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -56005,14 +56326,6 @@
/obj/structure/transit_tube/horizontal,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"sdP" = (
-/obj/machinery/light/warm/directional/east,
-/obj/structure/chair/sofa/bench/right{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"sdW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -56519,6 +56832,11 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"smL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"sng" = (
/obj/structure/table,
/obj/item/wrench,
@@ -56730,6 +57048,10 @@
},
/turf/open/floor/wood,
/area/station/service/library)
+"sqg" = (
+/obj/machinery/smartfridge,
+/turf/closed/wall,
+/area/station/security/prison/mess)
"sqs" = (
/obj/machinery/skill_station,
/obj/machinery/newscaster/directional/north,
@@ -56840,10 +57162,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
-"srY" = (
-/obj/machinery/deepfryer,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"srZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -57591,6 +57909,14 @@
/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
+"sDO" = (
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/item/stack/ore/iron,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"sDT" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
@@ -57638,14 +57964,6 @@
"sEB" = (
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"sEC" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"sED" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -57975,18 +58293,6 @@
},
/turf/open/floor/iron/large,
/area/station/commons/storage/tools)
-"sJt" = (
-/obj/machinery/door/poddoor{
- id = "executionfireblast"
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/plating/icemoon,
-/area/station/security/execution/education)
"sJA" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58432,6 +58738,10 @@
/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos/pumproom)
+"sTg" = (
+/obj/item/toy/snowball,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
"sTi" = (
/obj/effect/turf_decal/box/white{
color = "#52B4E9"
@@ -59339,6 +59649,16 @@
},
/turf/open/floor/stone,
/area/station/smithing)
+"tke" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"tkf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -59512,6 +59832,15 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark,
/area/mine/eva/lower)
+"tmK" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/contraband/permabrig_gear,
+/obj/structure/sign/warning/cold_temp/directional/west,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/turf/open/floor/vault,
+/area/station/security/prison/rec)
"tmQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -60121,12 +60450,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/plating,
/area/station/medical/treatment_center)
-"txr" = (
-/obj/machinery/growing/soil,
-/obj/item/cultivator,
-/obj/effect/spawner/random/contraband/cannabis,
-/turf/open/floor/grass,
-/area/station/security/prison/garden)
"txE" = (
/obj/item/cigbutt,
/obj/effect/decal/cleanable/dirt,
@@ -60461,16 +60784,6 @@
},
/turf/open/floor/plating,
/area/station/security/interrogation)
-"tCV" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Security - Permabrig Observation Prep";
- network = list("ss13","prison")
- },
-/obj/structure/sign/poster/official/safety_internals{
- pixel_x = -32
- },
-/turf/open/floor/vault,
-/area/station/security/prison/rec)
"tCW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/obj/machinery/meter,
@@ -60492,6 +60805,15 @@
},
/turf/open/floor/glass/reinforced/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"tDh" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating/snowed/icemoon,
+/area/icemoon/underground/explored)
"tDj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60679,15 +61001,6 @@
dir = 8
},
/area/station/science/lab)
-"tFP" = (
-/obj/structure/closet/crate,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"tFV" = (
/obj/structure/cable,
/obj/machinery/light/directional/south,
@@ -60829,6 +61142,9 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
+"tIs" = (
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"tIt" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -62079,13 +62395,6 @@
/obj/structure/cable,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"ueo" = (
-/obj/machinery/light/warm/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"uep" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -62483,6 +62792,15 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"ukq" = (
+/obj/machinery/microwave{
+ pixel_y = 7
+ },
+/obj/structure/table,
+/obj/machinery/light/warm/directional/north,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"ukz" = (
/obj/machinery/duct,
/obj/structure/disposalpipe/segment{
@@ -62877,6 +63195,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"uqo" = (
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"uqB" = (
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/blue/diagonal_edge,
@@ -63410,13 +63736,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"uAS" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/landmark/start/bitrunner,
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/robot_debris,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"uBi" = (
/turf/closed/wall,
/area/station/ai_monitored/turret_protected/ai)
@@ -63508,22 +63827,6 @@
/obj/structure/grille/broken,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
-"uCU" = (
-/obj/machinery/button/flasher{
- id = "executionflash";
- pixel_x = -24;
- pixel_y = 5
- },
-/obj/machinery/button/door/directional/west{
- id = "executionfireblast";
- name = "Transfer Area Lockdown";
- pixel_y = -6;
- req_access = list("brig")
- },
-/obj/structure/railing,
-/obj/machinery/door/window/left/directional/south,
-/turf/open/floor/plating/icemoon,
-/area/station/security/execution/education)
"uDi" = (
/obj/structure/closet/emcloset/anchored,
/obj/machinery/light/small/directional/west,
@@ -63743,6 +64046,14 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"uGO" = (
+/obj/item/cultivator,
+/obj/effect/spawner/random/contraband/cannabis,
+/obj/item/cultivator,
+/obj/effect/spawner/random/contraband/cannabis,
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"uGT" = (
/obj/machinery/light/directional/east,
/obj/item/radio/intercom/directional/east,
@@ -64608,11 +64919,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"uXn" = (
-/obj/structure/cable,
-/obj/machinery/computer/quantum_console,
-/turf/open/floor/iron/dark/smooth_corner,
-/area/station/bitrunning/den)
"uXr" = (
/obj/machinery/camera/directional/east{
c_tag = "Chapel East"
@@ -65171,6 +65477,12 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"vfQ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating/snowed/icemoon,
+/area/station/security/prison/rec)
"vfS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65224,6 +65536,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
+"vgP" = (
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/food/dough,
+/obj/item/food/dough{
+ pixel_y = 4;
+ pixel_x = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"vgR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65398,6 +65721,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
+"vka" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"vky" = (
/obj/machinery/computer/pod/old/mass_driver_controller/trash{
pixel_x = -24;
@@ -65453,12 +65782,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"vkJ" = (
-/obj/structure/table,
-/obj/item/plate,
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron,
-/area/station/security/prison/mess)
"vkW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -65789,10 +66112,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/pathology)
-"vqM" = (
-/obj/machinery/light/small/directional/west,
-/turf/open/openspace/icemoon/keep_below,
-/area/icemoon/underground/explored)
"vqN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67018,17 +67337,6 @@
/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
/turf/open/floor/iron/white,
/area/station/medical/pathology)
-"vJE" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
"vJI" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -67077,10 +67385,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"vKA" = (
-/obj/machinery/light/small/directional/east,
-/turf/open/openspace/icemoon/keep_below,
-/area/icemoon/underground/explored)
"vKE" = (
/obj/machinery/computer/holodeck,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -67709,12 +68013,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"vXn" = (
-/obj/structure/table,
-/obj/item/food/pie/cream,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"vXy" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
@@ -67826,6 +68124,14 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
+"vZf" = (
+/obj/structure/rack,
+/obj/item/toy/snowball,
+/obj/item/toy/snowball,
+/obj/item/toy/snowball,
+/obj/item/toy/snowball,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/underground/explored)
"vZq" = (
/obj/structure/chair/plastic{
dir = 8
@@ -67889,6 +68195,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"waj" = (
+/obj/machinery/door/window/brigdoor/left/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"wal" = (
/obj/structure/sign/warning,
/turf/closed/wall,
@@ -68019,6 +68332,12 @@
/obj/structure/cable/multilayer/multiz,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"wcc" = (
+/obj/item/shovel/spade,
+/obj/item/shovel/spade,
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"wch" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/north,
@@ -69316,6 +69635,11 @@
"wxg" = (
/turf/open/floor/iron/freezer,
/area/mine/laborcamp)
+"wxn" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/middle,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/bitden)
"wxp" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/line{
@@ -69420,17 +69744,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
-"wyO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/directional/south{
- c_tag = "Security - Permabrig Kitchen";
- network = list("ss13","prison")
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"wzc" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -69667,6 +69980,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
+"wCU" = (
+/obj/structure/cable,
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"wCV" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -70193,6 +70515,11 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/command/bridge)
+"wLu" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/hollow/reinforced/middle,
+/turf/open/floor/plating/icemoon,
+/area/station/security/execution/education)
"wLI" = (
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -70292,18 +70619,6 @@
dir = 9
},
/area/station/science/research)
-"wMq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/machinery/holopad,
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"wMt" = (
/turf/closed/wall,
/area/station/hallway/primary/central/fore)
@@ -71093,6 +71408,13 @@
},
/turf/open/floor/vault,
/area/station/security/prison/rec)
+"wYr" = (
+/obj/structure/chair,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating/snowed/icemoon,
+/area/icemoon/underground/explored)
"wYs" = (
/turf/open/floor/plating,
/area/station/service/kitchen/coldroom)
@@ -71855,6 +72177,12 @@
/obj/effect/turf_decal/tile/yellow/full,
/turf/open/floor/iron/large,
/area/station/medical/storage)
+"xli" = (
+/obj/machinery/door/poddoor{
+ id = "executionfireblast"
+ },
+/turf/open/floor/plating/icemoon,
+/area/station/security/execution/education)
"xlq" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing,
@@ -71883,6 +72211,15 @@
},
/turf/open/floor/wood,
/area/station/maintenance/fore)
+"xlM" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/red,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/burnchamber)
"xlN" = (
/obj/machinery/door/poddoor/preopen{
id = "maint2"
@@ -71994,14 +72331,6 @@
/obj/item/multitool,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"xnk" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"xnr" = (
/obj/structure/sign/poster/official/here_for_your_safety{
pixel_y = 32
@@ -72185,12 +72514,16 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"xrf" = (
-/obj/structure/railing,
+"xrh" = (
+/obj/machinery/light/warm/directional/south,
/obj/structure/cable,
-/obj/machinery/door/window/right/directional/south,
-/turf/open/floor/plating/icemoon,
-/area/station/security/execution/education)
+/obj/structure/table,
+/obj/item/kitchen/rollingpin,
+/obj/item/kitchen/rollingpin{
+ pixel_x = 7
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"xri" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -72369,6 +72702,13 @@
"xuo" = (
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
+"xuy" = (
+/obj/item/kirbyplants/dead,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating/snowed/icemoon,
+/area/icemoon/underground/explored)
"xuA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
@@ -73422,6 +73762,11 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
+"xKp" = (
+/obj/structure/table,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"xKA" = (
/obj/machinery/conveyor{
dir = 4;
@@ -73627,6 +73972,15 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/iron,
/area/station/cargo/office)
+"xNy" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal/incinerator)
"xNE" = (
/obj/structure/stairs/west,
/obj/structure/railing,
@@ -74121,6 +74475,9 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"xWV" = (
+/turf/closed/wall/r_wall/rust,
+/area/station/security/bitden)
"xXf" = (
/obj/machinery/portable_atmospherics/pump,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -74196,6 +74553,12 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"xYh" = (
+/obj/structure/reagent_dispensers/servingdish,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/security/prison/mess)
"xYj" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -74427,6 +74790,12 @@
},
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hop)
+"ybJ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"ybN" = (
/obj/machinery/door/airlock/public/glass{
name = "Courtroom"
@@ -74492,6 +74861,12 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/engineering/storage)
+"ycC" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/cargo/miningdock)
"ycQ" = (
/obj/structure/closet/crate,
/obj/effect/spawner/random/maintenance,
@@ -74506,6 +74881,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"ycV" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/bitden)
"ycY" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -92766,10 +93148,10 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -93022,23 +93404,23 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -93278,26 +93660,26 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -93535,27 +93917,27 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -93792,29 +94174,29 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -94048,31 +94430,31 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -94304,17 +94686,6 @@ thA
thA
thA
thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
ghx
ghx
ghx
@@ -94325,12 +94696,23 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
+ghx
thA
thA
thA
@@ -94565,14 +94947,17 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+ghx
+ghx
+ghx
ghx
ghx
ghx
@@ -94585,9 +94970,6 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
thA
thA
thA
@@ -94821,16 +95203,18 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+ghx
+ghx
ghx
ghx
ghx
@@ -94843,8 +95227,6 @@ ghx
ghx
ghx
ghx
-thA
-thA
thA
thA
thA
@@ -95077,20 +95459,21 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+xMq
+xMq
+xMq
+iDt
+ijY
+iDt
+iDt
+iDt
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+ghx
ghx
ghx
ghx
@@ -95101,7 +95484,6 @@ ghx
ghx
ghx
ghx
-thA
thA
thA
thA
@@ -95334,25 +95716,25 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-ghx
-ghx
-ghx
-ghx
+xMq
+xMq
+xMq
+iDt
+iDt
+jWB
+iDt
+ebd
+ebd
+ijY
+xMq
+xMq
+xMq
+xMq
ghx
+lGA
+lWI
+lWI
+pHr
ghx
ghx
ghx
@@ -95590,26 +95972,26 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-ghx
+xMq
+xMq
+xMq
+xMq
+iDt
+ebd
+ebd
+iDt
+sTg
+iDt
+iDt
+iDt
+iDt
+xMq
+xMq
+xMq
+oiZ
+xuo
+xuo
+xlq
ghx
ghx
ghx
@@ -95846,27 +96228,27 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-ghx
+xMq
+xMq
+xMq
+xMq
+scw
+iDt
+sTg
+iDt
+iDt
+iDt
+iDt
+sTg
+iDt
+iDt
+iDt
+iDt
+scw
+xuo
+xuo
+xuo
+xlq
ghx
ghx
ghx
@@ -96098,32 +96480,32 @@ ghx
ghx
ghx
ghx
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-ghx
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+scw
+scw
+iDt
+ijY
+iDt
+iDt
+iDt
+iDt
+iDt
+iDt
+jWB
+iDt
+ebd
+iDt
+xuo
+xuo
+xuo
+xlq
ghx
ghx
ghx
@@ -96355,32 +96737,32 @@ ghx
iDt
iDt
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-ghx
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+scw
+iDt
+lkA
+xWV
+xWV
+lkA
+xWV
+iDt
+iDt
+iDt
+scw
+iDt
+iDt
+iDt
+ebd
+xuo
+xuo
+xuo
+xlq
ghx
ghx
ghx
@@ -96613,30 +96995,30 @@ iDt
iDt
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+xMq
+biu
+scw
+scw
+iDt
+iDt
+iDt
+iDt
+lkA
+plC
+dJP
+dJP
+lkA
+iDt
+sTg
+iDt
+iDt
+iDt
+ebd
+iDt
+scw
+scw
+vZf
+xuo
rfu
ghx
ghx
@@ -96872,28 +97254,28 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+scw
+iDt
+iDt
+ijY
+ebd
+iDt
+xWV
+hpP
+qac
+nlk
+wxn
+qIZ
+rgH
+rgH
+iDt
+iDt
+iDt
+iDt
+iDt
+rgH
+rgH
+xuo
rfu
ghx
ghx
@@ -97130,27 +97512,27 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+scw
+iDt
+sTg
+ebd
+iDt
+lkA
+uqo
+goS
+ycV
+wxn
+iDt
+iDt
+rgH
+iDt
+sTg
+iDt
+scw
+iDt
+rgH
+iDt
+xuo
rfu
ghx
ghx
@@ -97388,26 +97770,26 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+iDt
+ebd
+ebd
+iDt
+xWV
+sdd
+tIs
+ycV
+wxn
+scw
+iDt
+rgH
+iDt
+iDt
+iDt
+scw
+iDt
+rgH
+iDt
+xuo
rfu
rhF
ghx
@@ -97646,25 +98028,25 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+scw
+iDt
+iDt
+xWV
+bdm
+mET
+tke
+lkA
+iDt
+rgH
+rgH
+iDt
+scw
+iDt
+iDt
+iDt
+rgH
+nBH
+xuo
rfu
lWI
lWI
@@ -97904,24 +98286,24 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
+iDt
+iDt
+lkA
+lkA
+lkA
+kpK
+lkA
+scw
+scw
+scw
+iDt
+iDt
+iDt
+iDt
+iDt
+scw
+scw
+xuo
rfu
xuo
xuo
@@ -98161,29 +98543,29 @@ iDt
iDt
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-thA
-rfu
-xuo
-xuo
-xuo
-xuo
+scw
+iDt
+jWB
+iDt
+scw
+cUD
+cUD
+cUD
+cmh
+cmh
+cUD
+cUD
+cUD
+cmh
+cUD
+cUD
+cUD
+cUD
+vfQ
+cmh
+cmh
+cmh
+cmh
xuo
ojf
ena
@@ -98420,12 +98802,12 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
+iDt
+iDt
+iDt
+scw
+iDt
+jWB
uOb
uOb
uOb
@@ -98438,9 +98820,9 @@ uOb
uOb
uOb
rfu
-omJ
+qrR
rfu
-pjj
+wYr
daf
kmH
ojf
@@ -98677,12 +99059,12 @@ iDt
iDt
xMq
xMq
-thA
-thA
-thA
-thA
-thA
-thA
+scw
+iDt
+ebd
+iDt
+iDt
+iDt
uOb
nDV
amx
@@ -98694,10 +99076,10 @@ lBR
nhg
qrq
lBR
-kIo
+dLA
hap
rfu
-pjj
+wYr
daf
daf
xuo
@@ -98934,12 +99316,12 @@ ghx
iDt
iDt
xMq
-thA
-thA
-thA
-thA
-thA
-thA
+iDt
+iDt
+iDt
+ijY
+ebd
+iDt
uOb
eAg
eAg
@@ -98951,13 +99333,13 @@ lBR
fZq
lBR
lBR
-kZI
+mkP
hap
rfu
-kuu
-dFF
-dFF
-xuo
+xuy
+tDh
+tDh
+cmh
xuo
xlq
ghx
@@ -99193,10 +99575,10 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
+scw
+sTg
+iDt
+iDt
uOb
jnX
amx
@@ -99214,7 +99596,7 @@ rfu
ooW
ooW
rfu
-xuo
+cmh
xuo
xlq
ghx
@@ -99450,10 +99832,10 @@ iDt
xMq
xMq
xMq
-thA
-thA
-thA
-thA
+iDt
+iDt
+iDt
+iDt
uOb
eAg
eAg
@@ -99471,7 +99853,7 @@ bAk
mAO
kXY
mJX
-xuo
+cmh
xuo
xlq
ghx
@@ -99707,10 +100089,10 @@ iDt
iDt
xMq
xMq
-thA
-thA
-thA
-thA
+iDt
+ebd
+iDt
+iDt
uOb
ifZ
amx
@@ -99728,7 +100110,7 @@ foO
bDF
kXY
mJX
-xuo
+cmh
xuo
xlq
ghx
@@ -99964,10 +100346,10 @@ ghx
iDt
iDt
xMq
-thA
-thA
-thA
-thA
+scw
+ebd
+ijY
+scw
uOb
eAg
eAg
@@ -99985,7 +100367,7 @@ dEz
gcP
hOA
mJX
-xuo
+cmh
xuo
xlq
ghx
@@ -100221,10 +100603,10 @@ ghx
ghx
iDt
xMq
-thA
-thA
-thA
-thA
+scw
+doH
+iDt
+scw
uOb
aLM
amx
@@ -100242,7 +100624,7 @@ foO
bdo
kXY
mJX
-xuo
+cmh
xuo
xlq
raY
@@ -100499,7 +100881,7 @@ qna
dEz
gxx
rfu
-kIi
+eYD
rfu
rfu
rfu
@@ -100756,9 +101138,9 @@ nNn
gzV
nNn
nNn
-axb
-tCV
-cFc
+gzm
+fzf
+tmK
mJX
ghx
ghx
@@ -101014,7 +101396,7 @@ kqR
qSu
wYq
nkP
-kry
+lpz
uRi
mJX
ghx
@@ -101533,8 +101915,8 @@ ldH
dbH
dbH
dbH
-ghx
-ghx
+dbH
+dbH
ghx
ghx
ghx
@@ -101788,15 +102170,15 @@ xUG
kcC
ddd
ioC
-sEC
+lkf
+nFn
+nyo
dbH
ghx
ghx
ghx
ghx
ghx
-ghx
-ghx
lcA
psb
psb
@@ -102042,18 +102424,18 @@ pdx
uma
nNn
fTb
+vrG
cgb
nwF
nwF
-kFN
+grJ
+iHu
ots
ghx
ghx
ghx
ghx
ghx
-ghx
-ghx
rcY
iDt
thA
@@ -102299,13 +102681,13 @@ ldH
ldH
ldH
fTb
+vrG
iKw
iZs
sOT
-rCE
-ots
-ghx
-ghx
+kEk
+iHu
+naT
ghx
ghx
ghx
@@ -102556,18 +102938,18 @@ dNH
xyU
wlY
fTb
-eQA
+vrG
+hQR
xWA
rHH
-bZK
+hQR
+iHu
ots
ghx
ghx
ghx
ghx
ghx
-ghx
-ghx
lcA
iDt
thA
@@ -102810,16 +103192,16 @@ ldH
qiJ
qTs
vPt
-hfv
+vPt
ldH
pEX
+vrG
bta
lpY
lpY
-kse
-ots
-ghx
-ghx
+vka
+iHu
+naT
ghx
ghx
ghx
@@ -103073,10 +103455,10 @@ vCn
jdf
tuH
jdf
-fhU
-ots
-ghx
-ghx
+cDr
+pri
+eCf
+naT
ghx
ghx
ghx
@@ -103324,21 +103706,21 @@ sKu
rAR
jZI
oUM
-nFn
+baq
jQE
fTb
vrG
+eIB
+vrG
vrG
cgb
-kFN
+cKG
ots
ghx
ghx
ghx
ghx
ghx
-ghx
-ghx
psb
iDt
thA
@@ -103586,11 +103968,11 @@ mpn
bfg
bfg
ydt
+jpv
+vrG
sOT
-vkJ
-ots
-ghx
-ghx
+eRF
+naT
ghx
ghx
ghx
@@ -103838,21 +104220,21 @@ qSb
ylA
krN
ldH
-mXK
+xYh
ueP
bZK
gOS
wZT
-sdP
-kse
+iHu
+iHu
+fTN
+aFC
dbH
ghx
ghx
ghx
ghx
ghx
-ghx
-ghx
psb
iDt
thA
@@ -104095,21 +104477,21 @@ vPx
qDG
bDj
ldH
-fTo
+jkt
fVJ
-kzx
-kFx
-dbH
-dbH
-dbH
+day
+waj
+sqg
+mJy
+bQH
+ldq
+ldH
dbH
ghx
ghx
ghx
ghx
ghx
-ghx
-ghx
psb
iDt
thA
@@ -104352,16 +104734,16 @@ cYv
cmD
cmD
ldH
-pyr
+rqe
lkS
wKC
-wyO
-dbH
-aCH
-iDt
-iDt
-ghx
-ghx
+qMw
+wKC
+wKC
+wKC
+wKC
+caL
+naT
ghx
ghx
ghx
@@ -104609,16 +104991,16 @@ rLX
kLo
wnm
ldH
-gNP
-pBb
-gbu
-ueo
-dbH
-psb
-psb
-psb
-psb
-fIt
+iOx
+eVL
+fIQ
+ybJ
+vgP
+ifW
+gTS
+qdb
+wCU
+naT
ghx
ghx
ghx
@@ -104866,16 +105248,16 @@ vyw
bdJ
mxG
ldH
-opI
+ukq
+smL
+gwW
daE
-nub
-hCv
-ots
-ghx
-ghx
-ghx
-ghx
-ghx
+hYO
+mzY
+qdb
+wKC
+xrh
+dbH
ghx
ghx
ghx
@@ -105123,16 +105505,16 @@ sbJ
vyw
fuX
ldH
-srY
+kOM
+qdb
wKC
-pYa
-gcZ
-ots
-ghx
-ghx
-ghx
-ghx
-ghx
+wKC
+wKC
+wKC
+qdb
+wKC
+xKp
+naT
ghx
ghx
ghx
@@ -105380,16 +105762,16 @@ vsp
qwa
qts
ldH
-fwL
-hux
+dhl
+qdb
kDu
-vXn
-ots
-ghx
-ghx
-ghx
-ghx
-ghx
+bYk
+jKn
+qOE
+qdb
+wKC
+blx
+naT
ghx
ghx
ghx
@@ -105638,15 +106020,15 @@ uAE
dKS
dbH
dbH
+gcY
+gcY
dbH
dbH
dbH
+gcY
+gcY
+dbH
dbH
-psb
-psb
-psb
-psb
-fIt
ghx
ghx
ghx
@@ -106665,7 +107047,7 @@ lmf
fnW
lTa
xad
-scw
+mpc
ghx
ghx
ghx
@@ -161402,8 +161784,8 @@ jlF
jNf
dpC
cGQ
-lZc
-txr
+jDz
+uGO
hVY
gjq
gjq
@@ -161657,9 +162039,9 @@ jsp
wSz
nFU
jNf
-xnk
+ioZ
tau
-cPE
+pFQ
cPE
hVY
gjq
@@ -161914,10 +162296,10 @@ cQf
mdo
exN
jNf
-qIo
+aCr
tau
-afF
-bXI
+wcc
+qHR
hVY
gjq
gjq
@@ -162173,7 +162555,7 @@ obv
jNf
dID
tau
-cPE
+aFM
cPE
hVY
gjq
@@ -162430,7 +162812,7 @@ tWO
jNf
tXd
qSo
-cPE
+nxb
cPE
hVY
gjq
@@ -162687,7 +163069,7 @@ tCL
jNf
wcz
hKI
-ffY
+lZc
bXI
hVY
gjq
@@ -162942,7 +163324,7 @@ nvE
uKJ
tCL
jNf
-kRm
+iAZ
ijC
cXy
cXy
@@ -163201,7 +163583,7 @@ eCD
jNf
pbB
tzf
-bXI
+afF
bXI
hVY
gjq
@@ -167070,7 +167452,7 @@ hgM
vIH
gXh
rEe
-fiL
+gOQ
gjq
gjq
gjq
@@ -170407,11 +170789,11 @@ ulz
pNm
eOz
fdG
-uCU
-gjq
-gjq
-vqM
-gjq
+nAu
+cnS
+ovP
+ovP
+ovP
gjq
gjq
gjq
@@ -170665,12 +171047,12 @@ pNm
wQu
fdG
lPb
-sJt
+xli
+jKr
+jKr
+jKr
jKr
jKr
-gjq
-gjq
-gjq
gjq
gjq
gjq
@@ -170921,11 +171303,11 @@ qoY
pNm
iEN
paL
-xrf
-gjq
-lzx
-vKA
-gjq
+fdG
+wLu
+gEI
+ovP
+ovP
gjq
gjq
gjq
@@ -174558,7 +174940,7 @@ hmb
eoq
ece
bSU
-nVz
+fFp
iNt
hmb
ePx
@@ -178158,7 +178540,7 @@ dEB
dMS
jBB
pKe
-jZg
+lAO
qPE
fwB
fwB
@@ -190265,11 +190647,11 @@ nBV
iao
iPD
iao
-eDX
+xlM
qSk
xtS
rhY
-mwK
+hjy
pjc
gmb
hac
@@ -226751,11 +227133,11 @@ irD
irD
pzX
gdN
-emT
+ajw
maT
bln
qjQ
-aVE
+ycC
qxb
nrm
hoD
@@ -227007,13 +227389,13 @@ iaF
iaF
ajw
ajw
+ajw
vVN
-ehu
-ehu
-aKb
-ehu
-ehu
-ojk
+kXr
+bln
+qjQ
+sDO
+fIq
bVJ
dSO
qjQ
@@ -227265,12 +227647,12 @@ qqJ
gjP
ajw
ajw
-aKb
-pkv
-kit
-uAS
-ehu
-tFP
+ajw
+oGt
+bln
+qjQ
+cvp
+ieE
hxE
xtr
qjQ
@@ -227520,13 +227902,13 @@ kXr
kXr
kXr
kXr
-fHn
-eMa
-qKk
-dsp
-gxb
-dGi
-ehu
+lWw
+ajw
+qjQ
+qjQ
+qjQ
+qjQ
+qjQ
qjQ
rVe
qjQ
@@ -227778,12 +228160,12 @@ lZQ
wXR
kXr
oou
-eMa
-ehu
-uXn
-iKe
-nfV
-ehu
+ajw
+qjQ
+qhg
+fjy
+oUP
+jOS
tLX
jBf
naO
@@ -228034,14 +228416,14 @@ oDt
kRU
oQa
kXr
-kQL
-vgC
-ehu
-flq
-wMq
-dUK
-ehu
-rVt
+cXa
+ajw
+qjQ
+jDf
+rTU
+lQm
+hoD
+hoD
hxE
dPn
aOd
@@ -228292,12 +228674,12 @@ oRy
aHC
kXr
ewq
-vgC
-ehu
-aKb
-aKb
-ehu
-ehu
+ajw
+qjQ
+jAr
+hoD
+lQm
+hoD
iVA
hxE
aCh
@@ -228553,8 +228935,8 @@ vgC
tyH
hxE
hxE
-pfc
-dtn
+hxE
+hxE
hxE
hxE
wBV
@@ -234760,7 +235142,7 @@ glc
fab
ktw
bny
-oZA
+cxC
xBp
bYw
bYw
@@ -244773,7 +245155,7 @@ oAD
xKX
vep
pBI
-vJE
+xNy
gGo
uqH
qXk
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index d3fc31af7541..15b94c9fc7a0 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -621,18 +621,6 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"ahX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"aia" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -972,6 +960,35 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"alN" = (
+/obj/structure/closet/crate,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/item/storage/bag/tray/cafeteria,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"alO" = (
/obj/machinery/duct,
/obj/machinery/light/neon_lining{
@@ -1083,12 +1100,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
-"ano" = (
-/obj/item/radio/intercom/prison/directional/south,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/deepfryer,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"anp" = (
/obj/structure/railing{
dir = 4
@@ -2496,15 +2507,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"aNZ" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Bitrunning Den Maintenance"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/iron/dark,
-/area/station/bitrunning/den)
"aOc" = (
/obj/effect/turf_decal/plaque{
icon_state = "L1"
@@ -2652,20 +2654,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/tcommsat/computer)
-"aRz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"aRI" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -2948,21 +2936,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel/monastery)
-"aXg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/bitrunner,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"aXw" = (
/obj/effect/landmark/start/warden,
/obj/structure/chair/office,
@@ -3057,6 +3030,22 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/engineering/lobby)
+"aZg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"aZh" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/food/pie_smudge,
@@ -3112,6 +3101,11 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"bad" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"ban" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -3878,6 +3872,16 @@
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall,
/area/station/maintenance/starboard/fore)
+"boR" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"bpj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4512,6 +4516,12 @@
/obj/structure/transit_tube/crossing,
/turf/open/space/basic,
/area/space/nearstation)
+"bzY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"bAc" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
@@ -4660,6 +4670,11 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"bDy" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"bDF" = (
/obj/structure/table/wood/fancy/red,
/obj/machinery/door/window/right/directional/east,
@@ -5228,6 +5243,12 @@
},
/turf/open/floor/grass,
/area/station/security/prison/garden)
+"bNg" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"bNl" = (
/obj/docking_port/stationary/escape_pod{
dir = 4
@@ -5373,6 +5394,16 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/showroomfloor,
/area/station/security/brig)
+"bPx" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"bPK" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/obj/structure/flora/bush/lavendergrass/style_random,
@@ -6043,6 +6074,11 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
+"bZT" = (
+/obj/machinery/growing/tray,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"bZY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/crate,
@@ -6389,6 +6425,16 @@
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/medbay/lobby)
+"cen" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ceq" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -6557,10 +6603,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"cgG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall,
-/area/station/bitrunning/den)
"cgJ" = (
/obj/machinery/ai_slipper{
uses = 10
@@ -7385,6 +7427,17 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"csF" = (
+/obj/machinery/door/airlock/highsecurity{
+ name = "Bitrunner Den"
+ },
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/station/security/bitden)
"csL" = (
/obj/structure/table/wood/fancy/black,
/obj/item/food/grown/poppy/lily{
@@ -7476,6 +7529,13 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"ctP" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/oven/range,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"cua" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -8799,17 +8859,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
-"cTN" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet{
- name = "supply locker"
- },
-/obj/item/clothing/shoes/sneakers/brown,
-/obj/effect/spawner/random/maintenance,
-/obj/item/clothing/under/rank/cargo/tech,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard)
"cTY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/office{
@@ -9337,6 +9386,13 @@
dir = 4
},
/area/station/hallway/primary/fore)
+"dcn" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/quantum_server{
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"dcq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9842,14 +9898,6 @@
/obj/machinery/holopad,
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/hop)
-"dkr" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/red/filled/end{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/engine,
-/area/station/security/prison)
"dkA" = (
/obj/structure/flora/bush/leavy/style_random,
/obj/machinery/light/small/directional/south,
@@ -11601,22 +11649,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
-"dLx" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/small/directional/east,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"dLA" = (
/obj/item/kirbyplants{
icon_state = "plant-10"
@@ -11798,6 +11830,20 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"dPa" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"dPn" = (
/obj/structure/cable,
/obj/machinery/photocopier,
@@ -12081,19 +12127,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"dUN" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 5
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/turf_decal/trimline/red/filled/end{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"dUQ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -12109,6 +12142,23 @@
dir = 1
},
/area/station/hallway/primary/fore)
+"dUW" = (
+/obj/machinery/camera/directional/south{
+ c_tag = "Prison Cafeteria";
+ network = list("ss13","prison")
+ },
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/spawner/random/food_or_drink/donkpockets{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/machinery/light/directional/south,
+/obj/item/radio/intercom/prison/directional/west,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"dUY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12220,18 +12270,6 @@
"dWG" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/safe)
-"dWM" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/storage)
"dXI" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/turf/open/floor/grass,
@@ -12267,17 +12305,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
-"dYt" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Prison Recreation";
- network = list("ss13","prison")
- },
-/obj/machinery/light/small/red/dim/directional/west,
-/obj/structure/kitchenspike,
-/obj/effect/mob_spawn/corpse/human/damaged,
-/obj/effect/turf_decal/bot/right,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/prison)
"dYy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12471,12 +12498,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"ecs" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"ecu" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -12631,6 +12652,13 @@
},
/turf/open/floor/stone,
/area/station/science/xenobiology)
+"efE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"efG" = (
/turf/closed/wall,
/area/station/maintenance/fore)
@@ -12834,15 +12862,6 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"eiO" = (
-/obj/machinery/light/small/red/dim/directional/east,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 6
- },
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/engine,
-/area/station/security/prison)
"eiW" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing,
@@ -13155,10 +13174,6 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
-"enI" = (
-/obj/machinery/netpod,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"enP" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -13702,6 +13717,12 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/fore)
+"exQ" = (
+/obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/growing/tray,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"exV" = (
/obj/structure/table,
/obj/item/tank/internals/emergency_oxygen{
@@ -15479,24 +15500,6 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"fax" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/landmark/start/bitrunner,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"faJ" = (
/obj/machinery/door/airlock/grunge{
name = "Leave"
@@ -15527,6 +15530,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/bar/atrium)
+"fbd" = (
+/obj/item/radio/intercom/prison/directional/south,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/deepfryer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"fbm" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -16026,12 +16036,6 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/station/maintenance/port/lesser)
-"fiI" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/oven/range,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"fiQ" = (
/obj/structure/table/wood,
/obj/item/pinpointer/nuke,
@@ -16361,9 +16365,6 @@
/obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
/turf/open/floor/iron/showroomfloor,
/area/station/science/xenobiology)
-"fnt" = (
-/turf/open/floor/glass/plasma,
-/area/station/security/prison)
"fnu" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -17983,11 +17984,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/port)
-"fKj" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/griddle,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"fKl" = (
/obj/structure/chair/sofa/right/maroon{
dir = 8
@@ -18179,16 +18175,6 @@
},
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
-"fMM" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"fMV" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -18387,6 +18373,12 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/showroomfloor,
/area/station/security/office)
+"fQa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"fQb" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate{
@@ -18424,6 +18416,30 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"fQE" = (
+/obj/structure/sign/poster/contraband/the_griffin{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 4
+ },
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #1";
+ suffix = "#1"
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=8";
+ location = "QM #2"
+ },
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"fQF" = (
/obj/structure/toilet,
/obj/machinery/light/small/directional/north,
@@ -19053,14 +19069,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/wood,
/area/station/service/bar)
-"gbW" = (
-/obj/structure/closet/wardrobe/miner,
-/obj/item/clothing/suit/hooded/wintercoat/miner,
-/obj/item/clothing/suit/hooded/wintercoat/miner,
-/obj/item/clothing/suit/hooded/wintercoat/miner,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"gbY" = (
/obj/effect/turf_decal/bot/left,
/obj/effect/decal/cleanable/ash,
@@ -19263,6 +19271,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
+"ggf" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/door/firedoor,
+/obj/machinery/chem_dispenser/drinks/beer,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"ggj" = (
/obj/structure/chair/pew/left{
dir = 8
@@ -19641,20 +19656,6 @@
"glI" = (
/turf/closed/indestructible/opshuttle,
/area/station/science/ordnance/bomb)
-"glV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"glX" = (
/obj/machinery/holopad,
/turf/open/floor/carpet/green,
@@ -20075,10 +20076,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"gsI" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/ballpit,
-/area/station/security/prison)
"gsO" = (
/obj/effect/landmark/start/cargo_technician,
/obj/structure/chair/office{
@@ -20263,6 +20260,10 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"gwj" = (
+/obj/effect/decal/cleanable/blood/gibs/up,
+/turf/open/ballpit,
+/area/station/security/bitden)
"gwk" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
/turf/closed/wall,
@@ -20356,14 +20357,6 @@
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron/showroomfloor,
/area/station/science/lab)
-"gxE" = (
-/obj/machinery/vending/cola/red,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"gyb" = (
/turf/open/floor/plating/rust,
/area/station/security/prison)
@@ -21129,12 +21122,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/closed/wall/rust,
/area/station/maintenance/disposal/incinerator)
-"gJN" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/turf/open/floor/engine,
-/area/station/security/prison)
"gKg" = (
/obj/structure/railing,
/obj/structure/disposalpipe/segment{
@@ -22158,16 +22145,6 @@
dir = 1
},
/area/station/hallway/primary/port)
-"hdm" = (
-/obj/structure/kitchenspike,
-/obj/effect/turf_decal/bot/left,
-/obj/machinery/airalarm/kitchen_cold_room{
- dir = 1;
- pixel_y = 24
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"hdo" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -22195,6 +22172,11 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/central/fore)
+"hdD" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/bitden)
"hea" = (
/obj/effect/turf_decal/siding/blue,
/obj/effect/turf_decal/tile/blue/half/contrasted,
@@ -22319,26 +22301,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science/research)
-"hgB" = (
-/obj/structure/table,
-/obj/item/reagent_containers/spray/cleaner{
- pixel_y = 9
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -7;
- pixel_y = 1
- },
-/obj/item/food/donkpocket/warm,
-/obj/item/food/donkpocket/warm/teriyaki{
- pixel_x = -9;
- pixel_y = -2
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"hgH" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral{
@@ -22402,6 +22364,14 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"hhu" = (
+/obj/effect/turf_decal/arrows,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"hhE" = (
/obj/item/kirbyplants{
icon_state = "plant-18"
@@ -22423,12 +22393,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/science/lab)
-"hhY" = (
-/obj/structure/kitchenspike,
-/obj/effect/decal/cleanable/piss_stain,
-/obj/effect/mob_spawn/corpse/human/damaged,
-/turf/open/ballpit,
-/area/station/security/prison)
"hib" = (
/obj/machinery/door/airlock/maintenance/external{
name = "Construction Zone"
@@ -23506,6 +23470,13 @@
/obj/structure/chair/stool/bar/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"hyT" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/piss_stain,
+/turf/open/ballpit,
+/area/station/security/bitden)
"hzC" = (
/obj/structure/flora/rock/icy/style_2,
/turf/open/misc/asteroid/airless,
@@ -23541,22 +23512,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"hAd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"hAF" = (
/obj/structure/table/wood,
/obj/machinery/reagentgrinder{
@@ -24033,6 +23988,10 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
+"hHy" = (
+/obj/effect/turf_decal/trimline/red/filled/end,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"hHL" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -24359,24 +24318,6 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen)
-"hMg" = (
-/obj/effect/decal/cleanable/piss_stain,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 10
- },
-/obj/effect/turf_decal/caution,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"hMi" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
@@ -24479,6 +24420,20 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
+"hNI" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/conveyor{
+ dir = 1;
+ id = "QMLoad";
+ name = "off ramp"
+ },
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
"hNL" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron/showroomfloor,
@@ -24493,13 +24448,6 @@
/obj/effect/mapping_helpers/airlock/access/all/command/teleporter,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
-"hNV" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/security/prison)
"hOc" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -24564,6 +24512,16 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"hOH" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
"hOJ" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -24872,6 +24830,16 @@
/obj/machinery/firealarm/directional/north,
/turf/closed/wall,
/area/station/commons/fitness/recreation)
+"hRE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/toy/figure/prisoner{
+ pixel_x = 3;
+ pixel_y = 6
+ },
+/turf/open/floor/catwalk_floor,
+/area/station/security/prison/mess)
"hRG" = (
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
dir = 1
@@ -24958,10 +24926,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"hTs" = (
-/obj/effect/turf_decal/trimline/red/filled/end,
-/turf/open/floor/engine,
-/area/station/security/prison)
"hTw" = (
/obj/machinery/door/airlock/medical{
id_tag = "Unit_2";
@@ -25087,13 +25051,6 @@
/obj/item/wirecutters,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"hVe" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/ballpit,
-/area/station/security/prison)
"hVj" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -25595,15 +25552,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"icl" = (
-/obj/machinery/computer/quantum_console,
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 6
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"ics" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/effect/turf_decal/tile/red{
@@ -25696,6 +25644,13 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"icZ" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/ballpit,
+/area/station/security/bitden)
"idF" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -25744,35 +25699,6 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
-"iew" = (
-/obj/structure/closet/crate,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"ieI" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -26200,6 +26126,13 @@
"imh" = (
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/medical)
+"imi" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"imo" = (
/obj/structure/sign/directions/science{
dir = 4;
@@ -27138,6 +27071,13 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"iyV" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"iza" = (
/turf/closed/wall/rust,
/area/station/maintenance/port/lesser)
@@ -27678,6 +27618,17 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/storage/primary)
+"iHc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"iHp" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -28213,10 +28164,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
-"iOJ" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/glass/plasma,
-/area/station/security/prison)
"iOO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28245,6 +28192,11 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/recharge_floor,
/area/station/science/robotics/mechbay)
+"iPM" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/byteforge,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"iQd" = (
/obj/effect/turf_decal/bot,
/obj/machinery/holopad,
@@ -28308,16 +28260,6 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/station/service/bar/atrium)
-"iRz" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"iRD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28899,10 +28841,6 @@
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/station/security/processing)
-"iZs" = (
-/obj/effect/decal/cleanable/blood/gibs/up,
-/turf/open/ballpit,
-/area/station/security/prison)
"iZB" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -29779,21 +29717,6 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/carpet/red,
/area/station/service/chapel)
-"joF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/bitrunner,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"joK" = (
/obj/structure/chair/pew{
dir = 8
@@ -29827,14 +29750,6 @@
dir = 4
},
/area/station/service/chapel)
-"jpm" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/engine,
-/area/station/security/prison)
"jpD" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/opposingcorners,
@@ -30156,18 +30071,6 @@
dir = 8
},
/area/station/hallway/primary/port)
-"jvc" = (
-/obj/structure/closet/crate,
-/obj/item/food/grown/onion,
-/obj/item/food/grown/onion,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/potato,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"jvh" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/radiation,
@@ -30257,6 +30160,11 @@
"jwV" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/atmos)
+"jxm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/vehicle/sealed/mecha/working/ripley/cargo,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"jxy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/crate,
@@ -30390,6 +30298,15 @@
/obj/structure/sign/poster/contraband/random/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"jzG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/landmark/event_spawn,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"jzH" = (
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/r_wall,
@@ -32415,23 +32332,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"klE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/loading_area{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"klK" = (
/obj/structure/railing{
dir = 4
@@ -32637,13 +32537,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"kqq" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/decal/cleanable/piss_stain,
-/turf/open/ballpit,
-/area/station/security/prison)
"kqD" = (
/obj/structure/flora/grass/jungle/a/style_random,
/obj/structure/flora/bush/grassy/style_random,
@@ -32970,11 +32863,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/stone,
/area/station/science/xenobiology)
-"kwF" = (
-/obj/structure/frame,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/prison)
"kwM" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/yellow,
@@ -33533,13 +33421,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/atmos)
-"kFW" = (
-/obj/effect/turf_decal/trimline/red/filled/corner,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"kGc" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -34155,12 +34036,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"kPu" = (
-/obj/structure/kitchenspike,
-/obj/effect/mob_spawn/corpse/human/damaged,
-/obj/effect/turf_decal/bot/right,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/prison)
"kPv" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -35746,6 +35621,10 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"lrh" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/ballpit,
+/area/station/security/bitden)
"lrk" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/wood{
@@ -37273,6 +37152,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/bridge)
+"lPG" = (
+/obj/structure/grille/broken,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"lPU" = (
/obj/machinery/shower/directional/west,
/turf/open/floor/plastic,
@@ -37376,25 +37261,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/fore)
-"lSk" = (
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=8";
- location = "QM #1"
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #2";
- suffix = "#2"
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/storage)
"lSs" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -37465,6 +37331,15 @@
/obj/machinery/light/directional/north,
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/captain)
+"lUp" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/gibs/old,
+/obj/machinery/power/apc/auto_name/directional/east,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"lUq" = (
/turf/closed/wall/r_wall/rust,
/area/station/service/chapel/storage)
@@ -38263,6 +38138,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"miD" = (
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"miL" = (
/obj/machinery/door/airlock/security/glass{
name = "Transferring Centre"
@@ -38421,6 +38309,12 @@
/obj/structure/cable/layer3,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/aisat/foyer)
+"mlh" = (
+/obj/structure/kitchenspike,
+/obj/effect/decal/cleanable/piss_stain,
+/obj/effect/mob_spawn/corpse/human/damaged,
+/turf/open/ballpit,
+/area/station/security/bitden)
"mlm" = (
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
@@ -39067,6 +38961,11 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/showroomfloor,
/area/station/security/execution/transfer)
+"mvJ" = (
+/obj/machinery/light/small/red/dim/directional/west,
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"mvV" = (
/obj/effect/turf_decal/siding/thinplating/dark/end{
dir = 4
@@ -39531,17 +39430,6 @@
"mDj" = (
/turf/closed/wall,
/area/station/science/genetics)
-"mDt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"mDD" = (
/turf/closed/wall/rust,
/area/station/cargo/warehouse)
@@ -40021,6 +39909,10 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/execution/education)
+"mLs" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"mLE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40114,6 +40006,15 @@
/obj/structure/sign/poster/contraband/random/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"mNi" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/ordnance/freezerchamber)
"mNv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -40265,21 +40166,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"mPT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/sign/poster/contraband/the_griffin{
- pixel_y = 32
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"mPZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -40676,6 +40562,19 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"mVG" = (
+/obj/structure/rack,
+/obj/item/plant_analyzer,
+/obj/item/plant_analyzer{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/cultivator,
+/obj/effect/spawner/random/food_or_drink/seed,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"mVH" = (
/obj/machinery/vending/wallmed/directional/north{
pixel_x = -32
@@ -40776,6 +40675,11 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison)
+"mWI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"mWR" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/neutral,
@@ -41131,6 +41035,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/security/prison)
+"ncB" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/door/firedoor,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"ncC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/event_spawn,
@@ -41184,16 +41096,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"ndR" = (
-/obj/machinery/shower/directional/north,
-/obj/item/soap/nanotrasen{
- pixel_x = 3;
- pixel_y = -4
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/turf_decal/bot/left,
-/turf/open/floor/iron/freezer,
-/area/station/bitrunning/den)
"ndS" = (
/obj/effect/turf_decal/loading_area{
dir = 4
@@ -41680,19 +41582,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/chemistry)
-"nnx" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "Bitrunner Den"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 8
- },
-/obj/structure/barricade/wooden/crude,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/station/security/prison)
"nny" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/nitrogen,
@@ -42025,12 +41914,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"nsS" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/grill,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"nsZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42742,6 +42625,9 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/restrooms)
+"nEP" = (
+/turf/open/floor/glass/plasma,
+/area/station/security/bitden)
"nEQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -43162,12 +43048,6 @@
},
/turf/open/space/basic,
/area/space)
-"nLX" = (
-/obj/machinery/computer/order_console/bitrunning,
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"nLZ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -43568,6 +43448,14 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
+"nTB" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/bot,
+/obj/machinery/computer/quantum_console{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"nTG" = (
/obj/effect/spawner/random/vending/snackvend,
/obj/effect/turf_decal/bot,
@@ -43584,20 +43472,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/starboard/fore)
-"nUT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"nUZ" = (
/obj/effect/turf_decal/delivery,
/obj/structure/extinguisher_cabinet/directional/south,
@@ -43874,6 +43748,35 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"ocJ" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/saltshaker{
+ layer = 3.1;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/machinery/door/firedoor,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/rice{
+ pixel_y = 6
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"ocL" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/showroomfloor,
@@ -45528,26 +45431,6 @@
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/station/security/office)
-"oHt" = (
-/obj/structure/table/reinforced,
-/obj/item/toy/figure/prisoner{
- pixel_x = 3;
- pixel_y = 6
- },
-/obj/item/reagent_containers/condiment/saltshaker{
- layer = 3.1;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"oHD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -45793,10 +45676,6 @@
/obj/structure/sign/poster/official/twelve_gauge,
/turf/closed/wall,
/area/station/maintenance/starboard/fore)
-"oMh" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"oMr" = (
/obj/machinery/flasher/portable,
/obj/machinery/camera/motion/directional/east{
@@ -46076,16 +45955,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
-"oSf" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/obj/machinery/airalarm/mixingchamber{
- pixel_y = -24
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/ordnance/freezerchamber)
"oSq" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -46683,13 +46552,6 @@
/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/stone,
/area/station/science/xenobiology)
-"pbq" = (
-/obj/effect/turf_decal/arrows,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"pbs" = (
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall/rust,
@@ -47014,6 +46876,15 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/showroomfloor,
/area/station/security/brig)
+"phD" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"phF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47884,12 +47755,6 @@
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"pss" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/table,
-/turf/open/floor/catwalk_floor,
-/area/station/security/prison/mess)
"psC" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -47909,21 +47774,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"psR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"ptu" = (
/obj/machinery/air_sensor/oxygen_tank,
/turf/open/floor/engine/o2,
@@ -48262,6 +48112,17 @@
/obj/machinery/telecomms/bus/preset_one,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
+"pAm" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Prison Recreation";
+ network = list("ss13","prison")
+ },
+/obj/machinery/light/small/red/dim/directional/west,
+/obj/structure/kitchenspike,
+/obj/effect/mob_spawn/corpse/human/damaged,
+/obj/effect/turf_decal/bot/right,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"pAq" = (
/obj/machinery/newscaster/directional/south,
/obj/effect/turf_decal/siding/white{
@@ -48653,6 +48514,20 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"pGm" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cargo_shelf,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pGA" = (
/obj/structure/sink/directional/east,
/obj/effect/decal/cleanable/dirt,
@@ -48716,10 +48591,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"pGT" = (
-/obj/structure/frame,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/security/prison)
"pHD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -49680,6 +49551,13 @@
"pXi" = (
/turf/open/floor/plating,
/area/station/service/chapel)
+"pXq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
"pXt" = (
/obj/structure/table,
/obj/machinery/recharger,
@@ -49813,6 +49691,20 @@
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"qai" = (
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/gibs/old,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"qao" = (
/obj/structure/table/glass,
/obj/item/clothing/gloves/latex,
@@ -50675,6 +50567,15 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"qod" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"qoi" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/binary/pump{
@@ -51178,6 +51079,23 @@
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"qwN" = (
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"qwR" = (
/obj/machinery/door/airlock/maintenance{
name = "Research Lab Maintenance"
@@ -51457,11 +51375,6 @@
/obj/effect/turf_decal/box,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/cryo)
-"qBw" = (
-/obj/structure/frame,
-/obj/machinery/light/small/red/dim/directional/west,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/security/prison)
"qBz" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -51737,23 +51650,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/checkpoint/science/research)
-"qGA" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 10
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"qGH" = (
/obj/structure/table/reinforced/plasmarglass,
/obj/item/book/manual/wiki/cytology{
@@ -51773,6 +51669,23 @@
"qHe" = (
/turf/closed/wall/r_wall/rust,
/area/station/ai_monitored/command/storage/eva)
+"qHq" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"qHy" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -52037,16 +51950,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/service/library)
-"qLi" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"qLr" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
@@ -52546,15 +52449,6 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"qSc" = (
-/obj/machinery/quantum_server{
- pixel_y = 3
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/bot/left,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"qSe" = (
/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible,
/obj/effect/turf_decal/stripes/line,
@@ -52620,19 +52514,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"qTi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/storage)
"qTt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52642,11 +52523,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/security/prison)
-"qTv" = (
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/security/prison)
"qTC" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -53733,12 +53609,6 @@
"rkG" = (
/turf/closed/wall/r_wall/rust,
/area/station/security/lockers)
-"rkQ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/decal/cleanable/oil/streak,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"rkT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53919,22 +53789,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"roy" = (
-/obj/effect/turf_decal/arrows,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"roF" = (
/obj/machinery/door/airlock/command/glass{
name = "Server Access"
@@ -55337,13 +55191,6 @@
"rJs" = (
/turf/open/floor/iron/showroomfloor,
/area/station/security/medical)
-"rJz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"rJJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56015,6 +55862,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"rTG" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"rTI" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -56026,17 +55879,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/cryo)
-"rTJ" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"rTK" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -56171,6 +56013,18 @@
dir = 1
},
/area/station/hallway/primary/port)
+"rVT" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet{
+ name = "supply locker"
+ },
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/effect/spawner/random/maintenance,
+/obj/item/clothing/under/rank/cargo/tech,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"rVY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -56252,12 +56106,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/service/library)
-"rYP" = (
-/obj/machinery/byteforge,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"rZb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -56308,17 +56156,6 @@
"rZW" = (
/turf/open/floor/iron/showroomfloor,
/area/station/medical/chemistry)
-"rZY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/mining/glass{
- name = "Bitrunning Den"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
-/area/station/bitrunning/den)
"sab" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/event_spawn,
@@ -56332,19 +56169,6 @@
},
/turf/open/misc/asteroid,
/area/space/nearstation)
-"sas" = (
-/obj/effect/decal/cleanable/vomit/old,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/book/manual/chef_recipes,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"sav" = (
/obj/structure/flora/bush/pale/style_random,
/obj/structure/sign/warning/electric_shock/directional/south,
@@ -57178,6 +57002,18 @@
/obj/item/pickaxe,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"smd" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/structure/cargo_shelf,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"smi" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -58117,6 +57953,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"sCF" = (
+/obj/machinery/light/small/red/dim/directional/east,
+/obj/effect/decal/cleanable/blood/tracks,
+/turf/open/ballpit,
+/area/station/security/bitden)
"sCK" = (
/obj/machinery/computer/communications{
dir = 4
@@ -58235,6 +58076,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"sEC" = (
+/obj/machinery/light/small/red/dim/directional/east,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"sEK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58457,14 +58307,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"sIu" = (
-/obj/structure/cable,
-/obj/structure/frame/computer{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/prison)
"sIx" = (
/obj/effect/turf_decal/loading_area{
dir = 4;
@@ -58868,6 +58710,10 @@
/obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
/turf/open/floor/iron/showroomfloor,
/area/station/science/xenobiology)
+"sOr" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/glass/plasma,
+/area/station/security/bitden)
"sOD" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -58921,6 +58767,21 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"sPf" = (
+/obj/effect/turf_decal/arrows,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"sPq" = (
/obj/structure/table/glass,
/obj/machinery/reagentgrinder{
@@ -59244,6 +59105,13 @@
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/station/command/heads_quarters/cmo)
+"sUf" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"sUq" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -59628,14 +59496,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
-"tah" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard)
"tav" = (
/obj/structure/cable,
/obj/effect/turf_decal/bot,
@@ -59941,6 +59801,21 @@
/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"tfo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/structure/closet/wardrobe/miner,
+/obj/item/clothing/suit/hooded/wintercoat/miner,
+/obj/item/clothing/suit/hooded/wintercoat/miner,
+/obj/item/clothing/suit/hooded/wintercoat/miner,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"tfs" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -60095,6 +59970,19 @@
},
/turf/open/space/basic,
/area/space)
+"thR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"thU" = (
/mob/living/basic/mining/goliath/ancient,
/turf/open/misc/asteroid/lowpressure,
@@ -60257,10 +60145,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"tlg" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"tlu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60302,6 +60186,11 @@
},
/turf/open/misc/asteroid,
/area/space/nearstation)
+"tlN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/cola/red,
+/turf/open/floor/plating,
+/area/station/security/prison/mess)
"tlS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -60757,20 +60646,6 @@
/obj/structure/sign/warning/fire,
/turf/closed/wall/rust,
/area/station/commons/fitness/recreation)
-"tsy" = (
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/gibs/old,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"tsD" = (
/obj/effect/turf_decal/bot,
/obj/machinery/conveyor{
@@ -61885,19 +61760,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"tMs" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/station/security/prison)
"tMu" = (
/obj/machinery/shower/directional/east,
/obj/structure/cable,
@@ -62233,6 +62095,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
+"tRe" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"tRw" = (
/obj/machinery/telecomms/bus/preset_three,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -62495,6 +62368,27 @@
/obj/item/wrench,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/aft)
+"tWR" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 1
+ },
+/obj/structure/cargo_shelf,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"tWW" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"tXg" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/bridge)
@@ -64664,6 +64558,24 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"uIb" = (
+/obj/effect/decal/cleanable/piss_stain,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 10
+ },
+/obj/effect/turf_decal/caution,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/security/bitden)
"uIf" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -65189,6 +65101,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"uSv" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/end{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/gibs/old,
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 4;
+ pixel_x = -8
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"uSB" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
@@ -65407,28 +65332,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"uXS" = (
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=8";
- location = "QM #2"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #1";
- suffix = "#1"
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/storage)
"uXZ" = (
/turf/closed/wall/rust,
/area/station/hallway/primary/aft)
@@ -65533,23 +65436,6 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
-"uZX" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/pump/lil_pump,
-/obj/machinery/camera/directional/west{
- c_tag = "Ordnance Mixing Lab";
- name = "science camera";
- network = list("ss13","rd")
- },
-/obj/machinery/airalarm/mixingchamber{
- dir = 8;
- pixel_x = -28
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/science/ordnance/burnchamber)
"uZY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/shaft_miner,
@@ -66318,6 +66204,9 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"vlE" = (
+/turf/closed/wall/r_wall/rust,
+/area/station/security/bitden)
"vlF" = (
/obj/machinery/camera/directional/north{
c_tag = "Medbay Aux Storage";
@@ -66386,11 +66275,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/medbay/lobby)
-"vmD" = (
-/obj/effect/spawner/structure/window/reinforced/tinted,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison)
"vmO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -66579,6 +66463,19 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"vpg" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"vpi" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/crate,
@@ -66598,6 +66495,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/brig)
+"vpU" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/griddle,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"vpV" = (
/obj/structure/chair{
dir = 4
@@ -67936,27 +67839,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"vHA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/loading_area{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"vHC" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -69229,6 +69111,18 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"vYk" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"vYm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -69421,6 +69315,15 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
+"wbj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"wbo" = (
/obj/machinery/door/airlock/maintenance{
name = "Service Maintenance"
@@ -69823,6 +69726,9 @@
/obj/machinery/atm,
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
+"wio" = (
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"wiw" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70170,6 +70076,21 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/storage)
+"wnx" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/pump/lil_pump,
+/obj/machinery/camera/directional/west{
+ c_tag = "Ordnance Mixing Lab";
+ name = "science camera";
+ network = list("ss13","rd")
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/ordnance/burnchamber)
"wny" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/turf_decal/delivery,
@@ -70590,6 +70511,13 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"wtJ" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"wua" = (
/obj/machinery/modular_computer/preset/civilian{
dir = 1
@@ -70604,6 +70532,22 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/central/fore)
+"wuk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"wur" = (
/obj/structure/table/glass,
/obj/item/book/manual/wiki/infections{
@@ -71061,11 +71005,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel/monastery)
-"wEo" = (
-/obj/machinery/light/small/red/dim/directional/east,
-/obj/effect/decal/cleanable/blood/tracks,
-/turf/open/ballpit,
-/area/station/security/prison)
"wEt" = (
/turf/closed/wall/r_wall/rust,
/area/station/service/bar/atrium)
@@ -71525,9 +71464,6 @@
dir = 1
},
/area/station/service/chapel)
-"wKU" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"wLp" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -71675,6 +71611,15 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/pharmacy)
+"wNW" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"wOk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -71711,6 +71656,14 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"wOS" = (
+/obj/structure/kitchenspike,
+/obj/effect/turf_decal/bot/left,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"wPh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -71816,13 +71769,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
-"wQd" = (
-/obj/machinery/holopad,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"wQf" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -72146,25 +72092,6 @@
/obj/machinery/smartfridge,
/turf/closed/wall/r_wall,
/area/station/security/prison/mess)
-"wVt" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/item/reagent_containers/condiment/rice{
- pixel_y = 6
- },
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = -3
- },
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = -3
- },
-/obj/item/reagent_containers/condiment/sugar{
- pixel_x = 7
- },
-/obj/item/storage/fancy/egg_box,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"wVA" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/corner,
@@ -72690,6 +72617,20 @@
},
/turf/open/floor/iron,
/area/station/engineering/hallway)
+"xew" = (
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/trimline/red/filled/end{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/engine,
+/area/station/security/bitden)
"xex" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/caution/stand_clear,
@@ -72716,13 +72657,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"xfB" = (
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"xfN" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/booze{
@@ -73403,21 +73337,6 @@
"xqw" = (
/turf/open/floor/bronze,
/area/station/maintenance/department/chapel)
-"xqz" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Prison Cafeteria";
- network = list("ss13","prison")
- },
-/obj/structure/table,
-/obj/machinery/microwave,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/spawner/random/food_or_drink/donkpockets{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"xqE" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -73456,6 +73375,12 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/atmos)
+"xsy" = (
+/obj/structure/kitchenspike,
+/obj/effect/mob_spawn/corpse/human/damaged,
+/obj/effect/turf_decal/bot/right,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"xsJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -74629,6 +74554,27 @@
/obj/effect/mapping_helpers/airlock/access/all/service/general,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
+"xLy" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery,
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #2";
+ suffix = "#2"
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=8";
+ location = "QM #1"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"xLC" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -74838,6 +74784,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"xQj" = (
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/conveyor{
+ dir = 1;
+ id = "QMLoad";
+ name = "off ramp"
+ },
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
"xQA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/landmark/start/hangover,
@@ -75063,12 +75021,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"xUw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"xUy" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -75113,6 +75065,17 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"xUZ" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Cargo Bay Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
"xVm" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/gravity_generator)
@@ -75910,20 +75873,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"ygL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"ygO" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -75981,6 +75930,28 @@
/obj/item/storage/fancy/candle_box,
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
+"yhx" = (
+/obj/effect/decal/cleanable/vomit/old,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/book/manual/chef_recipes,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = -5
+ },
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"yhI" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -80553,15 +80524,15 @@ aeU
aaa
aaa
aaa
-sAv
-lrq
-sAv
-vmD
-vmD
-vmD
-sAv
-lrq
-lrq
+wio
+vlE
+wio
+hdD
+hdD
+hdD
+wio
+vlE
+vlE
aeU
aeU
aaa
@@ -80810,15 +80781,15 @@ mWy
mWy
mWy
mWy
-sAv
-kPu
-dYt
-kPu
-dkr
-pGT
-qBw
-pGT
-lrq
+wio
+xsy
+pAm
+xsy
+uSv
+mLs
+mvJ
+mLs
+vlE
coy
aeU
aeU
@@ -81067,15 +81038,15 @@ mWy
oqI
esv
isS
-lrq
-dUN
-tsy
-qGA
-fMM
-ecs
-kFW
-hTs
-vmD
+vlE
+xew
+qai
+qwN
+bPx
+rTG
+imi
+hHy
+hdD
aeU
aeU
aeU
@@ -81324,15 +81295,15 @@ pbx
dZm
isS
msK
-lrq
-hVe
-kqq
-tMs
-fnt
-fnt
-gJN
-sIu
-vmD
+vlE
+icZ
+hyT
+miD
+nEP
+nEP
+bNg
+nTB
+hdD
aeU
aUz
aeU
@@ -81581,15 +81552,15 @@ oQv
dxf
mJA
ymc
-sAv
-iZs
-gsI
-tMs
-iOJ
-fnt
-qTv
-kwF
-vmD
+wio
+gwj
+lrh
+miD
+sOr
+nEP
+bDy
+dcn
+hdD
aeU
aeU
aeU
@@ -81838,15 +81809,15 @@ cuS
kvU
mTM
mRm
-sAv
-hhY
-wEo
-hMg
-jpm
-hNV
-eiO
-kwF
-sAv
+wio
+mlh
+sCF
+uIb
+lUp
+wtJ
+sEC
+iPM
+wio
aeu
aeU
coy
@@ -82095,15 +82066,15 @@ gDl
sHX
mTM
oNf
-lrq
-sAv
-sAv
-nnx
-sAv
-sAv
-sAv
-sAv
-sAv
+vlE
+wio
+wio
+csF
+wio
+wio
+wio
+wio
+wio
aeu
aeu
aeU
@@ -86212,7 +86183,7 @@ dWG
bbZ
fsm
wjn
-pss
+hRE
bEv
sVk
tPH
@@ -86724,7 +86695,7 @@ mbh
oUS
eJN
bbZ
-rJz
+phD
bbZ
kfg
gdH
@@ -86982,7 +86953,7 @@ wVI
eJN
saW
cjQ
-hDM
+tlN
kGN
oSG
lUV
@@ -87496,10 +87467,10 @@ pfO
sJD
saW
cKA
-wVt
-iew
-jvc
-xqz
+ggf
+dFN
+alN
+dUW
aKY
cmU
cmU
@@ -87753,10 +87724,10 @@ tpd
sJD
igV
cKA
-xfB
+ncB
edr
nAL
-fiI
+ctP
tPH
aUz
cmU
@@ -88008,12 +87979,12 @@ vXn
kPd
hCK
mMy
-gxE
+iyV
cKA
weP
wiN
dFN
-fKj
+vpU
tPH
aeU
cmU
@@ -88267,10 +88238,10 @@ mvF
jsV
ybG
cKA
-oHt
+ocJ
wiN
dFN
-ano
+fbd
gSF
cmU
cmU
@@ -88523,11 +88494,11 @@ iOR
mvF
vAa
bxo
-wQd
+cKA
wVr
edr
qfF
-nsS
+wNW
tPH
aeU
aqQ
@@ -88784,7 +88755,7 @@ cKA
hJR
eyb
gcg
-sas
+yhx
tPH
aeU
cmU
@@ -109564,7 +109535,7 @@ pLB
hxw
irL
bXz
-hdm
+wOS
dMp
skW
jDF
@@ -115218,7 +115189,7 @@ awT
aMU
iLX
rZV
-cTN
+rVT
xZL
xZL
rZV
@@ -115742,7 +115713,7 @@ pLX
oeZ
dMo
lea
-qLi
+vpg
vgd
eQD
jaR
@@ -115991,15 +115962,15 @@ dty
cqr
lDu
mtN
-wKU
-wKU
+rZV
+rZV
gYU
gYU
gYU
mlJ
gYU
lmO
-rTJ
+qHq
gUS
aSZ
aTx
@@ -116248,15 +116219,15 @@ gBd
xxN
lDu
rWS
-wKU
-qSc
-fax
-enI
-wKU
-hAd
-roy
-oMh
-fLo
+bad
+bZT
+lKq
+xLy
+tRe
+vYk
+sPf
+tWW
+thR
wdL
xYx
wdL
@@ -116504,17 +116475,17 @@ vls
xxN
xxN
lDu
-tah
-wKU
-icl
-aXg
-enI
-wKU
-aRz
-pbq
-klE
-vHA
-kxu
+jzG
+fkP
+mVG
+lKq
+pGm
+mYW
+lJD
+hhu
+aZg
+wuk
+iHc
kxu
xVK
kxu
@@ -116762,16 +116733,16 @@ uuW
uuW
lDu
tOJ
-wKU
-rkQ
-joF
-enI
-wKU
-mPT
-mYW
-lSk
-uXS
-dWM
+bad
+exQ
+lKq
+fQE
+sUf
+bzY
+mWI
+hOH
+xQj
+hNI
oAJ
sPV
eiI
@@ -117019,12 +116990,12 @@ pLJ
pLJ
oLH
wCY
-cgG
-rYP
-glV
-ndR
-wKU
-qTi
+lPG
+lKq
+lKq
+lKq
+boR
+pXq
ltG
lKq
lKq
@@ -117276,13 +117247,13 @@ vCh
reo
lDu
wCY
-wKU
-wKU
-psR
-hgB
-wKU
-ygL
-nLX
+rZV
+lKq
+tWR
+cen
+qod
+bzY
+mYW
hOc
acm
aaa
@@ -117532,14 +117503,14 @@ qew
sVI
dry
lDu
+wbj
xZL
-xZL
-wKU
-psR
-iRz
-wKU
-ahX
-gbW
+lKq
+smd
+ncH
+mYW
+bzY
+jxm
hOc
qJs
jze
@@ -117791,11 +117762,11 @@ dty
lDu
lDu
xZL
-aNZ
-dLx
-xUw
-rZY
-nUT
+xUZ
+dPa
+fQa
+lJD
+efE
aZY
hOc
aaa
@@ -118036,7 +118007,7 @@ hjk
oTD
loO
oTD
-uZX
+wnx
kFN
uYh
hvz
@@ -118048,10 +118019,10 @@ eGD
rcI
lDu
xZL
-wKU
-wKU
-tlg
-wKU
+lKq
+lKq
+hOc
+lKq
ipU
qAR
qAR
@@ -118299,7 +118270,7 @@ lkB
lkB
lkB
lkB
-oSf
+mNi
aMb
djo
cGr
@@ -118562,8 +118533,8 @@ rPl
uwq
oLH
wCY
-sJS
-mDt
+rZV
+tfo
wdx
vuu
bAy
@@ -118819,7 +118790,7 @@ fqb
lDu
lDu
mrt
-sJS
+rZV
dtH
hbC
chT
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 51278ded1861..c2b3bfe718e4 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -363,14 +363,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
-"aht" = (
-/obj/machinery/vending/sustenance,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"ahD" = (
/obj/structure/displaycase/trophy,
/turf/open/floor/wood,
@@ -417,16 +409,6 @@
},
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/entry)
-"aij" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"aim" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -941,6 +923,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/computer)
+"ase" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/camera/directional/west{
+ c_tag = "Telecomms - Server Room - Aft-Port";
+ network = list("ss13","tcomms")
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/station/tcommsat/server)
"asz" = (
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
@@ -1263,15 +1255,6 @@
dir = 1
},
/area/station/engineering/atmos)
-"axK" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"axO" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -1321,6 +1304,15 @@
"ayr" = (
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"ayx" = (
+/obj/machinery/door/airlock/mining{
+ name = "Mining Office"
+ },
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"ayz" = (
/obj/machinery/nanite_program_hub,
/obj/effect/turf_decal/tile/purple/anticorner{
@@ -1620,11 +1612,6 @@
/obj/item/poster/random_official,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"aEl" = (
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"aEr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1682,6 +1669,14 @@
/obj/effect/spawner/random/bureaucracy/paper,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"aFG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/grass,
+/area/station/service/hydroponics)
"aGe" = (
/obj/machinery/door/airlock/maintenance{
name = "Storage Room"
@@ -1921,14 +1916,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/hallway/secondary/service)
-"aJK" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"aJO" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers";
@@ -1986,15 +1973,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"aKl" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"aKz" = (
/obj/structure/chair{
dir = 4
@@ -2414,6 +2392,11 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"aRW" = (
+/obj/machinery/biogenerator,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"aSd" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -3632,6 +3615,24 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
+"bmu" = (
+/obj/structure/table,
+/obj/item/folder/red{
+ pixel_x = 3
+ },
+/obj/item/taperecorder{
+ pixel_x = -3
+ },
+/obj/item/storage/fancy/cigarettes,
+/obj/item/assembly/flash/handheld,
+/obj/item/reagent_containers/spray/pepper,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"bmz" = (
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/cobweb,
@@ -3670,12 +3671,6 @@
/obj/effect/mapping_helpers/airlock/access/any/command/captain,
/turf/open/floor/plating,
/area/station/maintenance/central)
-"bmX" = (
-/obj/machinery/light/small/directional/west,
-/obj/structure/sink/directional/south,
-/mob/living/basic/mouse/brown/tom,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"bno" = (
/obj/structure/transit_tube/diagonal,
/turf/open/space,
@@ -3688,21 +3683,6 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/office)
-"bns" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Prison Cafeteria"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"bnv" = (
/obj/structure/table,
/obj/item/folder/yellow{
@@ -3856,23 +3836,6 @@
},
/turf/open/floor/carpet/red,
/area/station/cargo/quartermaster)
-"boz" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 8
- },
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"boD" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -3966,18 +3929,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
-"bqv" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/effect/turf_decal/siding/purple{
- dir = 6
- },
-/obj/machinery/airalarm/mixingchamber{
- dir = 4;
- pixel_x = 25
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/burnchamber)
"bqJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4722,18 +4673,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"bGM" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/mining{
- name = "Mining Office"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"bGV" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -4806,6 +4745,12 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/customs)
+"bIB" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"bIF" = (
/obj/machinery/door/airlock/maintenance{
name = "Library Maintenance"
@@ -4995,16 +4940,6 @@
},
/turf/open/floor/iron/checker,
/area/station/engineering/atmos/pumproom)
-"bMM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"bMW" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5401,17 +5336,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"bVF" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"bVI" = (
/obj/item/kirbyplants,
/obj/machinery/vending/wallmed/directional/south,
@@ -5505,6 +5429,12 @@
},
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"bXG" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"bXO" = (
/turf/closed/indestructible/riveted{
desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
@@ -5918,6 +5848,14 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"ciQ" = (
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"ciU" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/airless,
@@ -6084,16 +6022,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/cargo/sorting)
-"cnk" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"cnn" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/toy/basketball,
@@ -6108,6 +6036,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"cnz" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/closet/secure_closet/miner,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"cnA" = (
/obj/machinery/status_display/evac/directional/north,
/obj/effect/turf_decal/tile/neutral{
@@ -6145,6 +6082,16 @@
"cnK" = (
/turf/closed/wall,
/area/station/engineering/main)
+"cnU" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Mining Dock Maintenance"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"coc" = (
/obj/structure/chair,
/obj/effect/turf_decal/stripes/line{
@@ -6368,6 +6315,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"cru" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"crA" = (
/obj/structure/window/spawner/directional/north,
/turf/open/floor/iron/dark,
@@ -6461,6 +6417,10 @@
/obj/machinery/disposal/bin,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"ctD" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"ctL" = (
/obj/machinery/computer/records/security{
dir = 4
@@ -7057,6 +7017,11 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"cDg" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/plating,
+/area/station/security/bitden)
"cDA" = (
/obj/machinery/dna_scannernew,
/obj/effect/turf_decal/siding/purple{
@@ -7173,15 +7138,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/brig)
-"cGL" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"cGS" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/camera/directional/west{
@@ -7745,6 +7701,10 @@
/obj/effect/mapping_helpers/mail_sorting/science/genetics,
/turf/open/floor/iron/white,
/area/station/science/research)
+"cTa" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"cTk" = (
/obj/machinery/camera/motion/directional/south{
active_power_usage = 0;
@@ -8193,6 +8153,15 @@
"dca" = (
/turf/open/floor/iron/white,
/area/station/medical/office)
+"dcc" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Bitrunner Den"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/bitden)
"dce" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -8330,6 +8299,17 @@
/obj/machinery/vending/wardrobe/law_wardrobe,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"deK" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/white,
+/area/station/security/prison)
"deO" = (
/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment{
@@ -8532,15 +8512,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"dhW" = (
-/obj/structure/table/reinforced,
-/obj/item/kitchen/fork/plastic,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"dhX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -8670,6 +8641,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"dlj" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/effect/turf_decal/siding/purple{
+ dir = 6
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/burnchamber)
"dlr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/broken_floor,
@@ -8700,6 +8681,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"dmE" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dmJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -9414,12 +9402,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"dCp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"dCx" = (
/obj/machinery/computer/shuttle/mining{
dir = 4
@@ -9429,6 +9411,17 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"dCH" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/item/storage/medkit/regular{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dCN" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
@@ -9687,15 +9680,6 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/pharmacy)
-"dHQ" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/machinery/light/directional/north,
-/obj/structure/cable,
-/obj/item/radio/intercom/prison/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"dIy" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -9776,6 +9760,10 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"dKd" = (
+/obj/machinery/smartfridge,
+/turf/closed/wall,
+/area/station/security/prison/mess)
"dKl" = (
/obj/structure/sign/warning/pods,
/turf/closed/wall/r_wall,
@@ -10016,6 +10004,17 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"dNN" = (
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/freezerchamber)
"dNX" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -10222,16 +10221,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"dRE" = (
-/obj/structure/chair/office{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"dRF" = (
/obj/structure/cable,
/obj/machinery/door/firedoor,
@@ -10272,11 +10261,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
-"dSG" = (
-/obj/structure/closet/wardrobe/miner,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"dTi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -10287,6 +10271,11 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"dTj" = (
+/obj/machinery/light/small/directional/west,
+/obj/structure/sink/directional/south,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
"dTq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -10338,13 +10327,6 @@
/obj/structure/sign/poster/contraband/random/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
-"dTQ" = (
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"dTS" = (
/obj/machinery/computer/security{
dir = 8
@@ -12127,12 +12109,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"eyX" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"ezb" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/filingcabinet{
@@ -12322,22 +12298,6 @@
},
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/captain/private)
-"eEb" = (
-/obj/effect/turf_decal/trimline/brown/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/corner{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/mining{
- name = "Bitrunning Den"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"eEf" = (
/obj/machinery/camera/directional/north{
c_tag = "Bar - Backroom"
@@ -12444,12 +12404,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"eGE" = (
-/obj/machinery/growing/soil,
-/obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/grass,
-/area/station/security/prison/garden)
"eGJ" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line,
@@ -12460,6 +12414,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
+"eGR" = (
+/obj/item/clothing/suit/hooded/wintercoat/miner,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"eGV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -12527,6 +12485,17 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"eJJ" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/mining{
+ name = "Mining Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"eJM" = (
/obj/machinery/camera/directional/east{
c_tag = "Atmospherics Tank - CO2"
@@ -13385,6 +13354,15 @@
/obj/structure/displaycase/labcage,
/turf/open/floor/engine,
/area/station/command/heads_quarters/rd)
+"eZV" = (
+/obj/machinery/light_switch/directional/north,
+/obj/structure/closet/wardrobe/miner,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"fad" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
@@ -13407,6 +13385,12 @@
dir = 1
},
/area/station/science/lobby)
+"fao" = (
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"fat" = (
/obj/structure/sign/plaques/kiddie/perfect_man{
pixel_y = 32
@@ -13455,6 +13439,13 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"fbQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"fbX" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -14188,6 +14179,17 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"fnv" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 8
+ },
+/obj/item/secateurs,
+/obj/item/secateurs{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"fnE" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -14932,15 +14934,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
-"fGP" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"fGR" = (
/obj/machinery/camera/directional/east{
c_tag = "Atmospherics Tank - N2"
@@ -14987,6 +14980,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/cargo/quartermaster)
+"fIb" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/kitchen/fork/plastic,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/food/energybar,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"fIo" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -15265,15 +15268,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/medical/abandoned)
-"fNH" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mining Dock Maintenance"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"fNI" = (
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/wood,
@@ -15742,6 +15736,16 @@
},
/turf/open/floor/iron/white,
/area/station/security/prison/safe)
+"fWw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 6
+ },
+/obj/machinery/light/directional/north,
+/obj/machinery/airalarm/directional/north,
+/mob/living/basic/mouse/brown/tom,
+/turf/open/floor/iron,
+/area/station/security/prison)
"fWA" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/greater)
@@ -16204,6 +16208,15 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"gff" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"gfh" = (
/obj/structure/sign/poster/random/directional/east,
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
@@ -16338,24 +16351,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/service/theater)
-"ghC" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/window/left/directional/east{
- name = "Kitchen Delivery";
- req_access = list("kitchen")
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/airalarm/kitchen_cold_room{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/service/kitchen/coldroom)
"ghK" = (
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
@@ -16769,13 +16764,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
-"goq" = (
-/obj/machinery/growing/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/item/plant_analyzer,
-/turf/open/floor/grass,
-/area/station/security/prison/garden)
"goG" = (
/obj/item/radio/intercom/directional/north,
/obj/machinery/camera/directional/north{
@@ -17035,13 +17023,6 @@
"gtb" = (
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"gtk" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"gto" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 4
@@ -17723,6 +17704,15 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"gHT" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/stove,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"gHY" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -18218,17 +18208,6 @@
"gQQ" = (
/turf/closed/wall,
/area/station/engineering/break_room)
-"gQT" = (
-/obj/structure/table,
-/obj/item/folder,
-/obj/item/pen,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/photo_album/prison,
-/obj/item/camera,
-/obj/machinery/light/directional/south,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"gRb" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -18562,15 +18541,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/station/service/cafeteria)
-"gWS" = (
-/obj/structure/window/spawner/directional/south,
-/obj/effect/decal/cleanable/food/flour,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"gXd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -18934,6 +18904,18 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/storage/gas)
+"hcb" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/processor{
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"hcv" = (
/obj/effect/landmark/observer_start,
/obj/effect/turf_decal/plaque{
@@ -19133,6 +19115,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
+"hfU" = (
+/obj/structure/table,
+/obj/item/folder,
+/obj/item/pen,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/photo_album/prison,
+/obj/item/camera,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/station/security/prison)
"hfZ" = (
/obj/structure/window/spawner/directional/south,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -19498,16 +19490,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"hmy" = (
-/obj/machinery/door/window/left/directional/south{
- name = "Permabrig Kitchen"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"hmM" = (
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
@@ -19564,6 +19546,19 @@
},
/turf/open/floor/plating,
/area/station/engineering/main)
+"hnS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/button/door/directional/south{
+ id = "prisonereducation";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"hod" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -20411,6 +20406,22 @@
},
/turf/open/floor/plating,
/area/station/medical/pharmacy)
+"hEl" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/window/left/directional/east{
+ name = "Kitchen Delivery";
+ req_access = list("kitchen")
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
+/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
+/area/station/service/kitchen/coldroom)
"hEA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -20857,6 +20868,17 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/warden)
+"hMC" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/atmospherics/components/binary/pump{
+ name = "Fuel Pipe to Incinerator"
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/disposal/incinerator)
"hME" = (
/obj/structure/table/wood,
/obj/item/taperecorder{
@@ -21380,6 +21402,15 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/commons/locker)
+"hWP" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"hWS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -21477,14 +21508,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"hXQ" = (
-/obj/machinery/vending/cola/red,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"hXR" = (
/obj/structure/table/reinforced,
/obj/structure/window/spawner/directional/west,
@@ -21679,6 +21702,11 @@
/obj/machinery/slime_extract_requestor,
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"ibx" = (
+/obj/machinery/composters,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"ibz" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -21733,6 +21761,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"icF" = (
+/obj/machinery/mineral/ore_redemption{
+ input_dir = 8;
+ output_dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/left/directional/east{
+ name = "Ore Redemtion Window"
+ },
+/turf/open/floor/iron,
+/area/station/construction/storage_wing)
"icG" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -21830,6 +21870,13 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"ieK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"ieV" = (
/turf/closed/wall/r_wall,
/area/station/security/holding_cell)
@@ -22902,19 +22949,6 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
-"ivu" = (
-/obj/structure/table/reinforced,
-/obj/machinery/camera/directional/west{
- c_tag = "Prison Cafeteria";
- network = list("ss13","prison")
- },
-/obj/item/food/energybar,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"ivx" = (
/obj/effect/spawner/random/structure/chair_maintenance{
dir = 8
@@ -23108,6 +23142,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"ixX" = (
+/obj/machinery/netpod,
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"ixY" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23299,16 +23338,6 @@
},
/turf/open/floor/iron,
/area/station/security/warden)
-"iAR" = (
-/obj/structure/table/reinforced,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"iBf" = (
/obj/structure/closet,
/obj/item/stack/sheet/iron{
@@ -23413,6 +23442,13 @@
/obj/machinery/keycard_auth/directional/east,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"iDi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/end,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"iDq" = (
/obj/effect/turf_decal/box,
/obj/structure/cable,
@@ -23494,6 +23530,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"iES" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/closet/secure_closet/miner,
+/obj/machinery/camera/directional/north{
+ c_tag = "Mining Dock"
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"iFe" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line{
@@ -24567,6 +24615,11 @@
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
+"iTS" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron,
+/area/station/security/prison)
"iTV" = (
/obj/machinery/corral_corner{
mapping_id = "3"
@@ -25501,12 +25554,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
-"jjM" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"jjN" = (
/obj/structure/chair/stool/directional/south,
/obj/structure/disposalpipe/segment{
@@ -25539,6 +25586,13 @@
},
/turf/open/floor/iron,
/area/station/security/office)
+"jks" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"jkv" = (
/obj/structure/cable,
/obj/effect/landmark/start/security_assistant,
@@ -25795,14 +25849,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"jpG" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/machinery/camera/directional/north{
- c_tag = "Mining Dock"
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"jpI" = (
/obj/machinery/shower/directional/west,
/obj/effect/landmark/event_spawn,
@@ -25855,19 +25901,6 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"jqC" = (
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/machinery/airalarm/mixingchamber{
- dir = 8;
- pixel_x = -26
- },
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/freezerchamber)
"jqQ" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -26322,6 +26355,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"jwK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"jwW" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -27184,6 +27226,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"jNt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/flora/bush/flowers_yw/style_random,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"jNK" = (
/obj/structure/window/spawner/directional/north,
/obj/machinery/door/window/right/directional/east{
@@ -27489,6 +27538,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"jSK" = (
+/obj/structure/easel,
+/turf/open/floor/iron,
+/area/station/security/prison)
"jSS" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/firealarm/directional/west,
@@ -27602,12 +27655,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"jUP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"jVb" = (
/obj/effect/spawner/random/trash/garbage{
spawn_scatter_radius = 1
@@ -27794,15 +27841,6 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
-"jXU" = (
-/obj/machinery/seed_extractor,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"jYi" = (
/obj/structure/extinguisher_cabinet/directional/south,
/obj/effect/turf_decal/tile/yellow{
@@ -28116,6 +28154,14 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/restrooms)
+"keh" = (
+/obj/item/cultivator,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/cultivator,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"keq" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable,
@@ -29636,24 +29682,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"kHM" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"kIG" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/two,
@@ -29723,18 +29751,20 @@
"kKr" = (
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"kKu" = (
+/obj/structure/table,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/storage/crayons,
+/turf/open/floor/iron/dark/side,
+/area/station/security/prison)
"kKw" = (
/obj/structure/chair/stool/directional/south,
/turf/open/floor/iron,
/area/station/commons/locker)
-"kKF" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 9
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"kKG" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -29835,13 +29865,6 @@
/obj/structure/window/spawner/directional/east,
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
-"kLY" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/machinery/computer/order_console/bitrunning,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"kLZ" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -29980,18 +30003,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
-"kOq" = (
-/obj/machinery/airalarm/server{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/light/small/directional/west,
-/obj/machinery/camera/directional/west{
- c_tag = "Telecomms - Server Room - Aft-Port";
- network = list("ss13","tcomms")
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/station/tcommsat/server)
"kOt" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall,
@@ -30695,12 +30706,6 @@
"kZx" = (
/turf/closed/wall,
/area/station/science/lab)
-"kZF" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"kZG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30908,17 +30913,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"lds" = (
-/obj/structure/table,
-/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/condiment/flour,
-/obj/item/reagent_containers/condiment/rice,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"ldJ" = (
/obj/machinery/light/directional/north,
/obj/structure/sign/map/right{
@@ -31123,6 +31117,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
+"lih" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"liz" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -31165,14 +31167,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
-"liL" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"liO" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -31321,6 +31315,15 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"llF" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/grill,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"llT" = (
/obj/structure/table/wood,
/obj/machinery/button/ticket_machine{
@@ -31422,12 +31425,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"lmT" = (
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"lnc" = (
/turf/closed/wall,
/area/station/commons/dorms)
@@ -31690,10 +31687,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"lqG" = (
-/obj/machinery/netpod,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"lqL" = (
/obj/effect/turf_decal/siding{
dir = 1
@@ -32877,6 +32870,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"lON" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/structure/flora/bush/sparsegrass/style_random,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"lOU" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -33413,6 +33414,16 @@
/obj/structure/sign/warning/vacuum/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"lWY" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"lXm" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external,
@@ -34317,6 +34328,14 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron/white,
/area/station/science/research)
+"moO" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison)
"moQ" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/iron,
@@ -34467,6 +34486,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"msI" = (
+/turf/closed/wall,
+/area/station/security/bitden)
"msN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/reagent_dispensers/watertank,
@@ -34634,6 +34656,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"muu" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/oven,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"mux" = (
/obj/machinery/airalarm/directional/south,
/obj/effect/turf_decal/tile/neutral{
@@ -35474,19 +35505,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"mJo" = (
-/obj/machinery/mineral/ore_redemption{
- dir = 4;
- input_dir = 8;
- output_dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/left/directional/east{
- name = "Ore Redemtion Window"
- },
-/turf/open/floor/iron,
-/area/station/construction/storage_wing)
"mJE" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -35928,23 +35946,6 @@
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"mRq" = (
-/obj/structure/table,
-/obj/item/folder/red{
- pixel_x = 3
- },
-/obj/item/taperecorder{
- pixel_x = -3
- },
-/obj/item/storage/fancy/cigarettes,
-/obj/item/assembly/flash/handheld,
-/obj/item/reagent_containers/spray/pepper,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"mRs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/obj/machinery/rnd/server,
@@ -36142,6 +36143,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"mVa" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"mVb" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/defibrillator_mount/directional/south,
@@ -36622,6 +36632,10 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"nco" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"ncq" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36810,6 +36824,14 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/medical/break_room)
+"ngv" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"ngO" = (
/obj/structure/table,
/obj/structure/disposalpipe/segment,
@@ -36856,6 +36878,19 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
+"nhO" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Prison Cafeteria";
+ network = list("ss13","prison")
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/griddle,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"nhP" = (
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
@@ -37242,6 +37277,14 @@
/obj/item/reagent_containers/cup/glass/flask/gold,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
+"nnk" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/prisoner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"nnn" = (
/obj/structure/chair/office/light{
dir = 8
@@ -37862,6 +37905,15 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"nxm" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/security/prison)
"nxu" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -38162,6 +38214,12 @@
},
/turf/open/floor/wood,
/area/station/commons/lounge)
+"nCs" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"nCu" = (
/obj/structure/chair/office{
dir = 1
@@ -38381,13 +38439,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
-"nHB" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"nHG" = (
/obj/structure/chair/office/light{
dir = 8
@@ -38656,14 +38707,6 @@
/obj/structure/flora/bush/stalky/style_random,
/turf/open/floor/grass,
/area/station/science/research)
-"nNo" = (
-/obj/machinery/biogenerator,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"nNw" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral,
@@ -38707,6 +38750,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"nNZ" = (
+/obj/structure/sink/directional/west,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"nOh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -38874,13 +38928,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"nQx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
"nQz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/trash/janitor_supplies,
@@ -39167,6 +39214,15 @@
},
/turf/open/space/basic,
/area/space)
+"nWW" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"nXm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -40106,19 +40162,6 @@
},
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/restrooms)
-"oox" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/light/small/directional/east,
-/obj/machinery/atmospherics/components/binary/pump{
- name = "Fuel Pipe to Incinerator"
- },
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
"ooz" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera/directional/west{
@@ -40429,23 +40472,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/security/prison/work)
-"ouc" = (
-/obj/structure/closet/crate,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/stock_parts/cell/high,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"oue" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -40885,10 +40911,6 @@
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"oBV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"oCb" = (
/obj/structure/chair,
/obj/item/radio/intercom/chapel/directional/west,
@@ -41187,6 +41209,14 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"oGr" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"oGw" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
@@ -41217,15 +41247,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
-"oGZ" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"oHj" = (
/obj/structure/table,
/obj/item/folder/blue{
@@ -41508,6 +41529,12 @@
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/commons/locker)
+"oNA" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison)
"oND" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -41888,6 +41915,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
+"oUW" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/station/security/bitden)
"oVd" = (
/obj/machinery/power/terminal{
dir = 4
@@ -42629,14 +42661,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
-"piQ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/byteforge,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"piT" = (
/obj/structure/rack,
/obj/item/reagent_containers/cup/bottle/epinephrine{
@@ -42889,6 +42913,18 @@
/obj/machinery/holopad,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
+"poE" = (
+/obj/effect/decal/cleanable/food/flour,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"poJ" = (
/obj/machinery/telecomms/hub/preset,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -42909,6 +42945,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"poV" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"ppB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
@@ -44024,21 +44066,6 @@
/obj/machinery/research/anomaly_refinery,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"pII" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"pJf" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -44374,12 +44401,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/cult,
/area/station/service/chapel/funeral)
-"pPh" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/item/clothing/suit/hooded/wintercoat/miner,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"pPl" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -44414,9 +44435,6 @@
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/station/maintenance/starboard/aft)
-"pPV" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"pQj" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -44505,6 +44523,29 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/central)
+"pQV" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/light/directional/west,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice{
+ pixel_x = -10
+ },
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = 7
+ },
+/obj/item/storage/fancy/egg_box,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"pQW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -44942,6 +44983,17 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"qax" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"qaA" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -45528,6 +45580,11 @@
/obj/effect/landmark/start/psychologist,
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
+"qkM" = (
+/obj/machinery/seed_extractor,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"qkV" = (
/obj/structure/window/reinforced/spawner/directional/west,
/mob/living/basic/chicken,
@@ -45679,6 +45736,21 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"qnR" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/donkpockets_single,
+/obj/effect/spawner/random/food_or_drink/donkpockets_single{
+ pixel_x = 6
+ },
+/obj/effect/spawner/random/food_or_drink/donkpockets_single{
+ pixel_x = -6
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"qnS" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -46123,11 +46195,6 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"qvY" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"qvZ" = (
/obj/effect/turf_decal/tile/purple/half{
dir = 1
@@ -46576,6 +46643,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"qDI" = (
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"qDS" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -46844,6 +46917,13 @@
},
/turf/open/floor/plating,
/area/station/cargo/quartermaster)
+"qIL" = (
+/obj/structure/railing{
+ dir = 4;
+ layer = 4.1
+ },
+/turf/open/ballpit,
+/area/station/security/bitden)
"qIP" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -47131,21 +47211,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"qNS" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/bitrunner,
-/obj/machinery/holopad,
-/turf/open/floor/iron/dark/textured_half,
-/area/station/bitrunning/den)
"qNV" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47337,6 +47402,16 @@
/obj/effect/spawner/random/trash/janitor_supplies,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"qRA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/cable,
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"qRD" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -47437,6 +47512,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"qSq" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"qSJ" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall,
@@ -47708,10 +47793,14 @@
},
/turf/open/floor/plating,
/area/station/service/lawoffice)
-"qYd" = (
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/security/prison)
+"qYc" = (
+/obj/item/plant_analyzer,
+/obj/item/plant_analyzer{
+ pixel_y = -4;
+ pixel_x = -5
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"qYg" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms Server Room"
@@ -47886,6 +47975,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/warden)
+"rbE" = (
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"rbF" = (
/obj/machinery/mass_driver/chapelgun,
/obj/structure/sign/warning/vacuum/external/directional/north,
@@ -47923,16 +48021,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"rcs" = (
-/obj/machinery/quantum_server,
-/obj/effect/turf_decal/bot/left,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 6
- },
-/obj/machinery/light/directional/north,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"rcF" = (
/obj/structure/table/wood,
/obj/item/storage/crayons,
@@ -48051,9 +48139,6 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/solars/starboard/fore)
-"rft" = (
-/turf/closed/wall/r_wall,
-/area/station/security/prison/mess)
"rfY" = (
/obj/structure/lattice,
/obj/structure/sign/warning/electric_shock/directional/east,
@@ -48491,6 +48576,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"rpr" = (
+/obj/item/shovel/spade,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/shovel/spade,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/growing/tray,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
"rps" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -48622,15 +48715,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"rrW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 6
- },
-/obj/machinery/light/directional/north,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison)
"rrZ" = (
/obj/machinery/telecomms/processor/preset_one,
/obj/machinery/camera/directional/north{
@@ -48775,6 +48859,13 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"rud" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"rul" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/neutral{
@@ -49187,6 +49278,12 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"rAe" = (
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/bot,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"rAg" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -49257,6 +49354,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"rBl" = (
+/obj/item/radio/intercom/directional/north,
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"rBs" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/donkpockets,
@@ -49773,16 +49878,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"rKh" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"rKG" = (
/obj/structure/cable,
/obj/machinery/door/airlock/virology/glass{
@@ -50011,17 +50106,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"rNV" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mining Dock Maintenance"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"rNZ" = (
/obj/effect/turf_decal/tile/neutral,
/obj/structure/sign/directions/cryo/directional/east,
@@ -50059,11 +50143,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
-"rOP" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"rOY" = (
/obj/structure/mirror/directional/east,
/obj/machinery/shower/directional/west,
@@ -50476,15 +50555,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/pathology)
-"rVb" = (
-/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/cup/watering_can,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 4
- },
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"rVn" = (
/turf/open/floor/iron,
/area/station/construction/storage_wing)
@@ -50776,6 +50846,9 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"rZK" = (
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"rZT" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -50872,6 +50945,14 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"saI" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/item/radio/intercom/directional/north,
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"saN" = (
/obj/structure/bookcase/random/religion,
/turf/open/floor/wood,
@@ -50994,6 +51075,16 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"scZ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/obj/structure/cable,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"sdb" = (
/turf/open/floor/plating,
/area/station/science/ordnance/testlab)
@@ -51171,6 +51262,22 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"sfM" = (
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_x = 9;
+ pixel_y = 7
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"sfO" = (
/obj/structure/rack{
icon = 'icons/obj/stationobjs.dmi';
@@ -51262,6 +51369,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"shT" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"shV" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -51355,30 +51468,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"sku" = (
-/obj/structure/table,
-/obj/structure/window/spawner/directional/south,
-/obj/item/reagent_containers/condiment/saltshaker{
- layer = 3.1;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/book/manual/chef_recipes,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"skx" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -51580,6 +51669,14 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
+"spm" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Mining Dock Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"spH" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/tile/neutral{
@@ -51590,6 +51687,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"spJ" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/obj/structure/cable,
+/obj/item/radio/intercom/prison/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"sqb" = (
/obj/structure/rack,
/obj/item/reagent_containers/cup/bottle/ethanol{
@@ -51608,6 +51715,12 @@
dir = 8
},
/area/station/medical/medbay/central)
+"sqk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/security/bitden)
"sqt" = (
/obj/machinery/disposal/delivery_chute{
dir = 1;
@@ -52190,11 +52303,6 @@
/obj/machinery/telecomms/server/presets/engineering,
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
-"sAs" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/status_display/evac/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"sAz" = (
/obj/machinery/computer/monitor{
name = "Bridge Power Monitoring Console"
@@ -52560,6 +52668,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
+"sGZ" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"sHg" = (
/obj/item/radio/intercom/directional/south,
/obj/machinery/camera/directional/south{
@@ -53063,13 +53181,6 @@
/obj/item/exodrone,
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
-"sQq" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 5
- },
-/obj/machinery/composters,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"sQB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53873,6 +53984,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"tdf" = (
+/obj/structure/chair/office{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"tdg" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -54173,6 +54295,27 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"tiL" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 9
+ },
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/tree,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/seeds/pumpkin,
+/obj/item/seeds/wheat,
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/grass,
+/obj/item/seeds/carrot,
+/obj/item/seeds/tomato,
+/obj/item/seeds/potato,
+/obj/item/seeds/garlic,
+/obj/item/seeds/onion,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/item/seeds/tree,
+/obj/item/botanical_lexicon,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"tja" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/light/small/directional/south,
@@ -54485,6 +54628,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"tnR" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/light/directional/south,
+/obj/machinery/vending/cola/red,
+/turf/open/floor/iron/white,
+/area/station/security/prison)
"tnU" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/item/kirbyplants/random,
@@ -54767,11 +54916,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"ttG" = (
-/obj/machinery/netpod,
-/obj/effect/decal/cleanable/robot_debris,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"ttM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54799,14 +54943,6 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"tub" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"tuf" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
@@ -55054,13 +55190,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"tzJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"tzP" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -55885,6 +56014,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
+"tPM" = (
+/obj/machinery/computer/quantum_console,
+/obj/effect/turf_decal/bot,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"tPN" = (
/obj/structure/rack,
/obj/item/clothing/under/color/white,
@@ -56215,6 +56350,19 @@
/obj/effect/spawner/random/engineering/atmospherics_portable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"tWG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"tWJ" = (
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/stripes/line{
@@ -56723,6 +56871,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/brig)
+"ufu" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/deepfryer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"ufv" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -57803,18 +57960,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/brig)
-"uyi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/south{
- id = "prisonereducation";
- name = "Door Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"uyr" = (
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/tile/neutral{
@@ -57865,6 +58010,29 @@
},
/turf/open/space/basic,
/area/space)
+"uzw" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/book/manual/chef_recipes,
+/obj/item/reagent_containers/condiment/saltshaker{
+ layer = 3.1;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"uzJ" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 4
@@ -58143,16 +58311,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"uEA" = (
-/obj/structure/table/reinforced,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"uEC" = (
/obj/machinery/conveyor{
dir = 4;
@@ -58208,12 +58366,6 @@
/obj/machinery/photocopier,
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"uFF" = (
-/obj/machinery/netpod,
-/obj/machinery/light/directional/west,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"uFK" = (
/obj/structure/table,
/obj/item/clothing/under/rank/prisoner/skirt{
@@ -59658,19 +59810,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
-"viQ" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 4
- },
-/obj/structure/closet/crate/hydroponics,
-/obj/effect/spawner/random/contraband/prison,
-/obj/effect/spawner/random/food_or_drink/seed{
- spawn_all_loot = 1;
- spawn_random_offset = 1
- },
-/obj/item/paper/guides/jobs/hydroponics,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"viU" = (
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron,
@@ -59810,10 +59949,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"vjZ" = (
-/obj/structure/table,
-/turf/open/floor/iron/dark/side,
-/area/station/security/prison)
"vkb" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -60031,6 +60166,16 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"vnd" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Cafeteria"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"vnk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
@@ -61348,6 +61493,24 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"vMW" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = -5
+ },
+/obj/item/kitchen/rollingpin{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"vMX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -61380,6 +61543,17 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
+"vNL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"vNT" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/components/unary/passive_vent{
@@ -62399,6 +62573,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"wfw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/flora/bush/flowers_yw/style_random,
+/turf/open/floor/grass,
+/area/station/security/bitden)
"wfC" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -62552,16 +62733,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"why" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
"whC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -62699,6 +62870,18 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/wood,
/area/station/service/library)
+"wks" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/reagentgrinder{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/soup_pot{
+ pixel_x = -10
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"wkv" = (
/obj/structure/railing{
dir = 8
@@ -63644,6 +63827,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"wDj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Prison Workshop";
+ network = list("ss13","prison")
+ },
+/turf/open/floor/grass,
+/area/station/security/bitden)
"wDq" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -63877,10 +64076,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
-"wIM" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron,
-/area/station/security/prison)
"wIW" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/east,
@@ -64504,15 +64699,20 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"wST" = (
-/obj/machinery/computer/quantum_console,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/camera/directional/north{
- c_tag = "Mining Dock"
+"wTh" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
},
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
+/obj/structure/closet/crate,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/item/stock_parts/cell/high,
+/obj/effect/spawner/random/engineering/flashlight,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"wTp" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/brigdoor{
@@ -65066,16 +65266,6 @@
/obj/structure/sign/warning/hot_temp/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"xdR" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/drinkingglass,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"xdV" = (
/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/obj/effect/mapping_helpers/broken_floor,
@@ -65088,16 +65278,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/side,
/area/station/science/lobby)
-"xdY" = (
-/obj/machinery/door/airlock/mining{
- name = "Mining Office"
- },
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"xea" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/trimline/purple/filled/line,
@@ -65708,16 +65888,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"xoc" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"xoj" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave{
@@ -66630,6 +66800,16 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
+"xEr" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"xEt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
@@ -67073,6 +67253,11 @@
},
/turf/open/floor/engine/o2,
/area/station/engineering/atmos)
+"xNT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"xNU" = (
/turf/closed/wall,
/area/station/service/lawoffice)
@@ -67300,6 +67485,14 @@
"xRZ" = (
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
+"xSq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
"xSA" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
@@ -67658,6 +67851,15 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"xYr" = (
+/obj/effect/landmark/navigate_destination/common/bitrunner,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/grass,
+/area/station/security/bitden)
"xYu" = (
/obj/machinery/firealarm/directional/south,
/obj/structure/disposalpipe/segment{
@@ -67989,12 +68191,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmospherics_engine)
-"yen" = (
-/obj/effect/decal/cleanable/oil/streak,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"yeq" = (
/obj/machinery/conveyor{
dir = 1;
@@ -84426,9 +84622,9 @@ jXu
jXu
cQc
jXu
-lMJ
-lMJ
-lMJ
+aaa
+aaa
+aaa
pnI
qqp
xDu
@@ -84683,9 +84879,9 @@ nmg
vEV
ovy
jXu
-pPV
-pPV
-pPV
+lMJ
+lMJ
+lMJ
hKg
bUm
kRe
@@ -84940,9 +85136,9 @@ jXu
kXA
ufv
jXu
-wST
-kHM
-uFF
+pnI
+pnI
+pnI
hKg
hKg
fQW
@@ -85197,14 +85393,14 @@ jXu
jXu
hWS
jXu
-rcs
-qNS
-lqG
-oBV
-qvY
-kRe
-dCp
-sAs
+rBl
+poV
+nWW
+qnR
+wTh
+poV
+jwK
+lih
mdL
hKg
hxo
@@ -85454,11 +85650,11 @@ dHa
ugJ
edP
jXu
-yen
-pII
-ttG
-oBV
-pPh
+cnz
+kRe
+bXG
+kRe
+eGR
aFd
nVG
kRe
@@ -85711,11 +85907,11 @@ cTQ
xte
mzs
jXu
-piQ
-boz
-pPV
-pPV
-jpG
+iES
+kRe
+kRe
+kRe
+kRe
kRe
nVG
qOZ
@@ -85968,16 +86164,16 @@ wgw
twr
bSm
jXu
-oBV
-eEb
-pPV
-ouc
-dSG
+eZV
+kRe
+kRe
+kRe
+kRe
cLj
xYl
cLj
mUz
-xdY
+ayx
rgN
mmR
mmR
@@ -86224,17 +86420,17 @@ vEH
jXu
lUe
bMW
-rNV
-cGL
-xoc
-xoc
-rKh
+cnU
+nCs
+dmE
+dmE
+ieK
xyz
fgT
btt
aqx
shx
-bGM
+eJJ
fiC
dAk
rhn
@@ -86482,9 +86678,9 @@ jXu
nME
inp
jXu
-kLY
-muJ
wvC
+muJ
+dCH
mAy
cLj
kRe
@@ -86705,15 +86901,15 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-rrt
-aaa
-lMJ
-aaa
-aaa
-aaa
+rZK
+rZK
+rZK
+rZK
+rZK
+rZK
+rZK
+cmB
+cmB
cmB
cmB
cmB
@@ -86957,23 +87153,23 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-rrt
-aaa
-lMJ
-aaa
-aaa
-cmB
-cmB
+mxQ
+mxQ
+mxQ
+mxQ
+mxQ
+rZK
+cTa
+cTa
+ixX
+ngv
+qIL
+msI
+ibx
+qkM
+aRW
oAP
-goq
+uST
cRM
xTn
iOr
@@ -87000,7 +87196,7 @@ twr
rSa
jXu
jXu
-fNH
+spm
jXu
jXu
jXu
@@ -87215,20 +87411,20 @@ aaa
aaa
aaa
dnJ
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-rrt
-sfn
aaa
-lMJ
aaa
aaa
-cmB
-nNo
+aaa
+cDg
+nco
+wfw
+jNt
+lON
+rAe
+oUW
+tiL
+fnv
+jks
tCC
qDS
tVo
@@ -87476,20 +87672,20 @@ aaa
aaa
aaa
aaa
-lMJ
-aaa
-aaa
-lMJ
-aaa
-lMJ
-aaa
-aaa
-cmB
-jXU
+cDg
+bIB
+sqk
+fao
+xYr
+ciQ
+msI
+lWY
+qYc
+xNT
fiA
fiA
bSb
-nHB
+sfM
iOr
iOr
aaa
@@ -87733,21 +87929,21 @@ aaa
aaa
aaa
aaa
-lMJ
-aaa
-aaa
-lMJ
-aaa
-lMJ
-aaa
-aaa
-iOr
-sQq
-rVb
-viQ
-dTQ
-rOP
-eGE
+rZK
+tPM
+scZ
+qRA
+wDj
+iDi
+dcc
+mVa
+xEr
+gff
+nNZ
+gff
+rbE
+qDI
+keh
iOr
aUn
aUn
@@ -87990,21 +88186,21 @@ aaa
aaa
aaa
aaa
-iUv
-suD
-rft
-rft
-rft
-rft
-rft
-rft
-rft
+rZK
+msI
+msI
+msI
+oUW
+msI
+msI
aXa
aXa
aXa
-dHQ
-jjM
-uST
+aXa
+aXa
+spJ
+nnk
+fbQ
cmB
aaa
mji
@@ -88046,7 +88242,7 @@ yis
vQs
wdM
sai
-mJo
+icF
bzH
bzH
bzH
@@ -88248,20 +88444,20 @@ aaa
suD
suD
iUv
-gQT
+hfU
aXa
jMx
umN
-gWS
-aht
-ivu
-uEA
-iAR
-dhW
+poE
+muu
+nhO
+pQV
+vMW
+hcb
aXa
fbX
-cnk
-xTn
+oGr
+rpr
cmB
aaa
aUn
@@ -88509,10 +88705,10 @@ tGX
aXa
iSl
oZL
-hmy
oZL
oZL
-tub
+oZL
+hWP
eJp
bmB
aXa
@@ -88764,14 +88960,14 @@ hWW
iFz
tGX
aXa
-aKl
-lds
-sku
-hXQ
-bVF
-fGP
-aJK
-liL
+gHT
+oZL
+uzw
+ufu
+llF
+oUE
+qSq
+qSq
kKZ
ngT
kQm
@@ -89021,14 +89217,14 @@ jmv
iFz
fhP
aXa
-aXa
-kKZ
-aXa
-aXa
-xdR
-oUE
-aij
-oGZ
+saI
+ctD
+ctD
+ctD
+oZL
+sGZ
+oZL
+qSq
aXa
myH
kre
@@ -89277,15 +89473,15 @@ tGX
tYm
pZp
tGX
-cYX
-kKF
-vjF
-kZF
-aXa
-aXa
-bns
aXa
aXa
+wks
+shT
+fIb
+cru
+tWG
+dKd
+vnd
aXa
myH
kre
@@ -89534,15 +89730,15 @@ ocL
bBK
qEG
wBn
-iFz
-eyX
-qYd
-lmT
-gtk
+cYX
+oNA
+yhO
+yhO
yhO
-axK
yhO
yhO
+yhO
+nxm
crl
pSa
cUf
@@ -89793,7 +89989,7 @@ aYd
hwZ
rGe
wtw
-tcW
+deK
tcW
axO
tcW
@@ -90044,11 +90240,11 @@ aaa
rrt
aaa
suD
-iFz
+jSK
nCI
chH
tGX
-rDr
+moO
ihb
ihb
ewT
@@ -90064,7 +90260,7 @@ wZz
oUU
iFz
rDr
-wIM
+iTS
aCQ
kre
flk
@@ -90315,7 +90511,7 @@ nyf
uZa
nEZ
wZz
-bmX
+dTj
qOT
swR
tGX
@@ -90559,7 +90755,7 @@ dnJ
dji
iUv
iUv
-vjZ
+kKu
xdA
lyu
rQZ
@@ -90832,7 +91028,7 @@ wZz
wOm
fpE
wZz
-rrW
+fWw
vtx
jxS
mQr
@@ -91094,7 +91290,7 @@ uRT
gQw
tJH
aCQ
-aEl
+tnR
wZz
wZz
wZz
@@ -91339,7 +91535,7 @@ ehB
vht
tUX
drq
-why
+qax
cwa
rXB
wAp
@@ -91596,10 +91792,10 @@ ehB
oSf
nEF
ncq
-bMM
-mRq
-dRE
-jUP
+vNL
+bmu
+tdf
+rud
uYm
grb
tdW
@@ -91856,7 +92052,7 @@ ibH
hne
hnp
nrV
-tzJ
+xSq
hxW
cTp
tdW
@@ -92113,7 +92309,7 @@ tdW
tdW
dXR
bhu
-uyi
+hnS
tdW
tdW
tdW
@@ -98906,7 +99102,7 @@ raK
dOA
gyQ
hKE
-jqC
+dNN
iTc
qfQ
cLk
@@ -100452,7 +100648,7 @@ jwj
ujk
jvo
aHH
-bqv
+dlj
pCa
hRy
pCa
@@ -104268,7 +104464,7 @@ rhc
bii
wYB
kCZ
-nQx
+aFG
lXr
bel
qkV
@@ -106318,7 +106514,7 @@ fQT
eCQ
mMu
obG
-ghC
+hEl
cCR
unL
aLu
@@ -108644,7 +108840,7 @@ lmA
cnv
ouV
xhb
-oox
+hMC
lYM
vzc
gUY
@@ -122506,7 +122702,7 @@ tUA
tUA
juf
uRp
-kOq
+ase
ubl
gfU
aaa
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index be045da91462..4fdf1be95ac5 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -5211,6 +5211,14 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"bnm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/cargo/drone_bay)
"bnu" = (
/obj/machinery/light/blacklight/directional/west,
/obj/structure/table,
@@ -5615,13 +5623,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/white/smooth_large,
/area/station/science/robotics/lab)
-"brL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/stairs{
- dir = 1
- },
-/area/station/bitrunning/den)
"brN" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
/obj/structure/disposalpipe/segment,
@@ -6574,17 +6575,6 @@
/obj/machinery/computer/order_console/mining,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"bBW" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"bCh" = (
/obj/structure/table/reinforced,
/obj/item/mmi{
@@ -6782,6 +6772,16 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison/safe)
+"bFU" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/cargo/drone_bay)
"bFZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8255,14 +8255,6 @@
dir = 4
},
/area/station/hallway/floor2/aft)
-"caN" = (
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light/directional/south,
-/obj/effect/decal/cleanable/oil/streak,
-/obj/machinery/byteforge,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"caQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -10203,21 +10195,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor3/aft)
-"cBT" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/effect/decal/cleanable/robot_debris,
-/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"cBU" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/sunny/style_random,
@@ -10309,12 +10286,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"cDe" = (
-/obj/machinery/computer/quantum_console{
- dir = 4
- },
-/turf/open/floor/iron/dark/smooth_corner,
-/area/station/bitrunning/den)
"cDj" = (
/obj/effect/turf_decal/delivery,
/obj/structure/sign/departments/cargo/directional/north,
@@ -16929,20 +16900,6 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/starboard)
-"erV" = (
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/turf_decal/stripes,
-/obj/effect/turf_decal/trimline/brown/line,
-/turf/open/floor/iron/dark/smooth_half,
-/area/station/bitrunning/den)
"erY" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
@@ -20970,14 +20927,6 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port)
-"fCw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 8
- },
-/obj/machinery/holopad,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"fCx" = (
/obj/structure/rack,
/turf/open/floor/pod/dark,
@@ -21501,6 +21450,14 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/floor2/starboard/aft)
+"fIS" = (
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/freezerchamber)
"fIX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/crate,
@@ -29336,6 +29293,13 @@
},
/turf/open/floor/wood,
/area/station/commons/dorms/apartment2)
+"hSr" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot/left,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
+/area/station/cargo/drone_bay)
"hSC" = (
/obj/structure/railing{
dir = 4
@@ -29885,16 +29849,6 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/dorms/room4)
-"iaJ" = (
-/obj/machinery/netpod,
-/obj/effect/decal/cleanable/vomit/old{
- pixel_x = -12;
- pixel_y = -13
- },
-/obj/item/radio/intercom/directional/north,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"iaS" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -31427,6 +31381,13 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"ixP" = (
+/obj/machinery/netpod,
+/obj/structure/railing{
+ layer = 3.1
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/cargo/drone_bay)
"ixQ" = (
/obj/effect/turf_decal/tile/green/full,
/obj/structure/railing{
@@ -40282,6 +40243,12 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"kQJ" = (
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/engine_access,
+/obj/effect/baseturf_helper/reinforced_plating/ceiling,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter)
"kQN" = (
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41433,15 +41400,6 @@
dir = 8
},
/area/station/hallway/floor2/fore)
-"lgs" = (
-/obj/structure/sign/poster/random/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"lgt" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/dirt,
@@ -41965,6 +41923,12 @@
dir = 8
},
/area/station/ai_monitored/command/storage/eva)
+"lmi" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
+/area/station/service/kitchen/coldroom)
"lmk" = (
/obj/effect/turf_decal/trimline/red/warning{
dir = 8
@@ -42125,14 +42089,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor3/starboard/aft)
-"loe" = (
-/obj/machinery/airalarm/kitchen_cold_room{
- dir = 1;
- pixel_y = 24
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/service/kitchen/coldroom)
"lof" = (
/turf/open/floor/wood/parquet,
/area/station/commons/dorms/room2)
@@ -43075,6 +43031,21 @@
"lAU" = (
/turf/closed/wall,
/area/station/service/library/printer)
+"lBb" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/airlock/mining/glass{
+ name = "Bitrunning Den"
+ },
+/turf/open/floor/pod/dark,
+/area/station/cargo/drone_bay)
"lBo" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{
dir = 10
@@ -44428,6 +44399,20 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/floor3/aft)
+"lRL" = (
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = 8;
+ pixel_y = 32
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = -8;
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/burnchamber)
"lRO" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/entertainment/musical_instrument,
@@ -45157,6 +45142,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
+"mbR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/cargo/drone_bay)
"mbS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/obj/effect/spawner/structure/window/hollow/reinforced/plasma/middle,
@@ -45687,13 +45679,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/lobby)
-"mhU" = (
-/obj/machinery/netpod,
-/obj/structure/railing{
- layer = 3.1
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"mhY" = (
/obj/machinery/door/firedoor/border_only{
dir = 1
@@ -48149,6 +48134,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/tcommsat/server)
+"mNq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron/stairs{
+ dir = 1
+ },
+/area/station/cargo/drone_bay)
"mNT" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -50022,25 +50014,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/hallway/floor3/aft)
-"nkT" = (
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/smooth_corner{
- dir = 8
- },
-/area/station/bitrunning/den)
"nkY" = (
/obj/machinery/light/directional/west,
/obj/structure/chair/sofa/corp/left{
@@ -50588,6 +50561,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port)
+"nri" = (
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/cargo/drone_bay)
"nrk" = (
/obj/structure/cable,
/obj/structure/table,
@@ -51059,21 +51040,6 @@
},
/turf/open/floor/pod/dark,
/area/station/maintenance/floor3/starboard/fore)
-"nxs" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/item/cigbutt/cigarbutt{
- pixel_x = 7
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/iron/dark/smooth_half,
-/area/station/bitrunning/den)
"nxy" = (
/obj/effect/turf_decal/stripes{
dir = 1
@@ -51496,6 +51462,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor4/port/aft)
+"nCB" = (
+/obj/machinery/computer/quantum_console{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/cargo/drone_bay)
"nCD" = (
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/floor/grass,
@@ -52311,6 +52283,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/floor3/aft)
+"nNy" = (
+/obj/structure/sign/poster/random/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/cargo/drone_bay)
"nNJ" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -54860,24 +54841,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/security/checkpoint)
-"owk" = (
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark/smooth_half,
-/area/station/bitrunning/den)
"owo" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -56368,14 +56331,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/warden)
-"oRZ" = (
-/obj/machinery/netpod,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/bitrunning/den)
"oSb" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -61189,6 +61144,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"qlP" = (
+/obj/machinery/netpod,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/cargo/drone_bay)
"qlX" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -61593,6 +61556,21 @@
dir = 8
},
/area/station/service/chapel)
+"qsc" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/cigbutt/cigarbutt{
+ pixel_x = 7
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/cargo/drone_bay)
"qse" = (
/obj/structure/closet/secure_closet/personal,
/turf/open/floor/iron/dark,
@@ -64353,22 +64331,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/hallway/floor3/fore)
-"raK" = (
-/obj/machinery/button/ignition/incinerator/ordmix{
- pixel_x = 8;
- pixel_y = 32
- },
-/obj/machinery/button/door/incinerator_vent_ordmix{
- pixel_x = -8;
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/obj/machinery/airalarm/mixingchamber{
- dir = 8;
- pixel_x = -26
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/burnchamber)
"raO" = (
/obj/machinery/vending/cigarette,
/obj/structure/sign/departments/security/directional/east,
@@ -67351,10 +67313,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/floor1/starboard/fore)
-"rTq" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"rTt" = (
/obj/machinery/space_heater,
/turf/open/floor/pod/light,
@@ -70053,16 +70011,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/floor3/aft)
-"sKx" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
- dir = 4
- },
-/obj/machinery/airalarm/mixingchamber{
- dir = 1;
- pixel_y = 28
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/freezerchamber)
"sKC" = (
/obj/effect/spawner/structure/window/hollow/middle,
/turf/open/floor/plating,
@@ -70168,17 +70116,6 @@
/obj/effect/spawner/structure/window/hollow/end,
/turf/open/floor/plating,
/area/station/maintenance/floor2/starboard)
-"sLq" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/disposalpipe/trunk/multiz,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"sLA" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
@@ -71529,22 +71466,6 @@
/obj/effect/spawner/random/contraband/landmine,
/turf/open/floor/pod/dark,
/area/station/service/kitchen/abandoned)
-"tel" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/machinery/door/airlock/mining/glass{
- name = "Bitrunning Den"
- },
-/turf/open/floor/pod/dark,
-/area/station/bitrunning/den)
"teq" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/floor1/starboard/aft)
@@ -73143,6 +73064,24 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/kitchen,
/area/station/command/heads_quarters/rd)
+"tCm" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/cargo/drone_bay)
"tCB" = (
/obj/effect/spawner/random/trash/garbage{
spawn_scatter_radius = 1
@@ -74019,13 +73958,6 @@
"tPm" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/floor2/port/aft)
-"tPq" = (
-/obj/machinery/airalarm/engine{
- pixel_y = -24
- },
-/obj/effect/baseturf_helper/reinforced_plating/ceiling,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter)
"tPu" = (
/obj/machinery/door/airlock/maintenance{
name = "Bulb Storage"
@@ -76839,6 +76771,20 @@
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/engine,
/area/station/maintenance/floor4/starboard/aft)
+"uHw" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/structure/railing{
+ layer = 3.1
+ },
+/obj/effect/decal/cleanable/robot_debris,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/cargo/drone_bay)
"uHx" = (
/obj/structure/grille/broken,
/turf/open/floor/plating,
@@ -77137,13 +77083,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/carpet/royalblue,
/area/station/commons/dorms/room4)
-"uLN" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes{
- dir = 8
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"uLO" = (
/obj/structure/showcase/cyborg/old{
dir = 4;
@@ -80828,9 +80767,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/gateway)
-"vII" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"vIO" = (
/obj/effect/decal/cleanable/glitter,
/turf/open/floor/carpet/neon/simple/pink/nodots,
@@ -81394,6 +81330,20 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"vQF" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/trimline/brown/line,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/cargo/drone_bay)
"vQR" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/dark/side{
@@ -86082,6 +86032,17 @@
dir = 1
},
/area/station/hallway/floor3/aft)
+"xal" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/disposalpipe/trunk/multiz,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/cargo/drone_bay)
"xam" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 8
@@ -87500,6 +87461,24 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor2/port/aft)
+"xur" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 8
+ },
+/area/station/cargo/drone_bay)
"xuv" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/floor2/starboard/fore)
@@ -87828,6 +87807,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/starboard)
+"xyT" = (
+/obj/machinery/netpod,
+/obj/effect/decal/cleanable/vomit/old{
+ pixel_x = -12;
+ pixel_y = -13
+ },
+/obj/item/radio/intercom/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/cargo/drone_bay)
"xyU" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/picket_sign,
@@ -88819,6 +88808,10 @@
/obj/machinery/atmospherics/components/unary/cryo_cell,
/turf/open/floor/iron/dark/textured,
/area/station/medical/cryo)
+"xNr" = (
+/obj/structure/cable,
+/turf/closed/wall,
+/area/station/cargo/drone_bay)
"xNx" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -88863,10 +88856,6 @@
dir = 1
},
/area/station/engineering/lobby)
-"xOd" = (
-/obj/structure/cable,
-/turf/closed/wall,
-/area/station/bitrunning/den)
"xOe" = (
/obj/machinery/light/cold/no_nightlight/directional/north,
/turf/open/floor/engine,
@@ -89557,13 +89546,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"xYW" = (
-/obj/machinery/quantum_server,
-/obj/effect/turf_decal/bot/left,
-/turf/open/floor/iron/dark/smooth_corner{
- dir = 4
- },
-/area/station/bitrunning/den)
"xYY" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -112937,11 +112919,11 @@ owI
owI
owI
owI
-vII
-vII
-vII
-vII
-vII
+aQK
+aQK
+aQK
+aQK
+aQK
bAh
cUk
oic
@@ -113194,14 +113176,14 @@ owI
owI
owI
owI
-vII
-vII
-cDe
-xYW
-vII
-vII
-vII
-vII
+aQK
+aQK
+nCB
+hSr
+aQK
+aQK
+aQK
+aQK
gUS
nOj
dzo
@@ -113451,14 +113433,14 @@ owI
owI
owI
owI
-vII
-vII
-lgs
-fCw
-brL
-erV
-caN
-vII
+aQK
+aQK
+nNy
+bnm
+mNq
+vQF
+nri
+aQK
rGF
yiZ
yiZ
@@ -113708,14 +113690,14 @@ owI
owI
owI
owI
-vII
-vII
-bBW
-sLq
-cBT
-owk
-uLN
-rTq
+aQK
+aQK
+bFU
+xal
+uHw
+tCm
+mbR
+gfn
hBR
qWJ
qWJ
@@ -113965,14 +113947,14 @@ owI
owI
owI
owI
-vII
-vII
-iaJ
-oRZ
-mhU
-nkT
-nxs
-rTq
+aQK
+aQK
+xyT
+qlP
+ixP
+xur
+qsc
+gfn
rYA
eEB
lUY
@@ -114222,14 +114204,14 @@ owI
owI
owI
owI
-vII
-vII
-vII
-vII
-xOd
-tel
-vII
-vII
+aQK
+aQK
+aQK
+aQK
+xNr
+lBb
+aQK
+aQK
fxr
fve
aSL
@@ -136353,7 +136335,7 @@ sly
uyD
aFJ
mMq
-tPq
+kQJ
uyD
sHL
ddT
@@ -248936,7 +248918,7 @@ ftp
pzi
eMj
diA
-loe
+lmi
dDn
pmQ
pDK
@@ -310836,7 +310818,7 @@ tQO
mXH
qyH
mXH
-raK
+lRL
nmc
xJx
rov
@@ -312630,7 +312612,7 @@ ucA
ucA
ucA
lYx
-sKx
+fIS
koC
oOA
tyR
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 00c8465a57fc..b84faf05a59c 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -61,30 +61,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
-"ar" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/structure/closet/secure_closet/engineering_welding{
- locked = 0
- },
-/turf/open/floor/iron,
-/area/station/engineering/main)
-"as" = (
-/obj/machinery/power/smes{
- charge = 5e+006
- },
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
"at" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -101,10 +77,6 @@
"aw" = (
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"ay" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
-/turf/open/floor/plating,
-/area/station/construction)
"aA" = (
/turf/open/floor/iron,
/area/station/engineering/main)
@@ -328,14 +300,6 @@
/obj/machinery/announcement_system,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"bs" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/rnd/destructive_analyzer,
-/turf/open/floor/iron,
-/area/station/science)
"bt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -384,24 +348,6 @@
/obj/machinery/computer/rdconsole,
/turf/open/floor/iron,
/area/station/science)
-"bG" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/table,
-/obj/item/uplink/debug{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/uplink/nuclear/debug,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/command/bridge)
"bH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron,
@@ -452,15 +398,6 @@
/obj/machinery/door/poddoor,
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
-"bP" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/turf/open/floor/iron/dark,
-/area/station/medical/chemistry)
"bQ" = (
/obj/machinery/chem_master,
/turf/open/floor/iron/dark,
@@ -483,21 +420,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"bU" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/mob/living/carbon/human,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/station/medical/medbay)
"bV" = (
/obj/machinery/light/directional/north,
/mob/living/carbon/human,
@@ -781,16 +703,6 @@
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"cW" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/construction)
"cX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -823,16 +735,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"dd" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"de" = (
/obj/machinery/gulag_teleporter,
/turf/open/floor/iron,
@@ -1060,21 +962,6 @@
"dV" = (
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"dW" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/construction)
-"dX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/turf/open/floor/iron,
-/area/station/construction)
"dY" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/entry)
@@ -1107,6 +994,11 @@
/obj/structure/sign/warning/pods,
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/entry)
+"ee" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"ef" = (
/obj/machinery/door/airlock,
/turf/open/floor/iron,
@@ -1231,13 +1123,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"eG" = (
-/obj/machinery/airalarm/unlocked{
- dir = 8;
- pixel_x = -24
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"eH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/turf_decal/stripes/line{
@@ -1261,13 +1146,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"eM" = (
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
"eN" = (
/obj/machinery/conveyor{
dir = 9;
@@ -1646,6 +1524,19 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"fV" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/mob/living/carbon/human,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 1
+ },
+/area/station/medical/medbay)
"fW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 6
@@ -1653,23 +1544,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"fX" = (
-/obj/structure/sign/directions/supply{
- dir = 4;
- pixel_x = -32
- },
-/obj/structure/sign/directions/engineering{
- dir = 1;
- pixel_x = -32;
- pixel_y = 7
- },
-/obj/structure/sign/directions/evac{
- pixel_x = -32;
- pixel_y = -7
- },
-/obj/structure/machine/assembly_bench,
-/turf/open/floor/plating,
-/area/station/commons/storage/primary)
"fY" = (
/obj/machinery/light/directional/west,
/obj/structure/cable,
@@ -1721,16 +1595,11 @@
},
/turf/open/floor/plating,
/area/station/commons/storage/primary)
-"gi" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 32
- },
-/obj/structure/cable,
-/obj/machinery/computer/shuttle/mining,
+"gh" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
+/area/station/hallway/secondary/exit/departure_lounge)
"gk" = (
/obj/structure/sign/departments/evac,
/turf/closed/wall/r_wall,
@@ -1842,16 +1711,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"gG" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/construction)
"gI" = (
/obj/machinery/light/directional/north,
/obj/machinery/camera/directional/north,
@@ -1863,12 +1722,6 @@
/obj/item/paper/guides/jobs/security/labor_camp,
/turf/open/floor/iron,
/area/station/security/brig)
-"gT" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/station/construction)
"gW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/radiation/rad_area/directional/north,
@@ -1881,9 +1734,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science)
-"ht" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
- dir = 1
+"hr" = (
+/obj/machinery/electroplater,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"hA" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
+ dir = 5
},
/turf/open/floor/plating,
/area/station/construction)
@@ -1893,6 +1750,12 @@
},
/turf/open/floor/iron,
/area/station/medical/chemistry)
+"hJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/construction)
"ii" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -1919,6 +1782,12 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"jF" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/construction)
"jU" = (
/obj/structure/table,
/obj/item/melee/energy/axe,
@@ -1933,13 +1802,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"ko" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Port to Filter"
- },
-/turf/open/floor/plating,
-/area/station/construction)
"kp" = (
/obj/structure/server,
/turf/open/floor/iron/dark,
@@ -1962,16 +1824,25 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
-"lD" = (
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/construction)
+"lF" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"lH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 6
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"lQ" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"lT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -1983,10 +1854,22 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"mj" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/turf/open/floor/plating,
-/area/station/construction)
+"mz" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/structure/closet/secure_closet/engineering_welding{
+ locked = 0
+ },
+/turf/open/floor/iron,
+/area/station/engineering/main)
+"mC" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/structure/cable,
+/obj/machinery/computer/shuttle/mining,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"mE" = (
/obj/structure/cable,
/obj/machinery/chem_mass_spec,
@@ -2014,12 +1897,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"nv" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/construction)
"ny" = (
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
@@ -2035,13 +1912,26 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"oy" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible,
-/turf/open/floor/plating,
-/area/station/construction)
+"ow" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/structure/table,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/iron/dark,
+/area/station/medical/chemistry)
+"oE" = (
+/obj/structure/closet/syndicate/resources/everything,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"oK" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 5
+ },
+/turf/open/floor/iron,
/area/station/construction)
"oV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -2050,13 +1940,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/iron,
/area/station/medical/chemistry)
-"pf" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
-/turf/open/floor/plating,
-/area/station/construction)
"pl" = (
/turf/closed/wall/r_wall,
/area/station/bitrunning/den)
+"pt" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/obj/machinery/meter/monitored/distro_loop,
+/turf/open/floor/plating,
+/area/station/construction)
"pv" = (
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
@@ -2065,6 +1956,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/closed/wall/r_wall,
/area/station/science)
+"pD" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/turf/open/floor/iron,
+/area/station/construction)
"pI" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -2076,6 +1976,14 @@
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"qF" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"qQ" = (
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
@@ -2086,8 +1994,8 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"rC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
+"rr" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/turf/open/floor/plating,
/area/station/construction)
"rK" = (
@@ -2101,6 +2009,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"rU" = (
+/obj/machinery/atmospherics/components/binary/circulator,
+/turf/open/floor/plating,
+/area/station/construction)
+"rZ" = (
+/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
+/area/station/commons/storage/primary)
"sr" = (
/obj/machinery/door/airlock/shell,
/turf/open/floor/iron/dark,
@@ -2117,10 +2032,18 @@
/obj/item/storage/box/shipping,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"tx" = (
-/obj/effect/landmark/start/assistant,
+"sU" = (
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/commons/storage/primary)
+/area/station/engineering/gravity_generator)
"tB" = (
/obj/structure/table/reinforced,
/obj/machinery/light/directional/south,
@@ -2141,6 +2064,10 @@
/obj/structure/bot,
/turf/open/floor/iron/dark,
/area/station/science/explab)
+"tY" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on,
+/turf/open/floor/plating,
+/area/station/construction)
"uf" = (
/obj/structure/fans/tiny/invisible,
/obj/effect/turf_decal/stripes/line{
@@ -2155,14 +2082,9 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"uq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 6
- },
-/turf/open/floor/iron,
+"uo" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
+/turf/open/floor/plating,
/area/station/construction)
"ut" = (
/obj/structure/closet/secure_closet/atmospherics{
@@ -2192,10 +2114,9 @@
},
/turf/open/floor/iron/dark,
/area/station/science/explab)
-"vf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
- dir = 1
- },
+"vh" = (
+/obj/machinery/power/thermoelectric_generator,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/construction)
"vm" = (
@@ -2230,13 +2151,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"wl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/turf/open/floor/iron,
-/area/station/construction)
"wB" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -2247,16 +2161,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"wS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 4
- },
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
"wU" = (
/turf/closed/wall/r_wall,
/area/station/science/explab)
@@ -2264,6 +2168,19 @@
/obj/machinery/quantum_server,
/turf/open/floor/iron,
/area/station/bitrunning/den)
+"yx" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/construction)
+"yy" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/canister/plasma,
+/turf/open/floor/plating,
+/area/station/construction)
"yA" = (
/obj/docking_port/stationary/laborcamp_home{
dir = 8
@@ -2276,6 +2193,15 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"yJ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/construction)
"yK" = (
/obj/structure/fans/tiny/invisible,
/obj/effect/turf_decal/stripes/line{
@@ -2288,16 +2214,8 @@
/obj/machinery/power/rtg/debug,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"yP" = (
-/obj/machinery/power/thermoelectric_generator,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/construction)
-"zd" = (
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister/plasma,
+"yT" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/plating,
/area/station/construction)
"zo" = (
@@ -2305,25 +2223,45 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"zB" = (
+"Aa" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 10
+ dir = 4
},
/turf/open/floor/plating,
/area/station/construction)
-"AE" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"AP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
},
/turf/open/floor/iron,
/area/station/science)
+"AR" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/turf/open/floor/iron,
+/area/station/construction)
+"AY" = (
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"Be" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/table,
+/obj/item/uplink/debug{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/uplink/nuclear/debug,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/command/bridge)
"BD" = (
/obj/structure/closet/secure_closet/chief_medical{
locked = 0
@@ -2337,6 +2275,16 @@
/obj/item/gun/ballistic/automatic/pistol,
/turf/open/floor/iron,
/area/station/command/bridge)
+"BW" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/camera/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/construction)
+"Cc" = (
+/obj/item/wrench,
+/turf/open/floor/plating,
+/area/station/construction)
"Ce" = (
/turf/open/floor/iron,
/area/station/medical/chemistry)
@@ -2371,6 +2319,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/bitrunning/den)
+"DL" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
+/obj/machinery/meter/monitored/distro_loop,
+/turf/open/floor/plating,
+/area/station/construction)
"DW" = (
/obj/machinery/computer/scan_consolenew{
dir = 1
@@ -2380,6 +2333,11 @@
},
/turf/open/floor/iron/white/corner,
/area/station/medical/medbay)
+"Em" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"EA" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -2403,6 +2361,10 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
+"EN" = (
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/construction)
"ES" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -2417,19 +2379,44 @@
},
/turf/open/floor/iron,
/area/station/medical/chemistry)
-"EZ" = (
+"Fi" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
- dir = 6
+ dir = 10
},
/turf/open/floor/plating,
/area/station/construction)
-"GC" = (
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/commons/storage/primary)
-"GV" = (
-/obj/machinery/electroplater,
+"GB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/arc_forge,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"GS" = (
+/obj/structure/sign/directions/supply{
+ dir = 4;
+ pixel_x = -32
+ },
+/obj/structure/sign/directions/engineering{
+ dir = 1;
+ pixel_x = -32;
+ pixel_y = 7
+ },
+/obj/structure/sign/directions/evac{
+ pixel_x = -32;
+ pixel_y = -7
+ },
+/obj/structure/machine/assembly_bench,
+/turf/open/floor/plating,
+/area/station/commons/storage/primary)
+"Hr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible,
+/turf/open/floor/plating,
+/area/station/construction)
+"Id" = (
+/obj/structure/anvil,
+/turf/open/floor/plating,
+/area/station/commons/storage/primary)
"If" = (
/obj/machinery/rnd/production/techfab/department,
/turf/open/floor/iron,
@@ -2455,8 +2442,10 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"Jg" = (
-/obj/item/wrench,
+"Jn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/construction)
"Jp" = (
@@ -2464,12 +2453,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
-"Jv" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/construction)
"JF" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -2483,9 +2466,21 @@
/obj/machinery/light/directional/south,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"Li" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/construction)
"Lq" = (
/turf/open/floor/circuit/green,
/area/station/bitrunning/den)
+"Lx" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/construction)
"Ly" = (
/obj/machinery/chem_dispenser/chem_synthesizer,
/turf/open/floor/iron/dark,
@@ -2498,6 +2493,14 @@
/obj/machinery/door/airlock/research,
/turf/open/floor/iron/dark,
/area/station/science/explab)
+"LL" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/turf/open/floor/iron,
+/area/station/construction)
"LW" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -2516,10 +2519,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
-"MR" = (
-/obj/machinery/atmospherics/components/binary/circulator/cold,
-/turf/open/floor/plating,
-/area/station/construction)
"MY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -2538,18 +2537,20 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/medical/medbay)
-"NI" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/construction)
"NZ" = (
/obj/machinery/rnd/production/protolathe/department,
/turf/open/floor/iron,
/area/station/science)
-"Os" = (
-/obj/machinery/atmospherics/components/binary/circulator,
+"Ob" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/station/construction)
+"Oc" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/construction)
"Ov" = (
@@ -2588,14 +2589,6 @@
},
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
-"QA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/light_switch/directional/west,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/turf/open/floor/iron,
-/area/station/construction)
"Rb" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -2611,10 +2604,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"RF" = (
-/obj/structure/anvil,
+"Rx" = (
+/obj/machinery/atmospherics/components/binary/circulator/cold,
/turf/open/floor/plating,
-/area/station/commons/storage/primary)
+/area/station/construction)
"RM" = (
/obj/structure/closet/secure_closet/hop{
locked = 0
@@ -2622,21 +2615,13 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
-"RT" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/obj/machinery/meter/monitored/distro_loop,
-/turf/open/floor/plating,
-/area/station/construction)
"RW" = (
/turf/open/floor/iron,
/area/station/bitrunning/den)
-"Sg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/arc_forge,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
+"Sd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
+/turf/open/floor/plating,
+/area/station/construction)
"Sj" = (
/obj/structure/table/optable,
/obj/effect/turf_decal/tile/blue{
@@ -2644,19 +2629,6 @@
},
/turf/open/floor/iron/white/corner,
/area/station/medical/medbay)
-"Sp" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
-"SK" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/station/construction)
"Td" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/stripes/line{
@@ -2676,6 +2648,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/construction)
+"Uc" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/machinery/rnd/destructive_analyzer,
+/turf/open/floor/iron,
+/area/station/science)
"Ut" = (
/obj/structure/closet/secure_closet/medical3{
locked = 0
@@ -2683,6 +2661,14 @@
/obj/item/healthanalyzer/advanced,
/turf/open/floor/iron,
/area/station/medical/medbay)
+"UK" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/construction)
"Vg" = (
/obj/machinery/light/directional/south,
/obj/structure/cable,
@@ -2739,10 +2725,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/main)
-"Xf" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/commons/storage/primary)
"Xg" = (
/obj/machinery/light/directional/east,
/obj/machinery/vending/syndichem{
@@ -2758,22 +2740,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"Xr" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/construction)
-"Xz" = (
-/obj/machinery/atmospherics/components/binary/volume_pump{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/construction)
"XC" = (
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science)
+"XE" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1;
+ name = "Port to Filter"
+ },
+/turf/open/floor/plating,
+/area/station/construction)
"XN" = (
/obj/structure/table,
/obj/item/organ/internal/cyberimp/bci{
@@ -2787,10 +2764,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/explab)
-"XQ" = (
-/obj/structure/closet/syndicate/resources/everything,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"XR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 9
@@ -2817,11 +2790,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/explab)
-"Yq" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
-/obj/machinery/meter/monitored/distro_loop,
-/turf/open/floor/plating,
-/area/station/construction)
"Yy" = (
/obj/machinery/light/directional/north,
/obj/machinery/rnd/production/circuit_imprinter/department,
@@ -2829,6 +2797,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science)
+"Yz" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
+/area/station/commons/storage/primary)
"YL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -4520,7 +4492,7 @@ em
em
em
em
-gi
+mC
gm
go
gp
@@ -6005,7 +5977,7 @@ eh
eh
eh
eF
-eM
+ee
fM
eh
eh
@@ -6177,7 +6149,7 @@ aw
aw
Kx
ah
-bs
+Uc
bB
ca
If
@@ -6186,14 +6158,14 @@ kn
ES
bE
cN
-cW
+UK
dm
-uq
-QA
-dX
-wl
-wl
-gG
+yJ
+LL
+pD
+AR
+AR
+oK
ii
dy
dm
@@ -6279,13 +6251,13 @@ ES
rL
cP
cX
-pf
-rC
+uo
+Sd
dn
dn
dn
dn
-Xz
+Oc
dn
dn
dn
@@ -6371,19 +6343,19 @@ bE
Mh
TV
EA
-pf
-rC
+uo
+Sd
dn
dn
dn
dn
-ht
-ko
-zd
+Jn
+XE
+yy
dn
dL
cN
-AE
+lQ
kp
XN
Ym
@@ -6463,13 +6435,13 @@ bE
bE
ef
EA
-pf
-rC
+uo
+Sd
dn
dn
dn
dn
-NI
+Aa
dn
dn
dn
@@ -6550,18 +6522,18 @@ bD
XC
co
bA
-wS
+lF
bE
bE
cN
-dW
+BW
dn
-zB
-RT
-Os
-RT
-mj
-Jv
+Ob
+pt
+rU
+pt
+rr
+Li
dn
dn
dn
@@ -6647,12 +6619,12 @@ bE
bE
cN
EA
-lD
-lD
-lD
-yP
+EN
+EN
+EN
+vh
dn
-Jg
+Cc
dn
dn
dn
@@ -6730,7 +6702,7 @@ ab
ab
ab
bu
-bG
+Be
ce
cp
bu
@@ -6740,12 +6712,12 @@ bE
cN
cY
dn
-EZ
-Yq
-MR
-Yq
-ay
-gT
+jF
+DL
+Rx
+DL
+yT
+hA
dn
dn
dn
@@ -6831,13 +6803,13 @@ bE
bE
cN
cY
-oK
-oy
+tY
+Hr
dn
dn
dn
dn
-Xr
+yx
dn
dn
dn
@@ -6923,15 +6895,15 @@ bE
bE
cN
cY
-oK
-oy
+tY
+Hr
dn
dn
dn
dn
-vf
-ko
-zd
+hJ
+XE
+yy
dn
dL
cN
@@ -7015,13 +6987,13 @@ bE
bE
ef
cY
-oK
-oy
+tY
+Hr
dn
dn
dn
dn
-Xz
+Oc
dn
dn
dn
@@ -7108,12 +7080,12 @@ bE
ef
cY
dn
-SK
-ay
-ay
-ay
-ay
-nv
+Fi
+yT
+yT
+yT
+yT
+Lx
dn
dn
dn
@@ -7382,17 +7354,17 @@ cE
bE
bE
cS
-dd
+qF
dp
dl
-RF
-fX
+Id
+GS
dE
dB
-GC
-GC
-GC
-Xf
+rZ
+rZ
+rZ
+Yz
dE
cS
Tt
@@ -7476,7 +7448,7 @@ bE
cS
dc
dC
-Sg
+GB
dC
dC
eW
@@ -7569,7 +7541,7 @@ da
fK
dJ
dJ
-tx
+AY
dJ
dJ
dJ
@@ -7642,7 +7614,7 @@ aa
aa
aa
aj
-ar
+mz
aA
aH
aF
@@ -7650,7 +7622,7 @@ lg
bf
bp
aj
-bP
+ow
Ce
JF
mE
@@ -7753,8 +7725,8 @@ cS
fy
dr
dJ
-GV
-XQ
+hr
+oE
dI
dJ
dJ
@@ -7828,7 +7800,7 @@ aa
ad
af
ak
-as
+sU
aG
aV
bg
@@ -8202,7 +8174,7 @@ MN
MN
av
by
-bU
+fV
cl
cl
cl
@@ -8672,7 +8644,7 @@ es
by
eu
eu
-eG
+Em
eP
fY
eZ
@@ -8683,7 +8655,7 @@ eu
eu
eu
et
-Sp
+gh
fO
fO
fO
diff --git a/_maps/map_files/debug/shiptest.dmm b/_maps/map_files/debug/shiptest.dmm
index ccd796d13847..48f19b748324 100644
--- a/_maps/map_files/debug/shiptest.dmm
+++ b/_maps/map_files/debug/shiptest.dmm
@@ -56,10 +56,8 @@
/turf/open/floor/iron,
/area/station/engineering/main)
"ar" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/structure/closet/secure_closet/engineering_welding{
locked = 0
},
@@ -69,10 +67,8 @@
/obj/machinery/power/smes{
charge = 5e+006
},
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -319,10 +315,8 @@
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
"bs" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/machinery/rnd/destructive_analyzer,
/turf/open/floor/iron,
/area/station/science)
@@ -375,10 +369,8 @@
/turf/open/floor/iron,
/area/station/science)
"bG" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/table,
/obj/item/uplink/debug{
@@ -434,10 +426,8 @@
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
"bP" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/structure/table,
/obj/machinery/reagentgrinder,
/turf/open/floor/iron/dark,
@@ -465,10 +455,8 @@
/turf/open/floor/iron,
/area/station/security/brig)
"bU" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/mob/living/carbon/human,
@@ -763,10 +751,8 @@
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"cW" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
@@ -805,10 +791,8 @@
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"dd" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -1204,10 +1188,8 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"eG" = (
-/obj/machinery/airalarm/unlocked{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/cargo/storage)
"eH" = (
@@ -1234,10 +1216,8 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"eM" = (
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 23
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"eN" = (
@@ -1694,10 +1674,8 @@
/area/station/commons/storage/primary)
"gi" = (
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/airalarm/unlocked{
- dir = 4;
- pixel_x = 32
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/obj/structure/cable,
/obj/machinery/computer/shuttle/mining,
/turf/open/floor/iron,
@@ -2110,10 +2088,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"wU" = (
@@ -2143,10 +2119,8 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"AE" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/science/explab)
"AP" = (
@@ -2405,10 +2379,8 @@
/turf/open/floor/iron/white/corner,
/area/station/medical/medbay)
"Sp" = (
-/obj/machinery/airalarm/unlocked{
- dir = 1;
- pixel_y = 23
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"Td" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 486cd3464c84..6e1dc6b946ac 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -468,6 +468,16 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/iron,
/area/centcom/central_command_areas/ferry)
+"bn" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/records/security/laptop/syndie,
+/obj/effect/spawner/random/entertainment/drugs,
+/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
+/obj/machinery/door/window{
+ dir = 1
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"bo" = (
/obj/effect/turf_decal/siding/green{
dir = 8
@@ -697,6 +707,18 @@
/obj/structure/railing,
/turf/open/lava/plasma/ice_moon,
/area/centcom/syndicate_mothership/control)
+"bS" = (
+/obj/structure/bed/maint,
+/obj/item/bedsheet/centcom,
+/obj/item/pillow,
+/obj/item/photo{
+ desc = "It's a family photograph. The edges of the picture are faded and the identities of anyone in it are lost to time."
+ },
+/obj/structure/sign/poster/official/work_for_a_future/directional/south,
+/turf/open/floor/iron/white/corner{
+ dir = 1
+ },
+/area/centcom/central_command_areas/admin)
"bT" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -891,12 +913,6 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/medical)
-"cv" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/admin)
"cw" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/large,
@@ -942,13 +958,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/hall)
-"cC" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/obj/structure/light_prism,
-/turf/open/floor/plating/abductor,
-/area/centcom/central_command_areas/admin)
"cD" = (
/obj/structure/chair/pew{
dir = 8
@@ -1277,18 +1286,6 @@
/obj/structure/closet/mini_fridge,
/turf/open/floor/iron/dark/small,
/area/centcom/central_command_areas/admin)
-"du" = (
-/obj/structure/bed/maint,
-/obj/item/bedsheet/centcom,
-/obj/item/pillow,
-/obj/item/photo{
- desc = "It's a family photograph. The edges of the picture are faded and the identities of anyone in it are lost to time."
- },
-/obj/structure/sign/poster/official/work_for_a_future/directional/south,
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/centcom/central_command_areas/admin)
"dv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
@@ -1480,12 +1477,6 @@
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/admin_hangout)
-"dU" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/turf/open/misc/grass,
-/area/centcom/central_command_areas/admin)
"dV" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -1619,21 +1610,6 @@
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/borbop)
-"el" = (
-/obj/machinery/light/small/maintenance/directional/west,
-/obj/structure/window/reinforced/tinted,
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = -4
- },
-/obj/effect/spawner/random/trash/garbage{
- pixel_y = 9
- },
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"em" = (
/obj/machinery/chem_mass_spec,
/turf/open/floor/mineral/titanium/tiled/yellow,
@@ -1819,6 +1795,14 @@
/obj/structure/curtain/cloth/fancy,
/turf/open/indestructible/event/plating,
/area/centcom/central_command_areas/borbop)
+"eQ" = (
+/mob/living/basic/bot/medbot/mysterious{
+ desc = "If you don't accidentally blow yourself up from time to time you're not really a wizard anyway.";
+ faction = list("neutral","silicon","creature");
+ name = "Nobody's Perfect"
+ },
+/turf/open/floor/engine/cult,
+/area/centcom/wizard_station)
"eR" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -2027,6 +2011,9 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/smooth_large,
/area/centcom/central_command_areas/evacuation/ship)
+"fA" = (
+/turf/open/floor/iron/white/side,
+/area/centcom/central_command_areas/admin)
"fB" = (
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin_hangout)
@@ -2203,6 +2190,11 @@
/obj/machinery/computer/records/security/laptop,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin)
+"gg" = (
+/obj/machinery/light/small/maintenance/directional/east,
+/obj/structure/window/reinforced/tinted,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"gh" = (
/obj/structure/sign/poster/contraband/revolver{
pixel_y = -32
@@ -2616,6 +2608,14 @@
/obj/effect/decal/remains/xeno/larva,
/turf/open/floor/grass,
/area/centcom/wizard_station)
+"hl" = (
+/obj/machinery/modular_computer/preset/id/centcom{
+ dir = 1
+ },
+/turf/open/floor/iron/white/side{
+ dir = 1
+ },
+/area/centcom/central_command_areas/admin)
"hm" = (
/obj/effect/turf_decal/siding/blue,
/obj/effect/turf_decal/siding/blue/corner{
@@ -2758,6 +2758,10 @@
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/borbop)
+"hF" = (
+/obj/structure/sign/poster/official/bless_this_spess/directional/west,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"hG" = (
/obj/structure/chair/sofa/bench/right{
dir = 4
@@ -3016,18 +3020,6 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/iron/freezer,
/area/centcom/syndicate_mothership/control)
-"is" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood/large,
-/area/centcom/central_command_areas/admin)
"it" = (
/obj/structure/railing/wood,
/obj/structure/flora/bush/grassy/style_random,
@@ -3189,6 +3181,11 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/centcom/syndicate_mothership/control)
+"iT" = (
+/obj/machinery/door/window,
+/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"iV" = (
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/centcom/syndicate_mothership)
@@ -3244,6 +3241,20 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/supply)
+"jd" = (
+/obj/effect/spawner/random/trash/cigbutt{
+ pixel_y = -2
+ },
+/obj/structure/sign/poster/official/cleanliness/directional/north,
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = 9;
+ pixel_y = 8
+ },
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = -6
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"je" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
@@ -3498,6 +3509,11 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/supply)
+"jM" = (
+/mob/living/basic/bot/cleanbot/medbay,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/medical)
"jN" = (
/obj/structure/flora/tree/dead/style_random,
/obj/structure/flora/grass/both/style_random,
@@ -3715,11 +3731,8 @@
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/botany)
"ky" = (
-/obj/machinery/door/airlock/centcom{
- name = "Brad Lods 'Office'"
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
-/turf/open/floor/iron/dark,
+/obj/structure/chair/office,
+/turf/open/floor/iron/white/side,
/area/centcom/central_command_areas/admin)
"kz" = (
/obj/machinery/door/airlock/maintenance/external{
@@ -4034,6 +4047,13 @@
/obj/structure/window/plasma/spawner/directional/west,
/turf/open/floor/carpet/royalblue,
/area/centcom/central_command_areas/admin)
+"ln" = (
+/obj/machinery/light/small/maintenance/directional/west,
+/obj/effect/spawner/random/trash/bin{
+ name = "treat storage"
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"lo" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
@@ -4067,16 +4087,6 @@
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/hall)
-"lv" = (
-/obj/structure/table/wood,
-/obj/item/trash/tray,
-/obj/item/trash/energybar,
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/window/reinforced/tinted,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"lw" = (
/obj/structure/sign/poster/contraband/lizard{
pixel_x = -32
@@ -4198,10 +4208,6 @@
/obj/effect/mapping_helpers/airlock/access/any/admin/general,
/turf/open/floor/iron,
/area/centcom/central_command_areas/supply)
-"lL" = (
-/obj/structure/chair/office,
-/turf/open/floor/iron/white/side,
-/area/centcom/central_command_areas/admin)
"lM" = (
/obj/structure/toilet{
dir = 1
@@ -4553,6 +4559,10 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/supply)
+"mJ" = (
+/obj/structure/curtain/bounty,
+/turf/closed/indestructible/fakeglass,
+/area/centcom/central_command_areas/admin)
"mK" = (
/obj/machinery/light/cold/directional/east,
/obj/item/kirbyplants/random,
@@ -4570,11 +4580,6 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/plating,
/area/centcom/syndicate_mothership/control)
-"mN" = (
-/obj/structure/table/reinforced,
-/obj/structure/sign/poster/official/moth_meth/directional/west,
-/turf/open/floor/iron/white/corner,
-/area/centcom/central_command_areas/admin)
"mO" = (
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron/dark/textured_half{
@@ -4821,6 +4826,11 @@
/obj/structure/table/wood/fancy/royalblue,
/turf/open/floor/iron/white/diagonal,
/area/centcom/central_command_areas/hall)
+"nx" = (
+/turf/open/floor/iron/white/side{
+ dir = 1
+ },
+/area/centcom/central_command_areas/admin)
"ny" = (
/obj/machinery/computer/operating{
dir = 8
@@ -4945,10 +4955,6 @@
/obj/machinery/vending/boozeomat,
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin)
-"nW" = (
-/obj/structure/sign/poster/official/bless_this_spess/directional/west,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"nX" = (
/obj/structure/hedge,
/obj/effect/turf_decal/siding/dark{
@@ -5149,11 +5155,6 @@
},
/turf/open/floor/carpet,
/area/centcom/wizard_station)
-"ox" = (
-/obj/machinery/light/small/maintenance/directional/east,
-/obj/structure/filingcabinet/employment,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"oy" = (
/obj/machinery/vending/wardrobe/curator_wardrobe,
/obj/effect/turf_decal/siding/dark,
@@ -5172,13 +5173,6 @@
/obj/structure/flora/rock/icy/style_random,
/turf/open/misc/asteroid/snow/airless,
/area/centcom/syndicate_mothership)
-"oA" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/briefing)
"oD" = (
/turf/closed/indestructible/opsglass,
/area/centcom/syndicate_mothership/control)
@@ -5641,6 +5635,10 @@
},
/turf/open/misc/snow/actually_safe,
/area/centcom/central_command_areas/admin)
+"pM" = (
+/obj/structure/chair/plastic,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"pN" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -5907,6 +5905,17 @@
/obj/effect/turf_decal/siding/thinplating_new/dark/corner,
/turf/open/floor/mineral/plastitanium/red,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
+"qt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/mineral/titanium/tiled/yellow,
+/area/centcom/syndicate_mothership/expansion_bombthreat)
"qu" = (
/obj/effect/turf_decal/tile/dark/diagonal_edge,
/obj/structure/table/wood/fancy/royalblue,
@@ -5942,20 +5951,6 @@
},
/turf/open/misc/asteroid/snow/airless,
/area/centcom/syndicate_mothership)
-"qz" = (
-/obj/effect/spawner/random/trash/cigbutt{
- pixel_y = -2
- },
-/obj/structure/sign/poster/official/cleanliness/directional/north,
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = 9;
- pixel_y = 8
- },
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = -6
- },
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"qA" = (
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark/textured_large,
@@ -6295,11 +6290,6 @@
dir = 4
},
/area/centcom/syndicate_mothership/control)
-"rw" = (
-/obj/structure/window/reinforced/tinted,
-/obj/item/chair/wood,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"rx" = (
/obj/structure/table/reinforced,
/obj/item/knife/combat/survival{
@@ -6370,6 +6360,12 @@
},
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation/ship)
+"rH" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/turf/open/misc/grass,
+/area/centcom/central_command_areas/admin)
"rJ" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/components/tank/nitrogen,
@@ -6819,6 +6815,12 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/hall)
+"sT" = (
+/obj/structure/chair/plastic{
+ dir = 4
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"sU" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
@@ -7131,11 +7133,6 @@
/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
-"tF" = (
-/obj/machinery/door/window,
-/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"tG" = (
/obj/structure/railing{
dir = 6
@@ -7226,6 +7223,21 @@
/obj/structure/table,
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/arcade)
+"tS" = (
+/obj/machinery/light/small/maintenance/directional/west,
+/obj/structure/window/reinforced/tinted,
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = -4
+ },
+/obj/effect/spawner/random/trash/garbage{
+ pixel_y = 9
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"tU" = (
/turf/closed/indestructible/fakeglass,
/area/centcom/tdome/observation)
@@ -7303,15 +7315,6 @@
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin_hangout)
-"ug" = (
-/obj/structure/showcase/machinery/cloning_pod{
- name = "Brad Pod";
- desc = "Out of everything in this room, this is the only thing that is free from grime."
- },
-/turf/open/floor/iron/white/corner{
- dir = 8
- },
-/area/centcom/central_command_areas/admin)
"uh" = (
/turf/open/floor/carpet/purple,
/area/centcom/central_command_areas/admin)
@@ -8208,6 +8211,12 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/ghost_spawn)
+"wJ" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/turf/open/floor/carpet/royalblue,
+/area/centcom/central_command_areas/admin)
"wK" = (
/obj/effect/turf_decal/siding/blue/corner{
dir = 4
@@ -8994,6 +9003,29 @@
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/carpet/purple,
/area/centcom/central_command_areas/admin)
+"yN" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = -5;
+ pixel_y = -3
+ },
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = 7;
+ pixel_y = -1
+ },
+/obj/effect/spawner/random/trash/garbage{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 1
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"yO" = (
/obj/item/paper_bin{
pixel_x = 5;
@@ -9435,12 +9467,6 @@
"zX" = (
/turf/open/floor/plating/abductor,
/area/centcom/central_command_areas/admin)
-"zY" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/turf/open/floor/circuit,
-/area/centcom/central_command_areas/admin)
"zZ" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
@@ -9970,14 +9996,6 @@
/obj/structure/flora/bush/grassy/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/hall)
-"Bs" = (
-/obj/structure/sign/poster/official/no_erp/directional/east,
-/obj/machinery/door/window{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"Bt" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -10155,14 +10173,6 @@
"BR" = (
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation/ship)
-"BS" = (
-/mob/living/basic/bot/medbot/mysterious{
- desc = "If you don't accidentally blow yourself up from time to time you're not really a wizard anyway.";
- faction = list("neutral","silicon","creature");
- name = "Nobody's Perfect"
- },
-/turf/open/floor/engine/cult,
-/area/centcom/wizard_station)
"BT" = (
/obj/machinery/door/airlock{
icon = 'icons/obj/doors/airlocks/station/uranium.dmi';
@@ -10285,27 +10295,16 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/borbop)
"Cn" = (
-/obj/structure/table/wood,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = -5;
- pixel_y = -3
- },
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = 7;
- pixel_y = -1
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
},
-/obj/effect/spawner/random/trash/garbage{
- pixel_x = -3;
- pixel_y = 5
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
},
-/obj/structure/window/reinforced/tinted{
- dir = 1
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
},
-/turf/open/floor/iron/grimy,
+/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin)
"Co" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
@@ -10409,11 +10408,6 @@
/obj/item/megaphone/sec,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/firing_range_checkpoint_control)
-"CE" = (
-/obj/machinery/light/small/maintenance/directional/east,
-/obj/structure/window/reinforced/tinted,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"CF" = (
/obj/machinery/suit_storage_unit/industrial,
/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
@@ -10487,12 +10481,6 @@
/obj/structure/injured_spawner,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/medical)
-"CR" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/turf/open/floor/mineral/titanium/white,
-/area/centcom/central_command_areas/admin)
"CS" = (
/obj/machinery/door/airlock/centcom,
/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
@@ -10921,6 +10909,12 @@
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/hall)
+"Ed" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"Ee" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -11081,6 +11075,16 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin)
+"EB" = (
+/obj/structure/table/reinforced,
+/obj/machinery/fax{
+ fax_name = "Brad";
+ name = "Brads Fax Machine"
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 4
+ },
+/area/centcom/central_command_areas/admin)
"EC" = (
/obj/machinery/light/floor/has_bulb,
/obj/structure/hedge,
@@ -11150,6 +11154,12 @@
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/centcom/central_command_areas/admin)
+"EK" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/admin)
"EL" = (
/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 4
@@ -11323,14 +11333,6 @@
/obj/effect/landmark/basketball/game_area,
/turf/open/space/basic,
/area/space)
-"Fk" = (
-/obj/machinery/modular_computer/preset/id/centcom{
- dir = 1
- },
-/turf/open/floor/iron/white/side{
- dir = 1
- },
-/area/centcom/central_command_areas/admin)
"Fl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
@@ -11480,6 +11482,12 @@
},
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/medical)
+"FG" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/turf/open/floor/circuit,
+/area/centcom/central_command_areas/admin)
"FH" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -12729,6 +12737,15 @@
},
/turf/open/indestructible/event/plating,
/area/centcom/tdome/arena/actual)
+"Jl" = (
+/obj/machinery/firealarm/directional/south,
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/ferry)
"Jm" = (
/obj/effect/turf_decal/tile/dark/opposingcorners,
/turf/open/floor/iron/dark,
@@ -13000,6 +13017,23 @@
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin_hangout)
+"JY" = (
+/obj/structure/table/wood,
+/obj/structure/chem_separator{
+ pixel_x = 2
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = -3
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 1
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"JZ" = (
/obj/machinery/smartfridge/chemistry/virology/preloaded,
/turf/closed/indestructible/syndicate,
@@ -13817,12 +13851,6 @@
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/botany)
-"Mb" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"Mc" = (
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin)
@@ -13835,16 +13863,6 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/supply)
-"Me" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/records/security/laptop/syndie,
-/obj/effect/spawner/random/entertainment/drugs,
-/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
-/obj/machinery/door/window{
- dir = 1
- },
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"Mf" = (
/obj/effect/turf_decal/siding/dark{
dir = 1
@@ -13956,11 +13974,6 @@
"Ms" = (
/turf/closed/indestructible/riveted/uranium,
/area/centcom/wizard_station)
-"Mt" = (
-/mob/living/basic/bot/cleanbot/medbay,
-/obj/machinery/light/floor/has_bulb,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/medical)
"Mu" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/airlock/titanium{
@@ -14006,9 +14019,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/centcom/syndicate_mothership/control)
-"MA" = (
-/turf/open/floor/iron/white/side,
-/area/centcom/central_command_areas/admin)
"MB" = (
/obj/structure/hedge,
/obj/effect/turf_decal/siding/dark{
@@ -14123,19 +14133,6 @@
dir = 10
},
/area/centcom/central_command_areas/hall)
-"MR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 1
- },
-/obj/machinery/airalarm/unlocked{
- dir = 8;
- pixel_x = -24
- },
-/turf/open/floor/mineral/titanium/tiled/yellow,
-/area/centcom/syndicate_mothership/expansion_bombthreat)
"MS" = (
/obj/machinery/door/airlock{
icon = 'icons/obj/doors/airlocks/station/uranium.dmi';
@@ -14617,16 +14614,6 @@
"On" = (
/turf/closed/indestructible/riveted,
/area/centcom/central_command_areas/admin)
-"Oo" = (
-/obj/structure/table/reinforced,
-/obj/machinery/fax{
- fax_name = "Brad";
- name = "Brads Fax Machine"
- },
-/turf/open/floor/iron/white/corner{
- dir = 4
- },
-/area/centcom/central_command_areas/admin)
"Op" = (
/obj/structure/railing/wood,
/obj/structure/table/reinforced,
@@ -14675,10 +14662,6 @@
/obj/structure/railing,
/turf/open/misc/asteroid/snow/icemoon,
/area/centcom/syndicate_mothership/control)
-"Ou" = (
-/obj/structure/chair/plastic,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"Ov" = (
/obj/structure/chair/wood/wings,
/turf/open/floor/engine/cult,
@@ -14939,6 +14922,11 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/smooth_edge,
/area/centcom/syndicate_mothership/control)
+"Pi" = (
+/obj/structure/window/reinforced/tinted,
+/obj/item/chair/wood,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"Pj" = (
/obj/machinery/light/floor/has_bulb,
/turf/open/floor/wood/large,
@@ -15103,20 +15091,6 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/supply)
-"PH" = (
-/obj/machinery/firealarm/directional/south,
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/ferry)
-"PI" = (
-/turf/open/floor/iron/white/side{
- dir = 1
- },
-/area/centcom/central_command_areas/admin)
"PJ" = (
/obj/structure/closet/crate/freezer/blood,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -15498,22 +15472,14 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin_hangout)
"QK" = (
-/obj/structure/table/wood,
-/obj/structure/chem_separator{
- pixel_x = 2
- },
-/obj/item/reagent_containers/cup/beaker{
- pixel_x = 8;
- pixel_y = -3
- },
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/window/reinforced/tinted{
- dir = 1
+/obj/machinery/firealarm/directional/south,
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
},
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/supply)
"QL" = (
/obj/structure/chair/office/tactical,
/turf/open/floor/carpet/royalblue,
@@ -15567,6 +15533,16 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/admin_hangout)
+"QT" = (
+/obj/structure/table/wood,
+/obj/item/trash/tray,
+/obj/item/trash/energybar,
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"QU" = (
/obj/structure/flora/tree/pine/style_random,
/obj/structure/flora/grass/both/style_random,
@@ -15579,12 +15555,6 @@
"QV" = (
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/admin)
-"QW" = (
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/turf/open/floor/carpet/royalblue,
-/area/centcom/central_command_areas/admin)
"QX" = (
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
@@ -15958,11 +15928,9 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/botany)
"RY" = (
-/obj/machinery/light/small/maintenance/directional/west,
-/obj/effect/spawner/random/trash/bin{
- name = "treat storage"
- },
-/turf/open/floor/iron/grimy,
+/obj/structure/table/reinforced,
+/obj/structure/sign/poster/official/moth_meth/directional/west,
+/turf/open/floor/iron/white/corner,
/area/centcom/central_command_areas/admin)
"RZ" = (
/obj/structure/chair/bronze{
@@ -16757,6 +16725,12 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/hall)
+"Ug" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/turf/open/floor/mineral/titanium/white,
+/area/centcom/central_command_areas/admin)
"Uh" = (
/obj/effect/turf_decal/tile/dark/opposingcorners,
/turf/open/floor/iron/dark,
@@ -16906,6 +16880,24 @@
/obj/effect/turf_decal/tile/dark/opposingcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin_hangout)
+"UH" = (
+/obj/structure/table/reinforced,
+/obj/item/stamp/centcom{
+ pixel_x = -7;
+ pixel_y = 5
+ },
+/obj/item/paper_bin{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/pen/fourcolor{
+ pixel_y = 6;
+ pixel_x = 5
+ },
+/turf/open/floor/iron/white/side{
+ dir = 1
+ },
+/area/centcom/central_command_areas/admin)
"UI" = (
/obj/effect/turf_decal/siding/green{
dir = 4
@@ -17029,6 +17021,13 @@
/obj/machinery/fishing_portal_generator,
/turf/open/floor/carpet/neon/simple/cyan,
/area/centcom/central_command_areas/admin)
+"Vb" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/obj/structure/light_prism,
+/turf/open/floor/plating/abductor,
+/area/centcom/central_command_areas/admin)
"Vc" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/lamp,
@@ -17243,6 +17242,13 @@
/obj/machinery/vending/dinnerware,
/turf/open/floor/iron/white/herringbone,
/area/centcom/central_command_areas/kitchen)
+"VA" = (
+/obj/machinery/door/airlock/centcom{
+ name = "Brad Lods 'Office'"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/admin)
"VB" = (
/obj/structure/chair/sofa/bench/right{
dir = 4
@@ -17259,9 +17265,11 @@
},
/area/centcom/syndicate_mothership/control)
"VD" = (
-/obj/structure/chair/plastic{
- dir = 4
+/obj/structure/sign/poster/official/no_erp/directional/east,
+/obj/machinery/door/window{
+ dir = 1
},
+/obj/effect/mapping_helpers/airlock/access/any/admin/captain,
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/admin)
"VE" = (
@@ -18011,15 +18019,6 @@
dir = 8
},
/area/centcom/syndicate_mothership/control)
-"XK" = (
-/obj/machinery/firealarm/directional/south,
-/obj/structure/closet/crate/bin{
- name = "treat storage"
- },
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/supply)
"XM" = (
/turf/open/floor/plating/elevatorshaft,
/area/centcom/syndicate_mothership/control)
@@ -18146,10 +18145,6 @@
/obj/item/clothing/head/beret/science/rd,
/turf/open/floor/carpet/purple,
/area/centcom/central_command_areas/admin)
-"Ye" = (
-/obj/structure/curtain/bounty,
-/turf/closed/indestructible/fakeglass,
-/area/centcom/central_command_areas/admin)
"Yf" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -18231,6 +18226,11 @@
},
/turf/open/floor/carpet/purple,
/area/centcom/central_command_areas/admin)
+"Yp" = (
+/obj/machinery/light/small/maintenance/directional/east,
+/obj/structure/filingcabinet/employment,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"Yq" = (
/obj/machinery/door/airlock{
icon = 'icons/obj/doors/airlocks/station/uranium.dmi';
@@ -18315,6 +18315,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation/ship)
+"YI" = (
+/obj/structure/closet/crate/bin{
+ name = "treat storage"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/briefing)
"YJ" = (
/obj/effect/turf_decal/siding/dark{
dir = 10
@@ -18341,30 +18348,21 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/centcom/central_command_areas/hall)
-"YO" = (
-/obj/structure/table/reinforced,
-/obj/item/stamp/centcom{
- pixel_x = -7;
- pixel_y = 5
- },
-/obj/item/paper_bin{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/pen/fourcolor{
- pixel_y = 6;
- pixel_x = 5
- },
-/turf/open/floor/iron/white/side{
- dir = 1
- },
-/area/centcom/central_command_areas/admin)
"YP" = (
/obj/effect/spawner/random/trash/garbage,
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/iron,
/area/centcom/central_command_areas/admin)
+"YQ" = (
+/obj/structure/showcase/machinery/cloning_pod{
+ name = "Brad Pod";
+ desc = "Out of everything in this room, this is the only thing that is free from grime."
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 8
+ },
+/area/centcom/central_command_areas/admin)
"YR" = (
/obj/effect/turf_decal/siding/dark{
dir = 8
@@ -21529,7 +21527,7 @@ Gf
QZ
QZ
QZ
-BS
+eQ
Ms
QZ
QZ
@@ -22876,7 +22874,7 @@ Wm
tZ
bh
qS
-MR
+qt
tV
eH
qW
@@ -49344,7 +49342,7 @@ iF
XA
bL
lq
-XK
+QK
iF
os
iR
@@ -49614,13 +49612,13 @@ SI
SI
pi
pi
-cv
+EK
On
uk
uk
Ji
uk
-dU
+rH
On
Bw
EJ
@@ -49635,7 +49633,7 @@ qx
IB
IB
hD
-QW
+wJ
Uu
hD
eA
@@ -50678,7 +50676,7 @@ mD
eY
sv
tt
-PH
+Jl
mD
vE
wt
@@ -51174,7 +51172,7 @@ SI
SI
pi
pi
-cv
+EK
On
Ob
VR
@@ -51690,7 +51688,7 @@ hw
pi
pi
On
-is
+Cn
ig
Xn
Dw
@@ -52191,7 +52189,7 @@ Mc
Mc
Mc
On
-cv
+EK
pi
SI
SI
@@ -52490,7 +52488,7 @@ JW
eE
rB
RH
-oA
+YI
gO
aa
aa
@@ -52705,12 +52703,12 @@ Mc
Mc
Mc
On
-RY
-nW
+ln
+hF
QV
-el
-mN
-Oo
+tS
+RY
+EB
On
On
Zf
@@ -52963,12 +52961,12 @@ Mc
Mc
IS
QV
-VD
-QK
-lv
-lL
-Fk
-Ye
+sT
+JY
+QT
+ky
+hl
+mJ
aa
aa
aa
@@ -53218,14 +53216,14 @@ CS
Mc
dQ
Mc
-ky
+VA
QV
-Ou
-Me
-rw
-MA
-YO
-Ye
+pM
+bn
+Pi
+fA
+UH
+mJ
aa
aa
aa
@@ -53476,13 +53474,13 @@ Mc
Mc
Mc
On
-qz
+jd
QV
-Cn
-tF
-MA
-PI
-Ye
+yN
+iT
+fA
+nx
+mJ
aa
aa
aa
@@ -53727,18 +53725,18 @@ oT
SI
SI
pi
-cv
+EK
On
Mc
Mc
Mc
On
-ox
+Yp
QV
-Bs
-CE
-ug
-du
+VD
+gg
+YQ
+bS
On
aa
aa
@@ -54241,7 +54239,7 @@ FS
pt
dP
yC
-zY
+FG
On
Mc
Mc
@@ -55023,7 +55021,7 @@ XI
ID
ID
ID
-CR
+Ug
ua
aa
aa
@@ -56811,13 +56809,13 @@ dt
Yz
ma
PZ
-Mb
+Ed
On
Mc
Mc
Mc
On
-cC
+Vb
zX
zX
qN
@@ -66027,7 +66025,7 @@ aa
aa
aa
we
-Mt
+jM
Nb
cu
Nb
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index b11d5dcf072b..41094ea9c1b1 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -5,32 +5,10 @@
"aac" = (
/turf/open/misc/asteroid/airless,
/area/station/asteroid)
-"aad" = (
-/obj/structure/cable,
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/sand/plating,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"aaf" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/central/greater)
"aag" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/central/greater)
-"aah" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/sign/warning/electric_shock{
- pixel_y = 32
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/central/greater)
"aai" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/turf_decal/stripes/asteroid/box,
@@ -48,11 +26,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/station/asteroid)
-"aal" = (
-/obj/effect/spawner/structure/electrified_grille,
-/obj/effect/turf_decal/sand/plating,
-/turf/open/floor/plating,
-/area/station/asteroid)
"aam" = (
/obj/machinery/power/solar{
id = "forestarboard";
@@ -313,11 +286,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/escapepodbay)
-"abc" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/prison)
"abd" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/marker_beacon/burgundy,
@@ -1286,11 +1254,6 @@
"adM" = (
/turf/closed/wall,
/area/station/medical/break_room)
-"adN" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"adO" = (
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/cafeteria,
@@ -1348,11 +1311,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/escapepodbay)
-"adX" = (
-/obj/structure/cable,
-/obj/structure/sink/kitchen/directional/east,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"adY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -1802,10 +1760,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"afL" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"afN" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -3423,15 +3377,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"atD" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
"atP" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
@@ -5770,32 +5715,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"aNA" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/cup/glass/mug/coco{
- pixel_x = -7;
- pixel_y = 7
- },
-/obj/item/reagent_containers/cup/glass/mug/coco{
- pixel_x = -6;
- pixel_y = -1
- },
-/obj/item/folder/yellow{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/item/pen{
- pixel_x = 6
- },
-/obj/machinery/light/neon_lining{
- icon_state = "pink2_1"
- },
-/obj/machinery/light/neon_lining{
- dir = 4;
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"aNO" = (
/obj/structure/cable,
/turf/open/floor/engine,
@@ -7461,6 +7380,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"blK" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"blN" = (
/obj/machinery/button/door/directional/west{
id = "private_r";
@@ -7590,6 +7513,11 @@
/obj/structure/chair/stool/directional/south,
/turf/open/floor/plating,
/area/station/asteroid)
+"bon" = (
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
+/turf/open/misc/asteroid/snow/coldroom,
+/area/station/service/kitchen/coldroom)
"bop" = (
/obj/machinery/button/door/directional/west{
id = "private_c";
@@ -7772,6 +7700,18 @@
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
+"brH" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison)
"bsf" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/portable_atmospherics/canister/bz,
@@ -8321,6 +8261,16 @@
},
/turf/open/floor/plastic,
/area/station/engineering/break_room)
+"bzi" = (
+/obj/machinery/duct,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table,
+/obj/item/storage/fancy/egg_box{
+ pixel_y = 7
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"bzk" = (
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/grass,
@@ -8957,6 +8907,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"bKr" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/quantum_server,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/bitden)
"bKs" = (
/obj/structure/table,
/obj/item/fuel_pellet,
@@ -9092,12 +9052,6 @@
/obj/machinery/bluespace_beacon,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/foyer)
-"bMV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/central/greater)
"bMX" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 1
@@ -9419,6 +9373,12 @@
},
/turf/open/floor/plating/elevatorshaft,
/area/station/science/lower)
+"bSy" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"bSI" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/glass/reinforced,
@@ -9485,6 +9445,23 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/eva)
+"bTD" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 8
+ },
+/area/station/security/bitden)
"bTJ" = (
/obj/structure/chair/office{
dir = 8
@@ -9516,6 +9493,20 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/right)
+"bUf" = (
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/bitden)
"bUh" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -9750,6 +9741,13 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/eighties,
/area/station/commons/fitness/recreation/entertainment)
+"bYn" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"bYs" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/engineering/canister,
@@ -10020,22 +10018,23 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"cbA" = (
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/light/neon_lining{
- dir = 4;
- icon_state = "pink2_1"
+"cbu" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 8;
+ piping_layer = 2
},
-/obj/machinery/light/neon_lining{
- dir = 1;
- icon_state = "pink2_1"
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/byteforge,
-/obj/effect/turf_decal/box,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/camera/directional/south{
+ c_tag = "Science - Mixing Lab";
+ network = list("ss13","rd")
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/burnchamber)
"cbG" = (
/obj/effect/landmark/start/security_officer,
/obj/structure/chair{
@@ -10166,6 +10165,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"cdD" = (
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/structure/cable,
+/obj/machinery/power/apc/worn_out/directional/west,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/obj/machinery/light/dim/directional/south,
+/turf/open/ballpit,
+/area/station/security/bitden)
"cdN" = (
/obj/machinery/button/ignition/incinerator/atmos,
/turf/closed/wall/r_wall,
@@ -10866,6 +10878,27 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"coR" = (
+/obj/machinery/light/directional/south,
+/obj/structure/closet/crate,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"coU" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -10898,11 +10931,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"cpy" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"cpG" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -11961,15 +11989,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"cIn" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/filled/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"cIq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/maint,
@@ -12121,23 +12140,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"cKy" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/neon_lining{
- dir = 8;
- icon_state = "pink2_1"
- },
-/obj/machinery/light/neon_lining{
- dir = 1;
- icon_state = "pink2_1"
- },
-/obj/machinery/computer/order_console/bitrunning,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"cKE" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weldingtool,
@@ -12422,12 +12424,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/science/lower)
-"cQD" = (
-/obj/structure/table/reinforced,
-/obj/structure/reagent_dispensers/servingdish,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"cQF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner{
@@ -12469,15 +12465,6 @@
},
/turf/closed/wall,
/area/station/hallway/primary/tram/center)
-"cRf" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/filled/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"cRu" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -12622,6 +12609,21 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/crew_quarters/dorms)
+"cUt" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"cUY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/engineering/canister,
@@ -12902,15 +12904,6 @@
/obj/effect/decal/cleanable/confetti,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/cargo)
-"cZl" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"cZo" = (
/obj/structure/sign/collision_counter{
pixel_x = -4;
@@ -13254,18 +13247,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"dfk" = (
-/obj/machinery/growing/soil,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 6
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/neutral/filled/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"dfs" = (
/obj/machinery/door/poddoor/preopen{
id = "atmos";
@@ -13395,6 +13376,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"dgD" = (
+/obj/item/stack/ore/glass,
+/obj/item/toy/basketball,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"dgE" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -13686,6 +13676,16 @@
"dlZ" = (
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/tram/left)
+"dmb" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/composters,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"dmf" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -13852,6 +13852,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
+"dox" = (
+/obj/effect/turf_decal/sand/plating,
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"doC" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/structure/cable,
@@ -13966,6 +13970,9 @@
/obj/structure/sink/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"dra" = (
+/turf/closed/wall/rock/porous,
+/area/station/security/bitden)
"drh" = (
/obj/structure/table,
/obj/machinery/fax{
@@ -14958,6 +14965,10 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
+"dId" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"dIv" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -15568,16 +15579,6 @@
},
/turf/open/floor/stone,
/area/station/science/xenobiology)
-"dQR" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/central/greater)
"dQX" = (
/obj/machinery/door/morgue{
name = "Relic Closet";
@@ -15613,10 +15614,6 @@
/obj/item/pillow/random,
/turf/open/floor/carpet,
/area/station/commons/dorms)
-"dRJ" = (
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"dRM" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/firealarm/directional/south,
@@ -16321,6 +16318,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"edk" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/structure/railing,
+/turf/open/floor/iron/dark/textured_corner,
+/area/station/security/bitden)
"edx" = (
/obj/effect/turf_decal/stripes/box,
/obj/structure/ladder,
@@ -18648,6 +18650,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"eRm" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"eRn" = (
/obj/structure/table/glass,
/obj/item/stack/medical/mesh,
@@ -18771,14 +18779,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
-"eTe" = (
-/obj/machinery/growing/soil,
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/effect/turf_decal/trimline/neutral/filled/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"eTl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -19048,6 +19048,11 @@
/obj/item/storage/belt/utility,
/turf/open/floor/iron,
/area/station/engineering/main)
+"eXs" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"eXB" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -19363,6 +19368,13 @@
},
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"feq" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/security/bitden)
"fez" = (
/obj/structure/chair{
dir = 8
@@ -19665,12 +19677,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/science/lower)
-"fiv" = (
-/obj/machinery/airalarm/kitchen_cold_room{
- pixel_y = -24
- },
-/turf/open/misc/asteroid/snow/coldroom,
-/area/station/service/kitchen/coldroom)
"fiA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
@@ -20516,14 +20522,6 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness)
-"fwh" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/effect/decal/cleanable/oil/streak,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"fwk" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -20535,6 +20533,19 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"fwr" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/growing/tray,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"fwA" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -20755,6 +20766,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"fzv" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison)
"fzz" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -20767,6 +20788,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"fzZ" = (
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"fAg" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
@@ -21295,6 +21325,13 @@
/obj/effect/turf_decal/trimline/neutral/filled/warning,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"fIM" = (
+/obj/machinery/door/airlock{
+ name = "Prison Stall"
+ },
+/obj/machinery/duct,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison)
"fJe" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/structure/cable,
@@ -21835,6 +21872,24 @@
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
+"fTa" = (
+/obj/machinery/duct,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -1;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"fTz" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood{
@@ -21991,17 +22046,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/checkpoint/engineering)
-"fXV" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/bitrunner,
-/obj/machinery/light/neon_lining{
- dir = 4;
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"fXY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -22031,6 +22075,13 @@
/obj/machinery/status_display/ai/directional/east,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
+"fYM" = (
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"fYW" = (
/obj/structure/grille,
/obj/structure/lattice,
@@ -22244,6 +22295,13 @@
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/auxlab/firing_range)
+"gcz" = (
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 1
+ },
+/mob/living/carbon/human/species/monkey/dukeman,
+/turf/open/floor/iron,
+/area/station/security/prison)
"gcE" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -23087,6 +23145,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"grD" = (
+/obj/machinery/stove,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"grN" = (
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 5
@@ -23176,6 +23239,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"gtW" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/popcorn/salty{
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/trash/waffles,
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/central/greater)
"gtZ" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/airalarm/directional/south,
@@ -23184,6 +23259,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"gud" = (
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 8
+ },
+/obj/structure/railing,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 8
+ },
+/area/station/security/bitden)
"gui" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23866,6 +23950,20 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
+"gFS" = (
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/bitden)
"gFV" = (
/obj/machinery/computer/operating{
dir = 1
@@ -24037,6 +24135,10 @@
},
/turf/open/floor/wood,
/area/station/command/meeting_room)
+"gIP" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"gIV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24156,6 +24258,17 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/drone_bay)
+"gKG" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/bitden)
"gKJ" = (
/obj/machinery/suit_storage_unit/ce,
/obj/machinery/airalarm/directional/north,
@@ -24224,11 +24337,6 @@
"gLI" = (
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"gLM" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/turf/closed/wall,
-/area/station/bitrunning/den)
"gLV" = (
/turf/open/misc/asteroid,
/area/station/maintenance/department/security)
@@ -24690,6 +24798,13 @@
},
/turf/open/floor/iron/dark,
/area/station/science/explab)
+"gSK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/station/maintenance/central/greater)
"gSQ" = (
/obj/machinery/door/airlock{
name = "Custodial Closet"
@@ -25122,6 +25237,10 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/art)
+"hbi" = (
+/obj/machinery/duct,
+/turf/open/floor/iron/freezer,
+/area/station/security/prison)
"hbq" = (
/mob/living/basic/sloth/paperwork,
/turf/open/floor/glass,
@@ -25571,6 +25690,21 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/greater)
+"hjX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/flashlight/lamp/green{
+ pixel_y = 9
+ },
+/obj/item/wirecutters{
+ pixel_x = -3;
+ pixel_y = -1
+ },
+/obj/structure/sign/poster/official/do_not_question{
+ pixel_y = 32
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/central)
"hkb" = (
/obj/structure/lattice/catwalk,
/obj/machinery/light/small/directional/west,
@@ -26026,12 +26160,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/prison/safe)
-"hst" = (
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"hsH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -26632,16 +26760,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plastic,
/area/station/engineering/break_room)
-"hDt" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/neon_lining{
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
+"hDD" = (
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soup_pot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"hDE" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/cable,
@@ -26896,6 +27020,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/maintenance/tram/right)
+"hIF" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Permabrig Maintenance"
+ },
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/station/maintenance/central/greater)
"hIH" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -27054,6 +27189,18 @@
/obj/structure/lattice/catwalk/mining,
/turf/open/lava,
/area/station/security/execution/education)
+"hLL" = (
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/bitden)
"hMb" = (
/obj/effect/turf_decal/caution/stand_clear/white{
dir = 8
@@ -27213,6 +27360,16 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"hNV" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 8
+ },
+/obj/structure/sink/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"hOd" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 1
@@ -28016,21 +28173,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"icw" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/mining/glass{
- name = "Bitrunning Den"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/obj/effect/landmark/navigate_destination/common/bitrunner,
-/turf/open/floor/iron,
-/area/station/bitrunning/den)
"icx" = (
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
@@ -29749,6 +29891,11 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"iFk" = (
+/obj/machinery/oven,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"iFz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -29828,6 +29975,15 @@
"iGG" = (
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"iGJ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/grunge{
+ name = "Bitrunner Den"
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"iGL" = (
/obj/structure/table,
/obj/item/assembly/timer{
@@ -31741,6 +31897,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard/central)
+"jkJ" = (
+/obj/machinery/growing/soil,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 1
+ },
+/obj/item/shovel/spade,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"jkM" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
@@ -31891,6 +32060,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/command/nuke_storage)
+"jnn" = (
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_corner,
+/area/station/security/bitden)
"jnq" = (
/turf/closed/wall,
/area/station/maintenance/central/lesser)
@@ -31979,12 +32163,6 @@
"joF" = (
/turf/open/floor/wood,
/area/station/command/meeting_room)
-"joG" = (
-/obj/structure/table,
-/obj/item/book/manual/chef_recipes,
-/obj/structure/sign/clock/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"joI" = (
/obj/structure/chair/office/light{
dir = 1
@@ -32066,6 +32244,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"jpG" = (
+/obj/machinery/duct,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"jpV" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -32266,27 +32448,13 @@
/obj/machinery/space_heater/improvised_chem_heater,
/turf/open/floor/plating,
/area/station/asteroid)
-"jsN" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/box/drinkingglasses,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
+"jsJ" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal/incinerator)
"jsW" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner,
/turf/open/floor/iron,
@@ -33940,6 +34108,12 @@
"jVw" = (
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"jVy" = (
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/grill,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"jVG" = (
/obj/structure/sign/warning/secure_area{
name = "HIGH SECURITY STORAGE";
@@ -34028,6 +34202,12 @@
/obj/machinery/light/dim/directional/north,
/turf/open/indestructible/dark,
/area/ruin/powered/clownplanet)
+"jWT" = (
+/obj/structure/sign/clock/directional/south,
+/obj/item/book/manual/chef_recipes,
+/obj/structure/table,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"jWY" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34463,6 +34643,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"kdv" = (
+/obj/machinery/smartfridge,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"kdw" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 6
@@ -35017,18 +35201,6 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/iron/smooth,
/area/station/maintenance/starboard/lesser)
-"kna" = (
-/obj/machinery/netpod,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/light/neon_lining{
- dir = 1;
- icon_state = "pink2_1"
- },
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/carpet/neon/simple/purple/nodots,
-/area/station/bitrunning/den)
"knl" = (
/obj/machinery/chem_dispenser/drinks{
pixel_y = 30;
@@ -35655,18 +35827,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"kzv" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "Prison Maintenance Access";
- security_level = 4
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/central/greater)
"kzw" = (
/obj/effect/spawner/random/vending/snackvend,
/obj/effect/turf_decal/stripes/line{
@@ -35825,6 +35985,11 @@
},
/turf/open/misc/asteroid,
/area/ruin/powered/clownplanet)
+"kCj" = (
+/obj/machinery/griddle,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"kCk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -36369,6 +36534,15 @@
},
/turf/open/misc/asteroid/airless,
/area/station/asteroid)
+"kJH" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"kJO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/fueltank,
@@ -36827,6 +37001,26 @@
/obj/structure/closet/lasertag/red,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/crew_quarters/dorms)
+"kPv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/closet/crate/hydroponics,
+/obj/item/botanical_lexicon,
+/obj/item/seeds/tree,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/seeds/pumpkin,
+/obj/item/seeds/wheat,
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/grass,
+/obj/item/seeds/carrot,
+/obj/item/seeds/tomato,
+/obj/item/seeds/potato,
+/obj/item/seeds/garlic,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/item/seeds/onion,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"kPx" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
@@ -37009,6 +37203,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"kSV" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/chem_dispenser/drinks/beer,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"kSZ" = (
/obj/effect/turf_decal/siding/wood/corner,
/obj/structure/disposalpipe/segment{
@@ -37359,6 +37559,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"kYd" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
+/obj/machinery/camera/emp_proof/directional/east{
+ c_tag = "Secure - Telecomms Server Room East"
+ },
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/station/tcommsat/server)
"kYk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -37440,16 +37648,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/white,
/area/station/science/lower)
-"kYZ" = (
-/obj/machinery/airalarm/server{
- dir = 4;
- pixel_x = 22
- },
-/obj/machinery/camera/emp_proof/directional/east{
- c_tag = "Secure - Telecomms Server Room East"
- },
-/turf/open/floor/circuit/telecomms/mainframe,
-/area/station/tcommsat/server)
"kZh" = (
/turf/open/floor/eighties/red,
/area/station/commons/fitness/recreation/entertainment)
@@ -38188,10 +38386,6 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"llf" = (
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"llk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -38274,6 +38468,14 @@
/obj/machinery/light/dim/directional/north,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"lma" = (
+/obj/machinery/processor{
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/table,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"lmk" = (
/obj/structure/window/spawner/directional/north,
/obj/effect/turf_decal/trimline/dark_green/filled/line{
@@ -38611,6 +38813,22 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"lqD" = (
+/obj/structure/table,
+/obj/machinery/light/directional/west,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/rollingpin,
+/obj/item/kitchen/rollingpin{
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"lqP" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -39674,6 +39892,21 @@
},
/turf/closed/wall,
/area/station/commons/vacant_room/commissary)
+"lMu" = (
+/obj/machinery/light/neon_lining,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/security/bitden)
"lMw" = (
/obj/machinery/door/airlock{
id_tag = "Toilet3";
@@ -39897,10 +40130,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
-"lPV" = (
-/obj/effect/spawner/structure/electrified_grille,
-/turf/open/floor/plating,
-/area/station/asteroid)
"lPY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -40105,15 +40334,6 @@
/obj/effect/spawner/random/engineering/material,
/turf/open/floor/iron/smooth,
/area/station/maintenance/starboard/lesser)
-"lSL" = (
-/obj/machinery/computer/quantum_console{
- dir = 1
- },
-/obj/machinery/light/neon_lining{
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"lSQ" = (
/obj/structure/disposalpipe/sorting/wrap/flip{
dir = 1
@@ -41364,6 +41584,25 @@
},
/turf/open/floor/glass,
/area/station/command/meeting_room)
+"mmy" = (
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/machinery/light/neon_lining,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 8
+ },
+/obj/item/food/kebab/tofu,
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/bitden)
"mmH" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "funnywindow"
@@ -41389,6 +41628,13 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/port/central)
+"mni" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/ballpit,
+/area/station/security/bitden)
"mnp" = (
/obj/machinery/door/airlock/external{
name = "Solar Maintenance"
@@ -41481,6 +41727,13 @@
"mos" = (
/turf/closed/wall,
/area/station/tcommsat/server)
+"mot" = (
+/obj/effect/turf_decal/sand,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"moz" = (
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
@@ -42213,6 +42466,9 @@
},
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
+"mCj" = (
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"mCx" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -42427,16 +42683,6 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/department/medical)
-"mFM" = (
-/obj/machinery/light/neon_lining{
- icon_state = "pink2_1"
- },
-/obj/machinery/light/neon_lining{
- dir = 8;
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"mFQ" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 1
@@ -42833,6 +43079,21 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"mMm" = (
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/machinery/light/neon_lining,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/bitden)
"mMn" = (
/obj/structure/closet/secure_closet/medical3,
/obj/item/clothing/glasses/hud/health,
@@ -43233,10 +43494,6 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron/smooth,
/area/station/maintenance/central/greater)
-"mST" = (
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/central/greater)
"mSY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/door/directional/east{
@@ -43355,6 +43612,11 @@
},
/turf/open/floor/glass/reinforced,
/area/station/security/brig)
+"mVR" = (
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"mVT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -43672,24 +43934,6 @@
},
/turf/open/floor/stone,
/area/station/science/xenobiology)
-"nbK" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 8;
- piping_layer = 2
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/directional/south{
- c_tag = "Science - Mixing Lab";
- network = list("ss13","rd")
- },
-/obj/machinery/airalarm/mixingchamber{
- pixel_y = -24
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/burnchamber)
"nbL" = (
/obj/structure/cable,
/mob/living/basic/pet/potty,
@@ -43872,10 +44116,6 @@
/obj/machinery/mineral/processing_unit_console,
/turf/closed/wall,
/area/station/maintenance/department/cargo)
-"nfy" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/bitrunning/den)
"nfB" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -43991,6 +44231,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"nhf" = (
+/obj/machinery/camera{
+ c_tag = "Security - Rec Room East";
+ dir = 6;
+ network = list("ss13","Security","prison")
+ },
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/vehicle/ridden/wheelchair,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/security/bitden)
"nhj" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -44230,6 +44487,12 @@
},
/turf/open/floor/plating,
/area/station/cargo/sorting)
+"nkB" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"nkE" = (
/obj/machinery/modular_computer/preset/civilian{
dir = 8
@@ -44656,6 +44919,11 @@
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/central/greater)
+"nqs" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/structure/cable,
+/turf/closed/wall/rock/porous,
+/area/station/security/bitden)
"nqv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/effect/landmark/blobstart,
@@ -45303,6 +45571,10 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"nAB" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/turf/open/floor/iron/dark/textured_corner,
+/area/station/security/bitden)
"nAF" = (
/obj/structure/railing,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -45552,6 +45824,17 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
+"nFg" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison)
"nFn" = (
/obj/structure/chair/office/light{
dir = 4
@@ -46095,16 +46378,6 @@
"nPe" = (
/turf/open/floor/carpet,
/area/station/medical/psychology)
-"nPx" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/external{
- name = "External Access"
- },
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"nPA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -46175,6 +46448,10 @@
},
/turf/open/floor/glass/reinforced,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"nPZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"nQc" = (
/obj/structure/industrial_lift/tram,
/obj/structure/window/reinforced/tram/directional/north,
@@ -46283,17 +46560,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"nRT" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"nRU" = (
/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -46340,6 +46606,18 @@
/obj/structure/beebox,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"nSo" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
+ dir = 8
+ },
+/obj/machinery/meter,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/freezerchamber)
"nSs" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -46524,15 +46802,6 @@
/obj/structure/cable/multilayer/connected,
/turf/open/floor/engine/hull/reinforced,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"nVL" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"nVP" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{
dir = 4
@@ -46805,6 +47074,15 @@
/obj/effect/turf_decal/trimline/white/warning,
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
+"oaE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bottle/ammonia{
+ pixel_x = 6
+ },
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/central/greater)
"oaI" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -46952,6 +47230,12 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"odq" = (
+/obj/effect/landmark/navigate_destination/common/bitrunner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"odr" = (
/turf/open/space/basic,
/area/station/cargo/mining/asteroid_magnet)
@@ -47389,6 +47673,15 @@
"okV" = (
/turf/open/misc/asteroid,
/area/station/maintenance/central/lesser)
+"ola" = (
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/turf/open/ballpit,
+/area/station/security/bitden)
"olc" = (
/obj/structure/table/wood,
/obj/item/camera_film{
@@ -47699,18 +47992,6 @@
/obj/item/wallframe/apc,
/turf/open/misc/asteroid,
/area/station/maintenance/department/security)
-"orC" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Permabrig Maintenance"
- },
-/obj/machinery/duct,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/central/greater)
"orH" = (
/obj/item/weldingtool/empty,
/obj/effect/decal/cleanable/dirt,
@@ -47847,6 +48128,9 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/smooth,
/area/station/maintenance/central/lesser)
+"otS" = (
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"otZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
@@ -47884,6 +48168,13 @@
/obj/structure/disposalpipe/junction/flip,
/turf/open/floor/iron,
/area/station/cargo/office)
+"ouG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor,
+/area/station/maintenance/central/greater)
"ouJ" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 9
@@ -48085,12 +48376,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor/iron,
/area/station/security/prison)
-"oyn" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"oyp" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -48119,6 +48404,21 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/tram/right)
+"oyN" = (
+/obj/machinery/light/neon_lining,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/security/bitden)
"oyQ" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood{
@@ -48183,6 +48483,11 @@
"ozQ" = (
/turf/open/floor/noslip/tram_plate,
/area/station/hallway/primary/tram/right)
+"ozR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/ballpit,
+/area/station/security/bitden)
"ozW" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
dir = 4
@@ -48449,6 +48754,13 @@
"oFd" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
+"oFi" = (
+/obj/effect/turf_decal/sand,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/security/prison/workout)
"oFo" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -48731,6 +49043,10 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/crew_quarters/dorms)
+"oKe" = (
+/obj/structure/sink/kitchen/directional/east,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"oKT" = (
/obj/structure/railing{
dir = 1
@@ -48820,6 +49136,26 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"oMd" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/item/cultivator,
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/item/cultivator,
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 8
+ },
+/obj/machinery/growing/tray,
+/obj/item/plant_analyzer,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"oMr" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -49015,15 +49351,6 @@
"oPQ" = (
/turf/closed/mineral/random/stationside/asteroid/porus,
/area/station/maintenance/starboard/lesser)
-"oQc" = (
-/obj/machinery/netpod,
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/light/neon_lining{
- dir = 1;
- icon_state = "pink2_1"
- },
-/turf/open/floor/carpet/neon/simple/purple/nodots,
-/area/station/bitrunning/den)
"oQd" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -49329,6 +49656,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"oVb" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"oVd" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
@@ -49490,6 +49821,13 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/crew_quarters/dorms)
+"oYr" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -7
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"oYs" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -49857,6 +50195,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
+"pgi" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/bitden)
"pgm" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -51157,22 +51507,6 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/mineral/titanium/blue,
/area/station/maintenance/starboard/central)
-"pAg" = (
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/obj/effect/decal/cleanable/oil/streak,
-/obj/structure/sign/poster/random/directional/north,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/light/neon_lining{
- dir = 8;
- icon_state = "pink2_1"
- },
-/obj/machinery/light/neon_lining{
- dir = 1;
- icon_state = "pink2_1"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/bitrunning/den)
"pAk" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/jungle/c/style_random,
@@ -51597,6 +51931,15 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/lesser)
+"pFu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/toy/plush/lizard_plushie{
+ pixel_y = 6;
+ pixel_x = 5
+ },
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/central/greater)
"pFw" = (
/obj/machinery/vending/modularpc,
/obj/item/radio/intercom/directional/east,
@@ -52625,6 +52968,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
+"pVw" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 4
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"pVA" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 1
@@ -52670,20 +53023,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"pWp" = (
-/obj/structure/closet/crate,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/breadslice/plain,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/potato,
-/obj/item/food/grown/onion,
-/obj/item/food/grown/onion,
-/obj/item/food/meat/rawcutlet/plain,
-/obj/item/food/meat/rawcutlet/plain,
-/obj/item/food/meat/rawcutlet/plain,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"pWt" = (
/obj/machinery/door/window/left/directional/north{
name = "The Monkey Pit";
@@ -52710,6 +53049,10 @@
},
/turf/open/floor/iron/stairs/medium,
/area/station/commons/dorms)
+"pWE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pWN" = (
/obj/structure/plaque/static_plaque/golden/commission/tram,
/obj/structure/disposalpipe/segment{
@@ -52803,16 +53146,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
-"pYS" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"pYZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/stripes/line{
@@ -52829,10 +53162,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/greater)
-"pZr" = (
-/mob/living/basic/mouse/brown/tom,
-/turf/open/misc/asteroid,
-/area/station/security/prison/workout)
"pZv" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/cable,
@@ -52978,6 +53307,19 @@
/obj/effect/spawner/random/entertainment/gambling,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/eva)
+"qbP" = (
+/obj/machinery/door/airlock/highsecurity{
+ name = "Prison Maintenance Access";
+ security_level = 4
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/central/greater)
"qbR" = (
/obj/item/pickaxe/mini,
/turf/open/misc/asteroid,
@@ -53176,6 +53518,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"qeV" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/machinery/deepfryer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"qfg" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -54557,6 +54906,16 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"qCI" = (
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/machinery/light/dim/directional/south,
+/turf/open/ballpit,
+/area/station/security/bitden)
"qCL" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -54834,19 +55193,6 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"qGw" = (
-/obj/machinery/growing/soil,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/neutral/filled/corner,
-/obj/item/cultivator,
-/obj/effect/turf_decal/trimline/neutral/filled/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"qGy" = (
/obj/structure/transit_tube/crossing,
/turf/open/floor/plating/airless,
@@ -55415,6 +55761,19 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"qPW" = (
+/obj/item/radio/intercom/prison/directional/south,
+/obj/machinery/camera/directional/south{
+ c_tag = "Security - Prison Cafeteria";
+ network = list("ss13","Security","prison")
+ },
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"qPX" = (
/obj/structure/table,
/obj/item/analyzer,
@@ -55626,21 +55985,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
-"qTQ" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
"qTR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{
dir = 8
@@ -56873,13 +57217,6 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/center)
-"rlQ" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"rlU" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 1
@@ -57414,16 +57751,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"rtM" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 8
- },
-/obj/effect/landmark/start/bitrunner,
-/obj/structure/chair{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"rtO" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/random/trash/bucket,
@@ -57766,15 +58093,6 @@
/obj/item/stock_parts/cell/high,
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"rAI" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"rAS" = (
/turf/closed/wall,
/area/station/service/library/lounge)
@@ -58320,18 +58638,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/office)
-"rLk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/flashlight/lamp/green{
- pixel_y = 9
- },
-/obj/item/wirecutters{
- pixel_x = -3;
- pixel_y = -1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/central)
"rLx" = (
/obj/effect/turf_decal/trimline/white/warning{
dir = 8
@@ -58844,18 +59150,6 @@
},
/turf/open/floor/plating,
/area/station/ai_monitored/command/nuke_storage)
-"rTc" = (
-/obj/structure/railing{
- layer = 3.1;
- dir = 4
- },
-/obj/machinery/netpod,
-/obj/machinery/light/neon_lining{
- dir = 1;
- icon_state = "pink2_1"
- },
-/turf/open/floor/carpet/neon/simple/purple/nodots,
-/area/station/bitrunning/den)
"rTm" = (
/obj/structure/sign/warning/vacuum/external{
pixel_x = 32
@@ -59393,6 +59687,11 @@
/obj/effect/spawner/random/engineering/tool,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"sdK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/mob/living/basic/mouse/brown/tom,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"sdN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -59911,16 +60210,6 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"smV" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/obj/item/radio/intercom/prison/directional/south,
-/obj/machinery/camera/directional/south{
- c_tag = "Security - Prison Cafeteria";
- network = list("ss13","Security","prison")
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"sne" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -59937,6 +60226,11 @@
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/dorms)
+"snA" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"snC" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 4
@@ -60241,6 +60535,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/chapel,
/area/station/service/chapel)
+"ssU" = (
+/obj/item/radio/intercom/prison/directional/east,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Security - Prison Garden";
+ dir = 6;
+ network = list("ss13","Security","prison")
+ },
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"stc" = (
/obj/machinery/duct,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -60270,20 +60580,6 @@
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"sts" = (
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/light/neon_lining{
- dir = 8;
- icon_state = "pink2_1"
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 4
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo - Bitrunning Den"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"stt" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/warning,
@@ -60440,6 +60736,14 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"svu" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/light/dim/directional/south,
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/bitden)
"svC" = (
/obj/machinery/door/airlock/security/glass{
name = "Holding Area"
@@ -60854,6 +61158,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"sCr" = (
+/obj/machinery/light/neon_lining,
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/security/bitden)
"sCs" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
@@ -61060,16 +61380,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"sFE" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
"sFF" = (
/obj/machinery/telecomms/broadcaster/preset_right,
/turf/open/floor/iron/dark/telecomms,
@@ -62295,11 +62605,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/central/greater)
-"sYd" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/sand/plating,
-/turf/open/floor/plating,
-/area/station/asteroid)
"sYh" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
@@ -62481,29 +62786,9 @@
icon_state = "clown_carpet"
},
/area/station/security/execution/education)
-"tbu" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/external{
- name = "External Access"
- },
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/permabrig,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"tby" = (
/turf/open/floor/iron/white,
/area/station/science/research)
-"tbA" = (
-/obj/machinery/growing/soil,
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 9
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"tbF" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -63377,20 +63662,6 @@
},
/turf/open/floor/noslip/tram_plate,
/area/station/hallway/primary/tram/right)
-"toN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
- dir = 8
- },
-/obj/machinery/meter,
-/obj/machinery/airalarm/mixingchamber{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/freezerchamber)
"toY" = (
/obj/structure/table/wood,
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
@@ -63925,6 +64196,18 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"txf" = (
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/item/secateurs{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/item/secateurs{
+ pixel_x = -9;
+ pixel_y = -9
+ },
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"txh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64140,9 +64423,6 @@
/obj/machinery/light/very_dim/directional/south,
/turf/open/floor/iron/dark/herringbone,
/area/ruin/powered/clownplanet)
-"tAX" = (
-/turf/closed/wall,
-/area/station/bitrunning/den)
"tBa" = (
/obj/effect/turf_decal/box/red,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -64956,6 +65236,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
+"tQE" = (
+/obj/structure/closet/crate,
+/obj/item/food/breadslice/plain,
+/obj/item/food/breadslice/plain,
+/obj/item/food/breadslice/plain,
+/obj/item/food/grown/potato,
+/obj/item/food/grown/potato,
+/obj/item/food/grown/onion,
+/obj/item/food/grown/onion,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"tQK" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -65642,11 +65933,6 @@
/obj/structure/sink/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
-"uca" = (
-/obj/item/stack/ore/glass,
-/obj/item/toy/basketball,
-/turf/open/misc/asteroid,
-/area/station/security/prison/workout)
"uck" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -65672,6 +65958,11 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"ucy" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/iron/dark/textured_corner,
+/area/station/security/bitden)
"ucA" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/red/filled/corner{
@@ -65901,6 +66192,10 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
+"uhy" = (
+/obj/structure/cable,
+/turf/closed/wall/rock/porous,
+/area/station/security/bitden)
"uhF" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -67119,27 +67414,6 @@
},
/turf/open/floor/plating,
/area/station/science/robotics/mechbay)
-"uzT" = (
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 1
- },
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"uzX" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -67187,6 +67461,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"uAE" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/storage/crayons{
+ pixel_y = 7
+ },
+/turf/open/floor/iron,
+/area/station/security/prison)
"uAK" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark,
@@ -68275,20 +68558,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
-"uSF" = (
-/obj/item/radio/intercom/prison/directional/east,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Security - Prison Garden";
- dir = 6;
- network = list("ss13","Security","prison")
- },
-/obj/machinery/composters,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"uSL" = (
/obj/effect/turf_decal/delivery/white,
/obj/structure/fluff/tram_rail/floor,
@@ -68324,16 +68593,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"uTq" = (
-/obj/machinery/growing/soil,
-/obj/machinery/status_display/evac/directional/north,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/filled/corner,
-/obj/effect/turf_decal/trimline/neutral/filled/line,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"uTz" = (
/obj/structure/railing{
dir = 8
@@ -69455,19 +69714,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/station/service/chapel/monastery)
-"vkk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/stool/directional/west,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/restraints/handcuffs{
- pixel_x = -3;
- pixel_y = 10
- },
-/obj/structure/sign/poster/official/do_not_question{
- pixel_y = 32
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/central)
"vkm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
@@ -69801,6 +70047,22 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"vph" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"vpo" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/radio{
@@ -70290,6 +70552,15 @@
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"vup" = (
+/obj/machinery/growing/soil,
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 4
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"vuO" = (
/obj/structure/bed/roller,
/turf/open/floor/iron/white,
@@ -70469,6 +70740,11 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/department/medical)
+"vxV" = (
+/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"vyo" = (
/obj/machinery/duct,
/obj/structure/cable,
@@ -70610,15 +70886,6 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
-"vAp" = (
-/obj/machinery/growing/soil,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/item/shovel/spade,
-/obj/effect/turf_decal/trimline/neutral/filled/corner,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/garden)
"vAs" = (
/obj/structure/railing,
/turf/open/openspace,
@@ -71029,6 +71296,21 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"vGx" = (
+/obj/machinery/light/neon_lining{
+ dir = 4
+ },
+/obj/machinery/light/neon_lining,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/security/bitden)
"vGB" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -71318,32 +71600,6 @@
/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
-"vMH" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/structure/sink{
- dir = 4;
- pixel_x = -12
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/closet/crate/hydroponics,
-/obj/item/seeds/onion,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/seeds/garlic,
-/obj/item/seeds/potato,
-/obj/item/seeds/tomato,
-/obj/item/seeds/carrot,
-/obj/item/seeds/grass,
-/obj/item/seeds/ambrosia,
-/obj/item/seeds/wheat,
-/obj/item/seeds/pumpkin,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/seeds/tree,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"vMI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -72769,18 +73025,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"wjX" = (
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/start/bitrunner,
-/obj/machinery/light/neon_lining{
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"wki" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
@@ -72797,9 +73041,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical)
-"wkk" = (
-/turf/open/floor/iron/freezer,
-/area/station/security/prison)
"wkp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -72934,6 +73175,10 @@
/obj/item/reagent_containers/syringe,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
+"wmE" = (
+/obj/structure/cable,
+/turf/closed/wall/r_wall,
+/area/station/security/bitden)
"wmK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -73073,6 +73318,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/tram/right)
+"wps" = (
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 8
+ },
+/area/station/security/bitden)
"wpz" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch"
@@ -73925,17 +74178,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"wBk" = (
-/obj/machinery/quantum_server,
-/obj/machinery/light/neon_lining{
- icon_state = "pink2_1"
- },
-/obj/machinery/light/neon_lining{
- dir = 4;
- icon_state = "pink2_1"
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/bitrunning/den)
"wBp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/lattice/catwalk,
@@ -74590,6 +74832,23 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/ordnance/testlab)
+"wMB" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Security - Rec Room West";
+ network = list("ss13","Security","prison")
+ },
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/bitden)
"wMD" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -74812,6 +75071,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"wQO" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/obj/item/shovel/spade,
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/item/shovel/spade,
+/obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/machinery/growing/tray,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"wQP" = (
/turf/closed/wall,
/area/station/maintenance/starboard/lesser)
@@ -75310,6 +75581,23 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"xaK" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_y = 4;
+ pixel_x = 7
+ },
+/turf/open/floor/iron,
+/area/station/security/prison)
"xaR" = (
/obj/effect/mapping_helpers/airlock/access/all/service/general,
/obj/effect/turf_decal/trimline/neutral/filled/line,
@@ -75428,6 +75716,15 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
+"xdD" = (
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 9
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/growing/tray,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/garden)
"xdG" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 5
@@ -75881,6 +76178,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/commons/dorms)
+"xmg" = (
+/obj/machinery/light/neon_lining{
+ dir = 1
+ },
+/obj/machinery/computer/quantum_console,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/bitden)
"xmm" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/structure/sign/gym/mirrored/right{
@@ -76457,6 +76764,11 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"xxk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/bitden)
"xxl" = (
/obj/effect/turf_decal/sand/plating,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -77145,6 +77457,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"xKZ" = (
+/obj/machinery/light/neon_lining{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/turf/open/ballpit,
+/area/station/security/bitden)
"xLb" = (
/obj/structure/dresser,
/obj/item/clothing/mask/cigarette/cigar/havana,
@@ -77291,10 +77612,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lower)
-"xNm" = (
-/obj/effect/turf_decal/trimline/neutral/filled/corner,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"xNq" = (
/obj/machinery/iv_drip,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -77777,6 +78094,16 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"xVK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/stool/directional/west,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/restraints/handcuffs{
+ pixel_x = -3;
+ pixel_y = 10
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/central)
"xVQ" = (
/obj/structure/closet/lasertag/red,
/obj/effect/turf_decal/tile/red/full,
@@ -94187,11 +94514,11 @@ aaa
aaa
aaa
aaa
-abM
-abM
-abM
-abM
-abM
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -94213,9 +94540,9 @@ jWs
jWs
jWs
jWs
-aaa
-aaa
-aaa
+oVM
+oVM
+oVM
aaa
aaa
aaa
@@ -94442,16 +94769,16 @@ aac
aaa
aaa
aaa
-abM
-abM
-abM
-abM
-abM
-abM
-abM
-abM
aaa
-abM
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -94467,12 +94794,12 @@ rau
cnD
kRI
jWs
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+oKe
+fYM
+lqD
+oYr
+nkB
+oVM
aaa
aaa
aaa
@@ -94697,20 +95024,20 @@ vXM
aac
aaa
aaa
-abM
-abM
-abM
-aal
-aal
-aal
-aal
-aal
-aal
-abM
-abM
-abM
-abM
-abM
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
jWs
jvE
@@ -94724,12 +95051,12 @@ kYr
trx
wro
jWs
-aaa
-aaa
-aaa
-aaa
-aaa
-pZW
+jpG
+mgS
+mgS
+mgS
+kCj
+oVM
pZW
pZW
pZW
@@ -94948,26 +95275,26 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
+aaa
+aaa
+aaa
aac
aaa
aaa
-abM
-aal
-aal
-aal
+aaa
+aaa
+aaa
+aaa
bhr
ryo
bhr
bhr
-aal
-aal
-aal
-aal
-aal
-aal
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
jWs
jvE
@@ -94981,12 +95308,12 @@ ggX
jWs
oVM
oVM
+jpG
+mgS
+mgS
+mgS
+kCj
oVM
-oVM
-oVM
-oVM
-aaa
-pZW
nhN
gtB
pZW
@@ -95204,15 +95531,15 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
aaa
aaa
-abM
-abM
-lPV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
bhr
bhr
bhr
@@ -95237,14 +95564,14 @@ neR
jGY
oEN
oVM
-adN
-adX
-dRJ
-pWp
+qeV
+mVR
+hDD
+grD
+mgS
+bLk
oVM
-aaa
-pZW
-rLk
+hjX
gtB
qLG
lRi
@@ -95461,15 +95788,15 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
aaa
aaa
-abM
-aal
-lPV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
kPC
lFk
lFk
@@ -95494,14 +95821,14 @@ abo
foy
gAS
dSe
-llf
+jVy
jPP
-edg
-joG
+fTa
+iFk
+mgS
+jWT
oVM
-aaa
-pZW
-vkk
+xVK
gtB
pZW
qJa
@@ -95716,16 +96043,16 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+dra
+mCj
+mCj
+mCj
+dra
+aaa
+aaa
+aaa
aaa
aaa
-abM
-aal
bhr
bhr
lFk
@@ -95750,14 +96077,14 @@ cSR
iZL
rBz
ung
-cQD
+kSV
mgS
-bLk
-edg
-smV
+mgS
+bzi
+grD
+mgS
+qPW
oVM
-aaa
-pZW
pZW
pZW
pZW
@@ -95973,16 +96300,16 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+dra
+jnn
+bUf
+lMu
+mCj
+mCj
+dra
+aaa
aaa
aaa
-abM
-aal
bhr
lFk
lFk
@@ -95996,9 +96323,9 @@ uyJ
smj
ryo
uLz
-fZX
-wkk
-fZX
+fIM
+hbi
+fIM
jLj
gvI
rAZ
@@ -96007,16 +96334,16 @@ mIN
dlJ
rBz
ung
-fZm
+eRm
+mgS
mgS
-bLk
edg
-jsN
+mgS
+mgS
+coR
oVM
aaa
aaa
-aaa
-aaa
pZW
oCT
nlh
@@ -96230,21 +96557,21 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+mCj
+gKG
+otS
+wps
+wMB
+sCr
+mCj
+mCj
aaa
aaa
-abM
-aal
ryo
bCc
lFk
-lFk
-lFk
+iqH
+iqH
lFk
lFk
jZM
@@ -96254,7 +96581,7 @@ smj
ryo
nlp
gvI
-wkk
+hbi
gvI
nlp
gvI
@@ -96264,17 +96591,17 @@ oCk
thP
rBz
ung
-fZm
+eXs
mgS
-afL
+sdK
jBD
-cpy
+mgS
+tQE
+lma
oVM
aaa
aaa
aaa
-aaa
-aaa
rUR
rUR
rUR
@@ -96487,20 +96814,20 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+mCj
+pgi
+pVw
+otS
+otS
+wps
+oyN
+dra
aaa
aaa
-abM
-aal
bhr
lFk
-lFk
-lFk
+uyJ
+iqH
lFk
lFk
lFk
@@ -96521,11 +96848,11 @@ wyM
lkP
rBz
ung
-cQD
+fZm
adO
mgS
jBD
-bLk
+kdv
rUR
rUR
rUR
@@ -96744,23 +97071,23 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-aaa
-aaa
-aaa
-abM
-aal
-bhr
+mCj
+bKr
+fzZ
+oVb
+dId
+dId
+svu
+dra
+dra
+dox
+dra
cRM
+iqH
lFk
lFk
-lFk
-lFk
-lFk
+jZM
+jZM
lFk
lFk
jZM
@@ -96772,7 +97099,7 @@ fqn
jAF
gvI
pAR
-hst
+gcz
rBz
wyM
lkP
@@ -97001,25 +97328,25 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-aaa
-aaa
-aaa
-abM
-aal
-ryo
-lFk
-lFk
-lFk
-lFk
-lFk
+mCj
+xmg
+fzZ
+otS
+otS
+dId
+gud
+xKZ
+xKZ
+cdD
+wmE
lFk
+uyJ
+iqH
+jZM
lFk
+jZM
lFk
+iqH
jZM
ftv
tBN
@@ -97031,7 +97358,7 @@ mHA
vNe
rBz
fPy
-cSR
+uAE
duC
rBz
upt
@@ -97258,29 +97585,29 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-aaa
-aaa
-aaa
-abM
-aal
-ryo
-lFk
-lFk
-uca
-lFk
-lFk
-lFk
-lFk
-jZM
-iqH
-ftv
+dra
+feq
+fzZ
+blK
+snA
+xxk
+odq
+ozR
+ozR
+mni
+iGJ
+bSy
+bYn
+dgD
+bSy
+bSy
+bYn
+bYn
+bYn
+mot
+oFi
gWM
-abc
+abj
abi
oxN
abn
@@ -97515,20 +97842,20 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-aaa
-aaa
-aaa
-abM
-aal
-kPC
-lFk
-lFk
+dra
+feq
+fzZ
+otS
+otS
+nPZ
+edk
+ola
+ola
+qCI
+wmE
lFk
+jZM
+jZM
lFk
lFk
lFk
@@ -97772,24 +98099,24 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-aaa
-aaa
-aaa
-abM
-aal
-bhr
+mCj
+feq
+fzZ
+gIP
+nPZ
+nPZ
+svu
+dra
+dra
+nqs
+uhy
cRM
lFk
+jZM
+jZM
lFk
lFk
lFk
-pZr
-lFk
lFk
lFk
kvd
@@ -98029,23 +98356,23 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
-aaa
+dra
+hLL
+kJH
+otS
+otS
+ucy
+vGx
+mCj
aaa
aaa
-abM
-aal
bhr
lFk
lFk
lFk
lFk
-lFk
-lFk
+iqH
+iqH
lFk
jZM
iqH
@@ -98286,22 +98613,22 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+mCj
+gKG
+otS
+nAB
+nhf
+mmy
+dra
+dra
aaa
aaa
-aaa
-abM
-aal
ryo
fwW
lFk
-lFk
-lFk
-lFk
+uyJ
+iqH
+uyJ
lFk
lFk
iqH
@@ -98543,21 +98870,21 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+dra
+bTD
+gFS
+mMm
+mCj
+mCj
+mCj
aaa
aaa
aaa
-abM
-aal
bhr
lFk
lFk
-lFk
-lFk
+iqH
+uyJ
lFk
jZM
iqH
@@ -98800,16 +99127,16 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
-vXM
+dra
+dra
+mCj
+mCj
+dra
+aaa
+aaa
aaa
aaa
aaa
-abM
-aal
bhr
bhr
lFk
@@ -99058,16 +99385,16 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
-vXM
-vXM
aaa
aaa
aaa
-abM
-aal
-aal
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
kPC
lFk
lFk
@@ -99316,15 +99643,15 @@ vXM
vXM
vXM
vXM
-vXM
-vXM
aaa
aaa
aaa
-abM
-abM
-abM
-aal
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
bhr
bhr
ryo
@@ -99343,7 +99670,7 @@ isW
isW
isW
isW
-cRf
+fzv
doY
aFs
oEN
@@ -99574,16 +99901,16 @@ vXM
vXM
vXM
vXM
-vXM
aaa
aaa
-abM
-sYd
-sYd
-sYd
-aal
-aal
-aal
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
bhr
kPC
bhr
@@ -99600,7 +99927,7 @@ aby
kTw
aaL
isW
-sFE
+nFg
abL
jMu
oEN
@@ -99834,16 +100161,16 @@ vXM
vXM
aaa
aaa
-abM
-sYd
-abM
-abM
aaa
aaa
-aal
-aal
-aal
-aal
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
pxW
ugu
xke
@@ -99857,7 +100184,7 @@ ugu
xfd
nOe
isW
-nRT
+brH
lPU
thG
vRO
@@ -100092,7 +100419,7 @@ vXM
aaa
aaa
aaa
-sYd
+aaa
aaa
aaa
xwf
@@ -100349,15 +100676,15 @@ vXM
aaa
aaa
aaa
-sYd
-hFr
-hFr
+aaa
+aaa
+aaa
xwf
-aaf
+gtW
dqp
dqp
anU
-orC
+hIF
ddN
dLN
xXt
@@ -100605,13 +100932,13 @@ vXM
vXM
aaa
aaa
-abM
-sYd
-nPx
-aad
-tbu
-mST
-bMV
+aaa
+aaa
+aaa
+aaa
+xwf
+oaE
+ouG
nMu
vzY
xwf
@@ -100862,13 +101189,13 @@ vXM
vXM
vXM
aaa
-abM
-abM
-hFr
-hFr
+aaa
+aaa
+aaa
+aaa
xwf
-aah
-dQR
+pFu
+gSK
pAl
vzY
xwf
@@ -101125,7 +101452,7 @@ aaa
aaa
xwf
sul
-kzv
+qbP
xwf
xwf
xwf
@@ -101400,7 +101727,7 @@ eBz
aaM
isW
yie
-nVL
+xaK
aFs
oEN
aaa
@@ -101912,9 +102239,9 @@ hFr
qDc
mSK
duB
-tbA
+xdD
sTq
-vMH
+dmb
eay
odb
duB
@@ -102169,11 +102496,11 @@ wxM
hsH
pIt
duB
-vAp
+wQO
gJR
cOv
-xNm
-eTe
+txf
+vup
duB
aaa
aaa
@@ -102426,9 +102753,9 @@ hFr
sYb
cAU
duB
-uTq
+fwr
ecs
-cOv
+kPv
biS
tgZ
duB
@@ -102683,11 +103010,11 @@ hFr
cNy
hFr
duB
-qGw
+oMd
kwk
acV
adq
-dfk
+jkJ
duB
aaa
aaa
@@ -102941,7 +103268,7 @@ aak
aac
duB
duB
-cIn
+hNV
arI
tWy
duB
@@ -103199,7 +103526,7 @@ aac
aaa
duB
cFO
-uSF
+ssU
koO
duB
aaa
@@ -106867,7 +107194,7 @@ dwR
ney
muK
pGS
-kYZ
+kYd
rME
dnE
ney
@@ -110133,7 +110460,7 @@ pKI
kav
jyC
cDO
-qTQ
+vph
nUP
clR
pnk
@@ -110403,7 +110730,7 @@ pVJ
nUP
fgH
aeo
-fiv
+bon
iRL
snQ
iRL
@@ -118695,7 +119022,7 @@ haI
qWU
pts
tuj
-atD
+jsJ
rnA
hBY
atX
@@ -128452,7 +128779,7 @@ dfz
vqa
uIk
uIk
-toN
+nSo
vjT
fjn
mBW
@@ -129994,7 +130321,7 @@ dfz
vqO
edP
edP
-nbK
+cbu
hBl
hBl
gkD
@@ -161252,11 +161579,11 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
jhd
jhd
aac
@@ -161509,13 +161836,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aac
aac
aac
@@ -161766,13 +162093,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aac
aac
aac
@@ -162023,13 +162350,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aac
aac
aaa
@@ -162280,13 +162607,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aac
aac
aaa
@@ -162537,13 +162864,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aac
aac
aaa
@@ -162794,13 +163121,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aac
aaa
aaa
@@ -163051,13 +163378,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aaa
aaa
aaa
@@ -163308,13 +163635,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aaa
aaa
aaa
@@ -163565,13 +163892,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aaa
aaa
aaa
@@ -163822,13 +164149,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aaa
aaa
aaa
@@ -164079,13 +164406,13 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
+vUu
aaa
aaa
aaa
@@ -164336,11 +164663,11 @@ jhd
jhd
jhd
jhd
-jhd
-jhd
-jhd
-jhd
-jhd
+vUu
+vUu
+vUu
+vUu
+vUu
jhd
aaa
aaa
@@ -186730,11 +187057,11 @@ aaa
aaa
aaa
aaa
-tAX
-tAX
-tAX
-tAX
-tAX
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -186987,11 +187314,11 @@ aaa
aaa
aaa
aaa
-tAX
-cKy
-sts
-mFM
-tAX
+aaa
+aaa
+aaa
+aaa
+cTU
lZW
lZW
lZW
@@ -187244,11 +187571,11 @@ aaa
aaa
aaa
aaa
-tAX
-kna
-fwh
-lSL
-tAX
+aaa
+aaa
+aaa
+aaa
+cTU
vSI
vSI
vSI
@@ -187501,11 +187828,11 @@ aaa
aaa
aaa
aaa
-tAX
-oQc
-pYS
-wBk
-tAX
+aaa
+aaa
+aaa
+aaa
+cTU
vSI
vSI
vSI
@@ -187757,12 +188084,12 @@ aaa
aaa
aaa
aaa
-tAX
-gLM
-rTc
-wjX
-tAX
-tAX
+aaa
+aaa
+aaa
+aaa
+cTU
+cTU
ohS
eaI
ohS
@@ -188014,11 +188341,11 @@ aac
aaa
aaa
aaa
-tAX
-pAg
-rAI
-hDt
-tAX
+aaa
+aaa
+aaa
+aaa
+cTU
exr
pZA
uax
@@ -188271,11 +188598,11 @@ aac
aac
aaa
aaa
-tAX
-cbA
-fXV
-aNA
-tAX
+aaa
+aaa
+aaa
+aaa
+cTU
kqy
pZA
uax
@@ -188528,11 +188855,11 @@ aac
aaa
aaa
cTU
-tAX
-nfy
-icw
-nfy
-tAX
+cTU
+cTU
+cTU
+cTU
+cTU
nnb
pZA
ayr
@@ -188787,8 +189114,8 @@ aaa
cTU
aSo
tAJ
-uzT
-rtM
+cUt
+qzr
qzr
rwo
dij
@@ -189044,13 +189371,13 @@ aaa
akr
tjS
hFV
-cZl
-dzw
-dzw
-dzw
-dzw
-rlQ
-oyn
+gDr
+uax
+uax
+uax
+pWE
+vxV
+pWE
dzw
msn
qza
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
index f244e20dfd0c..70db4140a340 100644
--- a/_maps/shuttles/arrival_box.dmm
+++ b/_maps/shuttles/arrival_box.dmm
@@ -14,6 +14,7 @@
/area/shuttle/arrival)
"d" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
"e" = (
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
index bfd93a051327..76fc4e69d81f 100644
--- a/_maps/shuttles/arrival_delta.dmm
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -39,6 +39,7 @@
/area/shuttle/arrival)
"ah" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
"ai" = (
diff --git a/_maps/shuttles/arrival_donut.dmm b/_maps/shuttles/arrival_donut.dmm
index b2fc86eb5afe..bfe55c9bfd11 100644
--- a/_maps/shuttles/arrival_donut.dmm
+++ b/_maps/shuttles/arrival_donut.dmm
@@ -56,6 +56,7 @@
/area/shuttle/arrival)
"o" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
"p" = (
diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm
index d5f11e4d28e3..6629438b3009 100644
--- a/_maps/shuttles/arrival_kilo.dmm
+++ b/_maps/shuttles/arrival_kilo.dmm
@@ -101,6 +101,7 @@
dir = 8
},
/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
"ap" = (
@@ -323,6 +324,11 @@
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/arrival)
+"NS" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
(1,1,1) = {"
aa
@@ -358,7 +364,7 @@ aX
aW
aQ
aY
-af
+NS
"}
(5,1,1) = {"
ae
@@ -376,7 +382,7 @@ rV
ay
aV
aN
-af
+NS
"}
(7,1,1) = {"
af
@@ -385,7 +391,7 @@ rV
az
aV
aN
-af
+NS
"}
(8,1,1) = {"
af
@@ -394,7 +400,7 @@ rV
ab
aV
aN
-af
+NS
"}
(9,1,1) = {"
ac
@@ -444,9 +450,9 @@ ag
(14,1,1) = {"
ag
ac
-af
-af
-af
+NS
+NS
+NS
ac
ag
"}
diff --git a/_maps/shuttles/arrival_northstar.dmm b/_maps/shuttles/arrival_northstar.dmm
index fa1b7c43f2f5..0b3017bfd276 100644
--- a/_maps/shuttles/arrival_northstar.dmm
+++ b/_maps/shuttles/arrival_northstar.dmm
@@ -180,6 +180,7 @@
/area/shuttle/arrival)
"Z" = (
/obj/effect/spawner/structure/window/survival_pod,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
index 9490cf5a8e24..308ac57be322 100644
--- a/_maps/shuttles/arrival_pubby.dmm
+++ b/_maps/shuttles/arrival_pubby.dmm
@@ -14,6 +14,7 @@
/area/shuttle/arrival)
"d" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
"e" = (
@@ -68,6 +69,7 @@
name = "Ship Shutters"
},
/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/arrival)
"n" = (
diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
index 7380fe8fe3ff..042a243d8911 100644
--- a/_maps/shuttles/emergency_monastery.dmm
+++ b/_maps/shuttles/emergency_monastery.dmm
@@ -180,11 +180,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"bK" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/watermelon/holy,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"bT" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -864,10 +859,9 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"mQ" = (
+"mR" = (
/obj/machinery/growing/soil,
-/obj/machinery/light/small/directional/north,
-/obj/item/seeds/watermelon/holy,
+/obj/item/seeds/carrot,
/turf/open/floor/grass,
/area/shuttle/escape)
"nb" = (
@@ -947,6 +941,12 @@
},
/turf/open/space,
/area/shuttle/escape)
+"on" = (
+/obj/machinery/growing/soil,
+/obj/item/seeds/sugarcane,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"ov" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/camera/directional/east{
@@ -983,13 +983,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"oI" = (
-/obj/machinery/airalarm/unlocked{
- pixel_y = 23;
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/shuttle/escape)
"oS" = (
/obj/structure/chair/wood{
dir = 1
@@ -1513,6 +1506,12 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"wf" = (
+/obj/machinery/growing/soil,
+/obj/machinery/light/small/directional/south,
+/obj/item/seeds/poppy,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"wp" = (
/turf/open/floor/iron/chapel{
dir = 4
@@ -1522,6 +1521,11 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"wL" = (
+/obj/machinery/growing/soil,
+/obj/item/seeds/wheat,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"wS" = (
/obj/machinery/camera/directional/east{
c_tag = "Monastery Secondary Dock";
@@ -1684,6 +1688,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"yY" = (
+/obj/machinery/growing/soil,
+/obj/machinery/light/small/directional/north,
+/obj/item/seeds/watermelon/holy,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"yZ" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -1913,6 +1923,11 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"BH" = (
+/obj/machinery/growing/soil,
+/obj/item/seeds/sugarcane,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"BQ" = (
/obj/machinery/door/airlock{
id_tag = "Cell1";
@@ -2143,23 +2158,12 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"EL" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/carrot,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"ET" = (
/obj/structure/flora/bush/flowers_pp/style_random,
/obj/structure/flora/bush/flowers_br/style_random,
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/floor/grass,
/area/shuttle/escape)
-"EU" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/wheat,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"Fa" = (
/obj/structure/table/wood,
/obj/item/disk/nuclear/fake,
@@ -2198,6 +2202,11 @@
/obj/machinery/reagentgrinder,
/turf/open/floor/iron,
/area/shuttle/escape)
+"Fu" = (
+/obj/machinery/growing/soil,
+/obj/item/seeds/poppy,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"Fx" = (
/obj/structure/table,
/obj/item/reagent_containers/condiment/saltshaker{
@@ -2266,7 +2275,7 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"Gk" = (
+"Gp" = (
/obj/machinery/growing/soil,
/obj/item/seeds/harebell,
/turf/open/floor/grass,
@@ -2304,6 +2313,12 @@
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/shuttle/escape)
+"GQ" = (
+/obj/machinery/growing/soil,
+/obj/item/seeds/wheat,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"GU" = (
/obj/structure/flora/bush/flowers_yw/style_random,
/obj/structure/flora/bush/flowers_pp/style_random,
@@ -2348,11 +2363,6 @@
"HD" = (
/turf/open/floor/iron/chapel,
/area/shuttle/escape)
-"HL" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/poppy,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"HS" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/obj/structure/flora/bush/flowers_br/style_random,
@@ -2634,6 +2644,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"Lj" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron/dark,
+/area/shuttle/escape)
"Ll" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/machinery/light/small/directional/north,
@@ -2950,11 +2965,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"Py" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/sugarcane,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"Pz" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/carpet,
@@ -3083,12 +3093,6 @@
},
/turf/open/floor/carpet,
/area/shuttle/escape)
-"Rd" = (
-/obj/machinery/growing/soil,
-/obj/machinery/light/small/directional/south,
-/obj/item/seeds/poppy,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"Rg" = (
/obj/structure/bed,
/obj/item/bedsheet/yellow,
@@ -3173,12 +3177,6 @@
/obj/machinery/vending/hydronutrients,
/turf/open/floor/iron,
/area/shuttle/escape)
-"RZ" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/sugarcane,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"Sb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/dim/directional/east,
@@ -3459,11 +3457,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"UC" = (
-/obj/machinery/growing/soil,
-/obj/item/seeds/wheat,
-/turf/open/floor/grass,
-/area/shuttle/escape)
"UJ" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/camera/directional/west{
@@ -3784,6 +3777,11 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"YL" = (
+/obj/machinery/growing/soil,
+/obj/item/seeds/watermelon/holy,
+/turf/open/floor/grass,
+/area/shuttle/escape)
"YO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
@@ -4318,7 +4316,7 @@ jx
kM
lP
nr
-oI
+Lj
zb
YE
BG
@@ -5561,9 +5559,9 @@ zB
it
Dc
DY
-EU
-Gk
-HL
+GQ
+Gp
+Fu
Kg
oc
hY
@@ -5725,9 +5723,9 @@ Rz
AM
GN
Vi
-UC
-Gk
-Rd
+wL
+Gp
+wf
nr
oc
hQ
@@ -5967,9 +5965,9 @@ yc
AG
oc
nr
-mQ
-EL
-Py
+yY
+mR
+BH
OM
Vi
GU
@@ -6131,9 +6129,9 @@ yc
qC
oc
Kg
-bK
-EL
-RZ
+YL
+mR
+on
Vi
Ff
zX
diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm
index 3d3727962f2d..c4610a1a0809 100644
--- a/_maps/shuttles/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter_bounty.dmm
@@ -8,6 +8,7 @@
"c" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external/ruin,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"d" = (
@@ -26,6 +27,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external/ruin,
/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"g" = (
@@ -52,6 +54,7 @@
dir = 1
},
/obj/machinery/door/airlock/external/ruin,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"m" = (
@@ -202,6 +205,7 @@
rechargeTime = 1800
},
/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"M" = (
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm
index a5981440ef03..b39b8a973fd5 100644
--- a/_maps/shuttles/hunter_russian.dmm
+++ b/_maps/shuttles/hunter_russian.dmm
@@ -108,10 +108,8 @@
/turf/open/floor/pod/dark,
/area/shuttle/hunter/russian)
"gp" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/suit_storage_unit/standard_unit{
mask_type = /obj/item/clothing/mask/gas;
storage_type = /obj/item/tank/internals/oxygen/yellow
@@ -140,6 +138,7 @@
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"ho" = (
@@ -173,6 +172,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"kL" = (
@@ -215,6 +215,7 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"qF" = (
@@ -246,6 +247,7 @@
/obj/machinery/door/airlock/security/glass{
name = "Cockpit Access"
},
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"vZ" = (
@@ -284,6 +286,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"yo" = (
@@ -519,6 +522,7 @@
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/plating,
/area/shuttle/hunter/russian)
"JU" = (
@@ -572,10 +576,8 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/dark,
/area/shuttle/hunter/russian)
"Nr" = (
@@ -586,6 +588,7 @@
/obj/machinery/door/airlock/security/glass{
name = "Cargo Hold Access"
},
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"QG" = (
@@ -595,6 +598,7 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/plating,
/area/shuttle/hunter/russian)
"Se" = (
@@ -633,6 +637,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"Uu" = (
@@ -688,10 +693,8 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/plating,
/area/shuttle/hunter/russian)
"WL" = (
@@ -702,6 +705,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"Xu" = (
@@ -722,10 +726,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/hunter/russian)
diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm
index 0b30ad502d8c..20c20eb5ea5d 100644
--- a/_maps/shuttles/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator_advanced.dmm
@@ -1553,6 +1553,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/medical)
+"dG" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/cc64k_ad{
+ pixel_y = 32
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
"dH" = (
/obj/machinery/sleeper/syndie{
dir = 4
@@ -1936,43 +1947,72 @@
"ev" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/syndicate/hallway)
+"ex" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/backpack/duffelbag/syndie/surgery,
+/turf/open/floor/pod/dark,
+/area/shuttle/syndicate/medical)
+"eM" = (
+/obj/structure/table/reinforced,
+/obj/item/bodypart/arm/left/robot{
+ pixel_x = -6
+ },
+/obj/item/bodypart/arm/right/robot{
+ pixel_x = 6
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/pod/dark,
+/area/shuttle/syndicate/medical)
"fP" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/effect/turf_decal/stripes/red/line,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/cc64k_ad{
- pixel_y = 32
- },
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/syndicate/armory)
-"kH" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 4;
- name = "tactical chair"
- },
/obj/effect/turf_decal/stripes/line{
- dir = 4
+ dir = 10
},
-/obj/machinery/airalarm/syndicate{
- pixel_y = -24
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/syndicate/airlock)
+"iN" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/light/directional/west,
+/obj/machinery/status_display/evac{
+ pixel_x = -32
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/syndicate/bridge)
-"oa" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/item/healthanalyzer/advanced,
+/turf/open/floor/pod/dark,
+/area/shuttle/syndicate/medical)
+"ss" = (
+/obj/machinery/suit_storage_unit/syndicate,
+/obj/effect/turf_decal/box,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/pod/dark,
+/area/shuttle/syndicate/eva)
+"xQ" = (
+/obj/machinery/computer/operating{
+ dir = 1
},
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
+/obj/effect/turf_decal/bot,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/pod/dark,
+/area/shuttle/syndicate/medical)
+"BD" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/syndicate/airlock)
-"pk" = (
+"DQ" = (
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/weldingtool/largetank,
@@ -1987,26 +2027,31 @@
pixel_y = 4
},
/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/pod/dark,
/area/shuttle/syndicate/armory)
-"ps" = (
+"HA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/machinery/airalarm/syndicate{
- pixel_y = -24
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
},
/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/syndicate/airlock)
+"LY" = (
/obj/effect/turf_decal/stripes/line{
- dir = 10
+ dir = 8
},
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/syndicate/airlock)
-"to" = (
+"TC" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -2024,46 +2069,26 @@
pixel_x = -4;
pixel_y = -4
},
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/syndicate/medical)
-"uz" = (
-/obj/machinery/suit_storage_unit/syndicate,
-/obj/effect/turf_decal/box,
-/obj/machinery/airalarm/syndicate{
- pixel_y = -24
- },
-/turf/open/floor/pod/dark,
-/area/shuttle/syndicate/eva)
-"AH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/obj/machinery/airalarm/syndicate{
- pixel_y = -24
+"VF" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "tactical chair"
},
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 4
},
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/syndicate/airlock)
-"MZ" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/machinery/light/directional/west,
-/obj/machinery/status_display/evac{
- pixel_x = -32
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/healthanalyzer/advanced,
-/turf/open/floor/pod/dark,
-/area/shuttle/syndicate/medical)
-"RO" = (
+/area/shuttle/syndicate/bridge)
+"YB" = (
/obj/effect/turf_decal/bot,
/obj/structure/table/reinforced,
/obj/machinery/light/directional/east,
@@ -2083,52 +2108,11 @@
},
/obj/effect/mapping_helpers/apc/cut_AI_wire,
/obj/effect/mapping_helpers/apc/syndicate_access,
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 25
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/hallway)
-"Sb" = (
-/obj/machinery/computer/operating{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/pod/dark,
-/area/shuttle/syndicate/medical)
-"SA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/syndicate{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/syndicate/airlock)
-"Vj" = (
-/obj/structure/table/reinforced,
-/obj/item/bodypart/arm/left/robot{
- pixel_x = -6
- },
-/obj/item/bodypart/arm/right/robot{
- pixel_x = 6
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/pod/dark,
-/area/shuttle/syndicate/medical)
-"Yx" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/backpack/duffelbag/syndie/surgery,
-/turf/open/floor/pod/dark,
-/area/shuttle/syndicate/medical)
(1,1,1) = {"
ad
@@ -2190,7 +2174,7 @@ aO
bd
bo
dH
-to
+TC
bf
bD
bD
@@ -2208,16 +2192,16 @@ ad
aO
aN
bm
-AH
+HA
aO
bl
bA
by
bH
bL
-MZ
+iN
dD
-Sb
+xQ
bn
cy
ad
@@ -2262,8 +2246,8 @@ cc
bJ
bN
bW
-Yx
-Vj
+ex
+eM
cx
cB
cP
@@ -2277,7 +2261,7 @@ aO
aE
aU
df
-SA
+BD
dv
bq
bs
@@ -2389,7 +2373,7 @@ ak
aq
ax
aF
-RO
+YB
bc
aQ
aZ
@@ -2410,7 +2394,7 @@ ad
ab
al
ar
-kH
+VF
aF
aF
be
@@ -2419,7 +2403,7 @@ dR
bS
ej
de
-uz
+ss
dR
bQ
ek
@@ -2461,7 +2445,7 @@ aO
aE
bv
dh
-oa
+LY
dv
cv
ds
@@ -2510,7 +2494,7 @@ bZ
aJ
aO
cF
-fP
+dG
dj
da
eg
@@ -2530,7 +2514,7 @@ ad
aO
aN
cu
-ps
+fP
aO
ai
bY
@@ -2555,7 +2539,7 @@ ca
dx
dq
aO
-pk
+DQ
ci
dM
db
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 652129f02446..e0334183c92f 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -4,10 +4,8 @@
dir = 1
},
/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
@@ -83,10 +81,8 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/pirate)
"ak" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
/obj/structure/closet/secure_closet/freezer{
@@ -140,10 +136,8 @@
dir = 1
},
/obj/machinery/light/small/directional/east,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
@@ -455,10 +449,8 @@
dir = 6
},
/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -554,10 +546,8 @@
/turf/open/floor/iron,
/area/shuttle/pirate)
"bC" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -831,10 +821,8 @@
"np" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/bot,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/pirate)
@@ -844,9 +832,8 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
},
@@ -957,10 +944,8 @@
/turf/open/floor/iron,
/area/shuttle/pirate)
"OD" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
@@ -977,10 +962,8 @@
/obj/effect/mob_spawn/ghost_role/human/pirate/captain{
dir = 4
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
diff --git a/_maps/shuttles/pirate_psyker.dmm b/_maps/shuttles/pirate_psyker.dmm
index beaf5434b9fe..0b68e740027d 100644
--- a/_maps/shuttles/pirate_psyker.dmm
+++ b/_maps/shuttles/pirate_psyker.dmm
@@ -842,10 +842,8 @@
/area/shuttle/pirate)
"Rs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/robot_debris/up,
/turf/open/floor/plating,
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index d4b45235fc94..3586386254d2 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -40,20 +40,16 @@
},
/area/shuttle/pirate)
"bH" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"ci" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"cE" = (
@@ -158,10 +154,8 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"ht" = (
@@ -244,10 +238,8 @@
/area/shuttle/pirate)
"lu" = (
/obj/item/storage/secure/safe/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/bed/pod,
/obj/item/bedsheet/black,
/turf/open/floor/carpet/royalblack,
@@ -560,10 +552,8 @@
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"DP" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"DX" = (
@@ -872,10 +862,8 @@
anchored = 1
},
/obj/structure/cable,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal/bot,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index 6b95b857f153..df00cdb2b539 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -185,10 +185,8 @@
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter1)
"nj" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -198,10 +196,8 @@
/turf/template_noop,
/area/shuttle/ruin/caravan/freighter1)
"nO" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
@@ -227,10 +223,8 @@
pixel_x = 1;
pixel_y = 5
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter1)
@@ -545,10 +539,8 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
@@ -628,10 +620,8 @@
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter1)
"LI" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 1
},
@@ -656,10 +646,8 @@
/area/shuttle/ruin/caravan/freighter1)
"Mr" = (
/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
@@ -678,10 +666,8 @@
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
@@ -735,10 +721,8 @@
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter1)
"Qi" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mob_spawn/corpse/human/cargo_tech,
diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin_cyborg_mothership.dmm
index e01b65a69d71..5f4408461d49 100644
--- a/_maps/shuttles/ruin_cyborg_mothership.dmm
+++ b/_maps/shuttles/ruin_cyborg_mothership.dmm
@@ -22,10 +22,6 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/cyborg_mothership)
-"bE" = (
-/mob/living/basic/bot/cleanbot,
-/turf/open/floor/iron/showroomfloor,
-/area/shuttle/ruin/cyborg_mothership)
"cU" = (
/obj/machinery/conveyor{
id = "mothership_main";
@@ -34,6 +30,11 @@
/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/shuttle/ruin/cyborg_mothership)
+"dn" = (
+/mob/living/basic/bot/hygienebot,
+/obj/machinery/camera/directional/south,
+/turf/open/floor/iron/showroomfloor,
+/area/shuttle/ruin/cyborg_mothership)
"dA" = (
/obj/item/disk/holodisk/ruin/cyborg_mothership,
/obj/effect/decal/cleanable/dirt,
@@ -466,6 +467,17 @@
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating/airless,
/area/shuttle/ruin/cyborg_mothership)
+"yc" = (
+/obj/machinery/space_heater{
+ anchored = 1
+ },
+/obj/machinery/camera/directional/west,
+/obj/item/pipe_dispenser,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/item/wrench,
+/turf/open/floor/plating,
+/area/shuttle/ruin/cyborg_mothership)
"yd" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -601,11 +613,6 @@
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/shuttle/ruin/cyborg_mothership)
-"Fe" = (
-/mob/living/basic/bot/hygienebot,
-/obj/machinery/camera/directional/south,
-/turf/open/floor/iron/showroomfloor,
-/area/shuttle/ruin/cyborg_mothership)
"FQ" = (
/obj/structure/lattice,
/mob/living/basic/hivebot/range,
@@ -641,19 +648,6 @@
/obj/structure/cable,
/turf/open/floor/circuit/green/airless,
/area/shuttle/ruin/cyborg_mothership)
-"HM" = (
-/obj/machinery/space_heater{
- anchored = 1
- },
-/obj/machinery/camera/directional/west,
-/obj/item/pipe_dispenser,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/item/wrench,
-/turf/open/floor/plating,
-/area/shuttle/ruin/cyborg_mothership)
"IS" = (
/obj/structure/lattice,
/obj/machinery/camera/directional/west,
@@ -944,6 +938,10 @@
/obj/structure/plasticflaps,
/turf/open/floor/plating/airless,
/area/shuttle/ruin/cyborg_mothership)
+"Zm" = (
+/mob/living/basic/bot/cleanbot,
+/turf/open/floor/iron/showroomfloor,
+/area/shuttle/ruin/cyborg_mothership)
"ZB" = (
/obj/machinery/light/cold/no_nightlight/directional/west,
/turf/open/floor/circuit/airless,
@@ -1215,9 +1213,9 @@ fB
zZ
Ey
jH
-Fe
+dn
yF
-HM
+yc
yF
yg
HK
@@ -1265,7 +1263,7 @@ pY
zZ
Ey
jH
-bE
+Zm
yF
hB
yF
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index db75b1eff6c2..57beb9d1b966 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -362,10 +362,8 @@
/area/shuttle/ruin/caravan/pirate)
"xq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/plating,
@@ -436,10 +434,8 @@
/area/shuttle/ruin/caravan/pirate)
"BX" = (
/obj/structure/closet/crate/secure/loot,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/pirate)
"CI" = (
@@ -511,10 +507,8 @@
/obj/item/bedsheet/brown{
dir = 4
},
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal/tile/red{
dir = 8
},
@@ -655,9 +649,8 @@
dir = 1
},
/obj/effect/turf_decal/delivery,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/white,
/area/shuttle/ruin/caravan/pirate)
"Po" = (
@@ -805,10 +798,8 @@
/area/shuttle/ruin/caravan/pirate)
"Xw" = (
/obj/structure/table,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/item/ammo_box/a40mm,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm
index b1f3f00897b7..db29494d5db0 100644
--- a/_maps/shuttles/ruin_syndicate_dropship.dmm
+++ b/_maps/shuttles/ruin_syndicate_dropship.dmm
@@ -166,10 +166,8 @@
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"nA" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
@@ -256,10 +254,8 @@
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"ES" = (
-/obj/machinery/airalarm/syndicate{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/syndicate3)
"GU" = (
@@ -365,10 +361,8 @@
/area/shuttle/ruin/caravan/syndicate3)
"Li" = (
/obj/structure/chair/comfy/shuttle,
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/ruin/caravan/syndicate3)
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index b99d256427f6..eb5da7b54d32 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -102,10 +102,8 @@
pixel_x = -6;
pixel_y = 6
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/item/storage/backpack/duffelbag/med/surgery{
pixel_y = 4
},
@@ -156,10 +154,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 1
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -413,9 +409,8 @@
/area/shuttle/abandoned/engine)
"aV" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/south,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -494,9 +489,8 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/bin,
/obj/item/trash/pistachios,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/item/trash/can,
/obj/item/light/bulb/broken,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
@@ -572,10 +566,8 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/north,
/obj/structure/cable,
/turf/open/floor/plating,
@@ -622,10 +614,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/shuttle/abandoned/medbay)
@@ -685,10 +675,8 @@
/obj/structure/closet/secure_closet/medical2{
anchored = 1
},
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/white/side{
dir = 5
},
@@ -744,10 +732,8 @@
/obj/structure/closet/firecloset{
anchored = 1
},
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
@@ -1248,10 +1234,8 @@
/obj/item/pen{
pixel_x = 4
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/item/flashlight/pen{
pixel_x = -6;
pixel_y = -2
@@ -1293,10 +1277,8 @@
/obj/machinery/vending/medical{
req_access = null
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/white,
/area/shuttle/abandoned/medbay)
"cM" = (
@@ -1668,10 +1650,8 @@
/obj/item/assembly/flash/handheld,
/obj/item/melee/baton/telescopic,
/obj/machinery/light/small/built/directional/west,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue{
@@ -1791,10 +1771,8 @@
/obj/structure/bed{
dir = 4
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/item/bedsheet{
dir = 4
},
@@ -1813,10 +1791,8 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/built/directional/north,
/obj/structure/bed,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/item/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/turf_decal/tile/neutral/fourcorners,
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index b2e669767791..a0f99b1da70a 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -76,10 +76,8 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/wood,
/area/shuttle/abandoned/crew)
"am" = (
@@ -88,10 +86,8 @@
/obj/item/bedsheet/centcom,
/obj/machinery/light/small/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/wood,
/area/shuttle/abandoned/crew)
"an" = (
@@ -349,10 +345,8 @@
"aT" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/south,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/firealarm/directional/south,
/obj/structure/spider/stickyweb,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -515,10 +509,8 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
},
@@ -607,9 +599,8 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
@@ -844,10 +835,8 @@
"bU" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -1027,10 +1016,8 @@
/obj/item/megaphone,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
@@ -1249,10 +1236,8 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/spider/stickyweb,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
@@ -1319,10 +1304,8 @@
pixel_y = 3
},
/obj/item/radio/off,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/medbay)
@@ -1607,10 +1590,8 @@
"dE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/built/directional/east,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/spider/stickyweb,
/turf/open/floor/iron/white/side,
/area/shuttle/abandoned/medbay)
@@ -1671,9 +1652,8 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/white,
/area/shuttle/abandoned/medbay)
"dP" = (
@@ -1904,9 +1884,8 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"La" = (
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/secure_closet/freezer{
locked = 0;
@@ -1950,10 +1929,8 @@
/obj/item/extinguisher,
/obj/item/extinguisher,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm
index d481932f3b26..b4d87448c5b8 100644
--- a/_maps/shuttles/whiteship_kilo.dmm
+++ b/_maps/shuttles/whiteship_kilo.dmm
@@ -170,9 +170,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/structure/cable,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
@@ -305,10 +304,8 @@
/obj/effect/decal/cleanable/vomit/old,
/obj/machinery/light/small/broken/directional/west,
/obj/structure/cable,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/light,
/area/shuttle/abandoned/crew)
"mH" = (
@@ -565,9 +562,8 @@
icon_state = "medium"
},
/obj/item/stack/cable_coil/cut,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/light,
/area/shuttle/abandoned/bridge)
"zu" = (
@@ -614,10 +610,8 @@
dir = 1
},
/obj/effect/decal/cleanable/blood,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"BS" = (
@@ -1071,10 +1065,8 @@
/obj/item/storage/box/stockparts/basic{
pixel_y = 6
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 22
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/dark,
/area/shuttle/abandoned/engine)
"Tg" = (
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index ae5b59b08897..7a977468c9cf 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -337,22 +337,6 @@
},
/turf/open/floor/iron,
/area/shuttle/abandoned/crew)
-"bc" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/shuttle/abandoned/crew)
"be" = (
/obj/machinery/light/small/built/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
@@ -398,18 +382,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
-"bi" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
-/obj/machinery/light/small/built/directional/south,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
"bj" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -526,15 +498,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
-"bC" = (
-/obj/machinery/light/built/directional/east,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/cargo)
"bD" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bar)
@@ -707,18 +670,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
-"cc" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
"cd" = (
/obj/structure/table,
/obj/machinery/light/small/built/directional/west,
@@ -740,20 +691,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bridge)
-"ce" = (
-/obj/structure/table,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/folder/blue{
- pixel_x = 6;
- pixel_y = 9
- },
-/obj/machinery/recharger,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/bridge)
"cf" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -1044,17 +981,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
-"cP" = (
-/obj/machinery/light/built/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/cargo)
"cQ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/secure/weapon,
@@ -1068,17 +994,6 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
-"cU" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/processor,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
"cV" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/deepfryer,
@@ -1111,19 +1026,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
-"cZ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
-/obj/machinery/light/small/built/directional/north,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
"db" = (
/obj/effect/turf_decal/box/white/corners{
dir = 8
@@ -1199,14 +1101,6 @@
/obj/structure/sign/departments/botany,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bar)
-"dm" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/growing/tray,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
"do" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
@@ -1504,16 +1398,6 @@
/obj/machinery/light/small/built/directional/east,
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
-"ef" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/built/directional/west,
-/obj/machinery/growing/tray,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
"eh" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/door/poddoor{
@@ -1571,19 +1455,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
-"fm" = (
-/obj/machinery/light/small/built/directional/south,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes/white/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/bar)
"gt" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/stripes/white/line{
@@ -1593,6 +1464,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
+"hr" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/processor,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
"hv" = (
/obj/effect/turf_decal/box/white/corners{
dir = 1
@@ -1613,6 +1493,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/engine)
+"iG" = (
+/obj/machinery/light/small/built/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/bar)
"iK" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1631,23 +1523,26 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/crew)
-"jv" = (
+"jo" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/turf_decal/stripes/white/line{
+/obj/machinery/light/small/built/directional/west,
+/obj/machinery/growing/tray,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 1
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
+"jT" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
},
-/obj/structure/cable,
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/crew)
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
"kz" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -1665,6 +1560,20 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bridge)
+"mL" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/shuttle/abandoned/crew)
"ni" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -1693,21 +1602,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
-"pC" = (
+"pp" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/engine)
+/obj/machinery/growing/tray,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/spawner/random/food_or_drink/seed_rare,
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
"pS" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/door/airlock{
@@ -1758,16 +1661,6 @@
/obj/item/reagent_containers/syringe,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
-"tq" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/growing/tray,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/spawner/random/food_or_drink/seed_rare,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
"wn" = (
/obj/effect/turf_decal/box/white/corners{
dir = 1
@@ -1797,6 +1690,26 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/crew)
+"zG" = (
+/obj/machinery/light/built/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/cargo)
+"zL" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/engine)
"Aa" = (
/obj/machinery/light/small/built/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
@@ -1822,6 +1735,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/crew)
+"AA" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/crew)
"AK" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt/dust,
@@ -1995,6 +1923,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
+"JV" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/crew)
"KK" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -2047,17 +1984,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/crew)
-"PW" = (
+"OM" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
+/obj/machinery/growing/tray,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/spawner/random/food_or_drink/seed_rare,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 1
},
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/crew)
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
"Qd" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -2076,6 +2012,26 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
+"Rz" = (
+/obj/machinery/light/built/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/cargo)
+"RH" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/built/directional/north,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/shuttle/abandoned/engine)
"Sd" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
@@ -2136,17 +2092,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
-"SW" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/growing/tray,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
-/obj/effect/spawner/random/food_or_drink/seed_rare,
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
"TE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -2155,6 +2100,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
+"UU" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/light/small/built/directional/south,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plating,
+/area/shuttle/abandoned/engine)
"VL" = (
/obj/effect/turf_decal/arrows/white{
dir = 1
@@ -2167,6 +2123,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
+"WY" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/growing/tray,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
"XR" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt/dust,
@@ -2179,6 +2143,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
+"ZZ" = (
+/obj/structure/table,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/folder/blue{
+ pixel_x = 6;
+ pixel_y = 9
+ },
+/obj/machinery/recharger,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/bridge)
(1,1,1) = {"
aa
@@ -2261,7 +2237,7 @@ ab
ac
aB
aO
-bi
+UU
ac
bH
ac
@@ -2269,7 +2245,7 @@ cj
ac
cH
ac
-cZ
+RH
dr
dJ
ac
@@ -2285,7 +2261,7 @@ by
Qd
NG
hW
-pC
+zL
Qd
by
bj
@@ -2344,7 +2320,7 @@ Fb
iK
wn
cJ
-cP
+Rz
db
SI
bV
@@ -2414,7 +2390,7 @@ as
aF
ni
bo
-bC
+zG
ap
DL
eD
@@ -2488,7 +2464,7 @@ aa
ag
ai
ai
-jv
+AA
FF
oT
bO
@@ -2498,7 +2474,7 @@ bO
cN
bK
Fu
-fm
+iG
bD
bD
cW
@@ -2511,7 +2487,7 @@ Of
bs
bD
HJ
-cc
+jT
cq
cC
Aa
@@ -2543,7 +2519,7 @@ bD
"}
(20,1,1) = {"
ai
-PW
+JV
ai
ba
ai
@@ -2553,7 +2529,7 @@ cd
GZ
cD
bQ
-cU
+hr
dj
dB
dQ
@@ -2568,7 +2544,7 @@ bb
bt
bG
bQ
-ce
+ZZ
kz
cE
bQ
@@ -2583,7 +2559,7 @@ eb
ai
ai
ai
-bc
+mL
bu
ai
bQ
@@ -2611,15 +2587,15 @@ cv
cG
bR
bD
-dm
+WY
dE
dT
-ef
+jo
eb
"}
(24,1,1) = {"
ai
-PW
+JV
ai
be
bw
@@ -2630,10 +2606,10 @@ bR
bR
bR
bD
-SW
+pp
dF
dU
-tq
+OM
bD
"}
(25,1,1) = {"
diff --git a/_maps/shuttles/whiteship_obelisk.dmm b/_maps/shuttles/whiteship_obelisk.dmm
index 05b17d19b71e..3c63cba32705 100644
--- a/_maps/shuttles/whiteship_obelisk.dmm
+++ b/_maps/shuttles/whiteship_obelisk.dmm
@@ -189,9 +189,8 @@
/area/shuttle/abandoned/crew)
"kE" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/broken/directional/east,
/obj/structure/table,
/obj/effect/spawner/random/entertainment/money_medium,
@@ -360,10 +359,8 @@
/obj/structure/cable,
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/spawner/random/trash/garbage,
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
@@ -498,10 +495,8 @@
/area/shuttle/abandoned/medbay)
"EB" = (
/obj/effect/decal/cleanable/blood/gibs/up,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -581,10 +576,8 @@
/turf/open/floor/catwalk_floor/iron_smooth,
/area/shuttle/abandoned/engine)
"Iu" = (
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/bookcase/random,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/abandoned)
@@ -800,10 +793,8 @@
/turf/open/floor/mineral/titanium/purple,
/area/shuttle/abandoned/bar)
"SW" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/suit_storage_unit/spaceruin{
desc = "An industrial suit storage device carrying retro space suits. Neat!"
},
@@ -898,9 +889,8 @@
/obj/effect/decal/cleanable/blood/footprints{
dir = 4
},
-/obj/machinery/airalarm/all_access{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
diff --git a/_maps/shuttles/whiteship_personalshuttle.dmm b/_maps/shuttles/whiteship_personalshuttle.dmm
index 49667f43a48b..55c215349ca8 100644
--- a/_maps/shuttles/whiteship_personalshuttle.dmm
+++ b/_maps/shuttles/whiteship_personalshuttle.dmm
@@ -466,10 +466,8 @@
/obj/machinery/light_switch/directional/north{
pixel_y = 23
},
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 30
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/blood/tracks{
dir = 5
},
@@ -486,10 +484,8 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -28
- },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned/engine)
"NX" = (
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index ed8d78e7494a..3b4ba5aee00e 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -32,6 +32,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
+"bs" = (
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
"bw" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 8
@@ -788,24 +798,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
+"Gh" = (
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/modular_computer/preset/research{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/purple/end,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white/diagonal,
+/area/shuttle/abandoned)
"Gl" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 1
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
-"GN" = (
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = 24
- },
-/turf/open/floor/plating,
-/area/shuttle/abandoned)
"Il" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -879,15 +886,6 @@
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
-"Ky" = (
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/modular_computer/preset/research{
- dir = 1
- },
-/obj/effect/turf_decal/siding/purple/end,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white/diagonal,
-/area/shuttle/abandoned)
"Lf" = (
/obj/machinery/computer/shuttle/white_ship/bridge,
/obj/effect/decal/cleanable/dirt,
@@ -1345,7 +1343,7 @@ rl
yu
Sc
Sc
-GN
+bs
bP
NA
Sc
@@ -1448,7 +1446,7 @@ re
Zp
MM
pk
-Ky
+Gh
Sc
Rr
vJ
diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm
index 506f5b101314..d24805bdfe23 100644
--- a/_maps/templates/lazy_templates/nukie_base.dmm
+++ b/_maps/templates/lazy_templates/nukie_base.dmm
@@ -90,19 +90,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/control)
-"bz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 1
- },
-/obj/machinery/airalarm/unlocked{
- dir = 8;
- pixel_x = -24
- },
-/turf/open/floor/mineral/titanium/tiled/yellow,
-/area/centcom/syndicate_mothership/expansion_bombthreat)
"bB" = (
/obj/structure/railing{
dir = 4
@@ -315,12 +302,6 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/mineral/titanium/yellow,
/area/centcom/syndicate_mothership/control)
-"ej" = (
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/tiled/yellow,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"ek" = (
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/expansion_fridgerummage)
@@ -347,6 +328,12 @@
},
/turf/open/floor/wood/tile,
/area/centcom/syndicate_mothership/control)
+"ez" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium/tiled/yellow,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"eF" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/cup/rag,
@@ -418,10 +405,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/centcom/syndicate_mothership/control)
-"fK" = (
-/obj/machinery/growing/tray,
-/turf/open/floor/mineral/titanium/tiled,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"fR" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/heat_exchanging/junction,
@@ -733,6 +716,11 @@
/obj/machinery/vending/boozeomat,
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
+"jI" = (
+/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
+/obj/machinery/growing/tray,
+/turf/open/floor/mineral/titanium/tiled,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"jO" = (
/obj/machinery/camera/autoname/directional/south{
network = list("nukie")
@@ -1256,6 +1244,10 @@
/obj/structure/flora/rock/icy/style_random,
/turf/open/misc/asteroid/snow/airless,
/area/centcom/syndicate_mothership)
+"pm" = (
+/mob/living/basic/slime,
+/turf/open/floor/circuit/red/off,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"pr" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
@@ -1324,11 +1316,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
-"pY" = (
-/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
-/obj/machinery/growing/tray,
-/turf/open/floor/mineral/titanium/tiled,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"qh" = (
/obj/item/stack/spacecash/c20,
/turf/open/misc/asteroid/snow/icemoon,
@@ -1556,6 +1543,10 @@
"sq" = (
/turf/open/misc/asteroid/snow/airless,
/area/centcom/syndicate_mothership/control)
+"su" = (
+/obj/machinery/growing/tray,
+/turf/open/floor/mineral/titanium/tiled,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"sv" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/mineral/plastitanium,
@@ -2039,10 +2030,6 @@
/obj/machinery/atmospherics/components/tank/nitrogen,
/turf/open/space/basic,
/area/space/nearstation)
-"zR" = (
-/mob/living/basic/slime,
-/turf/open/floor/circuit/red/off,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"zT" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -2288,6 +2275,18 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/smooth_edge,
/area/centcom/syndicate_mothership/control)
+"Cv" = (
+/obj/machinery/growing/tray,
+/obj/machinery/light/cold/directional/west,
+/obj/item/seeds/cannabis{
+ pixel_y = 8
+ },
+/obj/item/cultivator{
+ pixel_x = -6;
+ pixel_y = 11
+ },
+/turf/open/floor/mineral/titanium/tiled,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"CC" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/door/window/survival_pod{
@@ -2736,6 +2735,17 @@
/obj/machinery/shuttle_manipulator,
/turf/open/floor/circuit/red,
/area/centcom/syndicate_mothership/control)
+"Hw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/mineral/titanium/tiled/yellow,
+/area/centcom/syndicate_mothership/expansion_bombthreat)
"HD" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
@@ -3128,6 +3138,12 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/centcom/syndicate_mothership/control)
+"LT" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/tiled/yellow,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"LY" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -3257,10 +3273,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/centcom/syndicate_mothership/control)
-"Mv" = (
-/obj/structure/noticeboard/directional/east,
-/turf/open/floor/mineral/plastitanium,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"MD" = (
/obj/machinery/door/airlock/maintenance/external{
name = "Bunk Room 1"
@@ -3270,18 +3282,6 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/catwalk_floor/iron,
/area/centcom/syndicate_mothership/control)
-"MH" = (
-/obj/machinery/growing/tray,
-/obj/machinery/light/cold/directional/west,
-/obj/item/seeds/cannabis{
- pixel_y = 8
- },
-/obj/item/cultivator{
- pixel_x = -6;
- pixel_y = 11
- },
-/turf/open/floor/mineral/titanium/tiled,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"MP" = (
/obj/machinery/camera/autoname/directional/west{
network = list("nukie")
@@ -3454,12 +3454,6 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/textured_large,
/area/centcom/syndicate_mothership/control)
-"OX" = (
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/turf/open/floor/mineral/titanium/tiled/yellow,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"Pc" = (
/obj/structure/chair/greyscale{
dir = 4
@@ -4331,6 +4325,10 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark/textured_half,
/area/centcom/syndicate_mothership/control)
+"YB" = (
+/obj/structure/noticeboard/directional/east,
+/turf/open/floor/mineral/plastitanium,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"YF" = (
/obj/item/kirbyplants/random,
/obj/structure/cable,
@@ -4785,7 +4783,7 @@ yZ
xu
RT
fk
-zR
+pm
xu
Ox
sU
@@ -4884,7 +4882,7 @@ xu
US
HD
oi
-MH
+Cv
ZO
fk
fk
@@ -5088,7 +5086,7 @@ xu
jW
Ph
KL
-fK
+su
ZO
fk
jO
@@ -5292,7 +5290,7 @@ ZO
XT
xg
Ce
-pY
+jI
ZO
ZO
ZO
@@ -5395,7 +5393,7 @@ Wz
KL
JS
JS
-OX
+LT
ZO
oT
FP
@@ -5495,9 +5493,9 @@ lt
ZO
bg
mb
-Mv
+YB
nL
-ej
+ez
ZO
TD
FP
@@ -5805,7 +5803,7 @@ yp
CE
VF
If
-bz
+Hw
lC
yb
Uq
diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm
index a41275e20187..67d23d09a597 100644
--- a/_maps/virtual_domains/syndicate_assault.dmm
+++ b/_maps/virtual_domains/syndicate_assault.dmm
@@ -486,10 +486,8 @@
/turf/closed/wall/r_wall/syndicate,
/area/ruin/space/has_grav/powered/virtual_domain)
"rH" = (
-/obj/machinery/airalarm/syndicate{
- dir = 1;
- pixel_y = 20
- },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/powered/virtual_domain)
"rM" = (
diff --git a/_maps/~monkestation/RandomBars/Icebox/BarSM.dmm b/_maps/~monkestation/RandomBars/Icebox/BarSM.dmm
index 3b341440cb3c..80118626623b 100644
--- a/_maps/~monkestation/RandomBars/Icebox/BarSM.dmm
+++ b/_maps/~monkestation/RandomBars/Icebox/BarSM.dmm
@@ -142,6 +142,24 @@
/obj/structure/cable,
/turf/open/floor/pod/dark,
/area/station/commons/lounge)
+"fI" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/east{
+ pixel_y = 32
+ },
+/obj/effect/mapping_helpers/airalarm/engine_access,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/icebox_bar)
"gg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -668,6 +686,20 @@
/obj/structure/cable,
/turf/open/floor/pod/light,
/area/station/commons/lounge)
+"xN" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 5
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/bar,
+/turf/open/floor/pod/dark,
+/area/station/commons/lounge)
"xW" = (
/obj/machinery/door/window{
dir = 1;
@@ -1153,25 +1185,6 @@
"LN" = (
/turf/closed/wall/r_wall,
/area/station/service/bar)
-"Mz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/airalarm/engine{
- dir = 4;
- pixel_x = 23;
- pixel_y = 32
- },
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/icebox_bar)
"ML" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -1374,20 +1387,6 @@
},
/turf/open/floor/carpet/neon/simple/yellow/nodots,
/area/station/service/bar/backroom)
-"UT" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 5
- },
-/obj/effect/mapping_helpers/mail_sorting/service/bar,
-/turf/open/floor/pod/dark,
-/area/station/commons/lounge)
"Vg" = (
/turf/open/floor/iron/showroomfloor,
/area/station/commons/lounge)
@@ -1558,7 +1557,7 @@ EK
EK
EK
pH
-Mz
+fI
oK
Ys
Oc
@@ -1590,7 +1589,7 @@ sR
xd
uo
Yn
-UT
+xN
qd
EK
EK
diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm
index c0d678c12989..40b4603562af 100644
--- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm
+++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm
@@ -75,6 +75,16 @@
/obj/structure/cable/layer1,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"co" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1;
+ name = "Gas to Filter"
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/engine_access,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter)
"cs" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
@@ -143,17 +153,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"ee" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on{
- dir = 4;
- name = "Output Release"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"eo" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
@@ -167,6 +166,13 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"eA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"fc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/closed/wall/r_wall,
@@ -189,6 +195,16 @@
/obj/machinery/power/smes/engineering,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"fA" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
+/obj/machinery/camera/directional/south{
+ c_tag = "Engineering Supermatter Fore";
+ network = list("ss13","engine");
+ pixel_x = 23
+ },
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"fB" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -290,13 +306,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"jv" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"jx" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -327,13 +336,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"kd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"kx" = (
/obj/structure/table,
/obj/machinery/camera/directional/north{
@@ -363,14 +365,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"lz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/light/small/directional/west,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"lB" = (
/obj/structure/girder,
/turf/open/floor/engine,
@@ -660,18 +654,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"wP" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Gas to Filter"
- },
-/obj/machinery/airalarm/engine{
- dir = 8;
- pixel_x = -23
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter)
"wQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -732,6 +714,13 @@
/obj/structure/cable/layer1,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"zN" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"zV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -745,18 +734,6 @@
/obj/machinery/meter,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"Ae" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/firealarm/directional/north,
-/obj/structure/table/reinforced,
-/obj/item/clothing/suit/utility/radiation,
-/obj/item/clothing/head/utility/radiation,
-/obj/item/geiger_counter,
-/obj/item/clothing/glasses/meson,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"Ah" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -854,6 +831,14 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"CF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"CM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -861,16 +846,6 @@
/obj/machinery/power/energy_accumulator/grounding_rod/anchored,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"CU" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/obj/machinery/camera/directional/south{
- c_tag = "Engineering Supermatter Fore";
- network = list("ss13","engine");
- pixel_x = 23
- },
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"CW" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -1181,6 +1156,17 @@
"MV" = (
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"MZ" = (
+/obj/machinery/atmospherics/components/binary/valve/digital/on{
+ dir = 4;
+ name = "Output Release"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"Ng" = (
/obj/structure/reflector/single/anchored{
dir = 9
@@ -1230,6 +1216,18 @@
/obj/item/clothing/glasses/meson/engine,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"OR" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/utility/radiation,
+/obj/item/clothing/head/utility/radiation,
+/obj/item/geiger_counter,
+/obj/item/clothing/glasses/meson,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"OZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
@@ -1421,6 +1419,11 @@
"Ve" = (
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"Vi" = (
+/obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"Vr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -1490,11 +1493,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"Yz" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"YK" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -1825,7 +1823,7 @@ BL
lr
BJ
Lm
-lz
+CF
Lm
pC
bz
@@ -1862,7 +1860,7 @@ mb
zW
Xu
KA
-jv
+eA
BL
IV
TB
@@ -1976,7 +1974,7 @@ FP
vt
Ya
BL
-Yz
+Vi
MV
MV
MV
@@ -1992,9 +1990,9 @@ xP
qh
Su
TL
-CU
+fA
fc
-wP
+co
kz
XU
XU
@@ -2074,7 +2072,7 @@ Kd
"}
(20,1,1) = {"
BL
-Ae
+OR
TL
XP
HS
@@ -2088,7 +2086,7 @@ QX
vt
Ya
BL
-Yz
+Vi
MV
MV
MV
@@ -2198,7 +2196,7 @@ mb
Bs
QS
aX
-ee
+MZ
BL
Lj
rz
@@ -2217,7 +2215,7 @@ BL
vH
pU
QL
-kd
+zN
HQ
Vb
TH
diff --git a/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm
index 57600c908838..cc3cc346154a 100644
--- a/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm
+++ b/_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm
@@ -666,9 +666,8 @@
"xp" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/obj/machinery/airalarm/engine{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/engine_access,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"xq" = (
diff --git a/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm
index c12d3a6eea2f..52dc9b8b2ca7 100644
--- a/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm
+++ b/_maps/~monkestation/RandomEngines/MetaStation/supermatter.dmm
@@ -784,10 +784,8 @@
network = list("ss13","engine")
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/obj/machinery/airalarm/engine{
- dir = 4;
- pixel_x = 24
- },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/engine_access,
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
diff --git a/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm
index 666694e1d186..92f5662a5421 100644
--- a/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm
+++ b/_maps/~monkestation/RandomEngines/TramStation/supermatter.dmm
@@ -100,9 +100,8 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/machinery/meter,
-/obj/machinery/airalarm/engine{
- pixel_y = -24
- },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/engine_access,
/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
dir = 1
},
diff --git a/code/__DEFINES/bloodsuckers.dm b/code/__DEFINES/bloodsuckers.dm
index 6860403ba89f..20092a5eb1ac 100644
--- a/code/__DEFINES/bloodsuckers.dm
+++ b/code/__DEFINES/bloodsuckers.dm
@@ -165,6 +165,10 @@
*/
/// Source trait for Bloodsuckers-related traits
#define BLOODSUCKER_TRAIT "bloodsucker_trait"
+/// Source trait for bloodsuckers in torpor.
+#define TORPOR_TRAIT "torpor_trait"
+/// Source trait for bloodsucker mesmerization.
+#define MESMERIZED_TRAIT "mesmerized_trait"
/// Source trait for Monster Hunter-related traits
#define HUNTER_TRAIT "monsterhunter_trait"
/// Source trait while Feeding
diff --git a/code/__DEFINES/dcs/helpers.dm b/code/__DEFINES/dcs/helpers.dm
index 1824f20e2dae..75d37aebf72f 100644
--- a/code/__DEFINES/dcs/helpers.dm
+++ b/code/__DEFINES/dcs/helpers.dm
@@ -3,7 +3,7 @@
/// Returns a bitfield gathered from all registered procs
/// Arguments given here are packaged in a list and given to _SendSignal
-#define SEND_SIGNAL(target, sigtype, arguments...) ( !target._listen_lookup?[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) )
+#define SEND_SIGNAL(target, sigtype, arguments...) ( !target?._listen_lookup?[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) )
#define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) )
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index 57035a2fe17b..97a5c1188f03 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -157,6 +157,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
#define SMOOTH_GROUP_BRONZE_TABLES S_OBJ(54) ///obj/structure/table/bronze
#define SMOOTH_GROUP_ABDUCTOR_TABLES S_OBJ(55) ///obj/structure/table/abductor
#define SMOOTH_GROUP_GLASS_TABLES S_OBJ(56) ///obj/structure/table/glass
+#define SMOOTH_GROUP_SANDSTONE_TABLES S_OBJ(57) ///obj/structure/table/sandstone //MONKESTATION EDIT
#define SMOOTH_GROUP_ALIEN_NEST S_OBJ(60) ///obj/structure/bed/nest
#define SMOOTH_GROUP_ALIEN_RESIN S_OBJ(61) ///obj/structure/alien/resin
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 55295c8f01f6..38e97e1af976 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -304,6 +304,19 @@
#define ETHEREAL_CHARGE_DANGEROUS 3000
+//Monkestation Addition: Ethereal Blood Charge
+#define ETHEREAL_BLOOD_CHARGE_NONE 0
+#define ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE 56
+#define ETHEREAL_BLOOD_CHARGE_LOW 140
+#define ETHEREAL_BLOOD_CHARGE_NORMAL 280
+#define ETHEREAL_BLOOD_CHARGE_ALMOSTFULL 420
+#define ETHEREAL_BLOOD_CHARGE_FULL 560
+#define ETHEREAL_BLOOD_CHARGE_OVERLOAD 700
+#define ETHEREAL_BLOOD_CHARGE_DANGEROUS 840
+
+#define ETHEREAL_BLOOD_CHARGE_FACTOR 0.224
+//End of Monkestation addition
+
#define CRYSTALIZE_COOLDOWN_LENGTH (120 SECONDS)
#define CRYSTALIZE_PRE_WAIT_TIME (40 SECONDS)
#define CRYSTALIZE_DISARM_WAIT_TIME (120 SECONDS)
diff --git a/code/__DEFINES/nanites.dm b/code/__DEFINES/nanites.dm
index bbedb1ea6530..9ca8bdf11c6d 100644
--- a/code/__DEFINES/nanites.dm
+++ b/code/__DEFINES/nanites.dm
@@ -58,3 +58,7 @@
#define NES_SCAN_TYPE "Scan Type"
#define NES_BUTTON_NAME "Button Name"
#define NES_ICON "Icon"
+// MONKESTATION ADDITIONS
+#define NES_INVALID_PHRASE "Invalid Phrase"
+#define NES_PHRASE_REPLACEMENT "Phrase Replacement"
+#define NES_REPLACEMENT_MODE "Replacement Mode"
diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm
index 852870accf8b..540cadabc47a 100644
--- a/code/__DEFINES/pipe_construction.dm
+++ b/code/__DEFINES/pipe_construction.dm
@@ -6,6 +6,7 @@
#define PIPE_UNARY 4 //4 directions: N, S, E, W
#define PIPE_ONEDIR 5 //1 direction: N/S/E/W
#define PIPE_UNARY_FLIPPABLE 6 //8 directions: N/S/E/W/N-flipped/S-flipped/E-flipped/W-flipped
+#define PIPE_ONEDIR_FLIPPABLE 7 //2 direction: N/S/E/W, N-flipped/S-flipped/E-flipped/W-flipped
//Disposal pipe relative connection directions
#define DISP_DIR_BASE 0
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index a6a2d61c495b..65b3b3d30afb 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -134,6 +134,7 @@
#define INIT_ORDER_BLACKBOX 94
#define INIT_ORDER_SERVER_MAINT 93
#define INIT_ORDER_METRICS 91
+#define INIT_ORDER_OW 90
#define INIT_ORDER_INPUT 85
#define INIT_ORDER_SOUNDS 83
#define INIT_ORDER_INSTRUMENTS 82
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index f7aee2496aff..d1fa9ed66a32 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -1296,6 +1296,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// One can breath under water, you get me?
#define TRAIT_WATER_BREATHING "water_breathing"
+/// Does not take damage from bloodloss(or any blood shenanigans)
+#define TRAIT_NO_BLOODLOSS_DAMAGE "no_bloodloss_damage"
+
/// Do IPC's dream of doomsday? The answer is yes
#define TRAIT_ROBOT_CAN_BLEED "robots_can_bleed"
//monkestation edit end
diff --git a/code/__DEFINES/~monkestation/access.dm b/code/__DEFINES/~monkestation/access.dm
index 49f1c04f9401..e2d91e2d7fec 100644
--- a/code/__DEFINES/~monkestation/access.dm
+++ b/code/__DEFINES/~monkestation/access.dm
@@ -4,3 +4,6 @@
/// Access to permabrig. [ACCESS_BRIG] also grants permabrig access, this is just for ONLY permabrig accesss, for security assistants.
#define ACCESS_PERMABRIG "permabrig"
+
+/// Bounty Hunter access, to lock shitters out of easy access to bounty hunter ships. Bounty Hunter access JUST for their ships.
+#define ACCESS_BOUNTY_HUNTER "bounty_hunter"
diff --git a/code/__DEFINES/~monkestation/overwatch.dm b/code/__DEFINES/~monkestation/overwatch.dm
new file mode 100644
index 000000000000..77ac6ac82f1e
--- /dev/null
+++ b/code/__DEFINES/~monkestation/overwatch.dm
@@ -0,0 +1,17 @@
+
+/proc/new_sql_sanitize_text(text)
+ text = replacetext(text, "'", "")
+ text = replacetext(text, ";", "")
+ text = replacetext(text, "&", "")
+ text = replacetext(text, "`", "")
+ return text
+
+/proc/remove_all_spaces(text)
+ text = replacetext(text, " ", "")
+ return text
+
+/proc/sql_sanitize_text(text)
+ text = replacetext(text, "'", "''")
+ text = replacetext(text, ";", "")
+ text = replacetext(text, "&", "")
+ return text
diff --git a/code/__DEFINES/~monkestation/slimes.dm b/code/__DEFINES/~monkestation/slimes.dm
index 1f45bd96d28a..d2805810ab1b 100644
--- a/code/__DEFINES/~monkestation/slimes.dm
+++ b/code/__DEFINES/~monkestation/slimes.dm
@@ -50,6 +50,12 @@
#define SLIME_RANDOM_MODIFIER_MIN -0.0003
#define SLIME_RANDOM_MODIFIER_MAX 0.0003
+/// How many units of slime ooze are required for a normal extract recipe.
+#define EXTRACT_RECIPE_OOZE_AMOUNT 20
+/// How many units of slime ooze (of each color) are required for a crossbreed recipe.
+#define CROSSBREED_RECIPE_OOZE_AMOUNT 250
+/// How many units of slime ooze (of each color) are required for an regenerative crossbreed recipe.
+#define REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT 500
#define EMOTION_HAPPY "happy"
#define EMOTION_SAD "sad"
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 86e0f81367c7..5863abc7f764 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -33,6 +33,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae, GLOB.moth_antennae_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/ethereal_horns, GLOB.ethereal_horns_list) //Monkestation Addition
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/ethereal, GLOB.ethereal_tail_list) //Monkestation Addition
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_antenna, GLOB.apid_antenna_list) //Monkestation Addition
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list) //Monkestation Addition
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list) //Monkestation Addition
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
index 460357a9af0d..e9aa2963eed3 100644
--- a/code/__HELPERS/icon_smoothing.dm
+++ b/code/__HELPERS/icon_smoothing.dm
@@ -188,6 +188,8 @@ xxx xxx xxx
///do not use, use QUEUE_SMOOTH(atom)
/atom/proc/smooth_icon()
+ if(QDELETED(src))
+ return
smoothing_flags &= ~SMOOTH_QUEUED
flags_1 |= HTML_USE_INITAL_ICON_1
if (!z)
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index c6ecf3f4881d..7880e81f1e69 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -59,62 +59,66 @@
return pick(GLOB.backpacklist)
/proc/random_features()
- if(!GLOB.tails_list.len)
+ if(!length(GLOB.tails_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/, GLOB.tails_list, add_blank = TRUE)
- if(!GLOB.tails_list_human.len)
+ if(!length(GLOB.tails_list_human))
init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, GLOB.tails_list_human, add_blank = TRUE)
- if(!GLOB.tails_list_lizard.len)
+ if(!length(GLOB.tails_list_lizard))
init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, GLOB.tails_list_lizard, add_blank = TRUE)
- if(!GLOB.snouts_list.len)
+ if(!length(GLOB.snouts_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts, GLOB.snouts_list)
- if(!GLOB.horns_list.len)
+ if(!length(GLOB.horns_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, GLOB.horns_list)
- if(!GLOB.ears_list.len)
+ if(!length(GLOB.ears_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.horns_list)
- if(!GLOB.frills_list.len)
+ if(!length(GLOB.frills_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, GLOB.frills_list)
- if(!GLOB.spines_list.len)
+ if(!length(GLOB.spines_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, GLOB.spines_list)
- if(!GLOB.legs_list.len)
+ if(!length(GLOB.legs_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
- if(!GLOB.body_markings_list.len)
+ if(!length(GLOB.body_markings_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
- if(!GLOB.wings_list.len)
+ if(!length(GLOB.wings_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)
- if(!GLOB.moth_wings_list.len)
+ if(!length(GLOB.moth_wings_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
- if(!GLOB.moth_antennae_list.len)
+ if(!length(GLOB.moth_antennae_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae, GLOB.moth_antennae_list)
- if(!GLOB.moth_markings_list.len)
+ if(!length(GLOB.moth_markings_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)
- if(!GLOB.pod_hair_list.len)
+ if(!length(GLOB.pod_hair_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list)
//Monkestation Addition Start
- if(!GLOB.apid_antenna_list.len)
+ if(!length(GLOB.ethereal_horns_list))
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/ethereal_horns, GLOB.ethereal_horns_list)
+ if(!length(GLOB.ethereal_tail_list))
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/ethereal, GLOB.ethereal_tail_list)
+ if(!length(GLOB.apid_antenna_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_antenna, GLOB.apid_antenna_list)
- if(!GLOB.apid_wings_list.len)
+ if(!length(GLOB.apid_wings_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_wings, GLOB.apid_wings_list)
- if(!GLOB.ipc_screens_list.len)
+ if(!length(GLOB.ipc_screens_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
- if(!GLOB.ipc_antennas_list.len)
+ if(!length(GLOB.ipc_antennas_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
- if(!GLOB.ipc_chassis_list.len)
+ if(!length(GLOB.ipc_chassis_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
- if(!GLOB.tails_list_monkey.len)
+ if(!length(GLOB.tails_list_monkey))
init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey)
- if(!GLOB.anime_top_list.len)
+ if(!length(GLOB.anime_top_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_head, GLOB.anime_top_list)
- if(!GLOB.anime_middle_list.len)
+ if(!length(GLOB.anime_middle_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_middle, GLOB.anime_middle_list)
- if(!GLOB.anime_top_list.len)
+ if(!length(GLOB.anime_top_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_bottom, GLOB.anime_bottom_list)
- if(!GLOB.arachnid_appendages_list.len)
+ if(!length(GLOB.arachnid_appendages_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/arachnid_appendages, GLOB.arachnid_appendages_list)
- if(!GLOB.arachnid_chelicerae_list.len)
+ if(!length(GLOB.arachnid_chelicerae_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/arachnid_chelicerae, GLOB.arachnid_chelicerae_list)
- if(!GLOB.goblin_ears_list.len)
+ if(!length(GLOB.goblin_ears_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/goblin_ears, GLOB.goblin_ears_list)
- if(!GLOB.floran_leaves_list.len)
+ if(!length(GLOB.floran_leaves_list))
init_sprite_accessory_subtypes(/datum/sprite_accessory/floran_leaves, GLOB.floran_leaves_list)
//Monkestation Addition End
@@ -137,6 +141,8 @@
"moth_wings" = pick(GLOB.moth_wings_list),
"moth_antennae" = pick(GLOB.moth_antennae_list),
"moth_markings" = pick(GLOB.moth_markings_list),
+ "ethereal_horns" = pick(GLOB.ethereal_horns_list), //Monkestation Addition
+ "ethereal_tail" = pick(GLOB.ethereal_tail_list), //Monkestation Addition
"apid_antenna" = pick(GLOB.apid_antenna_list), //Monkestation Addition
"apid_wings" = pick(GLOB.apid_wings_list), //Monkestation Addition
"ipc_screen" = pick(GLOB.ipc_screens_list), //Monkestation Addition
diff --git a/code/__HELPERS/piping_colors_lists.dm b/code/__HELPERS/piping_colors_lists.dm
index 96ad7dc32ece..c198e569635e 100644
--- a/code/__HELPERS/piping_colors_lists.dm
+++ b/code/__HELPERS/piping_colors_lists.dm
@@ -1,5 +1,6 @@
///All colors available to pipes and atmos components
GLOBAL_LIST_INIT(pipe_paint_colors, list(
+ "omni" = COLOR_VERY_LIGHT_GRAY,
"green" = COLOR_VIBRANT_LIME,
"blue" = COLOR_BLUE,
"red" = COLOR_RED,
@@ -11,7 +12,6 @@ GLOBAL_LIST_INIT(pipe_paint_colors, list(
"pink" = COLOR_LIGHT_PINK,
"purple" = COLOR_PURPLE,
"violet" = COLOR_STRONG_VIOLET,
- "omni" = COLOR_VERY_LIGHT_GRAY
))
///List that sorts the colors and is used for setting up the pipes layer so that they overlap correctly
diff --git a/code/__HELPERS/~monkestation-helpers/clients.dm b/code/__HELPERS/~monkestation-helpers/clients.dm
new file mode 100644
index 000000000000..ea8f6fb6b45f
--- /dev/null
+++ b/code/__HELPERS/~monkestation-helpers/clients.dm
@@ -0,0 +1,16 @@
+/proc/kick_client(client/to_kick)
+ // Pretty much everything in this proc is copied straight from `code/modules/admin/topic.dm`,
+ // proc `/datum/admins/Topic()`, href `"boot2"`. If it breaks here, it was probably broken there
+ // too.
+ if(!check_rights(R_ADMIN))
+ return
+ if(!to_kick)
+ to_chat(usr, span_danger("Error: The client you specified has disappeared!"), confidential = TRUE)
+ return
+ if(!check_if_greater_rights_than(to_kick))
+ to_chat(usr, span_danger("Error: They have more rights than you do."), confidential = TRUE)
+ return
+ to_chat(to_kick, span_danger("You have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"]."), confidential = TRUE)
+ log_admin("[key_name(usr)] kicked [key_name(to_kick)].")
+ message_admins(span_adminnotice("[key_name_admin(usr)] kicked [key_name_admin(to_kick)]."))
+ qdel(to_kick)
diff --git a/code/__HELPERS/~monkestation-helpers/cmp.dm b/code/__HELPERS/~monkestation-helpers/cmp.dm
new file mode 100644
index 000000000000..eea5c3be71a7
--- /dev/null
+++ b/code/__HELPERS/~monkestation-helpers/cmp.dm
@@ -0,0 +1,5 @@
+/proc/cmp_mob_playtime_asc(mob/a, mob/b)
+ return cmp_numeric_asc(a?.client?.get_exp_living(TRUE), b?.client?.get_exp_living(TRUE))
+
+/proc/cmp_mob_playtime_dsc(mob/a, mob/b)
+ return cmp_numeric_dsc(a?.client?.get_exp_living(TRUE), b?.client?.get_exp_living(TRUE))
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 0448c8aa73ca..c65542313102 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -45,6 +45,8 @@ GLOBAL_LIST_EMPTY(ipc_chassis_list) //Monkestation Addition
GLOBAL_LIST_EMPTY(apid_wings_list) //Monkestation Addition
GLOBAL_LIST_EMPTY(caps_list)
GLOBAL_LIST_EMPTY(pod_hair_list)
+GLOBAL_LIST_EMPTY(ethereal_horns_list) //Monkestation Addition
+GLOBAL_LIST_EMPTY(ethereal_tail_list) //Monkestation Addition
GLOBAL_LIST_EMPTY(tails_list_monkey) //Monkestation Addition
GLOBAL_LIST_EMPTY(anime_top_list) //Monkestation Addition
GLOBAL_LIST_EMPTY(anime_middle_list) //Monkestation Addition
@@ -60,7 +62,7 @@ GLOBAL_LIST_INIT(color_list_ethereal, list(
"Burnt Orange" = "#cc4400",
"Cyan Blue" = "#00ffff",
"Dark Blue" = "#6666ff",
- "Dark Fuschia" = "#cc0066",
+ "Dark Fuschia" = "#C70064", //Monkestation Edit: #CC0066 TO #C70064
"Dark Green" = "#37835b",
"Dark Red" = "#9c3030",
@@ -75,6 +77,8 @@ GLOBAL_LIST_INIT(color_list_ethereal, list(
"Red" = "#ff4d4d",
"Seafoam Green" = "#00fa9a",
"White" = "#f2f2f2",
+ "Fuschia" = "#FF0066", //Monkestation Addition
+ "Dark Purple" = "#502A77", //Monkestation Addition
))
GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list(
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 58ae40cd39aa..7834d9547656 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -205,6 +205,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_ANALGESIA" = TRAIT_ANALGESIA,
"TRAIT_FAST_CLIMBER" = TRAIT_FAST_CLIMBER,
"TRAIT_ON_ELEVATED_SURFACE" = TRAIT_ON_ELEVATED_SURFACE,
+ "TRAIT_NO_BLOODLOSS_DAMAGE" = TRAIT_NO_BLOODLOSS_DAMAGE, // Monkestation Addition
"TRAIT_CANT_SIGN_SPELLS" = TRAIT_CANT_SIGN_SPELLS, // monke edit
),
/obj/item/bodypart = list(
diff --git a/code/_onclick/hud/map_view.dm b/code/_onclick/hud/map_view.dm
index bc304f20f8a1..ae71a9478732 100644
--- a/code/_onclick/hud/map_view.dm
+++ b/code/_onclick/hud/map_view.dm
@@ -17,7 +17,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
/atom/movable/screen/map_view/Destroy()
for(var/datum/weakref/client_ref in viewers_to_huds)
var/client/our_client = client_ref.resolve()
- if(!our_client)
+ if(!istype(our_client) || QDELING(our_client))
continue
hide_from(our_client.mob)
@@ -32,7 +32,9 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
set_position(1, 1)
/atom/movable/screen/map_view/proc/display_to(mob/show_to)
- show_to.client.register_map_obj(src)
+ if(QDELETED(show_to) || QDELETED(show_to.client))
+ return
+ show_to.client?.register_map_obj(src)
// We need to add planesmasters to the popup, otherwise
// blending fucks up massively. Any planesmaster on the main screen does
// NOT apply to map popups. If there's ever a way to make planesmasters
@@ -44,7 +46,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
var/datum/weakref/hud_ref = viewers_to_huds[client_ref]
var/datum/hud/our_hud = hud_ref?.resolve()
- if(our_hud)
+ if(!QDELETED(our_hud))
return our_hud.get_plane_group(PLANE_GROUP_POPUP_WINDOW(src))
// Generate a new plane group for this case
@@ -55,6 +57,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
return pop_planes
/atom/movable/screen/map_view/proc/hide_from(mob/hide_from)
+ if(QDELETED(hide_from) || QDELETED(hide_from.canon_client))
+ return
hide_from?.canon_client.clear_map(assigned_map)
var/client_ref = WEAKREF(hide_from?.canon_client)
@@ -62,7 +66,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
var/datum/weakref/hud_ref = viewers_to_huds[client_ref]
viewers_to_huds -= client_ref
var/datum/hud/clear_from = hud_ref?.resolve()
- if(!clear_from)
+ if(QDELETED(clear_from))
return
var/datum/plane_master_group/popup/pop_planes = clear_from.get_plane_group(PLANE_GROUP_POPUP_WINDOW(src))
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index 24f4a40ec078..441706906b7f 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -10,10 +10,10 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/datum/radial_menu/parent
/atom/movable/screen/radial/proc/set_parent(new_value)
- if(parent)
+ if(!QDELETED(parent))
UnregisterSignal(parent, COMSIG_QDELETING)
parent = new_value
- if(parent)
+ if(!QDELETED(parent))
RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(handle_parent_del))
/atom/movable/screen/radial/proc/handle_parent_del()
@@ -28,12 +28,12 @@ GLOBAL_LIST_EMPTY(radial_menus)
/atom/movable/screen/radial/slice/set_parent(new_value)
. = ..()
- if(parent)
+ if(!QDELETED(parent))
icon_state = parent.radial_slice_icon
/atom/movable/screen/radial/slice/MouseEntered(location, control, params)
. = ..()
- if(next_page || !parent)
+ if(next_page || QDELETED(parent))
icon_state = "radial_slice_focus"
else
icon_state = "[parent.radial_slice_icon]_focus"
@@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
/atom/movable/screen/radial/slice/MouseExited(location, control, params)
. = ..()
- if(next_page || !parent)
+ if(next_page || QDELETED(parent))
icon_state = "radial_slice"
else
icon_state = parent.radial_slice_icon
@@ -50,6 +50,8 @@ GLOBAL_LIST_EMPTY(radial_menus)
closeToolTip(usr)
/atom/movable/screen/radial/slice/Click(location, control, params)
+ if(QDELETED(parent))
+ return
if(usr.client == parent.current_user)
if(next_page)
parent.next_page()
@@ -69,6 +71,8 @@ GLOBAL_LIST_EMPTY(radial_menus)
icon_state = "radial_center"
/atom/movable/screen/radial/center/Click(location, control, params)
+ if(QDELETED(parent))
+ return
if(usr.client == parent.current_user)
parent.finished = TRUE
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index dace01528471..db565d2c15cc 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -1,5 +1,3 @@
-#define SUBSYSTEM_INIT_SOURCE "subsystem init"
-
SUBSYSTEM_DEF(atoms)
name = "Atoms"
init_order = INIT_ORDER_ATOMS
@@ -42,11 +40,16 @@ SUBSYSTEM_DEF(atoms)
if(initialized == INITIALIZATION_INSSATOMS)
return
- set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, SUBSYSTEM_INIT_SOURCE)
+ // Generate a unique mapload source for this run of InitializeAtoms
+ var/static/uid = 0
+ uid = (uid + 1) % (SHORT_REAL_LIMIT - 1)
+ var/source = "subsystem init [uid]"
+ set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, source)
// This may look a bit odd, but if the actual atom creation runtimes for some reason, we absolutely need to set initialized BACK
- CreateAtoms(atoms, atoms_to_return)
- clear_tracked_initalize(SUBSYSTEM_INIT_SOURCE)
+ CreateAtoms(atoms, atoms_to_return, source)
+ clear_tracked_initalize(source)
+ SSicon_smooth.free_deferred(source)
if(late_loaders.len)
for(var/I in 1 to late_loaders.len)
@@ -73,7 +76,7 @@ SUBSYSTEM_DEF(atoms)
#endif
/// Actually creates the list of atoms. Exists soley so a runtime in the creation logic doesn't cause initalized to totally break
-/datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms, list/atoms_to_return = null)
+/datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms, list/atoms_to_return = null, mapload_source = null)
if (atoms_to_return)
LAZYINITLIST(created_atoms)
@@ -91,7 +94,12 @@ SUBSYSTEM_DEF(atoms)
for(var/I in 1 to atoms.len)
var/atom/A = atoms[I]
if(!(A.flags_1 & INITIALIZED_1))
- CHECK_TICK
+ // Unrolled CHECK_TICK setup to let us enable/disable mapload based off source
+ if(TICK_CHECK)
+ clear_tracked_initalize(mapload_source)
+ stoplag()
+ if(mapload_source)
+ set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, mapload_source)
PROFILE_INIT_ATOM_BEGIN()
InitAtom(A, TRUE, mapload_arg)
PROFILE_INIT_ATOM_END(A)
@@ -108,7 +116,11 @@ SUBSYSTEM_DEF(atoms)
#ifdef TESTING
++count
#endif
- CHECK_TICK
+ if(TICK_CHECK)
+ clear_tracked_initalize(mapload_source)
+ stoplag()
+ if(mapload_source)
+ set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, mapload_source)
testing("Initialized [count] atoms")
@@ -172,6 +184,13 @@ SUBSYSTEM_DEF(atoms)
/datum/controller/subsystem/atoms/proc/map_loader_stop(source)
clear_tracked_initalize(source)
+/// Returns the source currently modifying SSatom's init behavior
+/datum/controller/subsystem/atoms/proc/get_initialized_source()
+ var/state_length = length(initialized_state)
+ if(!state_length)
+ return null
+ return initialized_state[state_length][1]
+
/// Use this to set initialized to prevent error states where the old initialized is overriden, and we end up losing all context
/// Accepts a state and a source, the most recent state is used, sources exist to prevent overriding old values accidentially
/datum/controller/subsystem/atoms/proc/set_tracked_initalized(state, source)
@@ -254,5 +273,3 @@ SUBSYSTEM_DEF(atoms)
var/initlog = InitLog()
if(initlog)
text2file(initlog, "[GLOB.log_directory]/initialize.log")
-
-#undef SUBSYSTEM_INIT_SOURCE
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 4b4c1a4c0417..b7bde6a8f01a 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -418,7 +418,7 @@ SUBSYSTEM_DEF(garbage)
SSgarbage.Queue(D)
//Monkestation Edit: REPLAYS
if(D)
- SSdemo.mark_destroyed(D)
+ SSdemo?.mark_destroyed(D)
//Monkestation Edit: REPLAYS
else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic")
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index 8163a86a6d98..d70eff801174 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -9,6 +9,7 @@ SUBSYSTEM_DEF(icon_smooth)
var/list/blueprint_queue = list()
var/list/smooth_queue = list()
var/list/deferred = list()
+ var/list/deferred_by_source = list()
/datum/controller/subsystem/icon_smooth/fire()
// We do not want to smooth icons of atoms whose neighbors are not initialized yet,
@@ -61,16 +62,30 @@ SUBSYSTEM_DEF(icon_smooth)
return SS_INIT_SUCCESS
+/// Releases a pool of delayed smooth attempts from a particular source
+/datum/controller/subsystem/icon_smooth/proc/free_deferred(source_to_free)
+ smooth_queue += deferred_by_source[source_to_free]
+ deferred_by_source -= source_to_free
+ if(!can_fire)
+ can_fire = TRUE
/datum/controller/subsystem/icon_smooth/proc/add_to_queue(atom/thing)
if(thing.smoothing_flags & SMOOTH_QUEUED)
return
thing.smoothing_flags |= SMOOTH_QUEUED
+ // If we're currently locked into mapload BY something
+ // Then put us in a deferred list that we release when this mapload run is finished
+ if(initialized && length(SSatoms.initialized_state) && SSatoms.initialized == INITIALIZATION_INNEW_MAPLOAD)
+ var/source = SSatoms.get_initialized_source()
+ LAZYADD(deferred_by_source[source], thing)
+ return
smooth_queue += thing
if(!can_fire)
can_fire = TRUE
/datum/controller/subsystem/icon_smooth/proc/remove_from_queues(atom/thing)
+ // Lack of removal from deferred_by_source is safe because the lack of SMOOTH_QUEUED will just free it anyway
+ // Hopefully this'll never cause a harddel (dies)
thing.smoothing_flags &= ~SMOOTH_QUEUED
smooth_queue -= thing
if(blueprint_queue)
diff --git a/code/controllers/subsystem/lua.dm b/code/controllers/subsystem/lua.dm
index da37dad34f5e..37d7dd63d3c2 100644
--- a/code/controllers/subsystem/lua.dm
+++ b/code/controllers/subsystem/lua.dm
@@ -51,7 +51,7 @@ SUBSYSTEM_DEF(lua)
world.SetConfig("env", "LUAU_PATH", jointext(lua_path, ";"))
/datum/controller/subsystem/lua/Shutdown()
- AUXTOOLS_SHUTDOWN(AUXLUA)
+ AUXTOOLS_FULL_SHUTDOWN(AUXLUA)
/datum/controller/subsystem/lua/proc/queue_resume(datum/lua_state/state, index, arguments)
if(!initialized)
diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm
index 013bca13467b..f37c94fd938b 100644
--- a/code/controllers/subsystem/minor_mapping.dm
+++ b/code/controllers/subsystem/minor_mapping.dm
@@ -64,7 +64,9 @@ SUBSYSTEM_DEF(minor_mapping)
for(var/turf/open/floor/plating/T in all_turfs)
if(T.is_blocked_turf())
continue
- if(locate(/obj/structure/cable) in T)
+ //dont include multiz cables in the list because repairing them sucks
+ var/cable = locate(/obj/structure/cable) in T
+ if(cable && !istype(cable, /obj/structure/cable/multilayer/multiz))
exposed_wires += T
return shuffle(exposed_wires)
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index cff5035b202a..5bdbe1bc95ee 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -4,8 +4,6 @@
#define BUCKET_POS(timer) (((ROUND_UP((timer.timeToRun - timer.timer_subsystem.head_offset) / world.tick_lag)+1) % BUCKET_LEN) || BUCKET_LEN)
/// Gets the maximum time at which timers will be invoked from buckets, used for deferring to secondary queue
#define TIMER_MAX(timer_ss) (timer_ss.head_offset + TICKS2DS(BUCKET_LEN + timer_ss.practical_offset - 1))
-/// Max float with integer precision
-#define TIMER_ID_MAX (2**24)
/**
* # Timer Subsystem
@@ -731,4 +729,3 @@ SUBSYSTEM_DEF(timer)
#undef BUCKET_LEN
#undef BUCKET_POS
#undef TIMER_MAX
-#undef TIMER_ID_MAX
diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm
index 7a981d173bfd..06967d509ec3 100644
--- a/code/datums/actions/action.dm
+++ b/code/datums/actions/action.dm
@@ -205,7 +205,7 @@
* force - whether we're forcing a full update
*/
/datum/action/proc/build_button_icon(atom/movable/screen/movable/action_button/button, update_flags = ALL, force = FALSE)
- if(!button)
+ if(QDELETED(button)) // monkestation edit: more elaborate check
return
if(update_flags & UPDATE_BUTTON_NAME)
@@ -230,9 +230,9 @@
* force - whether an update is forced regardless of existing status
*/
/datum/action/proc/update_button_name(atom/movable/screen/movable/action_button/button, force = FALSE)
- button.name = name
+ button?.name = name
if(desc)
- button.desc = desc
+ button?.desc = desc
/**
* Creates the background underlay for the button
@@ -241,7 +241,7 @@
* force - whether an update is forced regardless of existing status
*/
/datum/action/proc/apply_button_background(atom/movable/screen/movable/action_button/current_button, force = FALSE)
- if(!background_icon || !background_icon_state || (current_button.active_underlay_icon_state == background_icon_state && !force))
+ if(QDELETED(current_button) || !background_icon || !background_icon_state || (current_button.active_underlay_icon_state == background_icon_state && !force))
return
// What icons we use for our background
@@ -273,7 +273,7 @@
* force - whether an update is forced regardless of existing status
*/
/datum/action/proc/apply_button_icon(atom/movable/screen/movable/action_button/current_button, force = FALSE)
- if(!button_icon || !button_icon_state || (current_button.icon_state == button_icon_state && !force))
+ if(QDELETED(current_button) || !button_icon || !button_icon_state || (current_button.icon_state == button_icon_state && !force))
return
current_button.icon = button_icon
@@ -286,10 +286,9 @@
* force - whether an update is forced regardless of existing status
*/
/datum/action/proc/apply_button_overlay(atom/movable/screen/movable/action_button/current_button, force = FALSE)
-
SEND_SIGNAL(src, COMSIG_ACTION_OVERLAY_APPLY, current_button, force)
- if(!overlay_icon || !overlay_icon_state || (current_button.active_overlay_icon_state == overlay_icon_state && !force))
+ if(QDELETED(current_button) || !overlay_icon || !overlay_icon_state || (current_button.active_overlay_icon_state == overlay_icon_state && !force))
return
current_button.cut_overlay(current_button.button_overlay)
@@ -306,9 +305,9 @@
*/
/datum/action/proc/update_button_status(atom/movable/screen/movable/action_button/current_button, force = FALSE)
if(IsAvailable())
- current_button.color = rgb(255,255,255,255)
+ current_button?.color = rgb(255,255,255,255)
else
- current_button.color = transparent_when_unavailable ? rgb(128,0,0,128) : rgb(128,0,0)
+ current_button?.color = transparent_when_unavailable ? rgb(128,0,0,128) : rgb(128,0,0)
/// Gives our action to the passed viewer.
/// Puts our action in their actions list and shows them the button.
@@ -323,7 +322,7 @@
/// Adds our action button to the screen of the passed viewer.
/datum/action/proc/ShowTo(mob/viewer)
var/datum/hud/our_hud = viewer.hud_used
- if(!our_hud || viewers[our_hud]) // There's no point in this if you have no hud in the first place
+ if(QDELETED(our_hud) || viewers[our_hud]) // There's no point in this if you have no hud in the first place
return
var/atom/movable/screen/movable/action_button/button = create_button()
@@ -358,7 +357,9 @@
for(var/datum/action/action in owner.actions)
if(action == src) // This could be us, which is dumb
continue
- var/atom/movable/screen/movable/action_button/button = action.viewers[owner.hud_used]
+ var/atom/movable/screen/movable/action_button/button = action?.viewers[owner?.hud_used]
+ if(QDELETED(button)) // monkestation edit: fix runtime error
+ continue
if(action.name == name && button.id)
bitfield |= button.id
diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm
index 18e2a18d38dc..838ed7870cd3 100644
--- a/code/datums/alarm.dm
+++ b/code/datums/alarm.dm
@@ -203,4 +203,5 @@
if(length(alarm_packet) < 2)
continue
var/list/cameras = alarm_packet[2]
- cameras -= source // REF FOUND AND CLEARED BOYSSSS
+ if(cameras)
+ cameras -= source // REF FOUND AND CLEARED BOYSSSS
diff --git a/code/datums/components/crafting/atmospheric.dm b/code/datums/components/crafting/atmospheric.dm
index fd1906e01f8f..955c9704abda 100644
--- a/code/datums/components/crafting/atmospheric.dm
+++ b/code/datums/components/crafting/atmospheric.dm
@@ -17,6 +17,27 @@
time = 0.5 SECONDS
category = CAT_ATMOSPHERIC
+/datum/crafting_recipe/igniter
+ name = "Igniter"
+ result = /obj/machinery/igniter
+ reqs = list(
+ /obj/item/stack/sheet/iron = 5,
+ /obj/item/assembly/igniter = 1,
+ )
+ blacklist = list(/obj/item/assembly/igniter/condenser)
+ one_per_turf = TRUE
+ time = 2 SECONDS
+ category = CAT_ATMOSPHERIC
+
+/datum/crafting_recipe/air_sensor
+ name = "Monitored Air Sensor"
+ result = /obj/item/air_sensor
+ reqs = list(
+ /obj/item/analyzer = 1,
+ /obj/item/stack/sheet/iron = 1,
+ )
+ blacklist = list(/obj/item/analyzer/ranged)
+
/datum/crafting_recipe/pipe/on_craft_completion(mob/user, atom/result)
var/obj/item/pipe/crafted_pipe = result
crafted_pipe.pipe_type = /obj/machinery/atmospherics/pipe/smart
@@ -335,3 +356,14 @@
/obj/item/stock_parts/water_recycler = 1,
)
category = CAT_ATMOSPHERIC
+
+/datum/crafting_recipe/elder_atmosian_statue
+ name = "Elder Atmosian Statue"
+ result = /obj/structure/statue/elder_atmosian
+ time = 6 SECONDS
+ reqs = list(
+ /obj/item/stack/sheet/mineral/metal_hydrogen = 20,
+ /obj/item/stack/sheet/mineral/zaukerite = 15,
+ /obj/item/stack/sheet/iron = 30,
+ )
+ category = CAT_STRUCTURE
diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm
index 4a58660992a8..734f28e0ffe7 100644
--- a/code/datums/components/phylactery.dm
+++ b/code/datums/components/phylactery.dm
@@ -183,6 +183,7 @@
// Fix their name
lich.dna.real_name = lich_mind.name
lich.real_name = lich_mind.name
+ lich.update_name_tag(lich_mind.name) // monkestation edit: name tags
// Slap the lich mind in and get their ghost
lich_mind.transfer_to(lich)
lich_mind.grab_ghost(force = TRUE)
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index 32fcdeeb94bb..3223f4f75c9a 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -193,7 +193,7 @@
///Serializes into JSON. Does not encode type.
/datum/proc/serialize_json(list/options)
- . = serialize_list(options)
+ . = serialize_list(options, list())
if(!islist(.))
. = null
else
diff --git a/code/datums/elements/elevation.dm b/code/datums/elements/elevation.dm
index ffa6de398b6e..2fcacf37de93 100644
--- a/code/datums/elements/elevation.dm
+++ b/code/datums/elements/elevation.dm
@@ -18,8 +18,9 @@
if(ismovable(target))
RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
- var/turf/turf = get_turf(target)
- if(turf)
+ var/atom/atom_target = target
+ if(isturf(atom_target.loc))
+ var/turf/turf = atom_target.loc
if(!HAS_TRAIT(turf, TRAIT_TURF_HAS_ELEVATED_OBJ(pixel_shift)))
RegisterSignal(turf, COMSIG_TURF_RESET_ELEVATION, PROC_REF(check_elevation))
RegisterSignal(turf, COMSIG_TURF_CHANGE, PROC_REF(pre_change_turf))
diff --git a/code/datums/id_trim/centcom.dm b/code/datums/id_trim/centcom.dm
index c501722d6a9a..c8adf5925c22 100644
--- a/code/datums/id_trim/centcom.dm
+++ b/code/datums/id_trim/centcom.dm
@@ -46,7 +46,7 @@
/// Trim for Bounty Hunters hired by centcom.
/datum/id_trim/centcom/bounty_hunter
- access = list(ACCESS_CENT_GENERAL)
+ access = list(ACCESS_CENT_GENERAL, ACCESS_BOUNTY_HUNTER)
assignment = "Bounty Hunter"
/// Trim for Centcom Bartenders.
diff --git a/code/datums/id_trim/outfits.dm b/code/datums/id_trim/outfits.dm
index c8f84859d98c..69e7adbc7810 100644
--- a/code/datums/id_trim/outfits.dm
+++ b/code/datums/id_trim/outfits.dm
@@ -49,6 +49,7 @@
/// Trim for Bounty Hunters NOT hired by centcom. (?)
/datum/id_trim/bounty_hunter
+ access = list(ACCESS_BOUNTY_HUNTER)
assignment = "Bounty Hunter"
department_color = COLOR_PRISONER_ORANGE
subdepartment_color = COLOR_PRISONER_BLACK
diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm
index f177a5c93fcf..0760d493ed19 100644
--- a/code/datums/materials/basemats.dm
+++ b/code/datums/materials/basemats.dm
@@ -321,6 +321,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
armor_modifiers = list(MELEE = 1.5, BULLET = 1.5, LASER = 1.5, ENERGY = 1.5, BOMB = 1.5, BIO = 1.5, FIRE = 1.5, ACID = 1.5)
beauty_modifier = 0.5
+/* monkestation edit: this is given anyways by [/datum/material_trait/magical]
/datum/material/mythril/on_applied_obj(atom/source, amount, material_flags)
. = ..()
if(isitem(source))
@@ -332,6 +333,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
if(isitem(source))
REMOVE_TRAIT(source, TRAIT_INNATELY_FANTASTICAL_ITEM, REF(src)) // DO THIS FIRST OR WE WILL NEVER GET OUR BONUSES DELETED!!!
qdel(source.GetComponent(/datum/component/fantasy))
+monkestation end */
/datum/material/mythril/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
diff --git a/code/datums/signals.dm b/code/datums/signals.dm
index 236d2be4fc61..b4d7b5680eeb 100644
--- a/code/datums/signals.dm
+++ b/code/datums/signals.dm
@@ -33,22 +33,24 @@
var/list/target_procs = (procs[target] ||= list())
var/list/lookup = (target._listen_lookup ||= list())
- if(!override && target_procs[signal_type])
- var/override_message = "[signal_type] overridden. Use override = TRUE to suppress this warning.\nTarget: [target] ([target.type]) Proc: [proctype]"
- log_signal(override_message)
- stack_trace(override_message)
-
+ var/exists = target_procs[signal_type]
target_procs[signal_type] = proctype
+
+ if(exists)
+ if(!override)
+ var/override_message = "[signal_type] overridden. Use override = TRUE to suppress this warning.\nTarget: [target] ([target.type]) Proc: [proctype]"
+ log_signal(override_message)
+ stack_trace(override_message)
+ return
+
var/list/looked_up = lookup[signal_type]
if(isnull(looked_up)) // Nothing has registered here yet
lookup[signal_type] = src
- else if(looked_up == src) // We already registered here
- return
- else if(!length(looked_up)) // One other thing registered here
- lookup[signal_type] = list((looked_up) = TRUE, (src) = TRUE)
+ else if(!islist(looked_up)) // One other thing registered here
+ lookup[signal_type] = list(looked_up, src)
else // Many other things have registered here
- looked_up[src] = TRUE
+ looked_up += src
/// Registers multiple signals to the same proc.
/datum/proc/RegisterSignals(datum/target, list/signal_types, proctype, override = FALSE)
@@ -118,7 +120,9 @@
// all the objects that are receiving the signal get the signal this final time.
// AKA: No you can't cancel the signal reception of another object by doing an unregister in the same signal.
var/list/queued_calls = list()
- for(var/datum/listening_datum as anything in target)
- queued_calls[listening_datum] = listening_datum._signal_procs[src][sigtype]
- for(var/datum/listening_datum as anything in queued_calls)
- . |= call(listening_datum, queued_calls[listening_datum])(arglist(arguments))
+ // This should be faster than doing `var/datum/listening_datum as anything in target` as it does not implicitly copy the list
+ for(var/i in 1 to length(target))
+ var/datum/listening_datum = target[i]
+ queued_calls.Add(listening_datum, listening_datum._signal_procs[src][sigtype])
+ for(var/i in 1 to length(queued_calls) step 2)
+ . |= call(queued_calls[i], queued_calls[i + 1])(arglist(arguments))
diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm
index 504b89e590ff..b0df976e2eb1 100644
--- a/code/datums/status_effects/debuffs/debuffs.dm
+++ b/code/datums/status_effects/debuffs/debuffs.dm
@@ -132,9 +132,10 @@
. = ..()
if(!.)
return
- if(!HAS_TRAIT(owner, TRAIT_SLEEPIMMUNE))
- ADD_TRAIT(owner, TRAIT_KNOCKEDOUT, TRAIT_STATUS_EFFECT(id))
+ if(HAS_TRAIT(owner, TRAIT_SLEEPIMMUNE))
tick_interval = -1
+ else
+ ADD_TRAIT(owner, TRAIT_KNOCKEDOUT, TRAIT_STATUS_EFFECT(id))
RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(on_owner_insomniac))
RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(on_owner_sleepy))
diff --git a/code/datums/status_effects/debuffs/dna_transformation.dm b/code/datums/status_effects/debuffs/dna_transformation.dm
index 09c688e7c1f4..1ffcc2f5929d 100644
--- a/code/datums/status_effects/debuffs/dna_transformation.dm
+++ b/code/datums/status_effects/debuffs/dna_transformation.dm
@@ -37,6 +37,7 @@
new_dna.transfer_identity(transforming)
transforming.real_name = new_dna.real_name
transforming.name = transforming.get_visible_name()
+ transforming.update_name_tag() // monkestation edit: name tags
transforming.updateappearance(mutcolor_update = TRUE)
transforming.domutcheck()
return TRUE
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 64c224eaa1d9..b9428e2d250b 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -426,14 +426,10 @@
owner.Knockdown(10)
var/list/items = list()
- var/max_loop
- if (length(owner.get_contents()) >= 10)
- max_loop = 10
- else
- max_loop = length(owner.get_contents())
+ var/max_loop = min(length(owner.get_contents()), 10)
for (var/i in 1 to max_loop)
var/obj/item/item = owner.get_contents()[i]
- if ((item.item_flags & DROPDEL) || HAS_TRAIT(item, TRAIT_NODROP)) // can't teleport these kinds of items
+ if (!istype(item) || (item.item_flags & DROPDEL) || HAS_TRAIT(item, TRAIT_NODROP)) // can't teleport these kinds of items
continue
items.Add(item)
diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm
index 4cb19e626f95..483b47cce1fa 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -49,7 +49,7 @@
for(var/datum/reagent/reagent as anything in victim.reagents.reagent_list)
if(reagent.chemical_flags & REAGENT_AFFECTS_WOUNDS)
- reagent.on_burn_wound_processing()
+ reagent.on_burn_wound_processing(src)
if(limb.current_gauze)
limb.seep_gauze(WOUND_BURN_SANITIZATION_RATE * seconds_per_tick)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 502e422945d8..0b6f83a220b6 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -824,7 +824,6 @@
/// Updates the icon of the atom
/atom/proc/update_icon(updates=ALL)
- SIGNAL_HANDLER
SHOULD_CALL_PARENT(TRUE)
. = NONE
@@ -838,19 +837,54 @@
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
var/list/new_overlays = update_overlays(updates)
- if (managed_overlays)
- if (length(overlays) == (islist(managed_overlays) ? length(managed_overlays) : 1))
- overlays = null
- POST_OVERLAY_CHANGE(src)
- else
- cut_overlay(managed_overlays)
- managed_overlays = null
- if(length(new_overlays))
- if (length(new_overlays) == 1)
- managed_overlays = new_overlays[1]
- else
- managed_overlays = new_overlays
- add_overlay(new_overlays)
+ var/nulls = 0
+ for(var/i in 1 to length(new_overlays))
+ var/atom/maybe_not_an_atom = new_overlays[i]
+ if(isnull(maybe_not_an_atom))
+ nulls++
+ continue
+ if(istext(maybe_not_an_atom) || isicon(maybe_not_an_atom))
+ continue
+ new_overlays[i] = maybe_not_an_atom.appearance
+ if(nulls)
+ for(var/i in 1 to nulls)
+ new_overlays -= null
+
+ var/identical = FALSE
+ var/new_length = length(new_overlays)
+ if(!managed_overlays && !new_length)
+ identical = TRUE
+ else if(!islist(managed_overlays))
+ if(new_length == 1 && managed_overlays == new_overlays[1])
+ identical = TRUE
+ else if(length(managed_overlays) == new_length)
+ identical = TRUE
+ for(var/i in 1 to length(managed_overlays))
+ if(managed_overlays[i] != new_overlays[i])
+ identical = FALSE
+ break
+
+ if(!identical)
+ var/full_control = FALSE
+ if(managed_overlays)
+ full_control = length(overlays) == (islist(managed_overlays) ? length(managed_overlays) : 1)
+ if(full_control)
+ overlays = null
+ else
+ cut_overlay(managed_overlays)
+
+ switch(length(new_overlays))
+ if(0)
+ if(full_control)
+ POST_OVERLAY_CHANGE(src)
+ managed_overlays = null
+ if(1)
+ add_overlay(new_overlays)
+ managed_overlays = new_overlays[1]
+ else
+ add_overlay(new_overlays)
+ managed_overlays = new_overlays
+
. |= UPDATE_OVERLAYS
. |= SEND_SIGNAL(src, COMSIG_ATOM_UPDATED_ICON, updates, .)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 24548d01a40a..d3aa41fa3d15 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -760,6 +760,7 @@
/obj/machinery/proc/RefreshParts()
SHOULD_CALL_PARENT(TRUE)
//reset to baseline
+ /*
idle_power_usage = initial(idle_power_usage)
active_power_usage = initial(active_power_usage)
if(!component_parts || !component_parts.len)
@@ -774,10 +775,13 @@
idle_power_usage = initial(idle_power_usage) * (1 + parts_energy_rating)
active_power_usage = initial(active_power_usage) * (1 + parts_energy_rating)
+ */
update_current_power_usage()
SEND_SIGNAL(src, COMSIG_MACHINERY_REFRESH_PARTS)
/obj/machinery/proc/default_pry_open(obj/item/crowbar, close_after_pry = FALSE, open_density = FALSE, closed_density = TRUE)
+ if(ismob(crowbar)) // monkestation edit: make certain issues clearer with an explicit runtime
+ CRASH("The user should not be passed to /obj/machinery/proc/default_pry_open, only the tool being used.")
. = !(state_open || panel_open || is_operational || (flags_1 & NODECONSTRUCT_1)) && crowbar.tool_behaviour == TOOL_CROWBAR
if(!.)
return
@@ -788,6 +792,8 @@
close_machine(density_to_set = closed_density)
/obj/machinery/proc/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel = 0, custom_deconstruct = FALSE)
+ if(ismob(crowbar)) // monkestation edit: make certain issues clearer with an explicit runtime
+ CRASH("The user should not be passed to /obj/machinery/proc/default_deconstruction_crowbar, only the tool being used.")
. = (panel_open || ignore_panel) && !(flags_1 & NODECONSTRUCT_1) && crowbar.tool_behaviour == TOOL_CROWBAR
if(!. || custom_deconstruct)
return
diff --git a/code/game/machinery/camera/trackable.dm b/code/game/machinery/camera/trackable.dm
index 967b68e774b7..d28effbb33dd 100644
--- a/code/game/machinery/camera/trackable.dm
+++ b/code/game/machinery/camera/trackable.dm
@@ -172,7 +172,7 @@
* tracked_mob_name - The person being tracked.
*/
/datum/trackable/proc/track_name(mob/living/tracker, tracked_mob_name)
- if(!tracker || tracker.stat == DEAD)
+ if(!istext(tracked_mob_name) || QDELETED(tracker) || tracker.stat == DEAD)
return
find_trackable_mobs() //this is in case the tracked mob is newly/no-longer in camera field of view.
@@ -192,9 +192,9 @@
* tracked - The person being tracked.
*/
/datum/trackable/proc/track_mob(mob/living/tracker, mob/living/tracked)
- if(!tracker || tracker.stat == DEAD)
+ if(QDELETED(tracker) || QDELETED(tracked) || tracker.stat == DEAD)
return
// Need to make sure the tracked mob is in our list
- track_name(tracked.name)
+ track_name(tracker, tracked.name)
#undef CAMERA_TICK_LIMIT
diff --git a/code/game/machinery/computer/atmos_computers/__identifiers.dm b/code/game/machinery/computer/atmos_computers/__identifiers.dm
index 381fedd5bd0d..323dc68f89bf 100644
--- a/code/game/machinery/computer/atmos_computers/__identifiers.dm
+++ b/code/game/machinery/computer/atmos_computers/__identifiers.dm
@@ -30,14 +30,16 @@
#define ATMOS_GAS_MONITOR_ORDNANCE_FREEZER "ordnancefreezer"
#define ATMOS_GAS_MONITOR_DISTRO "distro"
#define ATMOS_GAS_MONITOR_WASTE "waste"
+#define ATMOS_GAS_MONITOR_ENGINE "engine"
-///maps a chamber id to its air sensor
-#define CHAMBER_SENSOR_FROM_ID(chamber_id) ((chamber_id) + "_sensor")
///maps an air sensor's chamber id to its input valve[ i.e. outlet_injector] id
#define CHAMBER_INPUT_FROM_ID(chamber_id) ((chamber_id) + "_in")
///maps an air sensor's chamber id to its output valve[i.e. vent pump] id
#define CHAMBER_OUTPUT_FROM_ID(chamber_id) ((chamber_id) + "_out")
+///list of all air sensor's created round start
+GLOBAL_LIST_EMPTY(map_loaded_sensors)
+
// Human-readble names of these funny tags.
GLOBAL_LIST_INIT(station_gas_chambers, list(
ATMOS_GAS_MONITOR_O2 = "Oxygen Supply",
@@ -67,4 +69,5 @@ GLOBAL_LIST_INIT(station_gas_chambers, list(
ATMOS_GAS_MONITOR_ORDNANCE_FREEZER = "Ordnance Freezer Chamber",
ATMOS_GAS_MONITOR_DISTRO = "Distribution Loop",
ATMOS_GAS_MONITOR_WASTE = "Waste Loop",
+ ATMOS_GAS_MONITOR_ENGINE = "Supermatter Engine Chamber",
))
diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
index aca8b7ef43d6..24ea3b8979de 100644
--- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm
+++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
@@ -5,14 +5,26 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
resistance_flags = FIRE_PROOF
-
+ power_channel = AREA_USAGE_ENVIRON
+ active_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 1.5
var/on = TRUE
/// The unique string that represents which atmos chamber to associate with.
var/chamber_id
+ /// The inlet[injector] controlled by this sensor
+ var/inlet_id
+ /// The outlet[vent pump] controlled by this sensor
+ var/outlet_id
/obj/machinery/air_sensor/Initialize(mapload)
- id_tag = CHAMBER_SENSOR_FROM_ID(chamber_id)
+ id_tag = assign_random_name()
+
+ //this global list of air sensors is available to all station monitering consoles round start and to new consoles made during the round
+ if(mapload)
+ GLOB.map_loaded_sensors[chamber_id] = id_tag
+ inlet_id = CHAMBER_INPUT_FROM_ID(chamber_id)
+ outlet_id = CHAMBER_OUTPUT_FROM_ID(chamber_id)
+
var/static/list/multitool_tips = list(
TOOL_MULTITOOL = list(
SCREENTIP_CONTEXT_LMB = "Link logged injectors/vents",
@@ -27,21 +39,45 @@
reset()
return ..()
+/obj/machinery/air_sensor/return_air()
+ if(!on)
+ return
+ . = ..()
+ use_power(active_power_usage) //use power for analyzing gases
+
+/obj/machinery/air_sensor/process()
+ //update appearance according to power state
+ if(machine_stat & NOPOWER)
+ if(on)
+ on = FALSE
+ update_appearance()
+ else if(!on)
+ on = TRUE
+ update_appearance()
+
+/obj/machinery/air_sensor/examine(mob/user)
+ . = ..()
+ . += span_notice("Use multitool to link it to an injector/vent or reset it's ports")
+ . += span_notice("Click with hand to turn it off.")
+
+/obj/machinery/air_sensor/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+
+ //switched off version of this air sensor but still anchored to the ground
+ var/obj/item/air_sensor/sensor = new(drop_location(), inlet_id, outlet_id)
+ sensor.set_anchored(TRUE)
+ sensor.balloon_alert(user, "sensor turned off")
+
+ //delete self
+ qdel(src)
+
/obj/machinery/air_sensor/update_icon_state()
icon_state = "gsensor[on]"
return ..()
/obj/machinery/air_sensor/proc/reset()
- var/input_id = CHAMBER_INPUT_FROM_ID(chamber_id)
- if(GLOB.objects_by_id_tag[input_id] != null)
- var/obj/machinery/atmospherics/components/unary/outlet_injector/injector = GLOB.objects_by_id_tag[input_id]
- injector.disconnect_chamber()
-
- var/output_id = CHAMBER_OUTPUT_FROM_ID(chamber_id)
- if(GLOB.objects_by_id_tag[output_id] != null)
- var/obj/machinery/atmospherics/components/unary/vent_pump/pump = GLOB.objects_by_id_tag[output_id]
- pump.disconnect_chamber()
-
+ inlet_id = null
+ outlet_id = null
///right click with multi tool to disconnect everything
/obj/machinery/air_sensor/multitool_act_secondary(mob/living/user, obj/item/tool)
@@ -50,20 +86,16 @@
return TRUE
/obj/machinery/air_sensor/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
- .= ..()
-
- if (!istype(multi_tool))
- return .
+ . = ..()
if(istype(multi_tool.buffer, /obj/machinery/atmospherics/components/unary/outlet_injector))
var/obj/machinery/atmospherics/components/unary/outlet_injector/input = multi_tool.buffer
- input.chamber_id = chamber_id
- GLOB.objects_by_id_tag[CHAMBER_INPUT_FROM_ID(chamber_id)] = input
+ inlet_id = input.id_tag
+ multi_tool.buffer = null
balloon_alert(user, "connected to input")
else if(istype(multi_tool.buffer, /obj/machinery/atmospherics/components/unary/vent_pump))
var/obj/machinery/atmospherics/components/unary/vent_pump/output = multi_tool.buffer
-
//so its no longer controlled by air alarm
output.disconnect_from_area()
//configuration copied from /obj/machinery/atmospherics/components/unary/vent_pump/siphon
@@ -71,9 +103,128 @@
output.pressure_checks = ATMOS_INTERNAL_BOUND
output.internal_pressure_bound = 4000
output.external_pressure_bound = 0
-
- output.chamber_id = chamber_id
- GLOB.objects_by_id_tag[CHAMBER_OUTPUT_FROM_ID(chamber_id)] = output
+ //finally assign it to this sensor
+ outlet_id = output.id_tag
+ multi_tool.buffer = null
balloon_alert(user, "connected to output")
+ else
+ multi_tool.buffer = src
+ balloon_alert(user, "added to multitool buffer")
+
return TRUE
+
+/**
+ * A portable version of the /obj/machinery/air_sensor
+ * Wrenching it & turning it on will convert it back to /obj/machinery/air_sensor
+ * Unwelding /obj/machinery/air_sensor will turn it back to /obj/item/air_sensor
+ * The logic is same as meters
+ */
+/obj/item/air_sensor
+ name = "Air Sensor"
+ desc = "A device designed to detect gases and their concentration in an area."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "gsensor0"
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT) // MONKESTATION EDIT CHANGE OLD // REQUIRES PR #75052
+
+ /// The injector linked with this sensor
+ var/input_id
+ /// The vent pump linked with this sensor
+ var/output_id
+
+/obj/item/air_sensor/Initialize(mapload, inlet, outlet)
+ . = ..()
+ register_context()
+ input_id = inlet
+ output_id = outlet
+
+/obj/item/air_sensor/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ if(isnull(held_item))
+ return NONE
+
+ if(held_item.tool_behaviour == TOOL_WRENCH)
+ context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unwrench" : "Wrench"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(held_item.tool_behaviour == TOOL_WELDER && !anchored)
+ context[SCREENTIP_CONTEXT_LMB] = "Dismantle"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ return NONE
+
+/obj/item/air_sensor/examine(mob/user)
+ . = ..()
+ if(anchored)
+ . += span_notice("It's [EXAMINE_HINT("wrenched")] in place")
+ else
+ . += span_notice("It should be [EXAMINE_HINT("wrenched")] in place to turn it on.")
+ . += span_notice("It could be [EXAMINE_HINT("welded")] apart.")
+ . += span_notice("Click with hand to turn it on.")
+
+/obj/item/air_sensor/attack_hand(mob/user, list/modifiers)
+ . = ..()
+ if(!anchored)
+ return
+
+ //List of air sensor's by name
+ var/list/available_sensors = list()
+ for(var/chamber_id in GLOB.station_gas_chambers)
+ //don't let it conflict with existing distro & waste moniter meter's
+ if(chamber_id == ATMOS_GAS_MONITOR_DISTRO)
+ continue
+ if(chamber_id == ATMOS_GAS_MONITOR_WASTE)
+ continue
+ available_sensors += GLOB.station_gas_chambers[chamber_id]
+
+ //make the choice
+ var/chamber_name = tgui_input_list(user, "Select Sensor Purpose", "Select Sensor ID", available_sensors)
+ if(isnull(chamber_name))
+ return
+
+ //map chamber name back to id
+ var/target_chamber
+ for(var/chamber_id in GLOB.station_gas_chambers)
+ if(GLOB.station_gas_chambers[chamber_id] != chamber_name)
+ continue
+ target_chamber = chamber_id
+ break
+
+ //build the sensor from the subtypes of sensor's available
+ var/static/list/chamber_subtypes = null
+ if(isnull(chamber_subtypes))
+ chamber_subtypes = subtypesof(/obj/machinery/air_sensor)
+ for(var/obj/machinery/air_sensor/sensor as anything in chamber_subtypes)
+ if(initial(sensor.chamber_id) != target_chamber)
+ continue
+
+ //make real air sensor in it's place
+ var/obj/machinery/air_sensor/new_sensor = new sensor(get_turf(src))
+ new_sensor.inlet_id = input_id
+ new_sensor.outlet_id = output_id
+ new_sensor.balloon_alert(user, "sensor turned on")
+ qdel(src)
+
+ break
+
+/obj/item/air_sensor/wrench_act(mob/living/user, obj/item/tool)
+ if(default_unfasten_wrench(user, tool) == SUCCESSFUL_UNFASTEN)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+ return
+
+/obj/item/air_sensor/welder_act(mob/living/user, obj/item/tool)
+ if(!tool.tool_start_check(user, amount = 1))
+ return
+
+ loc.balloon_alert(user, "dismantling sensor")
+ if(!tool.use_tool(src, user, 2 SECONDS, volume = 30, amount = 1))
+ return
+ loc.balloon_alert(user, "sensor dismanteled")
+
+ deconstruct(TRUE)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/item/air_sensor/deconstruct(disassembled)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ new /obj/item/analyzer(loc)
+ new /obj/item/stack/sheet/iron(loc, 1)
+ return ..()
diff --git a/code/game/machinery/computer/atmos_computers/_atmos_control.dm b/code/game/machinery/computer/atmos_computers/_atmos_control.dm
index dd885e2c1dde..57403a27d3d2 100644
--- a/code/game/machinery/computer/atmos_computers/_atmos_control.dm
+++ b/code/game/machinery/computer/atmos_computers/_atmos_control.dm
@@ -7,7 +7,7 @@
circuit = /obj/item/circuitboard/computer/atmos_control
light_color = LIGHT_COLOR_CYAN
- /// Which sensors/input/outlets do we want to listen to.
+ /// Which sensors do we want to listen to.
/// Assoc of list[chamber_id] = readable_chamber_name
var/list/atmos_chambers
@@ -19,12 +19,33 @@
/// Whether we are allowed to reconnect.
var/reconnecting = TRUE
+ /// Was this computer multitooled before. If so copy the list connected_sensors as it now mantain's it's own sensors independent of the map loaded one's
+ var/was_multi_tooled = FALSE
+
+ /// list of all sensors[key is chamber id, value is id of air sensor linked to this chamber] monitered by this computer
+ var/list/connected_sensors
+
/obj/machinery/computer/atmos_control/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
+
+ var/static/list/multitool_tips = list(
+ TOOL_MULTITOOL = list(
+ SCREENTIP_CONTEXT_LMB = "Link Sensor",
+ )
+ )
+ AddElement(/datum/element/contextual_screentip_tools, multitool_tips)
+
+ //all newly constructed/round start computers by default have access to this list
+ connected_sensors = GLOB.map_loaded_sensors
+
//special case for the station monitering console. We dont want to loose these chambers during reconnecting
if(!control && !isnull(atmos_chambers))
always_displayed_chambers = atmos_chambers.Copy()
+/obj/machinery/computer/atmos_control/examine(mob/user)
+ . = ..()
+ . += span_notice("Use a multitool to link a air sensor to this computer")
+
/// Reconnect only works for station based chambers.
/obj/machinery/computer/atmos_control/proc/reconnect(mob/user)
if(!reconnecting)
@@ -33,16 +54,25 @@
// We only prompt the user with the sensors that are actually available.
var/available_devices = list()
- for (var/chamber_identifier in GLOB.station_gas_chambers)
- if (!(CHAMBER_INPUT_FROM_ID(chamber_identifier) in GLOB.objects_by_id_tag) && !(CHAMBER_OUTPUT_FROM_ID(chamber_identifier) in GLOB.objects_by_id_tag))
+ for (var/chamber_identifier in connected_sensors)
+ //this sensor was destroyed at the time of reconnecting
+ var/obj/machinery/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber_identifier]]
+ if(QDELETED(sensor))
+ continue
+
+ //non master computers don't have access to these station moniters. Only done to give master computer's special access to these chambers and make them feel special or something
+ if(chamber_identifier == ATMOS_GAS_MONITOR_DISTRO)
+ continue
+ if(chamber_identifier == ATMOS_GAS_MONITOR_WASTE)
continue
available_devices[GLOB.station_gas_chambers[chamber_identifier]] = chamber_identifier
// As long as we dont put any funny chars in the strings it should match.
var/new_name = tgui_input_list(user, "Select the device set", "Reconnect", available_devices)
+ if(isnull(new_name))
+ return FALSE
var/new_id = available_devices[new_name]
-
if(isnull(new_id))
return FALSE
@@ -57,6 +87,22 @@
return TRUE
+/obj/machinery/computer/atmos_control/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
+ . = ..()
+
+ if(istype(multi_tool.buffer, /obj/machinery/air_sensor))
+ var/obj/machinery/air_sensor/sensor = multi_tool.buffer
+ //computers reference a global map loaded list of sensor's but as soon a user attempt's to edit it, make a copy of that list so other computers aren't affected
+ if(!was_multi_tooled)
+ connected_sensors = connected_sensors.Copy()
+ was_multi_tooled = TRUE
+ //register the sensor's unique ID with it's assositated chamber
+ connected_sensors[sensor.chamber_id] = sensor.id_tag
+ user.balloon_alert(user, "sensor connected to [src]")
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+ return
+
/obj/machinery/computer/atmos_control/ui_interact(mob/user, datum/tgui/ui)
. = ..()
ui = SStgui.try_update_ui(user, src, ui)
@@ -82,23 +128,26 @@
chamber_info["id"] = chamber_id
chamber_info["name"] = atmos_chambers[chamber_id]
- var/obj/machinery/sensor = GLOB.objects_by_id_tag[CHAMBER_SENSOR_FROM_ID(chamber_id)]
- if (!isnull(sensor))
+ var/obj/machinery/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber_id]]
+ if(!QDELETED(sensor))
chamber_info["gasmix"] = gas_mixture_parser(sensor.return_air())
- var/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/input = GLOB.objects_by_id_tag[CHAMBER_INPUT_FROM_ID(chamber_id)]
- if (!isnull(input))
- chamber_info["input_info"] = list(
- "active" = input.on,
- "amount" = input.volume_rate,
- )
+ if(istype(sensor, /obj/machinery/air_sensor)) //distro & waste loop are not air sensors and don't have these functions
+ var/obj/machinery/air_sensor/air_sensor = sensor
+
+ var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[air_sensor.inlet_id || ""]
+ if (!QDELETED(input))
+ chamber_info["input_info"] = list(
+ "active" = input.on,
+ "amount" = input.volume_rate,
+ )
- var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[CHAMBER_OUTPUT_FROM_ID(chamber_id)]
- if (!isnull(output))
- chamber_info["output_info"] = list(
- "active" = output.on,
- "amount" = output.internal_pressure_bound,
- )
+ var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[air_sensor.outlet_id || ""]
+ if (!QDELETED(output))
+ chamber_info["output_info"] = list(
+ "active" = output.on,
+ "amount" = output.internal_pressure_bound,
+ )
data["chambers"] += list(chamber_info)
return data
@@ -115,37 +164,66 @@
if (!(chamber in atmos_chambers))
return TRUE
- var/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/input = GLOB.objects_by_id_tag[CHAMBER_INPUT_FROM_ID(chamber)]
- input?.on = !input.on
+ var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]]
+ if(QDELETED(sensor))
+ return TRUE
+
+ var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[sensor.inlet_id || ""]
+ if(QDELETED(input))
+ return TRUE
+
+ input.on = !input.on
input.update_appearance(UPDATE_ICON)
if("toggle_output")
if (!(chamber in atmos_chambers))
return TRUE
- var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[CHAMBER_OUTPUT_FROM_ID(chamber)]
- output?.on = !output.on
+ var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]]
+ if(QDELETED(sensor))
+ return TRUE
+
+ var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[sensor.outlet_id || ""]
+ if(QDELETED(output))
+ return TRUE
+
+ output.on = !output.on
output.update_appearance(UPDATE_ICON)
if("adjust_input")
if (!(chamber in atmos_chambers))
return TRUE
+ var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]]
+ if(QDELETED(sensor))
+ return TRUE
+
+ var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[sensor.inlet_id || ""]
+ if(QDELETED(input))
+ return TRUE
+
var/target = text2num(params["rate"])
if(isnull(target))
return TRUE
target = clamp(target, 0, MAX_TRANSFER_RATE)
- var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[CHAMBER_INPUT_FROM_ID(chamber)]
- input?.volume_rate = clamp(target, 0, min(input.airs[1].volume, MAX_TRANSFER_RATE))
+ input.volume_rate = clamp(target, 0, min(input.airs[1].volume, MAX_TRANSFER_RATE))
if("adjust_output")
if (!(chamber in atmos_chambers))
return TRUE
+ var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]]
+ if(QDELETED(sensor))
+ return TRUE
+
+ var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[sensor.outlet_id || ""]
+ if(QDELETED(output))
+ return TRUE
+
var/target = text2num(params["rate"])
if(isnull(target))
return TRUE
+ target = clamp(target, 0, ATMOS_PUMP_MAX_PRESSURE)
- var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[CHAMBER_OUTPUT_FROM_ID(chamber)]
- output?.internal_pressure_bound = clamp(target, 0, ATMOS_PUMP_MAX_PRESSURE)
+ output.internal_pressure_bound = target
if("reconnect")
reconnect(usr)
diff --git a/code/game/machinery/computer/atmos_computers/air_sensors.dm b/code/game/machinery/computer/atmos_computers/air_sensors.dm
index bd28bcbae3a2..723ffacb2eb7 100644
--- a/code/game/machinery/computer/atmos_computers/air_sensors.dm
+++ b/code/game/machinery/computer/atmos_computers/air_sensors.dm
@@ -85,7 +85,7 @@
/obj/machinery/air_sensor/antinoblium_tank
name = "antinoblium tank gas sensor"
chamber_id = ATMOS_GAS_MONITOR_ANTINOBLIUM
-
+
/obj/machinery/air_sensor/incinerator_tank
name = "incinerator chamber gas sensor"
chamber_id = ATMOS_GAS_MONITOR_INCINERATOR
@@ -97,3 +97,7 @@
/obj/machinery/air_sensor/ordnance_freezer_chamber
name = "ordnance freezer chamber gas sensor"
chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER
+
+/obj/machinery/air_sensor/engine_chamber
+ name = "supermatter engine chamber gas sensor"
+ chamber_id = ATMOS_GAS_MONITOR_ENGINE
diff --git a/code/game/machinery/computer/atmos_computers/inlets.dm b/code/game/machinery/computer/atmos_computers/inlets.dm
index 5379a15c7258..32de77cc632d 100644
--- a/code/game/machinery/computer/atmos_computers/inlets.dm
+++ b/code/game/machinery/computer/atmos_computers/inlets.dm
@@ -1,6 +1,8 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored
on = TRUE
volume_rate = MAX_TRANSFER_RATE
+ /// The air sensor type this injector is linked to
+ var/chamber_id
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/Initialize(mapload)
id_tag = CHAMBER_INPUT_FROM_ID(chamber_id)
diff --git a/code/game/machinery/computer/atmos_computers/meters.dm b/code/game/machinery/computer/atmos_computers/meters.dm
index 9ff6578852b2..9cfe3072a69c 100644
--- a/code/game/machinery/computer/atmos_computers/meters.dm
+++ b/code/game/machinery/computer/atmos_computers/meters.dm
@@ -3,7 +3,9 @@
var/chamber_id
/obj/machinery/meter/monitored/Initialize(mapload, new_piping_layer)
- id_tag = CHAMBER_SENSOR_FROM_ID(chamber_id)
+ id_tag = assign_random_name()
+ if(mapload)
+ GLOB.map_loaded_sensors[chamber_id] = id_tag
. = ..()
/obj/machinery/meter/monitored/layer2
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 5ceedc6f0a83..44c97e1381a1 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -28,22 +28,32 @@
var/operating = FALSE
var/glass = FALSE
var/welded = FALSE
- var/heat_proof = FALSE // For rglass-windowed airlocks and firedoors
- var/emergency = FALSE // Emergency access override
- var/sub_door = FALSE // true if it's meant to go under another door.
+ /// For rglass-windowed airlocks and firedoors
+ var/heat_proof = FALSE
+ /// Emergency access override
+ var/emergency = FALSE
+ /// true if it's meant to go under another door.
+ var/sub_door = FALSE
var/closingLayer = CLOSED_DOOR_LAYER
- var/autoclose = FALSE //does it automatically close after some time
- var/safe = TRUE //whether the door detects things and mobs in its way and reopen or crushes them.
- var/locked = FALSE //whether the door is bolted or not.
+ ///does it automatically close after some time
+ var/autoclose = FALSE
+ ///whether the door detects things and mobs in its way and reopen or crushes them.
+ var/safe = TRUE
+ ///whether the door is bolted or not.
+ var/locked = FALSE
var/datum/effect_system/spark_spread/spark_system
- var/real_explosion_block //ignore this, just use explosion_block
- var/red_alert_access = FALSE //if TRUE, this door will always open on red alert
+ ///ignore this, just use explosion_block
+ var/real_explosion_block
+ ///if TRUE, this door will always open on red alert
+ var/red_alert_access = FALSE
/// Checks to see if this airlock has an unrestricted "sensor" within (will set to TRUE if present).
var/unres_sensor = FALSE
/// Unrestricted sides. A bitflag for which direction (if any) can open the door with no access
var/unres_sides = NONE
- var/can_crush = TRUE /// Whether or not the door can crush mobs.
- var/can_open_with_hands = TRUE /// Whether or not the door can be opened by hand (used for blast doors and shutters)
+ /// Whether or not the door can crush mobs.
+ var/can_crush = TRUE
+ /// Whether or not the door can be opened by hand (used for blast doors and shutters)
+ var/can_open_with_hands = TRUE
/// Whether or not this door can be opened through a door remote, ever
var/opens_with_door_remote = FALSE
/// Special operating mode for elevator doors
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 69651229fd26..ff5bad76dc2b 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -48,10 +48,9 @@ Possible to do for anyone motivated enough:
// Blue, dim light
light_power = 0.8
light_color = LIGHT_COLOR_BLUE
- /// associative lazylist of the form: list(mob calling us = hologram representing that mob).
- /// this is only populated for holopads answering calls from another holopad
+ /// associative lazylist of the form: list(owner of a hologram = hologram representing that owner).
var/list/masters
- /// Holoray-mob link
+ /// Holoray-owner link
var/list/holorays
/// To prevent request spam. ~Carn
var/last_request = 0
@@ -137,8 +136,6 @@ Possible to do for anyone motivated enough:
if(!loc)
return
// move any relevant holograms, basically non-AI, and rays with the pad
- if(replay_holo)
- replay_holo.abstract_move(loc)
for(var/mob/living/user as anything in holorays)
var/obj/effect/overlay/holoray/ray = holorays[user]
ray.abstract_move(loc)
@@ -149,7 +146,7 @@ Possible to do for anyone motivated enough:
non_call_masters -= holocall.user
// moving the eye moves the holo which updates the ray too
holocall.eye.setLoc(locate(clamp(x + (holocall.hologram.x - old_loc.x), 1, world.maxx), clamp(y + (holocall.hologram.y - old_loc.y), 1, world.maxy), z))
- for(var/mob/living/holo_master as anything in non_call_masters)
+ for(var/datum/holo_master as anything in non_call_masters)
var/obj/effect/holo = masters[holo_master]
update_holoray(holo_master, holo.loc)
@@ -398,7 +395,7 @@ Possible to do for anyone motivated enough:
new_turf = get_turf(src)
else
new_turf = get_step(src, GLOB.cardinals[offset])
- replay_holo.forceMove(new_turf)
+ move_hologram(disk.record, new_turf)
return TRUE
if("hang_up")
if(outgoing_call)
@@ -491,7 +488,7 @@ Possible to do for anyone motivated enough:
//everything in here can start processing if need be once first set and stop processing after being unset
/obj/machinery/holopad/process()
if(LAZYLEN(masters))
- for(var/mob/living/master as anything in masters)
+ for(var/datum/master as anything in masters)
if(!is_operational || !validate_user(master))
clear_holo(master)
@@ -548,6 +545,7 @@ Possible to do for anyone motivated enough:
SET_PLANE_EXPLICIT(hologram, ABOVE_GAME_PLANE, src)
hologram.set_anchored(TRUE)//So space wind cannot drag it.
hologram.name = "[user.name] (Hologram)"//If someone decides to right click.
+ set_holo(user, hologram)
set_holo(user, hologram)
visible_message(span_notice("A holographic image of [user] flickers to life before your eyes!"))
@@ -599,20 +597,20 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
icon_state = "[base_icon_state][(total_users || replay_mode) ? 1 : 0]"
return ..()
-/obj/machinery/holopad/proc/set_holo(mob/living/user, obj/effect/overlay/holo_pad_hologram/h)
- LAZYSET(masters, user, h)
- LAZYSET(holorays, user, new /obj/effect/overlay/holoray(loc))
+/obj/machinery/holopad/proc/set_holo(datum/owner, obj/effect/overlay/holo_pad_hologram/h)
+ LAZYSET(masters, owner, h)
+ LAZYSET(holorays, owner, new /obj/effect/overlay/holoray(loc))
set_can_hear_flags(CAN_HEAR_MASTERS)
- var/mob/living/silicon/ai/AI = user
+ var/mob/living/silicon/ai/AI = owner
if(istype(AI))
AI.current = src
SetLightsAndPower()
- update_holoray(user, get_turf(loc))
+ update_holoray(owner, get_turf(loc))
return TRUE
-/obj/machinery/holopad/proc/clear_holo(mob/living/user)
- qdel(masters[user]) // Get rid of user's hologram
- unset_holo(user)
+/obj/machinery/holopad/proc/clear_holo(datum/owner)
+ qdel(masters[owner]) // Get rid of owner's hologram
+ unset_holo(owner)
return TRUE
/**
@@ -643,7 +641,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
return TRUE
//Try to transfer hologram to another pad that can project on T
-/obj/machinery/holopad/proc/transfer_to_nearby_pad(turf/T,mob/holo_owner)
+/obj/machinery/holopad/proc/transfer_to_nearby_pad(turf/T, datum/holo_owner)
var/obj/effect/overlay/holo_pad_hologram/h = masters[holo_owner]
if(!h || h.HC) //Holocalls can't change source.
return FALSE
@@ -659,8 +657,13 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
return TRUE
return FALSE
-/obj/machinery/holopad/proc/validate_user(mob/living/user)
- if(QDELETED(user) || user.incapacitated() || !user.client)
+/obj/machinery/holopad/proc/validate_user(datum/owner)
+ if(QDELETED(owner))
+ return FALSE
+ if(!isliving(owner))
+ return TRUE
+ var/mob/living/user = owner
+ if(user.incapacitated() || !user.client)
return FALSE
return TRUE
@@ -672,13 +675,13 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
else
return FALSE
-/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf)
- if(!LAZYLEN(masters) || !masters[user])
+/obj/machinery/holopad/proc/move_hologram(datum/owner, turf/new_turf)
+ if(!LAZYLEN(masters) || !masters[owner])
return TRUE
- var/obj/effect/overlay/holo_pad_hologram/holo = masters[user]
+ var/obj/effect/overlay/holo_pad_hologram/holo = masters[owner]
var/transfered = FALSE
if(!validate_location(new_turf))
- if(!transfer_to_nearby_pad(new_turf,user))
+ if(!transfer_to_nearby_pad(new_turf, owner))
return FALSE
else
transfered = TRUE
@@ -686,13 +689,13 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
holo.abstract_move(new_turf)
SET_PLANE(holo, ABOVE_GAME_PLANE, new_turf)
if(!transfered)
- update_holoray(user,new_turf)
+ update_holoray(owner, new_turf)
return TRUE
-/obj/machinery/holopad/proc/update_holoray(mob/living/user, turf/new_turf)
- var/obj/effect/overlay/holo_pad_hologram/holo = masters[user]
- var/obj/effect/overlay/holoray/ray = holorays[user]
+/obj/machinery/holopad/proc/update_holoray(datum/holo_owner, turf/new_turf)
+ var/obj/effect/overlay/holo_pad_hologram/holo = masters[holo_owner]
+ var/obj/effect/overlay/holoray/ray = holorays[holo_owner]
var/disty = holo.y - ray.y
var/distx = holo.x - ray.x
var/newangle
@@ -717,7 +720,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/holopad/proc/setup_replay_holo(datum/holorecord/record)
var/obj/effect/overlay/holo_pad_hologram/hologram = new(loc)//Spawn a blank effect at the location.
- hologram.add_overlay(record.caller_image)
+ var/image/work_off = record.caller_image
+ hologram.icon = work_off.icon
+ hologram.icon_state = work_off.icon_state
+ hologram.copy_overlays(work_off, TRUE)
hologram.makeHologram()
var/datum/language_holder/holder = hologram.get_language_holder()
@@ -727,6 +733,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
SET_PLANE_EXPLICIT(hologram, ABOVE_GAME_PLANE, src)
hologram.set_anchored(TRUE)//So space wind cannot drag it.
hologram.name = "[record.caller_name] (Hologram)"//If someone decides to right click.
+ set_holo(record, hologram)
+
visible_message(span_notice("A holographic image of [record.caller_name] flickers to life before your eyes!"))
return hologram
@@ -741,6 +749,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(replay_mode)
replay_mode = FALSE
offset = FALSE
+ clear_holo(disk.record)
QDEL_NULL(replay_holo)
SetLightsAndPower()
@@ -809,8 +818,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(HOLORECORD_PRESET)
var/preset_type = entry[2]
var/datum/preset_holoimage/H = new preset_type
- replay_holo.cut_overlays()
- replay_holo.add_overlay(H.build_image())
+ var/image/work_off = H.build_image()
+ replay_holo.icon = work_off.icon
+ replay_holo.icon_state = work_off.icon_state
+ replay_holo.copy_overlays(work_off, TRUE)
if(HOLORECORD_RENAME)
replay_holo.name = entry[2] + " (Hologram)"
.(entry_number+1)
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 83f237d2e9d8..6f2fb64aaa97 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -8,9 +8,68 @@
max_integrity = 300
armor_type = /datum/armor/machinery_igniter
resistance_flags = FIRE_PROOF
+ processing_flags = NONE
var/id = null
var/on = FALSE
+/obj/machinery/igniter/Initialize(mapload)
+ . = ..()
+ update_appearance()
+ register_context()
+
+/obj/machinery/igniter/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ if(isnull(held_item))
+ return NONE
+
+ if(isnull(held_item))
+ return NONE
+
+ if(held_item.tool_behaviour == TOOL_MULTITOOL)
+ context[SCREENTIP_CONTEXT_LMB] = "Connect [src]"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(held_item.tool_behaviour == TOOL_WELDER)
+ context[SCREENTIP_CONTEXT_LMB] = "Unweld"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ return NONE
+
+/obj/machinery/igniter/examine(mob/user)
+ . = ..()
+ . += span_notice("Use a [EXAMINE_HINT("multitool")] to set its ID to match your ignition controller's ID.")
+ . += span_notice("It could be [EXAMINE_HINT("welded")] apart.")
+
+/obj/machinery/igniter/welder_act(mob/living/user, obj/item/tool)
+ if(on)
+ return
+
+ if(!tool.tool_start_check(user, amount = 2))
+ balloon_alert(user, "not enough fuel!")
+ return
+
+ loc.balloon_alert(user, "dismantling [src]")
+ if(!tool.use_tool(src, user, delay = 2.5 SECONDS, amount = 2, volume = 50))
+ return
+ loc.balloon_alert(user, "[src] dismantled")
+
+ deconstruct(TRUE)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/igniter/deconstruct(disassembled)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ new /obj/item/stack/sheet/iron(loc, 5)
+ new /obj/item/assembly/igniter(loc)
+ return ..()
+
+/obj/machinery/igniter/multitool_act(mob/living/user, obj/item/tool)
+ var/change_id = tgui_input_number(user, "Set the igniter controller's ID", "Igniter ID", id, 100)
+ if(!change_id || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
+ return
+ id = change_id
+ balloon_alert(user, "id set to [id]")
+ to_chat(user, span_notice("You change the ID to [id]."))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
/obj/machinery/igniter/incinerator_ordmix
id = INCINERATOR_ORDMIX_IGNITER
@@ -33,29 +92,38 @@
fire = 100
acid = 70
+/// turns the igniter on/off
+/obj/machinery/igniter/proc/toggle()
+ on = !( on )
+ if(on)
+ begin_processing()
+ else
+ end_processing()
+ update_appearance()
+
/obj/machinery/igniter/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
add_fingerprint(user)
+ toggle()
- use_power(active_power_usage)
- on = !( on )
- update_appearance()
-
-/obj/machinery/igniter/process() //ugh why is this even in process()?
- if (on && !(machine_stat & NOPOWER) )
- var/turf/location = loc
- if (isturf(location))
- location.hotspot_expose(1000,500,1)
- return 1
+/// Have to process to ignite any gas that comes in the turf
+/obj/machinery/igniter/process()
+ var/turf/location = loc
+ if(!isturf(location) || !isopenturf(location)) //don't ignite stuff inside walls
+ on = FALSE
+ if(machine_stat & NOPOWER)
+ on = FALSE
+ if(!on)
+ update_appearance()
+ return PROCESS_KILL
-/obj/machinery/igniter/Initialize(mapload)
- . = ..()
- icon_state = "igniter[on]"
+ location.hotspot_expose(1000, 500, 1)
+ use_power(active_power_usage) //use power to keep the turf hot
/obj/machinery/igniter/update_icon_state()
- icon_state = "[base_icon_state][(machine_stat & NOPOWER) ? 0 : on]"
+ icon_state = "[base_icon_state][on]"
return ..()
/obj/machinery/igniter/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
@@ -63,6 +131,14 @@
// Wall mounted remote-control igniter.
+/obj/item/wallframe/sparker
+ name = "Sparker WallFrame"
+ desc = "An unmounted sparker. Attach it to a wall to use."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "migniter"
+ result_path = /obj/machinery/sparker
+ pixel_shift = 26
+
/obj/machinery/sparker
name = "mounted igniter"
desc = "A wall-mounted ignition device."
@@ -85,11 +161,58 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/sparker, 26)
spark_system = new /datum/effect_system/spark_spread
spark_system.set_up(2, 1, src)
spark_system.attach(src)
+ register_context()
/obj/machinery/sparker/Destroy()
QDEL_NULL(spark_system)
return ..()
+/obj/machinery/sparker/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ if(isnull(held_item))
+ return NONE
+
+ if(held_item.tool_behaviour == TOOL_MULTITOOL)
+ context[SCREENTIP_CONTEXT_LMB] = "Connect [src]"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(held_item.tool_behaviour == TOOL_WELDER)
+ context[SCREENTIP_CONTEXT_LMB] = "Unweld"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ return NONE
+
+/obj/machinery/sparker/examine(mob/user)
+ . = ..()
+ . += span_notice("Use a [EXAMINE_HINT("multitool")] to set its ID to match your ignition controller's ID.")
+ . += span_notice("It could be [EXAMINE_HINT("welded")] apart.")
+
+/obj/machinery/sparker/welder_act(mob/living/user, obj/item/tool)
+ if(!tool.tool_start_check(user, amount = 1))
+ balloon_alert(user, "not enough fuel!")
+ return TRUE
+
+ loc.balloon_alert(user, "dismantling [src]")
+ if(!tool.use_tool(src, user, delay = 1.5 SECONDS, amount = 1, volume = 50))
+ return
+ loc.balloon_alert(user, "[src] dismantled")
+
+ deconstruct(TRUE)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/sparker/deconstruct(disassembled)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ new /obj/item/wallframe/sparker(loc)
+ return ..()
+
+/obj/machinery/sparker/multitool_act(mob/living/user, obj/item/tool)
+ var/change_id = tgui_input_number(user, "Set the sparker controller's ID", "Sparker ID", id, 100)
+ if(!change_id || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
+ return
+ id = change_id
+ balloon_alert(user, "id set to [id]")
+ to_chat(user, span_notice("You change the ID to [id]."))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
/obj/machinery/sparker/update_icon_state()
if(disable)
icon_state = "[base_icon_state]-d"
@@ -120,21 +243,23 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/sparker, 26)
return
/obj/machinery/sparker/proc/ignite()
- if (!(powered()))
- return
+ if(!(powered()))
+ return FALSE
- if ((disable) || (last_spark && world.time < last_spark + 50))
- return
+ if((disable) || (last_spark && world.time < last_spark + 50))
+ return FALSE
+ var/turf/location = loc
+ if(!isturf(location) || !isopenturf(location))
+ return FALSE
flick("[initial(icon_state)]-spark", src)
spark_system.start()
last_spark = world.time
+ location.hotspot_expose(1000, 2500, 1)
use_power(active_power_usage)
- var/turf/location = loc
- if (isturf(location))
- location.hotspot_expose(1000,2500,1)
- return 1
+
+ return TRUE
/obj/machinery/sparker/emp_act(severity)
. = ..()
diff --git a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm
index 57c1441b6fde..f1034c5541f7 100644
--- a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm
+++ b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm
@@ -16,10 +16,7 @@
var/range = 5
/obj/effect/anomaly/bioscrambler/Initialize(mapload, new_lifespan, drops_core)
- ..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/effect/anomaly/bioscrambler/LateInitialize()
+ . = ..()
pursuit_target = WEAKREF(find_nearest_target())
/obj/effect/anomaly/bioscrambler/anomalyEffect(seconds_per_tick)
@@ -32,22 +29,29 @@
nearby.bioscramble(name)
/obj/effect/anomaly/bioscrambler/move_anomaly()
+ update_target()
+ if (isnull(pursuit_target))
+ return ..()
+ var/turf/step_turf = get_step(src, get_dir(src, pursuit_target.resolve()))
+ if (!HAS_TRAIT(step_turf, TRAIT_CONTAINMENT_FIELD))
+ Move(step_turf)
+
+/// Select a new target if we need one
+/obj/effect/anomaly/bioscrambler/proc/update_target()
var/mob/living/current_target = pursuit_target?.resolve()
if (QDELETED(current_target))
pursuit_target = null
- if (isnull(pursuit_target) || prob(20))
- var/mob/living/new_target = find_nearest_target()
- if (isnull(new_target))
- pursuit_target = null
- else if (new_target != current_target)
- current_target = new_target
- pursuit_target = WEAKREF(new_target)
- new_target.ominous_nosebleed()
- if (isnull(pursuit_target))
+ if (!isnull(pursuit_target) && prob(80))
return
- var/turf/step_turf = get_step(src, get_dir(src, current_target))
- if (!HAS_TRAIT(step_turf, TRAIT_CONTAINMENT_FIELD))
- Move(step_turf)
+ var/mob/living/new_target = find_nearest_target()
+ if (isnull(new_target))
+ pursuit_target = null
+ return
+ if (new_target == current_target)
+ return
+ current_target = new_target
+ pursuit_target = WEAKREF(new_target)
+ new_target.ominous_nosebleed()
/// Returns the closest conscious carbon on our z level or null if there somehow isn't one
/obj/effect/anomaly/bioscrambler/proc/find_nearest_target()
@@ -56,12 +60,10 @@
for(var/mob/living/carbon/target in GLOB.player_list)
if (target.z != z)
continue
- if (target.status_effects & GODMODE)
+ if (target.status_flags & GODMODE)
continue
if (target.stat >= UNCONSCIOUS)
continue // Don't just haunt a corpse
- if (contained && get_area(target) != impact_area) // monkestation edit: fix "runaway" bioscramblers
- continue
var/distance_from_target = get_dist(src, target)
if(distance_from_target >= closest_distance)
continue
@@ -69,3 +71,9 @@
closest_target = target
return closest_target
+
+/// A bioscrambler anomaly subtype which does not pursue people, for purposes of a space ruin
+/obj/effect/anomaly/bioscrambler/docile
+
+/obj/effect/anomaly/bioscrambler/docile/update_target()
+ return
diff --git a/code/game/objects/effects/phased_mob.dm b/code/game/objects/effects/phased_mob.dm
index 1456fa350bfa..dcd4e39189c8 100644
--- a/code/game/objects/effects/phased_mob.dm
+++ b/code/game/objects/effects/phased_mob.dm
@@ -2,7 +2,7 @@
name = "water"
anchored = TRUE
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
- resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | SHUTTLE_CRUSH_PROOF
invisibility = INVISIBILITY_OBSERVER
movement_type = FLOATING
/// The movable which's jaunting in this dummy
diff --git a/code/game/objects/effects/spawners/random/random.dm b/code/game/objects/effects/spawners/random/random.dm
index 62f8bb7cc42f..36e60620d706 100644
--- a/code/game/objects/effects/spawners/random/random.dm
+++ b/code/game/objects/effects/spawners/random/random.dm
@@ -87,18 +87,30 @@
/obj/effect/spawner/random/proc/make_item(spawn_loc, type_path_to_make)
return new type_path_to_make(spawn_loc)
-///If the spawner has a spawn_scatter_radius set, this creates a list of nearby turfs available
+///If the spawner has a spawn_scatter_radius set, this creates a list of nearby turfs available that are in view and have an unblocked line to them.
/obj/effect/spawner/random/proc/get_spawn_locations(radius)
var/list/scatter_locations = list()
- if(radius >= 0)
- for(var/turf/turf_in_view in view(radius, get_turf(src)))
- if(isclosedturf(turf_in_view) || (isgroundlessturf(turf_in_view) && !GET_TURF_BELOW(turf_in_view)))
- continue
- scatter_locations += turf_in_view
+ if(!radius)
+ return scatter_locations
+
+ for(var/turf/turf_in_view in view(radius, get_turf(src)))
+ if(isclosedturf(turf_in_view) || (isgroundlessturf(turf_in_view) && !GET_TURF_BELOW(turf_in_view)))
+ continue
+ if(!has_unblocked_line(turf_in_view))
+ continue
+
+ scatter_locations += turf_in_view
return scatter_locations
+/obj/effect/spawner/random/proc/has_unblocked_line(destination)
+ for(var/turf/potential_blockage as anything in get_line(get_turf(src), destination))
+ if(!potential_blockage.is_blocked_turf(exclude_mobs = TRUE))
+ continue
+ return FALSE
+ return TRUE
+
//finds the probabilities of items spawning from a loot spawner's loot pool
/obj/item/loot_table_maker
icon = 'icons/effects/landmarks_static.dmi'
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index e4d3de4a1113..5e38a8be45da 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -793,6 +793,8 @@
. += "It has [charges_left] use\s left."
else
. += "It is empty."
+ if(!has_cap) // MONKESTATION ADDITION: SPRAYCAN GUN (monkestation/code/game/objects/items/spraycan_gun.dm)
+ return
. += span_notice("Alt-click [src] to [ is_capped ? "take the cap off" : "put the cap on"]. Right-click a colored object to match its existing color.")
/obj/item/toy/crayon/spraycan/use_on(atom/target, mob/user, params)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 9210a6af5c3f..ca1c602124e8 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -498,9 +498,9 @@
. = ..()
if(unscrewed)
return
- if(broadcasting)
+ if(broadcasting && overlay_mic_idle)
. += overlay_mic_idle
- if(listening)
+ if(listening && overlay_speaker_idle)
. += overlay_speaker_idle
/obj/item/radio/screwdriver_act(mob/living/user, obj/item/tool)
diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm
index 2f89920cfcf2..8f20281a2ba7 100644
--- a/code/game/objects/items/etherealdiscoball.dm
+++ b/code/game/objects/items/etherealdiscoball.dm
@@ -55,9 +55,9 @@
/obj/structure/etherealball/proc/DiscoFever()
remove_atom_colour(TEMPORARY_COLOUR_PRIORITY)
- current_color = random_color()
+ current_color = "#[random_color()]"
set_light(l_outer_range = range, l_power = power, l_color = current_color)
- add_atom_colour("#[current_color]", FIXED_COLOUR_PRIORITY)
+ add_atom_colour(current_color, FIXED_COLOUR_PRIORITY)
update_appearance()
TimerID = addtimer(CALLBACK(src, PROC_REF(DiscoFever)), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index 4ab8b92fc676..1392be355916 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -135,7 +135,7 @@
icon_state = "etherealmeat"
desc = "So shiny you feel like ingesting it might make you shine too"
food_reagents = list(/datum/reagent/consumable/liquidelectricity = 10)
- tastes = list("pure electricity" = 2, "meat" = 1)
+ tastes = list("pure electricity" = 2, "glass" = 1) //MONKE EDIT: "meat" to "glass"
foodtypes = RAW | MEAT | TOXIC | GORE
venue_value = FOOD_MEAT_MUTANT
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 2204043433a5..05fdeab013bf 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -125,7 +125,15 @@
*/ //MONKESTATION EDIT ORIGINAL
log_bomber_targeted(user, "planted", src, target, "with [det_time] second fuse")
//MONKESTATION EDIT END
- notify_ghosts("[user] has planted \a [src] on [target] with a [det_time] second fuse!", source = bomb_target, action = (isturf(target) ? NOTIFY_JUMP : NOTIFY_ORBIT), flashwindow = FALSE, header = "Explosive Planted")
+ var/icon/target_icon = icon(bomb_target.icon, bomb_target.icon_state)
+ target_icon.Blend(icon(icon, icon_state), ICON_OVERLAY)
+ var/image/bomb_target_image = image(target_icon)
+ notify_ghosts(
+ "[user] has planted \a [src] on [target] with a [det_time] second fuse!",
+ source = bomb_target_image,
+ flashwindow = FALSE,
+ header = "Explosive Planted",
+ )
moveToNullspace() //Yep
diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm
index 00751d5f945c..d93fdaab8efc 100644
--- a/code/game/objects/items/implants/implant_stealth.dm
+++ b/code/game/objects/items/implants/implant_stealth.dm
@@ -41,6 +41,9 @@
/obj/structure/closet/cardboard/agent/Bump(atom/A)
. = ..()
+ if(istype(A, /obj/machinery/door))
+ for(var/mob/mob_in_box in contents)
+ A.Bumped(mob_in_box)
if(isliving(A))
reveal()
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index 805f2b7de55d..01b22e9d366c 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -47,36 +47,6 @@
GLOB.janitor_devices -= src
return ..()
-/obj/item/mop/proc/attack_on_liquids_turf(obj/item/mop/the_mop, turf/T, mob/user, obj/effect/abstract/liquid_turf/liquids)
- if(!user.Adjacent(T))
- return FALSE
- var/free_space = max_reagent_volume - src.reagents.total_volume
- var/looping = TRUE
- var/speed_mult = 1
- var/datum/liquid_group/targeted_group = T.liquids.liquid_group
- while(looping)
- if(speed_mult >= 0.2)
- speed_mult -= 0.05
- if(free_space <= 0)
- to_chat(user, "Your mop can't absorb any more!")
- looping = FALSE
- return TRUE
- if(do_after(user, src.mopspeed * speed_mult, target = T))
- if(the_mop.reagents.total_volume == the_mop.max_reagent_volume)
- to_chat(user, "Your [src.name] can't absorb any more!")
- return TRUE
- if(targeted_group.reagents_per_turf)
- targeted_group.trans_to_seperate_group(the_mop.reagents, min(targeted_group.reagents_per_turf, 5))
- to_chat(user, "You soak up some liquids with the [src.name].")
- else if(T.liquids.liquid_group)
- targeted_group = T.liquids.liquid_group
- else
- looping = FALSE
- else
- looping = FALSE
- user.changeNext_move(CLICK_CD_MELEE)
- return TRUE
-
///Checks whether or not we should clean.
/obj/item/mop/proc/should_clean(datum/cleaning_source, atom/atom_to_clean, mob/living/cleaner)
diff --git a/code/game/objects/items/rcd/RPD.dm b/code/game/objects/items/rcd/RPD.dm
index e6bf59881cc7..554da557bfab 100644
--- a/code/game/objects/items/rcd/RPD.dm
+++ b/code/game/objects/items/rcd/RPD.dm
@@ -9,6 +9,11 @@
#define DESTROY_MODE (1<<2)
#define REPROGRAM_MODE (1<<3)
+#define PIPE_LAYER(num) (1<<(num-1))
+
+///Sound to make when we use the item to build/destroy something
+#define RPD_USE_SOUND 'sound/items/deconstruct.ogg'
+
GLOBAL_LIST_INIT(atmos_pipe_recipes, list(
"Pipes" = list(
new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/smart, TRUE),
@@ -17,22 +22,24 @@ GLOBAL_LIST_INIT(atmos_pipe_recipes, list(
new /datum/pipe_info/pipe("Bridge Pipe", /obj/machinery/atmospherics/pipe/bridge_pipe, TRUE),
new /datum/pipe_info/pipe("Multi-Deck Adapter", /obj/machinery/atmospherics/pipe/multiz, FALSE),
),
- "Devices" = list(
- new /datum/pipe_info/pipe("Connector", /obj/machinery/atmospherics/components/unary/portables_connector, TRUE),
+ "Binary" = list(
+ new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve, TRUE),
+ new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital, TRUE),
new /datum/pipe_info/pipe("Gas Pump", /obj/machinery/atmospherics/components/binary/pump, TRUE),
new /datum/pipe_info/pipe("Volume Pump", /obj/machinery/atmospherics/components/binary/volume_pump, TRUE),
+ new /datum/pipe_info/pipe("Passive Gate", /obj/machinery/atmospherics/components/binary/passive_gate, TRUE),
+ new /datum/pipe_info/pipe("Pressure Valve", /obj/machinery/atmospherics/components/binary/pressure_valve, TRUE),
+ new /datum/pipe_info/pipe("Temperature Gate", /obj/machinery/atmospherics/components/binary/temperature_gate, TRUE),
+ new /datum/pipe_info/pipe("Temperature Pump", /obj/machinery/atmospherics/components/binary/temperature_pump, TRUE),
+ ),
+ "Devices" = list(
new /datum/pipe_info/pipe("Gas Filter", /obj/machinery/atmospherics/components/trinary/filter, TRUE),
new /datum/pipe_info/pipe("Gas Mixer", /obj/machinery/atmospherics/components/trinary/mixer, TRUE),
- new /datum/pipe_info/pipe("Passive Gate", /obj/machinery/atmospherics/components/binary/passive_gate, TRUE),
+ new /datum/pipe_info/pipe("Connector", /obj/machinery/atmospherics/components/unary/portables_connector, TRUE),
new /datum/pipe_info/pipe("Injector", /obj/machinery/atmospherics/components/unary/outlet_injector, TRUE),
new /datum/pipe_info/pipe("Scrubber", /obj/machinery/atmospherics/components/unary/vent_scrubber, TRUE),
new /datum/pipe_info/pipe("Unary Vent", /obj/machinery/atmospherics/components/unary/vent_pump, TRUE),
new /datum/pipe_info/pipe("Passive Vent", /obj/machinery/atmospherics/components/unary/passive_vent, TRUE),
- new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve, TRUE),
- new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital, TRUE),
- new /datum/pipe_info/pipe("Pressure Valve", /obj/machinery/atmospherics/components/binary/pressure_valve, TRUE),
- new /datum/pipe_info/pipe("Temperature Gate", /obj/machinery/atmospherics/components/binary/temperature_gate, TRUE),
- new /datum/pipe_info/pipe("Temperature Pump", /obj/machinery/atmospherics/components/binary/temperature_pump, TRUE),
new /datum/pipe_info/meter("Meter"),
),
"Heat Exchange" = list(
@@ -41,33 +48,6 @@ GLOBAL_LIST_INIT(atmos_pipe_recipes, list(
new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, FALSE),
new /datum/pipe_info/pipe("Junction", /obj/machinery/atmospherics/pipe/heat_exchanging/junction, FALSE),
new /datum/pipe_info/pipe("Heat Exchanger", /obj/machinery/atmospherics/components/unary/heat_exchanger, FALSE),
- ),
- "Air Sensors" = list(
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/plasma_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/oxygen_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/nitrogen_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/mix_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/nitrous_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/air_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/carbon_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/bz_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/freon_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/halon_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/healium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/hydrogen_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/hypernoblium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/miasma_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/nitrium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/pluoxium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/proto_nitrate_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/tritium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/water_vapor_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/zauker_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/helium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/antinoblium_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/incinerator_tank),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/ordnance_burn_chamber),
- new /datum/pipe_info/sensor(/obj/machinery/air_sensor/ordnance_freezer_chamber),
)
))
@@ -77,6 +57,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list(
new /datum/pipe_info/disposal("Junction", /obj/structure/disposalpipe/junction, PIPE_TRIN_M),
new /datum/pipe_info/disposal("Y-Junction", /obj/structure/disposalpipe/junction/yjunction),
new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M),
+ new /datum/pipe_info/disposal("Rotator", /obj/structure/disposalpipe/rotator, PIPE_ONEDIR_FLIPPABLE),
new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk),
new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR),
new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet),
@@ -95,9 +76,9 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
),
"Station Equipment" = list(
new /datum/pipe_info/transit("Through Tube Station", /obj/structure/c_transit_tube/station, PIPE_STRAIGHT),
- new /datum/pipe_info/transit("Terminus Tube Station", /obj/structure/c_transit_tube/station/reverse, PIPE_UNARY),
+ new /datum/pipe_info/transit("Terminus Tube Station", /obj/structure/c_transit_tube/station/reverse, PIPE_UNARY_FLIPPABLE),
new /datum/pipe_info/transit("Through Tube Dispenser Station", /obj/structure/c_transit_tube/station/dispenser, PIPE_STRAIGHT),
- new /datum/pipe_info/transit("Terminus Tube Dispenser Station", /obj/structure/c_transit_tube/station/dispenser/reverse, PIPE_UNARY),
+ new /datum/pipe_info/transit("Terminus Tube Dispenser Station", /obj/structure/c_transit_tube/station/dispenser/reverse, PIPE_UNARY_FLIPPABLE),
new /datum/pipe_info/transit("Transit Tube Pod", /obj/structure/c_transit_tube_pod, PIPE_ONEDIR),
)
))
@@ -109,10 +90,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
var/dirtype = PIPE_BENDABLE
var/all_layers
-/datum/pipe_info/proc/Params()
- return ""
-
-/datum/pipe_info/proc/get_preview(selected_dir)
+/datum/pipe_info/proc/get_preview(selected_dir, selected = FALSE)
var/list/dirs
switch(dirtype)
if(PIPE_STRAIGHT, PIPE_BENDABLE)
@@ -135,35 +113,24 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
if(PIPE_UNARY_FLIPPABLE)
dirs = list("[NORTH]" = "North", "[EAST]" = "East", "[SOUTH]" = "South", "[WEST]" = "West",
"[NORTHEAST]" = "North Flipped", "[SOUTHEAST]" = "East Flipped", "[SOUTHWEST]" = "South Flipped", "[NORTHWEST]" = "West Flipped")
+ if(PIPE_ONEDIR_FLIPPABLE)
+ dirs = list("[SOUTH]" = name, "[SOUTHEAST]" = "[name] Flipped")
var/list/rows = list()
- var/list/row = list("previews" = list())
- var/i = 0
for(var/dir in dirs)
var/numdir = text2num(dir)
- var/flipped = ((dirtype == PIPE_TRIN_M) || (dirtype == PIPE_UNARY_FLIPPABLE)) && (ISDIAGONALDIR(numdir))
- row["previews"] += list(list(
- "selected" = dirtype == PIPE_ONEDIR ? TRUE : (numdir == selected_dir),
+ var/flipped = ((dirtype == PIPE_TRIN_M) || (dirtype == PIPE_UNARY_FLIPPABLE) || (dirtype == PIPE_ONEDIR_FLIPPABLE)) && (ISDIAGONALDIR(numdir))
+ var/is_variant_selected = selected && (!selected_dir ? FALSE : (dirtype == PIPE_ONEDIR ? TRUE : (numdir == selected_dir)))
+ rows += list(list(
+ "selected" = is_variant_selected,
"dir" = dir2text(numdir),
"dir_name" = dirs[dir],
"icon_state" = icon_state,
"flipped" = flipped,
))
- if(i++ || dirtype == PIPE_ONEDIR)
- rows += list(row)
- row = list("previews" = list())
- i = 0
return rows
-/datum/pipe_info/sensor
- dirtype = PIPE_ONEDIR
-
-/datum/pipe_info/sensor/New(obj/machinery/air_sensor/sensor)
- id = sensor
- name = capitalize(replacetext(initial(sensor.name), "gas sensor", ""))
- icon_state = "gsensor1"
-
/datum/pipe_info/pipe/New(label, obj/machinery/atmospherics/path, use_five_layers)
name = label
id = path
@@ -172,19 +139,14 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
var/obj/item/pipe/c = initial(path.construction_type)
dirtype = initial(c.RPD_type)
-/datum/pipe_info/pipe/Params()
- return "makepipe=[id]&type=[dirtype]"
-
/datum/pipe_info/meter
icon_state = "meter"
dirtype = PIPE_ONEDIR
+ all_layers = TRUE // MONKESTATION ADDITION -- TG DOES NOT WANT YOU TO KNOW THIS ONE TRICK TO MAKE METERS WORK ON LAYERS 1 AND 5
/datum/pipe_info/meter/New(label)
name = label
-/datum/pipe_info/meter/Params()
- return "makemeter=[id]&type=[dirtype]"
-
/datum/pipe_info/disposal/New(label, obj/path, dt=PIPE_UNARY)
name = label
id = path
@@ -195,9 +157,6 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
dirtype = dt
-/datum/pipe_info/disposal/Params()
- return "dmake=[id]&type=[dirtype]"
-
/datum/pipe_info/transit/New(label, obj/path, dt=PIPE_UNARY)
name = label
id = path
@@ -207,7 +166,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
icon_state = "[icon_state]_preview"
/obj/item/pipe_dispenser
- name = "Rapid Pipe Dispenser"
+ name = "rapid pipe dispenser"
desc = "A device used to rapidly pipe things."
icon = 'icons/obj/tools.dmi'
icon_state = "rpd"
@@ -235,19 +194,17 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
///Color of the device we are going to spawn
var/paint_color = "green"
///Speed of building atmos devices
- var/atmos_build_speed = 0.5 SECONDS
+ var/atmos_build_speed = 0.4 SECONDS
///Speed of building disposal devices
var/disposal_build_speed = 0.5 SECONDS
///Speed of building transit devices
var/transit_build_speed = 0.5 SECONDS
- ///Speed of removal of unwrenched devices
- var/destroy_speed = 0.5 SECONDS
- ///Speed of reprogramming connectable directions of smart pipes
- var/reprogram_speed = 0.5 SECONDS
///Category currently active (Atmos, disposal, transit)
var/category = ATMOS_CATEGORY
- ///Piping layer we are going to spawn the atmos device in
- var/piping_layer = PIPING_LAYER_DEFAULT
+ ///All pipe layers we are going to spawn the atmos devices in
+ var/pipe_layers = PIPE_LAYER(3)
+ ///Are we laying multiple layers per click
+ var/multi_layer = FALSE
///Layer for disposal ducts
var/ducting_layer = DUCT_LAYER_DEFAULT
///Stores the current device to spawn
@@ -289,8 +246,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/pipe_dispenser/examine(mob/user)
. = ..()
- . += "You can scroll your mouse wheel to change the piping layer."
- . += "You can right click a pipe to set the RPD to its color and layer."
+ . += span_notice("You can scroll your mouse wheel to change the piping layer.")
+ . += span_notice("You can right click a pipe to set the RPD to its color and layer.")
/obj/item/pipe_dispenser/equipped(mob/user, slot, initial)
. = ..()
@@ -303,6 +260,13 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
UnregisterSignal(user, COMSIG_MOUSE_SCROLL_ON)
return ..()
+/obj/item/pipe_dispenser/proc/get_active_pipe_layers()
+ var/list/layer_nums = list()
+ for(var/pipe_layer_number in 1 to 5)
+ if(PIPE_LAYER(pipe_layer_number) & pipe_layers)
+ layer_nums += pipe_layer_number
+ return layer_nums
+
/obj/item/pipe_dispenser/cyborg_unequip(mob/user)
UnregisterSignal(user, COMSIG_MOUSE_SCROLL_ON)
return ..()
@@ -310,32 +274,15 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/pipe_dispenser/attack_self(mob/user)
ui_interact(user)
-/obj/item/pipe_dispenser/pre_attack(atom/target, mob/user, params)
- if(istype(target, /obj/item/rpd_upgrade/unwrench))
- install_upgrade(target, user)
- return TRUE
- return ..()
-
/obj/item/pipe_dispenser/pre_attack_secondary(obj/machinery/atmospherics/target, mob/user, params)
- if(istype(target, /obj/machinery/air_sensor))
- if(!do_after(user, destroy_speed, target))
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
- qdel(target)
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-
if(!istype(target, /obj/machinery/atmospherics))
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(target.pipe_color && target.piping_layer)
paint_color = GLOB.pipe_color_name[target.pipe_color]
- piping_layer = target.piping_layer
+ pipe_layers = PIPE_LAYER(target.piping_layer)
+ balloon_alert(user, "color/layer copied")
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-/obj/item/pipe_dispenser/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/rpd_upgrade))
- install_upgrade(W, user)
- return TRUE
- return ..()
-
/obj/item/pipe_dispenser/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
. = ..()
if(istype(target, /obj/machinery/atmospherics))
@@ -344,26 +291,11 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
context[SCREENTIP_CONTEXT_RMB] = "Copy piping color and layer"
return CONTEXTUAL_SCREENTIP_SET
-/**
- * Installs an upgrade into the RPD
- *
- * Installs an upgrade into the RPD checking if it is already installed
- * Arguments:
- * * rpd_up - RPD upgrade
- * * user - mob that use upgrade on RPD
- */
-/obj/item/pipe_dispenser/proc/install_upgrade(obj/item/rpd_upgrade/rpd_up, mob/user)
- if(rpd_up.upgrade_flags& upgrade_flags)
- balloon_alert(user, "already installed!")
- return
- upgrade_flags |= rpd_up.upgrade_flags
- playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)
- qdel(rpd_up)
/obj/item/pipe_dispenser/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] points the end of the RPD down [user.p_their()] throat and presses a button! It looks like [user.p_theyre()] trying to commit suicide..."))
playsound(get_turf(user), 'sound/machines/click.ogg', 50, TRUE)
- playsound(get_turf(user), 'sound/items/deconstruct.ogg', 50, TRUE)
+ playsound(get_turf(user), RPD_USE_SOUND, 50, TRUE)
return BRUTELOSS
/obj/item/pipe_dispenser/ui_assets(mob/user)
@@ -384,42 +316,40 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/pipe_dispenser/ui_data(mob/user)
var/list/data = list(
"category" = category,
- "piping_layer" = piping_layer,
+ "multi_layer" = multi_layer,
+ "pipe_layers" = pipe_layers,
"ducting_layer" = ducting_layer,
- "preview_rows" = recipe.get_preview(p_dir),
"categories" = list(),
"selected_recipe" = recipe.name,
"selected_color" = paint_color,
"mode" = mode,
)
- var/list/recipes
+ //currently selected category (atmos, disposal or transit)
+ var/list/selected_major_category
switch(category)
if(ATMOS_CATEGORY)
- recipes = GLOB.atmos_pipe_recipes
+ selected_major_category = GLOB.atmos_pipe_recipes
if(DISPOSALS_CATEGORY)
- recipes = GLOB.disposal_pipe_recipes
+ selected_major_category = GLOB.disposal_pipe_recipes
if(TRANSIT_CATEGORY)
- recipes = GLOB.transit_tube_recipes
- for(var/c in recipes)
- var/list/cat = recipes[c]
- var/list/r = list()
- for(var/i in 1 to cat.len)
- var/datum/pipe_info/info = cat[i]
-
- //skip sensors which are already in the world so we dont create duplicate ones
- if(info.type == /datum/pipe_info/sensor)
- var/datum/pipe_info/sensor/sensor_info = info
- var/obj/machinery/air_sensor/sensor = sensor_info.id
- if(GLOB.objects_by_id_tag[CHAMBER_SENSOR_FROM_ID(initial(sensor.chamber_id))] != null)
- continue
-
- r += list(list("pipe_name" = info.name, "pipe_index" = i))
+ selected_major_category = GLOB.transit_tube_recipes
+ //selected subcategory (e.g. pipes/binary/devices/heat exchange for atmos)
+ for(var/subcategory in selected_major_category)
+ var/list/subcategory_recipes = selected_major_category[subcategory]
+ var/list/available_recipe = list()
+ for(var/i in 1 to subcategory_recipes.len)
+ var/datum/pipe_info/info = subcategory_recipes[i]
+
+ available_recipe += list(list(
+ "pipe_name" = info.name,
+ "pipe_index" = i,
+ "previews" = info.get_preview(p_dir, info == recipe)
+ ))
if(info == recipe)
- data["selected_category"] = c
- if(r.len == 0) //when all air sensors are installed this list will become empty
- continue
- data["categories"] += list(list("cat_name" = c, "recipes" = r))
+ data["selected_category"] = subcategory
+
+ data["categories"] += list(list("cat_name" = subcategory, "recipes" = available_recipe))
var/list/init_directions = list("north" = FALSE, "south" = FALSE, "east" = FALSE, "west" = FALSE)
for(var/direction in GLOB.cardinals)
@@ -448,9 +378,25 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
recipe = first_transit
p_dir = NORTH
playeffect = FALSE
- if("piping_layer")
- piping_layer = text2num(params["piping_layer"])
+ if("pipe_layers")
+ var/selected_layers = text2num(params["pipe_layers"])
+ var/valid_layer = FALSE
+ for(var/pipe_layer_number in 1 to 5)
+ if(!(PIPE_LAYER(pipe_layer_number) & selected_layers))
+ continue
+ valid_layer = TRUE
+ if(!valid_layer)
+ return
+ if(multi_layer)
+ if(pipe_layers != selected_layers)
+ pipe_layers ^= selected_layers
+ else
+ pipe_layers = selected_layers
playeffect = FALSE
+ if("toggle_multi_layer")
+ if(multi_layer)
+ pipe_layers = PIPE_LAYER(max(get_active_pipe_layers()))
+ multi_layer = !multi_layer
if("ducting_layer")
ducting_layer = text2num(params["ducting_layer"])
playeffect = FALSE
@@ -465,8 +411,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
p_flipped = text2num(params["flipped"])
playeffect = FALSE
if("mode")
- var/n = text2num(params["mode"])
- mode ^= n
+ var/selected_mode = text2num(params["mode"])
+ mode ^= selected_mode
if("init_dir_setting")
var/target_dir = p_init_dir ^ text2dir(params["dir_flag"])
// Refuse to create a smart pipe that can only connect in one direction (it would act weirdly and lack an icon)
@@ -482,161 +428,113 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
playsound(get_turf(src), 'sound/effects/pop.ogg', 50, FALSE)
return TRUE
-/obj/item/pipe_dispenser/pre_attack(atom/A, mob/user)
- if(!ISADVANCEDTOOLUSER(user) || istype(A, /turf/open/space/transit))
+/obj/item/pipe_dispenser/pre_attack(atom/atom_to_attack, mob/user, params)
+ if(!ISADVANCEDTOOLUSER(user) || istype(atom_to_attack, /turf/open/space/transit))
return ..()
- var/atom/attack_target = A
+ if(istype(atom_to_attack, /obj/item/rpd_upgrade))
+ install_upgrade(atom_to_attack, user)
+ return TRUE
+
+ var/atom/attack_target = atom_to_attack
//So that changing the menu settings doesn't affect the pipes already being built.
- var/queued_p_type = recipe.id
- var/queued_p_dir = p_dir
- var/queued_p_flipped = p_flipped
+ var/queued_pipe_type = recipe.id
+ var/queued_pipe_dir = p_dir
+ var/queued_pipe_flipped = p_flipped
//Unwrench pipe before we build one over/paint it, but only if we're not already running a do_after on it already to prevent a potential runtime.
if((mode & DESTROY_MODE) && (upgrade_flags & RPD_UPGRADE_UNWRENCH) && istype(attack_target, /obj/machinery/atmospherics) && !(DOING_INTERACTION_WITH_TARGET(user, attack_target)))
attack_target = attack_target.wrench_act(user, src)
- if(!isatom(attack_target))
- CRASH("When attempting to call [A.type].wrench_act(), received the following non-atom return value: [attack_target]")
+ if(!isatom(attack_target)) //can return null, FALSE if do_after() fails see /obj/machinery/atmospherics/wrench_act()
+ return TRUE
- //make sure what we're clicking is valid for the current category
- var/static/list/make_pipe_whitelist
- if(!make_pipe_whitelist)
- make_pipe_whitelist = typecacheof(list(/obj/structure/lattice, /obj/structure/girder, /obj/item/pipe, /obj/structure/window, /obj/structure/grille))
- if(istype(attack_target, /obj/machinery/atmospherics) && mode & BUILD_MODE)
+ if(istype(attack_target, /obj/machinery/atmospherics) && (mode & BUILD_MODE))
attack_target = get_turf(attack_target)
- var/can_make_pipe = (isturf(attack_target) || is_type_in_typecache(attack_target, make_pipe_whitelist))
+
+ var/can_make_pipe = check_can_make_pipe(attack_target)
. = TRUE
if((mode & DESTROY_MODE) && istype(attack_target, /obj/item/pipe) || istype(attack_target, /obj/structure/disposalconstruct) || istype(attack_target, /obj/structure/c_transit_tube) || istype(attack_target, /obj/structure/c_transit_tube_pod) || istype(attack_target, /obj/item/pipe_meter) || istype(attack_target, /obj/structure/disposalpipe/broken))
playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
- if(do_after(user, destroy_speed, target = attack_target))
- activate()
- qdel(attack_target)
+ playsound(get_turf(src), RPD_USE_SOUND, 50, TRUE)
+ qdel(attack_target)
return
if(mode & REPROGRAM_MODE)
// If this is a placed smart pipe, try to reprogram it
- var/obj/machinery/atmospherics/pipe/smart/S = attack_target
- if(istype(S))
- if (S.dir == ALL_CARDINALS)
+ var/obj/machinery/atmospherics/pipe/smart/target_smart_pipe = attack_target
+ if(istype(target_smart_pipe))
+ if(target_smart_pipe.dir == ALL_CARDINALS)
balloon_alert(user, "has no unconnected directions!")
return
- var/old_init_dir = S.get_init_directions()
- if (old_init_dir == p_init_dir)
+ var/old_init_dir = target_smart_pipe.get_init_directions()
+ if(old_init_dir == p_init_dir)
balloon_alert(user, "already configured!")
return
// Check for differences in unconnected directions
- var/target_differences = (p_init_dir ^ old_init_dir) & ~S.connections
- if (!target_differences)
+ var/target_differences = (p_init_dir ^ old_init_dir) & ~target_smart_pipe.connections
+ if(!target_differences)
balloon_alert(user, "already configured for its directions!")
return
playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
- if(!do_after(user, reprogram_speed, target = S))
- return
// Something else could have changed the target's state while we were waiting in do_after
// Most of the edge cases don't matter, but atmos components being able to have live connections not described by initializable directions sounds like a headache at best and an exploit at worst
// Double check to make sure that nothing has changed. If anything we were about to change was connected during do_after, abort
- if (target_differences & S.connections)
- balloon_alert(user, "cant configure for its direction!")
+ if(target_differences & target_smart_pipe.connections)
+ balloon_alert(user, "can't configure for its direction!")
return
// Grab the current initializable directions, which may differ from old_init_dir if someone else was working on the same pipe at the same time
- var/current_init_dir = S.get_init_directions()
+ var/current_init_dir = target_smart_pipe.get_init_directions()
// Access p_init_dir directly. The RPD can change target layer and initializable directions (though not pipe type or dir) while working to dispense and connect a component,
// and have it reflected in the final result. Reprogramming should be similarly consistent.
var/new_init_dir = (current_init_dir & ~target_differences) | (p_init_dir & target_differences)
// Don't make a smart pipe with only one connection
- if (ISSTUB(new_init_dir))
+ if(ISSTUB(new_init_dir))
balloon_alert(user, "no one directional pipes allowed!")
return
- S.set_init_directions(new_init_dir)
+ target_smart_pipe.set_init_directions(new_init_dir)
// We're now reconfigured.
// We can never disconnect from existing connections, but we can connect to previously unconnected directions, and should immediately do so
var/newly_permitted_connections = new_init_dir & ~current_init_dir
if(newly_permitted_connections)
// We're allowed to connect in new directions. Recompute our nodes
// Disconnect from everything that is currently connected
- for (var/i in 1 to S.device_type)
+ for(var/i in 1 to target_smart_pipe.device_type)
// This is basically pipe.nullifyNode, but using it here would create a pitfall for others attempting to
// copy and paste disconnection code for other components. Welcome to the atmospherics subsystem
- var/obj/machinery/atmospherics/node = S.nodes[i]
- if (!node)
+ var/obj/machinery/atmospherics/node = target_smart_pipe.nodes[i]
+ if(!node)
continue
- node.disconnect(S)
- S.nodes[i] = null
+ node.disconnect(target_smart_pipe)
+ target_smart_pipe.nodes[i] = null
// Get our new connections
- S.atmos_init()
+ target_smart_pipe.atmos_init()
// Connect to our new connections
- for (var/obj/machinery/atmospherics/O in S.nodes)
- O.atmos_init()
- O.add_member(src)
- SSair.add_to_rebuild_queue(S)
+ for(var/obj/machinery/atmospherics/connected_device in target_smart_pipe.nodes)
+ connected_device.atmos_init()
+ connected_device.add_member(target_smart_pipe)
+ SSair.add_to_rebuild_queue(target_smart_pipe)
// Finally, update our internal state - update_pipe_icon also updates dir and connections
- S.update_pipe_icon()
- user.visible_message(span_notice("[user] reprograms the \the [S]."),span_notice("You reprogram \the [S]."))
+ target_smart_pipe.update_pipe_icon()
+ user.visible_message(span_notice("[user] reprograms \the [target_smart_pipe]."), span_notice("You reprogram \the [target_smart_pipe]."))
return
// If this is an unplaced smart pipe, try to reprogram it
- var/obj/item/pipe/quaternary/I = attack_target
- if(istype(I) && ispath(I.pipe_type, /obj/machinery/atmospherics/pipe/smart))
+ var/obj/item/pipe/quaternary/target_unsecured_pipe = attack_target
+ if(istype(target_unsecured_pipe) && ispath(target_unsecured_pipe.pipe_type, /obj/machinery/atmospherics/pipe/smart))
// An unplaced pipe never has any existing connections, so just directly assign the new configuration
- I.p_init_dir = p_init_dir
- I.update()
+ target_unsecured_pipe.p_init_dir = p_init_dir
+ target_unsecured_pipe.update()
if(mode & BUILD_MODE)
switch(category) //if we've gotten this var, the target is valid
if(ATMOS_CATEGORY) //Making pipes
- if(!can_make_pipe)
+ if(!do_pipe_build(attack_target, user, params))
return ..()
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
- if (recipe.type == /datum/pipe_info/meter)
- if(do_after(user, atmos_build_speed, target = attack_target))
- activate()
- var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(attack_target))
- PM.setAttachLayer(piping_layer)
- if(mode & WRENCH_MODE)
- PM.wrench_act(user, src)
- else if(recipe.type == /datum/pipe_info/sensor)
- if(do_after(user, atmos_build_speed, target = attack_target))
- activate()
- var/datum/pipe_info/sensor/sensor_recipe = recipe
- var/obj/machinery/air_sensor/sensor_blueprint = sensor_recipe.id
- new sensor_blueprint(get_turf(attack_target))
- //change the recipe as the current one becomes unavailable
- recipe = first_atmos
- else
- if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5))
- balloon_alert(user, "cant build on this layer!")
- return ..()
- if(do_after(user, atmos_build_speed, target = attack_target))
- if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5))//double check to stop cheaters (and to not waste time waiting for something that can't be placed)
- balloon_alert(user, "cant build on this layer!")
- return ..()
- activate()
- var/obj/machinery/atmospherics/path = queued_p_type
- var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe
- var/obj/item/pipe/pipe_type = new pipe_item_type(
- get_turf(attack_target),
- queued_p_type,
- queued_p_dir,
- null,
- GLOB.pipe_paint_colors[paint_color],
- ispath(queued_p_type, /obj/machinery/atmospherics/pipe/smart) ? p_init_dir : null,
- )
- if(queued_p_flipped && istype(pipe_type, /obj/item/pipe/trinary/flippable))
- var/obj/item/pipe/trinary/flippable/F = pipe_type
- F.flipped = queued_p_flipped
-
- pipe_type.update()
- pipe_type.add_fingerprint(usr)
- pipe_type.set_piping_layer(piping_layer)
- if(ispath(queued_p_type, /obj/machinery/atmospherics) && !ispath(queued_p_type, /obj/machinery/atmospherics/pipe/color_adapter))
- pipe_type.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY)
- if(mode & WRENCH_MODE)
- pipe_type.wrench_act(user, src)
if(DISPOSALS_CATEGORY) //Making disposals pipes
if(!can_make_pipe)
@@ -647,19 +545,19 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
return
playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
if(do_after(user, disposal_build_speed, target = attack_target))
- var/obj/structure/disposalconstruct/C = new (attack_target, queued_p_type, queued_p_dir, queued_p_flipped)
+ var/obj/structure/disposalconstruct/new_disposals_segment = new (attack_target, queued_pipe_type, queued_pipe_dir, queued_pipe_flipped)
- if(!C.can_place())
+ if(!new_disposals_segment.can_place())
balloon_alert(user, "not enough room!")
- qdel(C)
+ qdel(new_disposals_segment)
return
- activate()
+ playsound(get_turf(src), RPD_USE_SOUND, 50, TRUE)
- C.add_fingerprint(usr)
- C.update_appearance()
+ new_disposals_segment.add_fingerprint(usr)
+ new_disposals_segment.update_appearance()
if(mode & WRENCH_MODE)
- C.wrench_act(user, src)
+ new_disposals_segment.wrench_act(user, src)
return
if(TRANSIT_CATEGORY) //Making transit tubes
@@ -677,19 +575,19 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
if(do_after(user, transit_build_speed, target = attack_target))
- activate()
- if(queued_p_type == /obj/structure/c_transit_tube_pod)
+ playsound(get_turf(src), RPD_USE_SOUND, 50, TRUE)
+ if(queued_pipe_type == /obj/structure/c_transit_tube_pod)
var/obj/structure/c_transit_tube_pod/pod = new /obj/structure/c_transit_tube_pod(attack_target)
pod.add_fingerprint(usr)
if(mode & WRENCH_MODE)
pod.wrench_act(user, src)
else
- var/obj/structure/c_transit_tube/tube = new queued_p_type(attack_target)
- tube.setDir(queued_p_dir)
+ var/obj/structure/c_transit_tube/tube = new queued_pipe_type(attack_target)
+ tube.setDir(queued_pipe_dir)
- if(queued_p_flipped)
- tube.setDir(turn(queued_p_dir, 45 + ROTATION_FLIP))
+ if(queued_pipe_flipped)
+ tube.setDir(turn(queued_pipe_dir, 45 + ROTATION_FLIP))
tube.AfterRotation(user, ROTATION_FLIP)
tube.add_fingerprint(usr)
@@ -699,36 +597,111 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
else
return ..()
-/obj/item/pipe_dispenser/proc/activate()
- playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
+/obj/item/pipe_dispenser/proc/check_can_make_pipe(atom/target_of_attack)
+ //make sure what we're clicking is valid for the current category
+ var/static/list/make_pipe_whitelist = typecacheof(list(/obj/structure/lattice, /obj/structure/girder, /obj/item/pipe, /obj/structure/window, /obj/structure/grille))
+ var/can_we_make_pipe = (isturf(target_of_attack) || is_type_in_typecache(target_of_attack, make_pipe_whitelist))
+ return can_we_make_pipe
+
+/obj/item/pipe_dispenser/proc/do_pipe_build(atom/atom_to_target, mob/user, params)
+ //So that changing the menu settings doesn't affect the pipes already being built.
+ var/queued_pipe_type = recipe.id
+ var/queued_pipe_dir = p_dir
+ var/queued_pipe_flipped = p_flipped
+
+ var/can_make_pipe = check_can_make_pipe(atom_to_target)
+ var/list/pipe_layer_numbers = get_active_pipe_layers()
+ var/continued_build = FALSE
+ for(var/pipe_layer_num in 1 to length(pipe_layer_numbers))
+ var/layer_to_build = pipe_layer_numbers[pipe_layer_num]
+ if(layer_to_build != pipe_layer_numbers[1])
+ continued_build = TRUE
+ if(!layer_to_build)
+ return FALSE
+ if(!can_make_pipe)
+ return FALSE
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, vary = TRUE)
+ if(!continued_build && !do_after(user, atmos_build_speed, target = atom_to_target))
+ return FALSE
+ if(!recipe.all_layers && (layer_to_build == 1 || layer_to_build == 5))
+ balloon_alert(user, "can't build on layer [layer_to_build]!")
+ if(multi_layer)
+ continue
+ return FALSE
+ playsound(get_turf(src), RPD_USE_SOUND, 50, TRUE)
+ if(recipe.type == /datum/pipe_info/meter)
+ var/obj/item/pipe_meter/new_meter = new /obj/item/pipe_meter(get_turf(atom_to_target))
+ new_meter.setAttachLayer(layer_to_build)
+ if(mode & WRENCH_MODE)
+ new_meter.wrench_act(user, src)
+ else
+ var/obj/machinery/atmospherics/path = queued_pipe_type
+ var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe
+ var/obj/item/pipe/pipe_type = new pipe_item_type(
+ get_turf(atom_to_target),
+ queued_pipe_type,
+ queued_pipe_dir,
+ null,
+ GLOB.pipe_paint_colors[paint_color],
+ ispath(queued_pipe_type, /obj/machinery/atmospherics/pipe/smart) ? p_init_dir : null,
+ )
+ if(queued_pipe_flipped && istype(pipe_type, /obj/item/pipe/trinary/flippable))
+ var/obj/item/pipe/trinary/flippable/new_flippable_pipe = pipe_type
+ new_flippable_pipe.flipped = queued_pipe_flipped
+
+ pipe_type.update()
+ pipe_type.add_fingerprint(usr)
+ pipe_type.set_piping_layer(layer_to_build)
+ if(ispath(queued_pipe_type, /obj/machinery/atmospherics) && !ispath(queued_pipe_type, /obj/machinery/atmospherics/pipe/color_adapter))
+ pipe_type.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY)
+ if(mode & WRENCH_MODE)
+ pipe_type.wrench_act(user, src)
+ return TRUE
+
+/obj/item/pipe_dispenser/attackby(obj/item/item, mob/user, params)
+ if(istype(item, /obj/item/rpd_upgrade))
+ install_upgrade(item, user)
+ return TRUE
+ return ..()
-/obj/item/pipe_dispenser/proc/mouse_wheeled(mob/source, atom/A, delta_x, delta_y, params)
+/// Installs an upgrade into the RPD after checking if it is already installed
+/obj/item/pipe_dispenser/proc/install_upgrade(obj/item/rpd_upgrade/rpd_disk, mob/user)
+ // Check if the upgrade's already present
+ if(rpd_disk.upgrade_flags & upgrade_flags)
+ balloon_alert(user, "already installed!")
+ return
+ // Adds the upgrade from the disk and then deletes the disk
+ upgrade_flags |= rpd_disk.upgrade_flags
+ playsound(loc, 'sound/machines/click.ogg', 50, vary = TRUE)
+ balloon_alert(user, "upgrade installed")
+ qdel(rpd_disk)
+
+///Changes the piping layer when the mousewheel is scrolled up or down.
+/obj/item/pipe_dispenser/proc/mouse_wheeled(mob/source_mob, atom/A, delta_x, delta_y, params)
SIGNAL_HANDLER
- if(source.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS))
+ if(multi_layer)
+ balloon_alert(source_mob, "turn off multi layer!")
+ return
+ if(source_mob.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS))
+ return
+ if(source_mob.get_active_held_item() != src)
return
if(delta_y < 0)
- piping_layer = min(PIPING_LAYER_MAX, piping_layer + 1)
+ pipe_layers = min(PIPE_LAYER(5), pipe_layers << 1)
else if(delta_y > 0)
- piping_layer = max(PIPING_LAYER_MIN, piping_layer - 1)
- else
+ pipe_layers = max(PIPE_LAYER(1), pipe_layers >> 1)
+ else //mice with side-scrolling wheels are apparently a thing and fuck this up
return
SStgui.update_uis(src)
- to_chat(source, span_notice("You set the layer to [piping_layer]."))
+ balloon_alert(source_mob, "set pipe layer to [get_active_pipe_layers()[1]]")
-#undef ATMOS_CATEGORY
-#undef DISPOSALS_CATEGORY
-#undef TRANSIT_CATEGORY
-
-#undef BUILD_MODE
-#undef DESTROY_MODE
-#undef WRENCH_MODE
-#undef REPROGRAM_MODE
/obj/item/rpd_upgrade
name = "RPD advanced design disk"
desc = "It seems to be empty."
- icon = 'icons/obj/module.dmi'
+// icon = 'icons/obj/devices/circuitry_n_data.dmi' // MONKESTATION EDIT CHANGE OLD // REQUIRES PR #80025
+ icon = 'icons/obj/module.dmi' // MONKESTATION EDIT CHANGE NEW
icon_state = "datadisk3"
/// Bitflags for upgrades
var/upgrade_flags
@@ -736,3 +709,16 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/rpd_upgrade/unwrench
desc = "Adds reverse wrench mode to the RPD. Attention, due to budget cuts, the mode is hard linked to the destroy mode control button."
upgrade_flags = RPD_UPGRADE_UNWRENCH
+
+#undef ATMOS_CATEGORY
+#undef DISPOSALS_CATEGORY
+#undef TRANSIT_CATEGORY
+
+#undef BUILD_MODE
+#undef DESTROY_MODE
+#undef WRENCH_MODE
+#undef REPROGRAM_MODE
+
+#undef PIPE_LAYER
+
+#undef RPD_USE_SOUND
diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm
index 6b308ea92e68..a90836aac441 100644
--- a/code/game/objects/items/rcd/RPLD.dm
+++ b/code/game/objects/items/rcd/RPLD.dm
@@ -102,7 +102,7 @@
/obj/item/construction/plumbing/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, "PlumbingService", name)
+ ui = new(user, src, "RapidPlumbingDevice", name)
ui.open()
/obj/item/construction/plumbing/ui_assets(mob/user)
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index f0a773f690d8..e994da442d5a 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -26,7 +26,11 @@ Mineral Sheets
GLOBAL_LIST_INIT(sandstone_recipes, list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/growing/soil, 3, time = 1 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_DOORS), \
- new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = FALSE, on_solid_ground = TRUE, category = CAT_MISC) \
+ new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = FALSE, on_solid_ground = TRUE, category = CAT_MISC), \
+
+ new/datum/stack_recipe("sandstone stool", /obj/structure/chair/stool/sandstone, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), \
+ new/datum/stack_recipe("sandstone sarcophagus", /obj/structure/closet/crate/coffin/sandstonesarcophagus, 8, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), \
+ new/datum/stack_recipe("sandstone table", /obj/structure/table/sandstone, 6, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE) \
))
/obj/item/stack/sheet/mineral/sandstone
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index d319e16229e2..f1c248a96d54 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -374,8 +374,10 @@
data["max_length"] = MAX_PLAQUE_LEN
data["has_showpiece"] = showpiece ? TRUE : FALSE
if(showpiece)
- data["showpiece_name"] = capitalize(format_text(showpiece.name))
- data["showpiece_description"] = trophy_message ? format_text(trophy_message) : null
+ // monkestation start: fix double-encoded trophy info
+ data["showpiece_name"] = capitalize(html_decode(format_text(showpiece.name)))
+ data["showpiece_description"] = trophy_message ? html_decode(format_text(trophy_message)) : null
+ // monkestation end
return data
/obj/structure/displaycase/trophy/ui_static_data(mob/user)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 49ce549abd57..7d8f931f5aaa 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -41,12 +41,12 @@
return
opening = TRUE
- update_appearance()
if(!density)
var/srcturf = get_turf(src)
for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield
opening = FALSE
return
+ update_appearance()
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/falsewall, toggle_open)), 5)
/obj/structure/falsewall/proc/toggle_open()
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 773d3a475bc6..9ff8b75bfbe6 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -254,6 +254,7 @@
..()
/obj/structure/guillotine/post_unbuckle_mob(mob/living/M)
+ M.cut_overlays() // monkestation: bugfix
M.regenerate_icons()
M.pixel_y -= -GUILLOTINE_HEAD_OFFSET // Move their body back
M.layer -= GUILLOTINE_LAYER_DIFF
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index ea3bdf682d3b..8386c640f339 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -229,7 +229,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
stashed_group.display_turf(new_turf)
else
for(var/turf/open/adjacent_turf as anything in atmos_adjacent_turfs)
- if(QDELETED(adjacent_turf))
+ if(QDELETED(adjacent_turf) || !adjacent_turf.atmos_adjacent_turfs)
continue
adjacent_turf.atmos_adjacent_turfs -= src
atmos_adjacent_turfs = null
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index 3820ab7f947e..bb4299a8416a 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -44,7 +44,6 @@
return
if(!carbon_mob.density)
return
- carbon_mob.is_leaning = TRUE
var/turf/checked_turf = get_step(carbon_mob, turn(carbon_mob.dir, 180))
if(checked_turf == src)
carbon_mob.start_leaning(src)
@@ -67,6 +66,7 @@
span_notice("You lean against \the [wall]!"))
RegisterSignals(src, list(COMSIG_MOB_CLIENT_PRE_MOVE, COMSIG_HUMAN_DISARM_HIT, COMSIG_LIVING_GET_PULLED, COMSIG_MOVABLE_TELEPORTING, COMSIG_ATOM_DIR_CHANGE), PROC_REF(stop_leaning))
update_fov()
+ is_leaning = TRUE
/mob/living/carbon/proc/stop_leaning()
SIGNAL_HANDLER
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 689b585882d6..34990daf4118 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -47,6 +47,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
/datum/admins/proc/view_all_circuits,
/datum/admins/proc/open_artifactpanel,
/datum/verbs/menu/Admin/verb/playerpanel, /* It isn't /datum/admin but it fits no less */
+ /datum/admins/proc/kick_player_by_ckey, //MONKESTATION ADDITION - kick a player by their ckey
// Client procs
/client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/
/client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcom*/
@@ -179,6 +180,8 @@ GLOBAL_PROTECT(admin_verbs_server)
/client/proc/toggle_hub,
/client/proc/toggle_interviews,
/client/proc/toggle_random_events,
+ /client/proc/Overwatch_ASN_panel,
+ /client/proc/Overwatch_WhitelistPanel,
)
GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug())
GLOBAL_PROTECT(admin_verbs_debug)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 05d71bf4a82c..7a40f7a03d80 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -212,18 +212,28 @@
if(!check_if_greater_rights_than(M.client))
to_chat(usr, span_danger("Error: They have more rights than you do."), confidential = TRUE)
return
+ /* //MONKESTATION EDIT START - Change this tgui alert to a regular alert
if(tgui_alert(usr, "Kick [key_name(M)]?", "Confirm", list("Yes", "No")) != "Yes")
return
+ */ //MONKESTATION EDIT ORIGINAL
+ if(alert(usr, "Kick [key_name(M)]?", "Confirm", "Yes", "No") != "Yes")
+ return
+ //MONKESTATION EDIT END
if(!M)
to_chat(usr, span_danger("Error: [M] no longer exists!"), confidential = TRUE)
return
if(!M.client)
to_chat(usr, span_danger("Error: [M] no longer has a client!"), confidential = TRUE)
return
+ //MONKESTATION EDIT START - Kicking players has been moved to a proc
+ /*
to_chat(M, span_danger("You have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"]."), confidential = TRUE)
log_admin("[key_name(usr)] kicked [key_name(M)].")
message_admins(span_adminnotice("[key_name_admin(usr)] kicked [key_name_admin(M)]."))
qdel(M.client)
+ */ //MONKESTATION EDIT ORIGINAL
+ kick_client(M.client)
+ //MONKESTATION EDIT END
else if(href_list["addmessage"])
if(!check_rights(R_ADMIN))
diff --git a/code/modules/admin/verbs/ert.dm b/code/modules/admin/verbs/ert.dm
index 89f99df5bec7..d43e58270249 100644
--- a/code/modules/admin/verbs/ert.dm
+++ b/code/modules/admin/verbs/ert.dm
@@ -215,13 +215,9 @@
var/leader_spawned = FALSE // just in case the earmarked leader disconnects or becomes unavailable, we can try giving leader to the last guy to get chosen
if(ertemplate.leader_experience)
- var/list/candidate_living_exps = list()
- for(var/i in candidates)
- var/mob/dead/observer/potential_leader = i
- candidate_living_exps[potential_leader] = potential_leader.client?.get_exp_living(TRUE)
-
- candidate_living_exps = sort_list(candidate_living_exps, cmp=/proc/cmp_numeric_dsc)
- if(candidate_living_exps.len > ERT_EXPERIENCED_LEADER_CHOOSE_TOP)
+ // monkestation edit: fix runtime with using wrong sort proc
+ var/list/candidate_living_exps = sort_list(candidates, cmp=/proc/cmp_mob_playtime_dsc)
+ if(length(candidate_living_exps) > ERT_EXPERIENCED_LEADER_CHOOSE_TOP)
candidate_living_exps = candidate_living_exps.Cut(ERT_EXPERIENCED_LEADER_CHOOSE_TOP+1) // pick from the top ERT_EXPERIENCED_LEADER_CHOOSE_TOP contenders in playtime
earmarked_leader = pick(candidate_living_exps)
else
diff --git a/code/modules/admin/verbs/lua/lua_state.dm b/code/modules/admin/verbs/lua/lua_state.dm
index ee7d6953e12a..bf2bcbd5a900 100644
--- a/code/modules/admin/verbs/lua/lua_state.dm
+++ b/code/modules/admin/verbs/lua/lua_state.dm
@@ -109,17 +109,8 @@ GLOBAL_PROTECT(lua_usr)
if(islist(function))
var/list/new_function_path = list()
for(var/path_element in function)
- if(isweakref(path_element))
- var/datum/weakref/weak_ref = path_element
- var/resolved = weak_ref.hard_resolve()
- if(!resolved)
- return list("status" = "errored", "param" = "Weakref in function path ([weak_ref] [text_ref(weak_ref)]) resolved to null.", "name" = jointext(function, "."))
- new_function_path += resolved
- else
- new_function_path += path_element
+ new_function_path += path_element
function = new_function_path
- var/msg = "[key_name(usr)] called the lua function \"[function]\" with arguments: [english_list(call_args)]"
- log_lua(msg)
var/tmp_usr = GLOB.lua_usr
GLOB.lua_usr = usr
diff --git a/code/modules/admin/view_variables/get_variables.dm b/code/modules/admin/view_variables/get_variables.dm
index ef795e71f974..a453e735d9ff 100644
--- a/code/modules/admin/view_variables/get_variables.dm
+++ b/code/modules/admin/view_variables/get_variables.dm
@@ -331,7 +331,7 @@
.["value"] = D
if(VV_COLOR)
- .["value"] = tgui_color_picker("Enter new color:", "Color", current_value)
+ .["value"] = tgui_color_picker(usr, "Enter new color:", "Color", current_value)
if(.["value"] == null)
.["class"] = null
return
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 24bd2763622c..078f4d2a5ae5 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -312,22 +312,20 @@ GLOBAL_LIST_EMPTY(antagonists)
clear_antag_moodies()
LAZYREMOVE(owner.antag_datums, src)
if(!LAZYLEN(owner.antag_datums))
- owner.current.remove_from_current_living_antags()
+ owner.current?.remove_from_current_living_antags()
if(info_button_ref)
QDEL_NULL(info_button_ref)
if(!silent && owner.current)
farewell()
UnregisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT)
UnregisterSignal(owner, COMSIG_MINDSHIELD_IMPLANTED)
- var/datum/team/team = get_team()
- if(team)
- team.remove_member(owner)
+ get_team()?.remove_member(owner)
SEND_SIGNAL(owner, COMSIG_ANTAGONIST_REMOVED, src)
// Remove HUDs that they should no longer see
var/mob/living/current = owner.current
for (var/datum/atom_hud/alternate_appearance/basic/has_antagonist/antag_hud as anything in GLOB.has_antagonist_huds)
- if (!antag_hud.mobShouldSee(current))
+ if(!antag_hud.mobShouldSee(current))
antag_hud.hide_from(current)
qdel(src)
@@ -367,7 +365,8 @@ GLOBAL_LIST_EMPTY(antagonists)
/**
* Proc that will return the team this antagonist belongs to, when called. Helpful with antagonists that may belong to multiple potential teams in a single round.
*/
-/datum/antagonist/proc/get_team()
+/datum/antagonist/proc/get_team() as /datum/team
+ RETURN_TYPE(/datum/team) // it's right there, dreamchecker, come on
return
/**
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 61f5cc5e6432..db43a3713d95 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -224,6 +224,7 @@
borg.mmi.brainmob.real_name = brainopsname
borg.mmi.brainmob.name = brainopsname
borg.real_name = borg.name
+ borg.update_name_tag() // monkestation edit: name tags
borg.key = C.key
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index d87574c092dc..af4b9b466930 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -63,6 +63,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
var/new_name = "[initial(name)] ([rand(1, 999)])"
name = new_name
real_name = new_name
+ update_name_tag() // monkestation edit: name tags
last_attack = world.time
var/datum/blobstrain/BS = pick(GLOB.valid_blobstrains)
set_strain(BS)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index ee42c1417031..1e5c969a3ffa 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -267,13 +267,15 @@
/datum/antagonist/changeling/proc/on_life(datum/source, seconds_per_tick, times_fired)
SIGNAL_HANDLER
+ var/delta_time = DELTA_WORLD_TIME(SSmobs)
+
// If dead, we only regenerate up to half chem storage.
if(owner.current.stat == DEAD)
- adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * seconds_per_tick, total_chem_storage * 0.5)
+ adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time, total_chem_storage * 0.5)
// If we're not dead - we go up to the full chem cap.
else
- adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * seconds_per_tick)
+ adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time)
/**
* Signal proc for [COMSIG_LIVING_POST_FULLY_HEAL], getting admin-healed restores our chemicals.
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index 364b0755c2f6..502a0ae8ccb5 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -141,6 +141,7 @@
if(istype(equip_to.wear_id, /obj/item/card/id))
var/obj/item/card/id/equipped_card = equip_to.wear_id
equipped_card.assignment = "Russian Bounty Hunter"
+ equipped_card.access = list(ACCESS_BOUNTY_HUNTER) //monkestation edit: adds BH access to their cards due to this being a post-process setup of their ID cards specifically.
equipped_card.registered_name = equip_to.real_name
equipped_card.update_label()
equipped_card.update_icon()
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 81c1a4ee740c..4c300101fc5d 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -67,7 +67,7 @@
var/mob/living/carbon/carbon_target = target
to_chat(carbon_target, span_danger("You hear echoing laughter from above"))
carbon_target.cause_hallucination(/datum/hallucination/delusion/preset/moon, "delusion/preset/moon hallucination caused by mansus grasp")
- carbon_target.mob_mood.set_sanity(carbon_target.mob_mood.sanity-30)
+ carbon_target.mob_mood?.set_sanity(carbon_target.mob_mood.sanity - 30)
/datum/heretic_knowledge/spell/moon_smile
name = "Smile of the moon"
@@ -104,7 +104,7 @@
// Also refunds 75% of charge!
var/datum/action/cooldown/spell/touch/mansus_grasp/grasp = locate() in source.actions
if(grasp)
- grasp.next_use_time = min(round(grasp.next_use_time - grasp.cooldown_time * 0.75, 0), 0)
+ grasp.next_use_time = min(round(grasp.next_use_time - grasp.cooldown_time * 0.75), 0)
grasp.build_all_button_icons()
/datum/heretic_knowledge/knowledge_ritual/moon
diff --git a/code/modules/antagonists/heretic/magic/space_crawl.dm b/code/modules/antagonists/heretic/magic/space_crawl.dm
index b88dc88b9943..e49e3136f364 100644
--- a/code/modules/antagonists/heretic/magic/space_crawl.dm
+++ b/code/modules/antagonists/heretic/magic/space_crawl.dm
@@ -69,6 +69,11 @@
RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(update_status_on_signal))
if(iscarbon(jaunter))
jaunter.drop_all_held_items()
+ // Sanity check to ensure we didn't lose our focus as a result.
+ if(!HAS_TRAIT(jaunter, TRAIT_ALLOW_HERETIC_CASTING))
+ REMOVE_TRAIT(jaunter, TRAIT_NO_TRANSFORM, REF(src))
+ exit_jaunt(jaunter, our_turf)
+ return FALSE
// Give them some space hands to prevent them from doing things
var/obj/item/space_crawl/left_hand = new(jaunter)
var/obj/item/space_crawl/right_hand = new(jaunter)
@@ -77,6 +82,8 @@
jaunter.put_in_hands(left_hand)
jaunter.put_in_hands(right_hand)
+ RegisterSignal(jaunter, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), PROC_REF(on_focus_lost))
+ RegisterSignal(jaunter, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))
our_turf.visible_message(span_warning("[jaunter] sinks into [our_turf]!"))
playsound(our_turf, 'sound/magic/cosmic_energy.ogg', 50, TRUE, -1)
new /obj/effect/temp_visual/space_explosion(our_turf)
@@ -88,8 +95,8 @@
/**
* Attempts to Exit the passed space or misc turf.
*/
-/datum/action/cooldown/spell/jaunt/space_crawl/proc/try_exit_jaunt(turf/our_turf, mob/living/jaunter)
- if(HAS_TRAIT_FROM(jaunter, TRAIT_NO_TRANSFORM, REF(src)))
+/datum/action/cooldown/spell/jaunt/space_crawl/proc/try_exit_jaunt(turf/our_turf, mob/living/jaunter, force = FALSE)
+ if(!force && HAS_TRAIT_FROM(jaunter, TRAIT_NO_TRANSFORM, REF(src)))
to_chat(jaunter, span_warning("You cannot exit yet!!"))
return FALSE
@@ -101,6 +108,7 @@
/datum/action/cooldown/spell/jaunt/space_crawl/on_jaunt_exited(obj/effect/dummy/phased_mob/jaunt, mob/living/unjaunter)
UnregisterSignal(jaunt, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(unjaunter, list(SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), COMSIG_MOB_STATCHANGE))
playsound(get_turf(unjaunter), 'sound/magic/cosmic_energy.ogg', 50, TRUE, -1)
new /obj/effect/temp_visual/space_explosion(get_turf(unjaunter))
if(iscarbon(unjaunter))
@@ -109,6 +117,19 @@
qdel(space_hand)
return ..()
+/// Signal proc for [SIGNAL_REMOVETRAIT] via [TRAIT_ALLOW_HERETIC_CASTING], losing our focus midcast will throw us out.
+/datum/action/cooldown/spell/jaunt/space_crawl/proc/on_focus_lost(mob/living/source)
+ SIGNAL_HANDLER
+ var/turf/our_turf = get_turf(source)
+ try_exit_jaunt(our_turf, source, TRUE)
+
+/// Signal proc for [COMSIG_MOB_STATCHANGE], to throw us out of the jaunt if we lose consciousness.
+/datum/action/cooldown/spell/jaunt/space_crawl/proc/on_stat_change(mob/living/source, new_stat, old_stat)
+ SIGNAL_HANDLER
+ if(new_stat != CONSCIOUS)
+ var/turf/our_turf = get_turf(source)
+ try_exit_jaunt(our_turf, source, TRUE)
+
/// Spacecrawl "hands", prevent the user from holding items in spacecrawl
/obj/item/space_crawl
name = "space crawl"
diff --git a/code/modules/antagonists/ninja/ninjaDrainAct.dm b/code/modules/antagonists/ninja/ninjaDrainAct.dm
index 806aa14b7132..291135911d12 100644
--- a/code/modules/antagonists/ninja/ninjaDrainAct.dm
+++ b/code/modules/antagonists/ninja/ninjaDrainAct.dm
@@ -205,12 +205,14 @@
if(!operating && density && hasPower() && !(obj_flags & EMAGGED))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, emag_act))
hacking_module.door_hack_counter++
+ /* monkestation edit: remove doorjack objective
var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
if(!ninja_antag)
return NONE
var/datum/objective/door_jack/objective = locate() in ninja_antag.objectives
if(objective && objective.doors_required <= hacking_module.door_hack_counter)
objective.completed = TRUE
+ monkestation end */
return COMPONENT_CANCEL_ATTACK_CHAIN
//WIRE//
diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm
index b7ae768d6f49..5f69a82a2132 100644
--- a/code/modules/antagonists/space_ninja/space_ninja.dm
+++ b/code/modules/antagonists/space_ninja/space_ninja.dm
@@ -40,9 +40,11 @@
/datum/objective/cyborg_hijack
explanation_text = "Use your gloves to convert at least one cyborg to aid you in sabotaging the station."
+/* monkestation edit: remove doorjack objective
/datum/objective/door_jack
///How many doors that need to be opened using the gloves to pass the objective
var/doors_required = 0
+*/
/datum/objective/plant_explosive
var/area/detonation_location
@@ -70,11 +72,13 @@
var/datum/objective/research_secrets/sabotage_research = new /datum/objective/research_secrets()
objectives += sabotage_research
+ /* monkestation edit: remove doorjack objective
//Door jacks, flag will be set to complete on when the last door is hijacked
var/datum/objective/door_jack/doorobjective = new /datum/objective/door_jack()
doorobjective.doors_required = rand(15,40)
doorobjective.explanation_text = "Use your gloves to doorjack [doorobjective.doors_required] airlocks on the station."
objectives += doorobjective
+ */
//Explosive plant, the bomb will register its completion on priming
var/datum/objective/plant_explosive/bombobjective = new /datum/objective/plant_explosive()
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
index 52b0726282a3..689932374b5a 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
@@ -225,6 +225,7 @@
log_spellbook("[key_name(user)] cast [src] for [cost] points")
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
log_purchase(user.key)
+ book.update_static_data(user) // updates "times" var
return TRUE
/// Non-purchasable flavor spells to populate the spell book with, for style.
diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
index 810ac29e9760..fcd88a07886d 100644
--- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
@@ -39,23 +39,21 @@
/obj/item/spellbook/proc/on_magic_charge(datum/source, datum/action/cooldown/spell/spell, mob/living/caster)
SIGNAL_HANDLER
- var/static/list/clever_girl = list(
+ to_chat(caster, span_warning("Glowing red letters appear on the front cover..."))
+ to_chat(caster, span_red(pick(
"NICE TRY BUT NO!",
"CLEVER BUT NOT CLEVER ENOUGH!",
"SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!",
"CUTE! VERY CUTE!",
"YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?",
- )
-
- to_chat(caster, span_warning("Glowing red letters appear on the front cover..."))
- to_chat(caster, span_red(pick(clever_girl)))
+ )))
return COMPONENT_ITEM_BURNT_OUT
/obj/item/spellbook/examine(mob/user)
. = ..()
if(owner)
- . += {"There is a small signature on the front cover: "[owner]"."}
+ . += "There is a small signature on the front cover: \"[owner]\"."
else
. += "It appears to have no author."
@@ -148,8 +146,6 @@
var/list/data = list()
data["owner"] = owner
data["points"] = uses
- data["semi_random_bonus"] = initial(uses) + semi_random_bonus
- data["full_random_bonus"] = initial(uses) + full_random_bonus
return data
//This is a MASSIVE amount of data, please be careful if you remove it from static.
@@ -172,6 +168,8 @@
entry_data += list(individual_entry_data)
data["entries"] = entry_data
+ data["semi_random_bonus"] = initial(uses) + semi_random_bonus
+ data["full_random_bonus"] = initial(uses) + full_random_bonus
return data
/obj/item/spellbook/ui_act(action, params)
diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm
index a8c3fe70f77b..e8d483e958ae 100644
--- a/code/modules/assembly/doorcontrol.dm
+++ b/code/modules/assembly/doorcontrol.dm
@@ -142,9 +142,7 @@
for(var/obj/machinery/igniter/M in GLOB.machines)
if(M.id == src.id)
- M.use_power(50)
- M.on = !M.on
- M.icon_state = "igniter[M.on]"
+ INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/igniter, toggle))
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 30)
diff --git a/code/modules/asset_cache/assets/pipes.dm b/code/modules/asset_cache/assets/pipes.dm
index 98eba9584978..8df196d3ad24 100644
--- a/code/modules/asset_cache/assets/pipes.dm
+++ b/code/modules/asset_cache/assets/pipes.dm
@@ -4,4 +4,3 @@
/datum/asset/spritesheet/pipes/create_spritesheets()
for (var/each in list('icons/obj/atmospherics/pipes/pipe_item.dmi', 'monkestation/icons/obj/atmospherics/pipes/disposal.dmi', 'icons/obj/atmospherics/pipes/transit_tube.dmi', 'icons/obj/plumbing/fluid_ducts.dmi'))
InsertAll("", each, GLOB.alldirs)
- Insert(sprite_name = "gsensor1", I = 'icons/obj/stationobjs.dmi', icon_state = "gsensor1")
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index f9e58bcb1ae4..fd7c12a5215e 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -21,9 +21,14 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
/datum/gas_mixture
var/list/gases
- var/temperature = 0 //kelvins
- var/tmp/temperature_archived = 0
- var/volume = CELL_VOLUME //liters
+ /// The temperature of the gas mix in kelvin. Should never be lower then TCMB
+ var/temperature = TCMB
+ /// Used, like all archived variables, to ensure turf sharing is consistent inside a tick, no matter
+ /// The order of operations
+ var/tmp/temperature_archived = TCMB
+ /// Volume in liters (duh)
+ var/volume = CELL_VOLUME
+ /// The last tick this gas mixture shared on. A counter that turfs use to manage activity
var/last_share = 0
/// Tells us what reactions have happened in our gasmix. Assoc list of reaction - moles reacted pair.
var/list/reaction_results
diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
index fb06f74cdabb..6d0da59d5650 100644
--- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
@@ -42,6 +42,32 @@
/// An assoc list of [datum/tlv]s, indexed by "pressure", "temperature", and [datum/gas] typepaths.
var/list/datum/tlv/tlv_collection
+ /// Used for air alarm helper called unlocked to make air alarm unlocked.
+ var/unlocked = FALSE
+ /// Used for air alarm helper called syndicate_access to make air alarm's required access syndicate_access.
+ var/syndicate_access = FALSE
+ /// Used for air alarm helper called away_general_access to make air alarm's required access away_general_access.
+ var/away_general_access = FALSE
+ /// Used for air alarm helper called engine_access to make air alarm's required access one of ACCESS_ATMOSPHERICS & ACCESS_ENGINEERING.
+ var/engine_access = FALSE
+ /// Used for air alarm helper called mixingchamber_access to make air alarm's required access one of ACCESS_ATMOSPHERICS & ACCESS_ORDNANCE.
+ var/mixingchamber_access = FALSE
+ /// Used for air alarm helper called all_access to remove air alarm's required access.
+ var/all_access = FALSE
+
+ /// Used for air alarm helper called tlv_cold_room to adjust alarm thresholds for cold room.
+ var/tlv_cold_room = FALSE
+ /// Used for air alarm helper called tlv_no_ckecks to remove alarm thresholds.
+ var/tlv_no_checks = FALSE
+
+ /// Used for connecting air alarm to a remote tile/zone via air sensor instead of the tile/zone of the air alarm
+ var/obj/machinery/air_sensor/connected_sensor
+ /// Used to link air alarm to air sensor via map helpers
+ var/air_sensor_chamber_id = ""
+ /// Whether it is possible to link/unlink this air alarm from a sensor
+ var/allow_link_change = TRUE
+
+
GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
/datum/armor/machinery_airalarm
@@ -76,7 +102,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
else
tlv_collection[gas_path] = new /datum/tlv/no_checks
- my_area = get_area(src)
+ my_area = connected_sensor ? get_area(connected_sensor) : get_area(src)
alarm_manager = new(src)
select_mode(src, /datum/air_alarm_mode/filtering)
@@ -99,13 +125,19 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
GLOB.air_alarms -= src
return ..()
+/obj/machinery/airalarm/power_change()
+ var/turf/our_turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src)
+ var/datum/gas_mixture/environment = our_turf.return_air()
+ check_danger(our_turf, environment, environment.temperature)
+ return ..()
+
/obj/machinery/airalarm/on_enter_area(datum/source, area/area_to_register)
//were already registered to an area. exit from here first before entering into an new area
if(!isnull(my_area))
return
. = ..()
- my_area = area_to_register
+ my_area = connected_sensor ? get_area(connected_sensor) : area_to_register
update_appearance()
/obj/machinery/airalarm/update_name(updates)
@@ -118,7 +150,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
return
. = ..()
- my_area = null
+ my_area = connected_sensor ? get_area(connected_sensor) : null
/obj/machinery/airalarm/examine(mob/user)
. = ..()
@@ -137,6 +169,19 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
return ..()
return UI_CLOSE
+/obj/machinery/airalarm/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
+ .= ..()
+
+ if (!istype(multi_tool) || locked)
+ return .
+
+ if(istype(multi_tool.buffer, /obj/machinery/air_sensor))
+ if(!allow_link_change)
+ balloon_alert(user, "linking disabled")
+ return TOOL_ACT_SIGNAL_BLOCKING
+ connect_sensor(multi_tool.buffer)
+ balloon_alert(user, "connected sensor")
+ return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/airalarm/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -166,14 +211,21 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
data["fireAlarm"] = my_area.fire
data["faultStatus"] = my_area.fault_status
data["faultLocation"] = my_area.fault_location
+ data["sensor"] = !!connected_sensor
+ data["allowLinkChange"] = allow_link_change
- var/turf/turf = get_turf(src)
+ var/turf/turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src)
var/datum/gas_mixture/environment = turf.return_air()
var/total_moles = environment.total_moles()
var/temp = environment.temperature
var/pressure = environment.return_pressure()
data["envData"] = list()
+ if(connected_sensor)
+ data["envData"] += list(list(
+ "name" = "Linked area",
+ "value" = my_area.name
+ ))
data["envData"] += list(list(
"name" = "Pressure",
"value" = "[round(pressure, 0.01)] kPa",
@@ -273,7 +325,8 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
return
var/mob/user = usr
- var/area/area = get_area(src)
+ var/area/area = connected_sensor ? get_area(connected_sensor) : get_area(src)
+
ASSERT(!isnull(area))
var/ref = params["ref"]
@@ -380,7 +433,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
tlv.set_value(threshold_type, value)
investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(usr)]", INVESTIGATE_ATMOS)
- var/turf/our_turf = get_turf(src)
+ var/turf/our_turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src)
var/datum/gas_mixture/environment = our_turf.return_air()
check_danger(our_turf, environment, environment.temperature)
@@ -393,7 +446,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
tlv.reset_value(threshold_type)
investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(usr)]", INVESTIGATE_ATMOS)
- var/turf/our_turf = get_turf(src)
+ var/turf/our_turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src)
var/datum/gas_mixture/environment = our_turf.return_air()
check_danger(our_turf, environment, environment.temperature)
@@ -405,6 +458,10 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
if (alarm_manager.clear_alarm(ALARM_ATMOS))
danger_level = AIR_ALARM_ALERT_NONE
+ if ("disconnect_sensor")
+ if(allow_link_change)
+ disconnect_sensor()
+
/* monke start: air conditioning: */
if("air_conditioning")
if(!isnum(params["value"]))
@@ -442,11 +499,11 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
var/color
if(danger_level == AIR_ALARM_ALERT_HAZARD)
- color = "#DA0205" // red
+ color = "#FF0022" // red
else if(danger_level == AIR_ALARM_ALERT_WARNING || my_area.active_alarms[ALARM_ATMOS])
- color = "#EC8B2F" // yellow
+ color = "#FFAA00" // yellow
else
- color = "#03A728" // green
+ color = "#00FFCC" // teal
set_light(l_outer_range = 1.4, l_power = 1, l_color = color)
@@ -461,7 +518,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
icon_state = "alarm_b1"
return ..()
- icon_state = "alarmp"
+ icon_state = isnull(connected_sensor) ? "alarmp" : "alarmp_remote"
return ..()
/obj/machinery/airalarm/update_overlays()
@@ -522,4 +579,84 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
selected_mode.apply(my_area)
SEND_SIGNAL(src, COMSIG_AIRALARM_UPDATE_MODE, source)
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
+
+/// Used for unlocked air alarm helper, which unlocks the air alarm.
+/obj/machinery/airalarm/proc/unlock()
+ locked = FALSE
+
+/// Used for syndicate_access air alarm helper, which sets air alarm's required access to syndicate_access.
+/obj/machinery/airalarm/proc/give_syndicate_access()
+ req_access = list(ACCESS_SYNDICATE)
+
+///Used for away_general_access air alarm helper, which set air alarm's required access to away_general_access.
+/obj/machinery/airalarm/proc/give_away_general_access()
+ req_access = list(ACCESS_AWAY_GENERAL)
+
+///Used for engine_access air alarm helper, which set air alarm's required access to away_general_access.
+/obj/machinery/airalarm/proc/give_engine_access()
+ name = "engine air alarm"
+ locked = FALSE
+ req_access = null
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINEERING)
+
+///Used for mixingchamber_access air alarm helper, which set air alarm's required access to away_general_access.
+/obj/machinery/airalarm/proc/give_mixingchamber_access()
+ name = "chamber air alarm"
+ locked = FALSE
+ req_access = null
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ORDNANCE)
+
+///Used for all_access air alarm helper, which set air alarm's required access to null.
+/obj/machinery/airalarm/proc/give_all_access()
+ name = "all-access air alarm"
+ desc = "This particular atmos control unit appears to have no access restrictions."
+ locked = FALSE
+ req_access = null
+ req_one_access = null
+
+///Used for air alarm cold room tlv helper, which sets cold room temperature and pressure alarm thresholds
+/obj/machinery/airalarm/proc/set_tlv_cold_room()
+ tlv_collection["temperature"] = new /datum/tlv/cold_room_temperature
+ tlv_collection["pressure"] = new /datum/tlv/cold_room_pressure
+
+///Used for air alarm no tlv helper, which removes alarm thresholds
+/obj/machinery/airalarm/proc/set_tlv_no_checks()
+ tlv_collection["temperature"] = new /datum/tlv/no_checks
+ tlv_collection["pressure"] = new /datum/tlv/no_checks
+
+///Used for air alarm link helper, which connects air alarm to a sensor with corresponding chamber_id
+/obj/machinery/airalarm/proc/setup_chamber_link()
+ var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[GLOB.map_loaded_sensors[air_sensor_chamber_id]]
+ if(isnull(sensor))
+ log_mapping("[src] at [AREACOORD(src)] tried to connect to a sensor, but no sensor with chamber_id:[air_sensor_chamber_id] found!")
+ return
+ connect_sensor(sensor)
+
+///Used to connect air alarm with a sensor
+/obj/machinery/airalarm/proc/connect_sensor(obj/machinery/air_sensor/sensor)
+ if(!isnull(connected_sensor))
+ UnregisterSignal(connected_sensor, COMSIG_QDELETING)
+ connected_sensor = sensor
+ RegisterSignal(connected_sensor, COMSIG_QDELETING, PROC_REF(disconnect_sensor))
+ my_area = get_area(connected_sensor)
+
+ var/turf/our_turf = get_turf(connected_sensor)
+ var/datum/gas_mixture/environment = our_turf.return_air()
+ check_danger(our_turf, environment, environment.temperature)
+
+ update_appearance()
+ update_name()
+
+///Used to reset the air alarm to default configuration after disconnecting from air sensor
+/obj/machinery/airalarm/proc/disconnect_sensor()
+ UnregisterSignal(connected_sensor, COMSIG_QDELETING)
+ connected_sensor = null
+ my_area = get_area(src)
+
+ var/turf/our_turf = get_turf(src)
+ var/datum/gas_mixture/environment = our_turf.return_air()
+ check_danger(our_turf, environment, environment.temperature)
+
+ update_appearance()
+ update_name()
diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm
index 4bd3a9b01c5d..7e3039158d2e 100644
--- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm
@@ -185,4 +185,4 @@
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm_bitem"
result_path = /obj/machinery/airalarm
- pixel_shift = 24
+ pixel_shift = 27
diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_variants.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_variants.dm
deleted file mode 100644
index d6230bbe2044..000000000000
--- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_variants.dm
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/obj/machinery/airalarm/server
-
-/obj/machinery/airalarm/server/Initialize(mapload)
- . = ..()
- tlv_collection["temperature"] = new /datum/tlv/no_checks
- tlv_collection["pressure"] = new /datum/tlv/no_checks
-
-/obj/machinery/airalarm/kitchen_cold_room
-
-/obj/machinery/airalarm/kitchen_cold_room/Initialize(mapload)
- . = ..()
- tlv_collection["temperature"] = new /datum/tlv/cold_room_temperature
- tlv_collection["pressure"] = new /datum/tlv/cold_room_pressure
-
-/obj/machinery/airalarm/unlocked
- locked = FALSE
-
-/obj/machinery/airalarm/engine
- name = "engine air alarm"
- locked = FALSE
- req_access = null
- req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINEERING)
-
-/obj/machinery/airalarm/mixingchamber
- name = "chamber air alarm"
- locked = FALSE
- req_access = null
- req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ORDNANCE)
-
-/obj/machinery/airalarm/all_access
- name = "all-access air alarm"
- desc = "This particular atmos control unit appears to have no access restrictions."
- locked = FALSE
- req_access = null
- req_one_access = null
-
-/obj/machinery/airalarm/syndicate //general syndicate access
- req_access = list(ACCESS_SYNDICATE)
-
-/obj/machinery/airalarm/away //general away mission access
- req_access = list(ACCESS_AWAY_GENERAL)
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index fcd5e1422c31..8d3b580050e3 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -369,7 +369,7 @@
add_fingerprint(user)
var/unsafe_wrenching = FALSE
- var/internal_pressure = int_air.return_pressure()-env_air.return_pressure()
+ var/internal_pressure = int_air.return_pressure() - env_air.return_pressure()
var/empty_pipe = FALSE
if(istype(src, /obj/machinery/atmospherics/components))
var/list/datum/gas_mixture/all_gas_mixes = return_analyzable_air()
@@ -386,12 +386,12 @@
if(!empty_pipe)
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
- if (internal_pressure > 2*ONE_ATMOSPHERE)
+ if (internal_pressure > 2 * ONE_ATMOSPHERE)
to_chat(user, span_warning("As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?"))
unsafe_wrenching = TRUE //Oh dear oh dear
var/time_taken = empty_pipe ? 0 : 20
- if(I.use_tool(src, user, time_taken, volume=50))
+ if(I.use_tool(src, user, time_taken, volume = 50))
user.visible_message( \
"[user] unfastens \the [src].", \
span_notice("You unfasten \the [src]."), \
@@ -402,7 +402,8 @@
if(unsafe_wrenching)
unsafe_pressure_release(user, internal_pressure)
return deconstruct(TRUE)
- return TRUE
+
+ return ..()
/**
* Getter for can_unwrench
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index bf79819e01b0..460b59d744db 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -17,11 +17,11 @@
///Rate of operation of the device
var/volume_rate = 50
- ///id of air sensor its connected to
- var/chamber_id
-
/obj/machinery/atmospherics/components/unary/outlet_injector/Initialize(mapload)
+ if(isnull(id_tag))
+ id_tag = assign_random_name()
. = ..()
+
var/static/list/tool_screentips = list(
TOOL_MULTITOOL = list(
SCREENTIP_CONTEXT_LMB = "Log to link later with air sensor",
@@ -42,27 +42,17 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
. = ..()
- if (!istype(multi_tool))
- return .
+
+ if(istype(multi_tool.buffer, /obj/machinery/air_sensor))
+ var/obj/machinery/air_sensor/sensor = multi_tool.buffer
+ sensor.inlet_id = id_tag
+ multi_tool.buffer = null
+ balloon_alert(user, "input linked to sensor")
+ return TOOL_ACT_TOOLTYPE_SUCCESS
balloon_alert(user, "saved in buffer")
multi_tool.buffer = src
- return TRUE
-
-/obj/machinery/atmospherics/components/unary/outlet_injector/wrench_act(mob/living/user, obj/item/I)
- . = ..()
- if(.)
- disconnect_chamber()
-
-///called when its either unwrenched or destroyed
-/obj/machinery/atmospherics/components/unary/outlet_injector/proc/disconnect_chamber()
- if(chamber_id != null)
- GLOB.objects_by_id_tag -= CHAMBER_INPUT_FROM_ID(chamber_id)
- chamber_id = null
-
-/obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
- disconnect_chamber()
- return ..()
+ return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/atmospherics/components/unary/outlet_injector/CtrlClick(mob/user)
if(can_interact(user))
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 067cad67d9e1..e0e13ff10c4d 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -52,23 +52,17 @@
/obj/machinery/atmospherics/components/unary/vent_pump/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
. = ..()
- if (!istype(multi_tool))
- return .
+
+ if(istype(multi_tool.buffer, /obj/machinery/air_sensor))
+ var/obj/machinery/air_sensor/sensor = multi_tool.buffer
+ sensor.outlet_id = id_tag
+ multi_tool.buffer = null
+ balloon_alert(user, "output linked to sensor")
+ return TOOL_ACT_TOOLTYPE_SUCCESS
balloon_alert(user, "saved in buffer")
multi_tool.buffer = src
- return TRUE
-
-/obj/machinery/atmospherics/components/unary/vent_pump/wrench_act(mob/living/user, obj/item/wrench)
- . = ..()
- if(.)
- disconnect_chamber()
-
-///called when its either unwrenched or destroyed
-/obj/machinery/atmospherics/components/unary/vent_pump/proc/disconnect_chamber()
- if(chamber_id != null)
- GLOB.objects_by_id_tag -= CHAMBER_OUTPUT_FROM_ID(chamber_id)
- chamber_id = null
+ return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/atmospherics/components/unary/vent_pump/Destroy()
disconnect_from_area()
@@ -77,8 +71,6 @@
if(vent_area)
vent_area.air_vents -= src
- disconnect_chamber()
-
return ..()
/obj/machinery/atmospherics/components/unary/vent_pump/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 6bb923f25ae6..a933ab2f6baf 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -177,7 +177,7 @@
return
/obj/machinery/atmospherics/pipe/add_member(obj/machinery/atmospherics/considered_device)
- parent.add_member(considered_device, src)
+ parent?.add_member(considered_device, src)
/obj/machinery/atmospherics/components/add_member(obj/machinery/atmospherics/considered_device)
var/datum/pipeline/device_pipeline = return_pipenet(considered_device)
diff --git a/code/modules/bitrunning/job.dm b/code/modules/bitrunning/job.dm
index 57581753c0fb..09d16ed823e0 100644
--- a/code/modules/bitrunning/job.dm
+++ b/code/modules/bitrunning/job.dm
@@ -1,3 +1,4 @@
+/* MONKESTATION REMOVAL: MERGED WITH PRISONERS
/datum/job/bitrunner
title = JOB_BITRUNNER
description = "Surf the virtual domain for gear and loot. Decrypt your rewards on station."
@@ -39,3 +40,4 @@
uniform = /obj/item/clothing/under/rank/cargo/bitrunner
belt = /obj/item/modular_computer/pda/bitrunner
ears = /obj/item/radio/headset/headset_cargo
+*/
diff --git a/code/modules/bitrunning/objects/netpod.dm b/code/modules/bitrunning/objects/netpod.dm
index eda081f1734a..ae3af33ff954 100644
--- a/code/modules/bitrunning/objects/netpod.dm
+++ b/code/modules/bitrunning/objects/netpod.dm
@@ -14,7 +14,7 @@
/// Whether we have an ongoing connection
var/connected = FALSE
/// A player selected outfit by clicking the netpod
- var/datum/outfit/netsuit = /datum/outfit/job/bitrunner
+ var/datum/outfit/netsuit = /datum/outfit/job/prisoner
/// Holds this to see if it needs to generate a new one
var/datum/weakref/avatar_ref
/// The linked quantum server
diff --git a/code/modules/bitrunning/objects/vendor.dm b/code/modules/bitrunning/objects/vendor.dm
index a995c0c0b6a9..07a9d537dfd3 100644
--- a/code/modules/bitrunning/objects/vendor.dm
+++ b/code/modules/bitrunning/objects/vendor.dm
@@ -12,7 +12,7 @@
cargo_cost_multiplier = 0.65
express_cost_multiplier = 1
purchase_tooltip = @{"Your purchases will arrive at cargo,
- and hopefully get delivered by them.
+ and hopefully gets delivered to you by the security.
35% cheaper than express delivery."}
express_tooltip = @{"Sends your purchases instantly."}
credit_type = CREDIT_TYPE_BITRUNNING
@@ -57,8 +57,8 @@
cost_type = credit_type,
can_be_cancelled = FALSE,
)
- say("Thank you for your purchase! It will arrive on the next cargo shuttle!")
- radio.talk_into(src, "A bitrunner has ordered equipment which will arrive on the cargo shuttle! Please make sure it gets to them as soon as possible!", radio_channel)
+ say("Thank you for your purchase! It will arrive on the next cargo shuttle! ")
+ radio.talk_into(src, "A prisoner has ordered equipment which will arrive on the cargo shuttle! Please make sure it gets to them as soon as possible!", radio_channel) //MONKESTATION EDIT
SSshuttle.shopping_list += new_order
/obj/machinery/computer/order_console/bitrunning/retrive_points(obj/item/card/id/id_card)
@@ -73,16 +73,18 @@
icon_state = "[initial(icon_state)][powered() ? null : "_off"]"
return ..()
+//MONKESTATION EDIT START
/datum/supply_pack/bitrunning
- name = "bitrunning order"
+ name = "prisoner bitrunning order"
hidden = TRUE
- crate_name = "bitrunning delivery crate"
+ crate_name = "prisoner bitrunning delivery crate"
access = list(ACCESS_BIT_DEN)
/datum/supply_pack/bitrunning/New(purchaser, cost, list/contains)
. = ..()
- name = "[purchaser]'s Bitrunning Order"
+ name = "[purchaser]'s Prisoner Bitrunning Order"
src.cost = cost
src.contains = contains
+//MONKESTATION EDIT END
#undef CREDIT_TYPE_BITRUNNING
diff --git a/code/modules/bitrunning/orders/flair.dm b/code/modules/bitrunning/orders/flair.dm
index c578c884d23c..a0ef986eac3f 100644
--- a/code/modules/bitrunning/orders/flair.dm
+++ b/code/modules/bitrunning/orders/flair.dm
@@ -39,6 +39,18 @@
item_path = /obj/item/clothing/shoes/jackboots
cost_per_order = 1000
+//MONKESTATION ADDITION START
+/datum/orderable_item/bitrunning_flair/jumpsuit
+ item_path = /obj/item/clothing/under/rank/cargo/bitrunner
+ desc = "An upgrade over the usual orange shirt...right?"
+ cost_per_order = 1000
+
+/datum/orderable_item/bitrunning_flair/mannitol
+ item_path = /obj/item/reagent_containers/cup/bottle/mannitol
+ desc = "A healing potion for your brain, acquired by doing the same thing that caused brain damage in the first place..."
+ cost_per_order = 1000
+
+//MONKESTATION ADDITION END
/datum/orderable_item/bitrunning_flair/neon_lining
item_path = /obj/item/stack/neon_lining/twenty
cost_per_order = 250
diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm
index ce1c66e8890f..f3131d098992 100644
--- a/code/modules/bitrunning/server/obj_generation.dm
+++ b/code/modules/bitrunning/server/obj_generation.dm
@@ -19,7 +19,7 @@
if(istype(jumpsuit))
jumpsuit.set_armor(/datum/armor/clothing_under)
- var/obj/item/clothing/head/hat = avatar.get_clothing_on_part(HEAD)
+ var/obj/item/clothing/head/hat = avatar.get_clothing_on_part(avatar.get_bodypart(BODY_ZONE_HEAD))
if(istype(hat))
hat.set_armor(null)
diff --git a/code/modules/bitrunning/server/quantum_server.dm b/code/modules/bitrunning/server/quantum_server.dm
index f469c4c95418..e95096090ec2 100644
--- a/code/modules/bitrunning/server/quantum_server.dm
+++ b/code/modules/bitrunning/server/quantum_server.dm
@@ -39,7 +39,7 @@
/// Changes how much info is available on the domain
var/scanner_tier = 1
/// Length of time it takes for the server to cool down after resetting. Here to give runners downtime so their faces don't get stuck like that
- var/server_cooldown_time = 3 MINUTES
+ var/server_cooldown_time = 90 SECONDS //MONKESTATION EDIT
/// Applies bonuses to rewards etc
var/servo_bonus = 0
/// The turfs we can place a hololadder on.
diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm
index 3d8b2c07880a..d7a014491f3b 100644
--- a/code/modules/bitrunning/server/util.dm
+++ b/code/modules/bitrunning/server/util.dm
@@ -5,7 +5,9 @@
/obj/machinery/quantum_server/proc/cool_off()
is_ready = TRUE
update_appearance()
- radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY)
+ playsound(loc, 'sound/machines/click.ogg', 30, TRUE) //MONKESTATION ADDITION
+ balloon_alert_to_viewers("Thermal systems within operational parameters. Proceeding to domain configuration.")
+ //radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY) MONKESTATION REMOVAL: prisoners don't have headsets atm, edit this if that's to change
/// Compiles a list of available domains.
/obj/machinery/quantum_server/proc/get_available_domains()
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 5ee9f856823e..f3dca7a3dca1 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -65,11 +65,13 @@
/mob/living/simple_animal/pet/gondola/gondolapod/setOpened()
opened = TRUE
+ SET_PLANE_IMPLICIT(src, GAME_PLANE)
update_appearance()
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, setClosed)), 50)
/mob/living/simple_animal/pet/gondola/gondolapod/setClosed()
opened = FALSE
+ SET_PLANE_IMPLICIT(src, GAME_PLANE_FOV_HIDDEN)
update_appearance()
/mob/living/simple_animal/pet/gondola/gondolapod/death()
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 9db511ea2775..d72d756fdc6a 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -222,6 +222,9 @@
stay_after_drop = FALSE
holder.pixel_z = initial(holder.pixel_z)
holder.alpha = initial(holder.alpha)
+ if (holder != src)
+ contents |= holder.contents
+ qdel(holder)
var/shippingLane = GLOB.areas_by_type[/area/centcom/central_command_areas/supplypod/supplypod_temp_holding]
forceMove(shippingLane) //Move to the centcom-z-level until the pod_landingzone says we can drop back down again
if (!reverse_dropoff_coords) //If we're centcom-launched, the reverse dropoff turf will be a centcom loading bay. If we're an extraction pod, it should be the ninja jail. Thus, this shouldn't ever really happen.
@@ -288,6 +291,8 @@
if (style == STYLE_GONDOLA) //Checks if we are supposed to be a gondola pod. If so, create a gondolapod mob, and move this pod to nullspace. I'd like to give a shout out, to my man oranges
var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(turf_underneath, src)
benis.contents |= contents //Move the contents of this supplypod into the gondolapod mob.
+ for (var/mob/living/mob_in_pod in benis.contents)
+ mob_in_pod.reset_perspective(null)
moveToNullspace()
addtimer(CALLBACK(src, PROC_REF(open_pod), benis), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
else if (style == STYLE_SEETHROUGH)
@@ -310,7 +315,7 @@
playsound(get_turf(holder), openingSound, soundVolume, FALSE, FALSE) //Special admin sound to play
for (var/turf_type in turfs_in_cargo)
turf_underneath.PlaceOnTop(turf_type)
- for (var/cargo in contents)
+ for (var/cargo in holder.contents)
var/atom/movable/movable_cargo = cargo
movable_cargo.forceMove(turf_underneath)
if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH && !(pod_flags & FIRST_SOUNDS)) //If we aren't being quiet, play the default pod open sound
@@ -479,7 +484,8 @@
. = ..()
if(same_z_layer)
return
- SET_PLANE_EXPLICIT(glow_effect, ABOVE_GAME_PLANE, src)
+ if(glow_effect)
+ SET_PLANE_EXPLICIT(glow_effect, ABOVE_GAME_PLANE, src)
/obj/structure/closet/supplypod/proc/endGlow()
if(!glow_effect)
@@ -529,7 +535,7 @@
/obj/effect/supplypod_smoke/proc/drawSelf(amount)
alpha = max(0, 255-(amount*20))
-/obj/effect/supplypod_rubble //This is the object that forceMoves the supplypod to it's location
+/obj/effect/supplypod_rubble
name = "debris"
desc = "A small crater of rubble. Closer inspection reveals the debris to be made primarily of space-grade metal fragments. You're pretty sure that this will disperse before too long."
icon = 'icons/obj/supplypods.dmi'
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 4a7d768a7d66..5e176fb3741d 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -499,7 +499,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if (CONFIG_GET(flag/irc_first_connection_alert))
send2tgs_adminless_only("new_byond_user", "[key_name(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age == 1?"":"s")] old, created on [account_join_date].")
get_message_output("watchlist entry", ckey)
- if(check_ip_intel() && CONFIG_GET(flag/vpn_kick))
+ if(check_overwatch() && CONFIG_GET(flag/vpn_kick))
return
validate_key_in_db()
// If we aren't already generating a ban cache, fire off a build request
@@ -758,12 +758,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
qdel(query_log_player)
if(!account_join_date)
account_join_date = "Error"
- var/datum/db_query/query_log_connection = SSdbcore.NewQuery({"
- INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`round_id`,`ckey`,`ip`,`computerid`)
- VALUES(null,Now(),INET_ATON(:internet_address),:port,:round_id,:ckey,INET_ATON(:ip),:computerid)
- "}, list("internet_address" = world.internet_address || "0", "port" = world.port, "round_id" = GLOB.round_id, "ckey" = ckey, "ip" = address, "computerid" = computer_id))
- query_log_connection.Execute()
- qdel(query_log_connection)
+ log_client_to_db_connection_log()
SSserver_maint.UpdateHubStatus()
@@ -771,6 +766,18 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
player_age = -1
. = player_age
+/client/proc/log_client_to_db_connection_log()
+ var/sql_ip = sql_sanitize_text(src.address)
+ var/sql_computerid = sql_sanitize_text(src.computer_id)
+ var/sql_ckey = sql_sanitize_text(src.ckey)
+
+ var/datum/db_query/query_log_connection = SSdbcore.NewQuery({"
+ INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`round_id`,`ckey`,`ip`,`computerid`)
+ VALUES(null,Now(),INET_ATON(:internet_address),:port,:round_id,:ckey,INET_ATON(:ip),:computerid)
+ "}, list("internet_address" = world.internet_address || "0", "port" = world.port, "round_id" = GLOB.round_id, "ckey" = sql_ckey, "ip" = sql_ip, "computerid" = sql_computerid))
+ query_log_connection.Execute()
+ qdel(query_log_connection)
+
/client/proc/findJoinDate()
var/list/http = world.Export("http://byond.com/members/[ckey]?format=text")
if(!http)
@@ -932,19 +939,29 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
create_message("note", key, system_ckey, message, null, null, 0, 0, null, 0, 0)
-/client/proc/check_ip_intel()
- ///we cant sleep here as it voids the ability for us to be added to the interview que
- if (CONFIG_GET(string/ipintel_email))
- var/failed = FALSE
- var/datum/ipintel/res = get_ip_intel(address)
- if (res.intel >= CONFIG_GET(number/ipintel_rating_bad))
- failed = TRUE
- ip_intel = res.intel
-
- if(ip_intel >= CONFIG_GET(number/ipintel_rating_bad) && !(ckey in GLOB.interviews.approved_ckeys))
- message_admins(span_adminnotice("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN, they will be added to interview queue"))
- interviewee = TRUE
- return failed
+/client/proc/check_overwatch()
+ var/failed = FALSE
+ SSoverwatch.CollectClientData(src)
+ failed = SSoverwatch.HandleClientAccessCheck(src)
+ SSoverwatch.HandleASNbanCheck(src)
+
+ var/string
+ if(ip_info)
+ if(ip_info.ip_proxy)
+ string += "Proxy IP"
+ if(ip_info.ip_hosting)
+ if(string)
+ string += ", "
+ string += "Hosted IP"
+ if(ip_info.ip_mobile)
+ if(string)
+ string += ", "
+ string += "Mobile Hostspot IP"
+
+ if(failed && !(ckey in GLOB.interviews.approved_ckeys))
+ message_admins(span_adminnotice("Proxy Detection: [key_name_admin(src)] Overwatch detected this is a [string]"))
+ interviewee = TRUE
+ return failed
/client/Click(atom/object, atom/location, control, params)
SEND_SIGNAL(src, COMSIG_CLIENT_CLICK_DIRTY, object, location, control, params, usr)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 3400ca81968e..193bb8c05fc6 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -215,7 +215,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Sanitize
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
- toggles = sanitize_integer(toggles, 0, (2**24)-1, initial(toggles))
+ toggles = sanitize_integer(toggles, 0, SHORT_REAL_LIMIT-1, initial(toggles))
be_special = sanitize_be_special(SANITIZE_LIST(be_special))
key_bindings = sanitize_keybindings(key_bindings)
favorite_outfits = SANITIZE_LIST(favorite_outfits)
diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm
index b52f126281c3..af59f2cbf643 100644
--- a/code/modules/clothing/head/mind_monkey_helmet.dm
+++ b/code/modules/clothing/head/mind_monkey_helmet.dm
@@ -94,7 +94,7 @@
if(2) //brain death
magnification.apply_damage(500,BRAIN,BODY_ZONE_HEAD,FALSE,FALSE,FALSE)
if(3) //primal gene (gorilla)
- magnification.gorillize()
+ magnification.gorillize(FALSE) // monkestation edit: don't keep monkey name for gorilla
if(4) //genetic mass susceptibility (gib)
magnification.gib()
//either used up correctly or taken off before polling finished (punish this by destroying the helmet)
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 41cbb5cb3bb6..3a816c006512 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -60,6 +60,7 @@
if(isnull(held_item) && has_sensor == HAS_SENSORS)
context[SCREENTIP_CONTEXT_RMB] = "Toggle suit sensors"
+ context[SCREENTIP_CONTEXT_CTRL_LMB] = "Set suit sensors to tracking"
. = CONTEXTUAL_SCREENTIP_SET
if(istype(held_item, /obj/item/clothing/accessory) && length(attached_accessories) < max_number_of_accessories)
@@ -319,6 +320,16 @@
if(H.w_uniform == src)
H.update_suit_sensors()
+/obj/item/clothing/under/CtrlClick(mob/user)
+ . = ..()
+ if(!.)
+ return
+ if(!can_toggle_sensors(user))
+ return
+
+ sensor_mode = SENSOR_COORDS
+ balloon_alert(user, "set to tracking")
+
/// Checks if the toggler is allowed to toggle suit sensors currently
/obj/item/clothing/under/proc/can_toggle_sensors(mob/toggler)
if(!can_use(toggler) || toggler.stat == DEAD) //make sure they didn't hold the window open.
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
index 4ed70576a12f..d99852d5fbef 100644
--- a/code/modules/jobs/job_types/prisoner.dm
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -3,8 +3,8 @@
description = "Keep yourself occupied in permabrig."
department_head = list("The Security Team")
faction = FACTION_STATION
- total_positions = 2
- spawn_positions = 2
+ total_positions = 5
+ spawn_positions = 5
supervisors = "the security team"
exp_granted_type = EXP_TYPE_CREW
paycheck = PAYCHECK_LOWER
@@ -41,9 +41,9 @@
crime_name = pick(assoc_to_keys(GLOB.prisoner_crimes))
var/datum/prisoner_crime/crime = GLOB.prisoner_crimes[crime_name]
- var/datum/record/crew/target_record = find_record(crewmember.real_name)
+ var/datum/record/crew/target_record = crewmember.mind?.crewfile || find_record(crewmember.real_name)
var/datum/crime/past_crime = new(crime.name, crime.desc, "Central Command", "Indefinite.")
- target_record.crimes += past_crime
+ target_record?.crimes += past_crime
to_chat(crewmember, span_warning("You are imprisoned for \"[crime_name]\"."))
crewmember.add_mob_memory(/datum/memory/key/permabrig_crimes, crimes = crime_name)
@@ -70,6 +70,8 @@
if(!crime_name)
return
var/datum/prisoner_crime/crime = GLOB.prisoner_crimes[crime_name]
+ if(!crime?.tattoos)
+ return
var/list/limbs_to_tat = new_prisoner.bodyparts.Copy()
for(var/i in 1 to crime.tattoos)
if(!length(SSpersistence.prison_tattoos_to_use) || visualsOnly)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm b/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm
index ba311d44a2ae..f290c06d78f1 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm
@@ -17,7 +17,7 @@
/obj/effect/anomaly/flux,
/obj/effect/anomaly/bluespace,
/obj/effect/anomaly/hallucination,
- /obj/effect/anomaly/bioscrambler
+ /obj/effect/anomaly/bioscrambler/docile
)
///Do we anchor the anomaly? Set to true if you don't want anomalies drifting away (like if theyre in space or something)
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 3d1065149d63..d70a22aa5082 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -247,6 +247,166 @@
else
airlock.autoname = TRUE
+//air alarm helpers
+/obj/effect/mapping_helpers/airalarm
+ desc = "You shouldn't see this. Report it please."
+ layer = ABOVE_OBJ_LAYER
+ late = TRUE
+
+/obj/effect/mapping_helpers/airalarm/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ log_mapping("[src] spawned outside of mapload!")
+ return INITIALIZE_HINT_QDEL
+
+ var/obj/machinery/airalarm/target = locate(/obj/machinery/airalarm) in loc
+ if(isnull(target))
+ var/area/target_area = get_area(target)
+ log_mapping("[src] failed to find an air alarm at [AREACOORD(src)] ([target_area.type]).")
+ else
+ payload(target)
+
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/mapping_helpers/airalarm/LateInitialize()
+ . = ..()
+ var/obj/machinery/airalarm/target = locate(/obj/machinery/airalarm) in loc
+
+ if(isnull(target))
+ qdel(src)
+ return
+ if(target.unlocked)
+ target.unlock()
+
+ if(target.tlv_cold_room)
+ target.set_tlv_cold_room()
+ if(target.tlv_no_checks)
+ target.set_tlv_no_checks()
+ if(target.tlv_no_checks && target.tlv_cold_room)
+ CRASH("Tried to apply incompatible air alarm threshold helpers!")
+
+ if(target.syndicate_access)
+ target.give_syndicate_access()
+ if(target.away_general_access)
+ target.give_away_general_access()
+ if(target.engine_access)
+ target.give_engine_access()
+ if(target.mixingchamber_access)
+ target.give_mixingchamber_access()
+ if(target.all_access)
+ target.give_all_access()
+ if(target.syndicate_access + target.away_general_access + target.engine_access + target.mixingchamber_access + target.all_access > 1)
+ CRASH("Tried to combine incompatible air alarm access helpers!")
+
+ if(target.air_sensor_chamber_id)
+ target.setup_chamber_link()
+
+ target.update_appearance()
+ qdel(src)
+
+/obj/effect/mapping_helpers/airalarm/proc/payload(obj/machinery/airalarm/target)
+ return
+
+/obj/effect/mapping_helpers/airalarm/unlocked
+ name = "airalarm unlocked interface helper"
+ icon_state = "airalarm_unlocked_interface_helper"
+
+/obj/effect/mapping_helpers/airalarm/unlocked/payload(obj/machinery/airalarm/target)
+ if(target.unlocked)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to unlock the [target] but it's already unlocked!")
+ target.unlocked = TRUE
+
+/obj/effect/mapping_helpers/airalarm/syndicate_access
+ name = "airalarm syndicate access helper"
+ icon_state = "airalarm_syndicate_access_helper"
+
+/obj/effect/mapping_helpers/airalarm/syndicate_access/payload(obj/machinery/airalarm/target)
+ if(target.syndicate_access)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to syndicate but it's already changed!")
+ target.syndicate_access = TRUE
+
+/obj/effect/mapping_helpers/airalarm/away_general_access
+ name = "airalarm away access helper"
+ icon_state = "airalarm_away_general_access_helper"
+
+/obj/effect/mapping_helpers/airalarm/away_general_access/payload(obj/machinery/airalarm/target)
+ if(target.away_general_access)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to away_general but it's already changed!")
+ target.away_general_access = TRUE
+
+/obj/effect/mapping_helpers/airalarm/engine_access
+ name = "airalarm engine access helper"
+ icon_state = "airalarm_engine_access_helper"
+
+/obj/effect/mapping_helpers/airalarm/engine_access/payload(obj/machinery/airalarm/target)
+ if(target.engine_access)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to engine_access but it's already changed!")
+ target.engine_access = TRUE
+
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access
+ name = "airalarm mixingchamber access helper"
+ icon_state = "airalarm_mixingchamber_access_helper"
+
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access/payload(obj/machinery/airalarm/target)
+ if(target.mixingchamber_access)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to mixingchamber_access but it's already changed!")
+ target.mixingchamber_access = TRUE
+
+/obj/effect/mapping_helpers/airalarm/all_access
+ name = "airalarm all access helper"
+ icon_state = "airalarm_all_access_helper"
+
+/obj/effect/mapping_helpers/airalarm/all_access/payload(obj/machinery/airalarm/target)
+ if(target.all_access)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to all_access but it's already changed!")
+ target.all_access = TRUE
+
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room
+ name = "airalarm cold room tlv helper"
+ icon_state = "airalarm_tlv_cold_room_helper"
+
+/obj/effect/mapping_helpers/airalarm/tlv_cold_room/payload(obj/machinery/airalarm/target)
+ if(target.tlv_cold_room)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s tlv to cold_room but it's already changed!")
+ target.tlv_cold_room = TRUE
+
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks
+ name = "airalarm no checks tlv helper"
+ icon_state = "airalarm_tlv_no_checks_helper"
+
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks/payload(obj/machinery/airalarm/target)
+ if(target.tlv_no_checks)
+ var/area/area = get_area(target)
+ log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s tlv to no_checks but it's already changed!")
+ target.tlv_no_checks = TRUE
+
+/obj/effect/mapping_helpers/airalarm/link
+ name = "airalarm link helper"
+ icon_state = "airalarm_link_helper"
+ var/chamber_id = ""
+ var/allow_link_change = FALSE
+
+/obj/effect/mapping_helpers/airalarm/link/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ log_mapping("[src] spawned outside of mapload!")
+ return INITIALIZE_HINT_QDEL
+
+ var/obj/machinery/airalarm/alarm = locate(/obj/machinery/airalarm) in loc
+ if(!isnull(alarm))
+ alarm.air_sensor_chamber_id = chamber_id
+ alarm.allow_link_change = allow_link_change
+ else
+ log_mapping("[src] failed to find air alarm at [AREACOORD(src)].")
+ return INITIALIZE_HINT_QDEL
+
//apc helpers
/obj/effect/mapping_helpers/apc
desc = "You shouldn't see this. Report it please."
diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm
index 669d7005e424..1374d542a055 100644
--- a/code/modules/mob/dead/new_player/login.dm
+++ b/code/modules/mob/dead/new_player/login.dm
@@ -60,8 +60,7 @@
// and set the player's client up for interview.
///guh
- if(client.ip_intel == "Disabled")
- client.check_ip_intel()
+ client.check_overwatch()
if(client.interviewee)
register_for_interview()
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index b0705cf82165..f232fc1f2143 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -477,7 +477,7 @@ GLOBAL_LIST_INIT(command_strings, list(
if(. & EMP_PROTECT_SELF)
return
new /obj/effect/temp_visual/emp(loc)
- if(paicard)
+ if(!QDELETED(paicard))
paicard.emp_act(severity)
src.visible_message(span_notice("[paicard] flies out of [initial(src.name)]!"), span_warning("You are forcefully ejected from [initial(src.name)]!"))
ejectpai()
@@ -549,6 +549,8 @@ GLOBAL_LIST_INIT(command_strings, list(
/mob/living/basic/bot/proc/bot_reset(bypass_ai_reset = FALSE)
SEND_SIGNAL(src, COMSIG_BOT_RESET)
if(length(initial_access))
+ if(QDELETED(access_card))
+ access_card = new /obj/item/card/id/advanced/simple_bot(src)
access_card.set_access(initial_access)
diag_hud_set_botstat()
diag_hud_set_botmode()
@@ -684,7 +686,7 @@ GLOBAL_LIST_INIT(command_strings, list(
/// Places a pAI in control of this mob
/mob/living/basic/bot/proc/insertpai(mob/user, obj/item/pai_card/card)
- if(paicard)
+ if(!QDELETED(paicard))
balloon_alert(user, "slot occupied!")
return
if(key)
@@ -723,10 +725,10 @@ GLOBAL_LIST_INIT(command_strings, list(
/// Ejects a pAI from this bot
/mob/living/basic/bot/proc/ejectpai(mob/user = null, announce = TRUE)
- if(isnull(paicard))
+ if(QDELETED(paicard))
return
- if(paicard.pai)
+ if(!QDELETED(paicard.pai))
if(isnull(mind))
mind.transfer_to(paicard.pai)
else
diff --git a/code/modules/mob/living/basic/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm
index 67b738d5ce04..88e843cc814d 100644
--- a/code/modules/mob/living/basic/bots/medbot/medbot.dm
+++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm
@@ -140,7 +140,7 @@
AddElement(/datum/element/hat_wearer, offsets = hat_offsets)
RegisterSignal(src, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(pre_attack))
- if(HAS_TRAIT(SSstation, STATION_TRAIT_MEDBOT_MANIA) || !mapload || !is_station_level(z))
+ if(HAS_TRAIT(SSstation, STATION_TRAIT_MEDBOT_MANIA) && mapload && is_station_level(z))
skin = "advanced"
update_appearance(UPDATE_OVERLAYS)
damage_type_healer = HEAL_ALL_DAMAGE
diff --git a/code/modules/mob/living/basic/farm_animals/goat/goat_subtypes.dm b/code/modules/mob/living/basic/farm_animals/goat/goat_subtypes.dm
index 0638163d0324..19d50fb38097 100644
--- a/code/modules/mob/living/basic/farm_animals/goat/goat_subtypes.dm
+++ b/code/modules/mob/living/basic/farm_animals/goat/goat_subtypes.dm
@@ -6,7 +6,7 @@
. = ..()
var/area/goat_area = get_area(src)
if((bodytemperature < T20C) || istype(goat_area, /area/station/service/kitchen/coldroom))
- . = span_notice("[p_They()] [p_do()]n't seem to be too bothered about the cold.") // special for pete
+ . += span_notice("[p_They()] [p_do()]n't seem to be too bothered about the cold.") // special for pete
/mob/living/basic/goat/pete/add_udder()
return //no thank you
diff --git a/code/modules/mob/living/basic/guardian/guardian_fluff.dm b/code/modules/mob/living/basic/guardian/guardian_fluff.dm
index 4ede238921ed..a09c966a98de 100644
--- a/code/modules/mob/living/basic/guardian/guardian_fluff.dm
+++ b/code/modules/mob/living/basic/guardian/guardian_fluff.dm
@@ -44,6 +44,7 @@
/datum/guardian_fluff/proc/apply(mob/living/basic/guardian/guardian)
guardian.name = name
guardian.real_name = name
+ guardian.update_name_tag() // monkestation edit: name tags
guardian.bubble_icon = bubble_icon
guardian.icon_living = icon_state
guardian.icon_state = icon_state
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 373398934a8b..0670e85a79cc 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -40,33 +40,34 @@
//Effects of bloodloss
var/word = pick("dizzy","woozy","faint")
- switch(blood_volume)
- if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
- if(SPT_PROB(7.5, seconds_per_tick))
- to_chat(src, span_userdanger("Blood starts to tear your skin apart. You're going to burst!"))
- investigate_log("has been gibbed by having too much blood.", INVESTIGATE_DEATHS)
- inflate_gib()
- if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS)
- if(SPT_PROB(5, seconds_per_tick))
- to_chat(src, span_warning("You feel terribly bloated."))
- if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
- if(SPT_PROB(2.5, seconds_per_tick))
- to_chat(src, span_warning("You feel [word]."))
- adjustOxyLoss(round(0.005 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1))
- if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
- adjustOxyLoss(round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1))
- if(SPT_PROB(2.5, seconds_per_tick))
- set_eye_blur_if_lower(12 SECONDS)
- to_chat(src, span_warning("You feel very [word]."))
- if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
- adjustOxyLoss(2.5 * seconds_per_tick)
- if(SPT_PROB(7.5, seconds_per_tick))
- Unconscious(rand(20,60))
- to_chat(src, span_warning("You feel extremely [word]."))
- if(-INFINITY to BLOOD_VOLUME_SURVIVE)
- if(!HAS_TRAIT(src, TRAIT_NODEATH))
- investigate_log("has died of bloodloss.", INVESTIGATE_DEATHS)
- death()
+ if(!HAS_TRAIT(src, TRAIT_NO_BLOODLOSS_DAMAGE)) //monkestation addition
+ switch(blood_volume)
+ if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
+ if(SPT_PROB(7.5, seconds_per_tick))
+ to_chat(src, span_userdanger("Blood starts to tear your skin apart. You're going to burst!"))
+ investigate_log("has been gibbed by having too much blood.", INVESTIGATE_DEATHS)
+ inflate_gib()
+ if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS)
+ if(SPT_PROB(5, seconds_per_tick))
+ to_chat(src, span_warning("You feel terribly bloated."))
+ if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
+ if(SPT_PROB(2.5, seconds_per_tick))
+ to_chat(src, span_warning("You feel [word]."))
+ adjustOxyLoss(round(0.005 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1))
+ if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
+ adjustOxyLoss(round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1))
+ if(SPT_PROB(2.5, seconds_per_tick))
+ set_eye_blur_if_lower(12 SECONDS)
+ to_chat(src, span_warning("You feel very [word]."))
+ if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
+ adjustOxyLoss(2.5 * seconds_per_tick)
+ if(SPT_PROB(7.5, seconds_per_tick))
+ Unconscious(rand(20,60))
+ to_chat(src, span_warning("You feel extremely [word]."))
+ if(-INFINITY to BLOOD_VOLUME_SURVIVE)
+ if(!HAS_TRAIT(src, TRAIT_NODEATH))
+ investigate_log("has died of bloodloss.", INVESTIGATE_DEATHS)
+ death()
var/temp_bleed = 0
//Bleeding out
@@ -327,16 +328,15 @@
/mob/living/proc/add_splatter_floor(turf/T, small_drip)
if(get_blood_id() != /datum/reagent/blood)
return
- if(!T)
+ if(!QDELETED(T))
T = get_turf(src)
- if(isclosedturf(T) || (isgroundlessturf(T) && !GET_TURF_BELOW(T)))
+ if(QDELETED(T) || isclosedturf(T) || (isgroundlessturf(T) && !GET_TURF_BELOW(T)))
return
var/datum/reagent/blood_type = get_blood_id()
var/list/temp_blood_DNA
if(small_drip)
-
- if(T.liquids)
+ if(!QDELETED(T.liquids))
var/list/blood_drop = list(get_blood_id() = 0.1)
T.add_liquid_list(blood_drop, FALSE, 300)
return
@@ -344,7 +344,7 @@
var/obj/effect/decal/cleanable/blood/drip/drop = locate() in T
if(drop)
if(drop.drips < 5)
- T.pollute_turf(/datum/pollutant/metallic_scent, 5)
+ T?.pollute_turf(/datum/pollutant/metallic_scent, 5)
drop.drips++
drop.add_overlay(pick(drop.random_icon_states))
drop.transfer_mob_blood_dna(src)
@@ -353,7 +353,7 @@
temp_blood_DNA = GET_ATOM_BLOOD_DNA(drop) //we transfer the dna from the drip to the splatter
qdel(drop)//the drip is replaced by a bigger splatter
else
- T.pollute_turf(/datum/pollutant/metallic_scent, 5)
+ T?.pollute_turf(/datum/pollutant/metallic_scent, 5)
drop = new(T, get_static_viruses())
drop.transfer_mob_blood_dna(src)
return
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 060bc273bf66..dad31b30a666 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -194,9 +194,7 @@
/obj/item/organ/internal/brain/proc/check_for_repair(obj/item/item, mob/user)
if(damage && item.is_drainable() && item.reagents.has_reagent(/datum/reagent/medicine/mannitol) && (status == ORGAN_ORGANIC)) //attempt to heal the brain
- if(brainmob?.health <= HEALTH_THRESHOLD_DEAD) //if the brain is fucked anyway, do nothing
- to_chat(user, span_warning("[src] is far too damaged, there's nothing else we can do for it!"))
- return TRUE
+ // MONKESTATION NOTE: There was a check for the brain being completely dead here. But that's like, the only case when you'd want to do this. Pretty sure it isn't on tg, so I'm leaving this here for documentation.
user.visible_message(span_notice("[user] starts to slowly pour the contents of [item] onto [src]."), span_notice("You start to slowly pour the contents of [item] onto [src]."))
if(!do_after(user, 3 SECONDS, src))
@@ -208,6 +206,7 @@
var/healto = max(0, damage - amount * 2)
item.reagents.remove_all(ROUND_UP(item.reagents.total_volume / amount * (damage - healto) * 0.5)) //only removes however much solution is needed while also taking into account how much of the solution is mannitol
set_organ_damage(healto) //heals 2 damage per unit of mannitol, and by using "set_organ_damage", we clear the failing variable if that was up
+ cure_all_traumas(TRAUMA_RESILIENCE_SURGERY) // MONKESTATION EDIT: if you go out of your way to do this, then you shouldn't have to do brain surgery
return TRUE
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index bf38e94bb96a..44d0d4322f8b 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -127,6 +127,7 @@ Des: Removes all infected images from the alien.
if(!alien_name_regex.Find(name))
new_xeno.name = name
new_xeno.real_name = real_name
+ new_xeno.update_name_tag() // monkestation edit: name tags
if(mind)
mind.name = new_xeno.real_name
mind.transfer_to(new_xeno)
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index 00c8a617c64f..5ef9b23c4182 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -51,21 +51,24 @@
actions_types = list(/datum/action/cooldown/alien/transfer)
/obj/item/organ/internal/alien/plasmavessel/on_life(seconds_per_tick, times_fired)
+ var/delta_time = DELTA_WORLD_TIME(SSmobs)
+ //Instantly healing to max health in a single tick would be silly. If it takes 8 seconds to fire, then something's fucked.
+ var/delta_time_capped = min(delta_time, 8)
//If there are alien weeds on the ground then heal if needed or give some plasma
if(locate(/obj/structure/alien/weeds) in owner.loc)
if(owner.health >= owner.maxHealth)
- owner.adjustPlasma(plasma_rate * seconds_per_tick)
+ owner.adjustPlasma(plasma_rate * delta_time)
else
var/heal_amt = heal_rate
if(!isalien(owner))
heal_amt *= 0.2
- owner.adjustPlasma(0.5 * plasma_rate * seconds_per_tick)
- owner.adjustBruteLoss(-heal_amt * seconds_per_tick)
- owner.adjustFireLoss(-heal_amt * seconds_per_tick)
- owner.adjustOxyLoss(-heal_amt * seconds_per_tick)
- owner.adjustCloneLoss(-heal_amt * seconds_per_tick)
+ owner.adjustPlasma(0.5 * plasma_rate * delta_time_capped)
+ owner.adjustBruteLoss(-heal_amt * delta_time_capped)
+ owner.adjustFireLoss(-heal_amt * delta_time_capped)
+ owner.adjustOxyLoss(-heal_amt * delta_time_capped)
+ owner.adjustCloneLoss(-heal_amt * delta_time_capped)
else
- owner.adjustPlasma(0.1 * plasma_rate * seconds_per_tick)
+ owner.adjustPlasma(0.1 * plasma_rate * delta_time)
/obj/item/organ/internal/alien/plasmavessel/on_insert(mob/living/carbon/organ_owner)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index 21962e3fc532..8f48a3924693 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -111,6 +111,8 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
target.dna.features["tail_lizard"] = "Smooth"
target.dna.features["tail_monkey"] = "Chimp" //Monkestation Addition
target.dna.features["pod_hair"] = "Ivy"
+ target.dna.features["ethereal_horns"] = "None" //Monkestation Addition
+ target.dna.features["ethereal_tail"] = "None" //Monkestation Addition
target.dna.features["ipc_screen"] = "BSOD" //Monkestation Addition
target.dna.features["ipc_chassis"] = "Bishop Cyberkinetics" //Monkestation Addition
target.dna.features["ipc_antenna"] = "None" //Monkestation Addition
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index abdc8f1dc400..172e8b2c467f 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -244,13 +244,31 @@
var/apparent_blood_volume = blood_volume
if((dna.species.use_skintones)&& skin_tone == "albino")
apparent_blood_volume -= 150 // enough to knock you down one tier
- switch(apparent_blood_volume)
- if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
- msg += "[t_He] [t_has] pale skin.\n"
- if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
- msg += "[t_He] look[p_s()] like pale death.\n"
- if(-INFINITY to BLOOD_VOLUME_BAD)
- msg += "[span_deadsay("[t_He] resemble[p_s()] a crushed, empty juice pouch.")]\n"
+ if(isethereal(src))//Monkestation Changes Start:
+ if(appears_dead)
+ if(blood_volume < ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE)
+ msg += "[span_deadsay("[t_He] resemble[p_s()] a crushed, empty juice pouch.")]\n"
+ else
+ switch(blood_volume)
+ if(ETHEREAL_BLOOD_CHARGE_OVERLOAD to ETHEREAL_BLOOD_CHARGE_DANGEROUS)
+ msg += "Electricity is arcing off of [t_him]!\n"
+ if(ETHEREAL_BLOOD_CHARGE_FULL to ETHEREAL_BLOOD_CHARGE_OVERLOAD)
+ msg += "[t_He] seems unusually bright, and [t_is] sparking occasionally.\n"
+ if(ETHEREAL_BLOOD_CHARGE_LOW to ETHEREAL_BLOOD_CHARGE_NORMAL)
+ msg += "[t_His] light is dimming.\n"
+ if(ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE to ETHEREAL_BLOOD_CHARGE_LOW)
+ msg += "[t_His] light is very dim, and is flickering slightly.\n"
+ if(-INFINITY to ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE)
+ msg += "[t_His] light is very dim, and is flickering on and off.\n"
+ msg += "[span_deadsay("[t_His] movements seem painful and [t_his] breathing is erratic!")]\n"
+ else
+ switch(apparent_blood_volume)
+ if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
+ msg += "[t_He] [t_has] pale skin.\n"
+ if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
+ msg += "[t_He] look[p_s()] like pale death.\n"
+ if(-INFINITY to BLOOD_VOLUME_BAD)
+ msg += "[span_deadsay("[t_He] resemble[p_s()] a crushed, empty juice pouch.")]\n"
if(is_bleeding())
var/list/obj/item/bodypart/bleeding_limbs = list()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 282b9e494269..8180e27be6ce 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -32,16 +32,15 @@
return 100 - protection
///Get all the clothing on a specific body part
-/mob/living/carbon/human/proc/get_clothing_on_part(obj/item/bodypart/def_zone)
+/mob/living/carbon/human/proc/get_clothing_on_part(def_zone)
+ if(istype(def_zone, /obj/item/bodypart))
+ var/obj/item/bodypart/def_bodypart = def_zone
+ def_zone = def_bodypart.body_part
var/list/covering_part = list()
var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, ears, wear_id, wear_neck) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor)
- for(var/bp in body_parts)
- if(!bp)
- continue
- if(bp && istype(bp , /obj/item/clothing))
- var/obj/item/clothing/C = bp
- if(C.body_parts_covered & def_zone.body_part)
- covering_part += C
+ for(var/obj/item/clothing/worn in body_parts)
+ if(worn.body_parts_covered & def_zone)
+ covering_part += worn
return covering_part
/mob/living/carbon/human/bullet_act(obj/projectile/P, def_zone, piercing_hit = FALSE)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d2bee822ef69..6ed3dd274433 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -48,7 +48,7 @@
//Update our name based on whether our face is obscured/disfigured
name = get_visible_name()
- update_name_tag(name)
+ update_name_tag(name) // monkestation edit: name tags
if(stat != DEAD)
return TRUE
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index aa77ad335b74..789f70c07440 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -1,3 +1,4 @@
+/* // MONKESTATION removal
/datum/species/ethereal
name = "\improper Ethereal"
id = SPECIES_ETHEREAL
@@ -232,3 +233,4 @@
)
return to_add
+*/
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index e9dd49a3a951..0d684e19024b 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -16,7 +16,7 @@
if(HAS_TRAIT(src, TRAIT_STASIS))
. = ..()
- reagents.handle_stasis_chems(src, seconds_per_tick, times_fired)
+ reagents?.handle_stasis_chems(src, seconds_per_tick, times_fired)
else
//Reagent processing needs to come before breathing, to prevent edge cases.
handle_dead_metabolization(seconds_per_tick, times_fired) //Dead metabolization first since it can modify life metabolization.
@@ -501,7 +501,7 @@
/mob/living/carbon/proc/handle_organs(seconds_per_tick, times_fired)
if(stat == DEAD)
- if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || reagents.has_reagent(/datum/reagent/cryostylane)) // No organ decay if the body contains formaldehyde.
+ if(reagents && (reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || reagents.has_reagent(/datum/reagent/cryostylane))) // No organ decay if the body contains formaldehyde.
return
for(var/obj/item/organ/internal/organ in organs)
// On-death is where organ decay is handled
@@ -556,6 +556,7 @@
if(dna.previous["name"])
real_name = dna.previous["name"]
name = real_name
+ update_name_tag() // monkestation edit: name tags
dna.previous.Remove("name")
if(dna.previous["UE"])
dna.unique_enzymes = dna.previous["UE"]
@@ -578,9 +579,9 @@
* - times_fired: The number of times SSmobs has ticked.
*/
/mob/living/carbon/proc/handle_dead_metabolization(seconds_per_tick, times_fired)
- if (stat != DEAD)
+ if(stat != DEAD)
return
- reagents.metabolize(src, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE, dead = TRUE) // Your liver doesn't work while you're dead.
+ reagents?.metabolize(src, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE, dead = TRUE) // Your liver doesn't work while you're dead.
/// Base carbon environment handler, adds natural stabilization
/mob/living/carbon/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 13348deb431c..0808e52eb054 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1542,6 +1542,7 @@
SEND_SIGNAL(src, COMSIG_LIVING_ON_WABBAJACKED, new_mob)
new_mob.name = real_name
new_mob.real_name = real_name
+ new_mob.update_name_tag(real_name) // monkestation edit: name tags
// Transfer mind to the new mob (also handles actions and observers and stuff)
if(mind)
@@ -1755,7 +1756,7 @@ GLOBAL_LIST_EMPTY(fire_appearances)
if(registered_z && old_level_new_clients == 0)
for(var/datum/ai_controller/controller as anything in SSai_controllers.ai_controllers_by_zlevel[registered_z])
controller.set_ai_status(AI_STATUS_OFF)
-
+
//Check the amount of clients exists on the Z level we're moving towards, excluding ourselves.
var/new_level_old_clients = SSmobs.clients_by_zlevel[new_z].len
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 0339a118c120..caa1fa0ee05f 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -221,6 +221,7 @@
eyeobj.setLoc(loc)
eyeobj.name = "[name] (AI Eye)"
eyeobj.real_name = eyeobj.name
+ eyeobj.update_name_tag() // monkestation edit: name tags
set_eyeobj_visible(TRUE)
/mob/living/silicon/ai/proc/set_eyeobj_visible(state = TRUE)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 8962ff842c99..e308eb5da66b 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -823,6 +823,7 @@
braintype = "AI Shell"
name = "Empty AI Shell-[ident]"
real_name = name
+ update_name_tag() // monkestation edit: name tags
GLOB.available_ai_shells |= src
if(!QDELETED(builtInCamera))
builtInCamera.c_tag = real_name //update the camera name too
@@ -842,6 +843,7 @@
GLOB.available_ai_shells -= src
name = "Unformatted Cyborg-[ident]"
real_name = name
+ update_name_tag() // monkestation edit: name tags
if(!QDELETED(builtInCamera))
builtInCamera.c_tag = real_name
diag_hud_set_aishell()
@@ -855,6 +857,7 @@
/mob/living/silicon/robot/proc/deploy_init(mob/living/silicon/ai/AI)
real_name = "[AI.real_name] [designation] Shell-[ident]"
name = real_name
+ update_name_tag() // monkestation edit: name tags
if(!QDELETED(builtInCamera))
builtInCamera.c_tag = real_name //update the camera name too
mainframe = AI
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index e4c1b704b0c7..6fe1c897965f 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -189,6 +189,9 @@
return laws_to_return
/mob/living/silicon/Topic(href, href_list)
+ // monkestation edit: extra sanity checks
+ if(QDELETED(usr) || QDELETED(usr.client))
+ return
if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb
var/law_index = text2num(href_list["lawc"])
var/law = assemble_laws()[law_index + 1]
@@ -220,7 +223,7 @@
statelaws()
if (href_list["printlawtext"]) // this is kinda backwards
- if (href_list["dead"] && (!isdead(usr) && !usr.client.holder)) // do not print deadchat law notice if the user is now alive
+ if (href_list["dead"] && (!isdead(usr) && !usr?.client?.holder)) // do not print deadchat law notice if the user is now alive
to_chat(usr, span_warning("You cannot view law changes that were made while you were dead."))
return
to_chat(usr, href_list["printlawtext"])
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index a5f6811fb56a..cf611f862a37 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -714,6 +714,8 @@ Pass a positive integer as an argument to override a bot's default speed.
set_path(null)
summon_target = null
pathset = FALSE
+ if(QDELETED(access_card))
+ access_card = new /obj/item/card/id/advanced/simple_bot(src)
access_card.set_access(prev_access)
tries = 0
mode = BOT_IDLE
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index b6c302f0a106..67539f876b98 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -129,15 +129,6 @@
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_LOGGED_IN, src)
- if(!client.patreon)
- client.patreon = new(client)
-
- if(!client.twitch)
- client.twitch = new(client)
-
- if(!client.client_token_holder)
- client.client_token_holder = new(client)
-
return TRUE
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a4ecc4e2ce7b..b65e584eefc0 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -557,7 +557,7 @@
if(is_blind()) //blind people see things differently (through touch)
if(!blind_examine_check(examinify))
return
- else if(!(examine_turf?.luminosity || examine_turf.dynamic_lumcount) && \
+ else if(!(examine_turf?.luminosity || examine_turf?.dynamic_lumcount) && \
get_dist(src, examine_turf) > 1 && \
!has_nightvision()) // If you aren't blind, it's in darkness (that you can't see) and farther then next to you
return
diff --git a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
index eca84f119e07..1dd64335da0f 100644
--- a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
+++ b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
@@ -15,6 +15,7 @@
. = ..()
dead_ai.name = src.name
dead_ai.real_name = src.name
+ dead_ai.update_name_tag(src.name) // monkestation edit: name tags
///dead slimes, with a var for whatever color you want.
/obj/effect/mob_spawn/corpse/slime
diff --git a/code/modules/pai/card.dm b/code/modules/pai/card.dm
index e8dd790660c1..0c84080ad7f9 100644
--- a/code/modules/pai/card.dm
+++ b/code/modules/pai/card.dm
@@ -195,6 +195,7 @@
var/mob/living/silicon/pai/new_pai = new(src)
new_pai.name = candidate.name || pick(GLOB.ninja_names)
new_pai.real_name = new_pai.name
+ new_pai.update_name_tag(new_pai.name) // monkestation edit: name tags
new_pai.key = candidate.ckey
set_personality(new_pai)
SSpai.candidates -= ckey
diff --git a/code/modules/pai/debug.dm b/code/modules/pai/debug.dm
index 8ddc7606782f..dd8d48bd7712 100644
--- a/code/modules/pai/debug.dm
+++ b/code/modules/pai/debug.dm
@@ -24,6 +24,7 @@
pai.name = chosen_name
pai.real_name = pai.name
+ pai.update_name_tag() // monkestation edit: name tags
pai.key = choice.key
card.set_personality(pai)
if(SSpai.candidates[key])
diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm
index 8c949892dbf4..813cdb23655e 100644
--- a/code/modules/photography/_pictures.dm
+++ b/code/modules/photography/_pictures.dm
@@ -175,7 +175,7 @@
fdel(jsonpath)
else
json = list()
- json[id] = serialize_list()
+ json[id] = serialize_list(semvers = list())
WRITE_FILE(jsonpath, json_encode(json))
/datum/picture/proc/Copy(greyscale = FALSE, cropx = 0, cropy = 0)
diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm
index 42d5a3470842..4743c0bafefd 100644
--- a/code/modules/power/apc/apc_attack.dm
+++ b/code/modules/power/apc/apc_attack.dm
@@ -208,13 +208,13 @@
if(cell.charge <= (cell.maxcharge / 2)) // ethereals can't drain APCs under half charge, this is so that they are forced to look to alternative power sources if the station is running low
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "safeties prevent draining!"), alert_timer_duration)
return
- if(stomach.crystal_charge > charge_limit)
+ if(ethereal.blood_volume > charge_limit) //Monkestation Edit
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "charge is full!"), alert_timer_duration)
return
stomach.drain_time = world.time + APC_DRAIN_TIME
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "draining power"), alert_timer_duration)
if(do_after(user, APC_DRAIN_TIME, target = src))
- if(cell.charge <= (cell.maxcharge / 2) || (stomach.crystal_charge > charge_limit))
+ if(cell.charge <= (cell.maxcharge / 2) || (ethereal.blood_volume > charge_limit)) //Monkestation Edit
return
balloon_alert(ethereal, "received charge")
stomach.adjust_charge(APC_POWER_GAIN)
@@ -224,14 +224,14 @@
if(cell.charge >= cell.maxcharge - APC_POWER_GAIN)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "APC can't receive more power!"), alert_timer_duration)
return
- if(stomach.crystal_charge < APC_POWER_GAIN)
+ if(ethereal.blood_volume < APC_POWER_GAIN) //Monkestation Edit
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "charge is too low!"), alert_timer_duration)
return
stomach.drain_time = world.time + APC_DRAIN_TIME
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "transfering power"), alert_timer_duration)
if(!do_after(user, APC_DRAIN_TIME, target = src))
return
- if((cell.charge >= (cell.maxcharge - APC_POWER_GAIN)) || (stomach.crystal_charge < APC_POWER_GAIN))
+ if((cell.charge >= (cell.maxcharge - APC_POWER_GAIN)) || (ethereal.blood_volume < APC_POWER_GAIN)) //Monkestation Edit
balloon_alert(ethereal, "can't transfer power!")
return
if(istype(stomach))
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 58c7cab0a39d..2a4fbca64fc6 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -238,7 +238,7 @@
if(istype(maybe_stomach, /obj/item/organ/internal/stomach/ethereal))
- var/charge_limit = ETHEREAL_CHARGE_DANGEROUS - CELL_POWER_GAIN
+ var/charge_limit = ETHEREAL_BLOOD_CHARGE_DANGEROUS - CELL_POWER_GAIN //Monkestation edit
var/obj/item/organ/internal/stomach/ethereal/stomach = maybe_stomach
if((stomach.drain_time > world.time) || !stomach)
return
@@ -251,7 +251,7 @@
to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body."))
stomach.drain_time = world.time + CELL_DRAIN_TIME
if(do_after(user, CELL_DRAIN_TIME, target = src))
- if((charge < CELL_POWER_DRAIN) || (stomach.crystal_charge > charge_limit))
+ if((charge < CELL_POWER_DRAIN) || (H.blood_volume > charge_limit)) //Monkestation edit
return
if(istype(stomach))
to_chat(H, span_notice("You receive some charge from [src], wasting some in the process."))
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 14e965cb6edd..55b070e02fda 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -281,11 +281,17 @@
var/delay = rand(BROKEN_SPARKS_MIN, BROKEN_SPARKS_MAX)
addtimer(CALLBACK(src, PROC_REF(broken_sparks)), delay, TIMER_UNIQUE | TIMER_NO_HASH_WAIT)
+/obj/machinery/light/proc/is_full_charge()
+ if(cell)
+ return cell.charge == cell.maxcharge
+ return TRUE
+
/obj/machinery/light/process(seconds_per_tick)
- if(has_power()) //If the light is being powered by the station.
+ if(has_power())
+ // If the cell is done mooching station power, and reagents don't need processing, stop processing
+ if(is_full_charge() && !reagents)
+ return PROCESS_KILL
if(cell)
- if(cell.charge == cell.maxcharge && !reagents) //If the cell is done mooching station power, and reagents don't need processing, stop processing
- return PROCESS_KILL
cell.charge = min(cell.maxcharge, cell.charge + LIGHT_EMERGENCY_POWER_USE) //Recharge emergency power automatically while not using it
if(reagents) //with most reagents coming out at 300, and with most meaningful reactions coming at 370+, this rate gives a few seconds of time to place it in and get out of dodge regardless of input.
reagents.adjust_thermal_energy(8 * reagents.total_volume * SPECIFIC_HEAT_DEFAULT * seconds_per_tick)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index d0e971d83d1e..d8c55f3eea3e 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -271,16 +271,19 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
// PART 3: POWER PROCESSING
internal_energy_factors = calculate_internal_energy()
zap_factors = calculate_zap_multiplier()
- if(internal_energy && (last_power_zap + 4 SECONDS - (internal_energy * 0.001)) < world.time)
+ if(internal_energy && (last_power_zap + (4 - internal_energy * 0.001) SECONDS) < world.time)
playsound(src, 'sound/weapons/emitter2.ogg', 70, TRUE)
hue_angle_shift = clamp(903 * log(10, (internal_energy + 8000)) - 3590, -50, 240)
var/zap_color = color_matrix_rotate_hue(hue_angle_shift)
+ //Scale the strength of the zap with the world's time elapsed between zaps in seconds.
+ //Capped at 16 seconds to prevent a crazy burst of energy if atmos was halted for a long time.
+ var/delta_time = min((world.time - last_power_zap) * 0.1, 16)
supermatter_zap(
zapstart = src,
range = 3,
- zap_str = 5 * internal_energy * zap_multiplier,
+ zap_str = 1.25 * internal_energy * zap_multiplier * delta_time,
zap_flags = ZAP_SUPERMATTER_FLAGS,
- zap_cutoff = 300,
+ zap_cutoff = 300 * delta_time,
power_level = internal_energy,
color = zap_color,
)
diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
index d312d481ef37..5a34ba0ca220 100644
--- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
@@ -43,15 +43,12 @@
taste_description = "rubbery"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE
-/datum/reagent/healium/on_mob_metabolize(mob/living/breather)
- . = ..()
- breather.PermaSleeping()
-
/datum/reagent/healium/on_mob_end_metabolize(mob/living/breather)
- breather.SetSleeping(10)
+ breather.SetSleeping(1 SECONDS)
return ..()
/datum/reagent/healium/on_mob_life(mob/living/breather, seconds_per_tick, times_fired)
+ breather.SetSleeping(30 SECONDS)
breather.adjustFireLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
breather.adjustToxLoss(-5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype)
breather.adjustBruteLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 50ffe7799979..da8cf6bf8e26 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -13,7 +13,7 @@
current_cycle++
if(length(reagent_removal_skip_list))
return
- holder.remove_reagent(type, metabolization_rate * seconds_per_tick / affected_mob.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
+ holder?.remove_reagent(type, metabolization_rate * seconds_per_tick / affected_mob.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
/datum/reagent/medicine/leporazine
name = "Leporazine"
diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm
index 7ff6ca1ab291..e96d1c2ba1fc 100644
--- a/code/modules/reagents/reagent_containers/cups/drinks.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -227,8 +227,8 @@
custom_price = PAYCHECK_LOWER * 0.8
/obj/item/reagent_containers/cup/glass/waterbottle/Initialize(mapload)
- . = ..()
cap_overlay = mutable_appearance(cap_icon, cap_icon_state)
+ . = ..()
if(cap_on)
spillable = FALSE
update_appearance()
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index afdade2b972b..c951467c70eb 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -145,6 +145,12 @@
/obj/item/reagent_containers/syringe/update_overlays()
. = ..()
+ var/list/reagent_overlays = update_reagent_overlay()
+ if(reagent_overlays)
+ . += reagent_overlays
+
+/// Returns a list of overlays to add that relate to the reagents inside the syringe
+/obj/item/reagent_containers/syringe/proc/update_reagent_overlay()
if(reagents?.total_volume)
var/mutable_appearance/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[get_rounded_vol()]")
filling_overlay.color = mix_color_from_reagents(reagents.reagent_list)
diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm
index e35be284bad0..a3f7be4b82ff 100644
--- a/code/modules/recycling/disposal/pipe.dm
+++ b/code/modules/recycling/disposal/pipe.dm
@@ -313,3 +313,18 @@
/obj/structure/disposalpipe/broken/deconstruct()
qdel(src)
+
+/obj/structure/disposalpipe/rotator
+ icon_state = "pipe-r1"
+ initialize_dirs = DISP_DIR_LEFT | DISP_DIR_RIGHT | DISP_DIR_FLIP
+ flip_type = /obj/structure/disposalpipe/rotator/flip
+ /// In what direction the atom travels.
+ var/direction_angle = -90
+
+/obj/structure/disposalpipe/rotator/nextdir(obj/structure/disposalholder/holder)
+ return turn(holder.dir, direction_angle)
+
+/obj/structure/disposalpipe/rotator/flip
+ icon_state = "pipe-r2"
+ flip_type = /obj/structure/disposalpipe/rotator
+ direction_angle = 90
diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm
index 24e1489c724a..75d70146121b 100644
--- a/code/modules/research/designs/autolathe/engineering_designs.dm
+++ b/code/modules/research/designs/autolathe/engineering_designs.dm
@@ -10,6 +10,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
+/datum/design/sparker
+ name = "Sparker WallFrame"
+ id = "sparker"
+ build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
+ materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT) // MONKESTATION EDIT CHANGE OLD // REQUIRES PR #75052
+ build_path = /obj/item/wallframe/sparker
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
+
/datum/design/tracker_electronics
name = "Solar Tracking Electronics"
id = "solar_tracker"
@@ -34,6 +46,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
+/datum/design/ignition_control
+ name = "Ignition Switch Controller"
+ id = "ignition"
+ build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5) // MONKESTATION EDIT CHANGE OLD // REQUIRES PR #75052
+ build_path = /obj/item/assembly/control/igniter
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_ELECTRONICS,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
+
/datum/design/custom_vendor_refill
name = "Custom Vendor Refill"
id = "custom_vendor_refill"
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 28c18f39174b..b4a3ddfe36db 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -249,6 +249,7 @@
"shovel",
"spade",
"spraycan",
+ "spraycan_gun", // MONKESTATION ADDITION (monkestation/code/game/objects/items/spraycan_gun.dm)
"tile_sprayer",
"tscanner",
"welding_helmet",
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 366e4d2e692a..03972455b3dc 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -137,6 +137,7 @@
var/mob/living/carbon/C = clone
if(istype(C) && istype(O))
C.real_name = O.real_name
+ C.update_name_tag(C.real_name) // monkestation edit: name tags
O.dna.transfer_identity(C)
C.updateappearance(mutcolor_update=1)
if(owner.mind)
@@ -739,6 +740,7 @@
var/mob/living/carbon/C = clone
if(istype(C) && istype(O))
C.real_name = O.real_name
+ C.update_name_tag(C.real_name) // monkestation edit: name tags
O.dna.transfer_identity(C)
C.updateappearance(mutcolor_update=1)
return ..()
@@ -820,6 +822,7 @@
var/mob/living/carbon/human/H = owner
originalDNA.transfer_identity(H)
H.real_name = originalname
+ H.update_name_tag(originalname) // monkestation edit: name tags
H.updateappearance(mutcolor_update=1)
/datum/status_effect/brokenpeace
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index a0b357d7bdcf..fb0e886f6995 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -247,6 +247,7 @@ Regenerative extracts:
T.dna.transfer_identity(D)
D.updateappearance(mutcolor_update=1)
D.real_name = T.real_name
+ D.update_name_tag(D.real_name) // monkestation edit: name tags
dummy.adjustBruteLoss(target.getBruteLoss())
dummy.adjustFireLoss(target.getFireLoss())
dummy.adjustToxLoss(target.getToxLoss())
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 353704f1270e..dd5c2baccd91 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -665,6 +665,7 @@
newname = "Pet Slime"
M.name = newname
M.real_name = newname
+ M.update_name_tag(newname) // monkestation edit: name tags
qdel(src)
/obj/item/slimepotion/slime/sentience
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index 1c25337a0e13..6f4b68328b86 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -118,12 +118,15 @@
/obj/machinery/computer/shuttle/proc/get_valid_destinations()
var/list/destination_list = params2list(possible_destinations)
var/obj/docking_port/mobile/mobile_docking_port = SSshuttle.getShuttle(shuttleId)
+ var/obj/docking_port/stationary/current_destination = mobile_docking_port.destination
var/list/valid_destinations = list()
for(var/obj/docking_port/stationary/stationary_docking_port in SSshuttle.stationary_docking_ports)
if(!destination_list.Find(stationary_docking_port.port_destinations))
continue
if(!mobile_docking_port.check_dock(stationary_docking_port, silent = TRUE))
continue
+ if(stationary_docking_port == current_destination)
+ continue
var/list/location_data = list(
id = stationary_docking_port.shuttle_id,
name = stationary_docking_port.name
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 3af161242747..b6b4f3eca912 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -21,15 +21,17 @@
..()
animal_count = rand(15,20) //might be too few given ~15 roundstart stationside ones
human_count = rand(round(0.75 * SSticker.totalPlayersReady) , SSticker.totalPlayersReady) // 75%+ roundstart population.
- var/non_standard_plants = non_standard_plants_count()
- plant_count = rand(round(0.5 * non_standard_plants),round(0.7 * non_standard_plants))
+ //var/non_standard_plants = non_standard_plants_count()
+ plant_count = rand(8, 15) // monkestation edit: make the dna vault actually viable
+/* monkestation removal
/datum/station_goal/dna_vault/proc/non_standard_plants_count()
. = 0
for(var/T in subtypesof(/obj/item/seeds)) //put a cache if it's used anywhere else
var/obj/item/seeds/S = T
if(initial(S.rarity) > 0)
.++
+*/
/datum/station_goal/dna_vault/get_report()
return list(
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index 2d5072bf6db9..710b0a1da3ca 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -14,12 +14,12 @@
///Replaces a single limb and deletes the old one if there was one
/mob/living/carbon/proc/del_and_replace_bodypart(obj/item/bodypart/new_limb, special)
var/obj/item/bodypart/old_limb = get_bodypart(new_limb.body_zone)
- if(old_limb)
+ if(!QDELETED(old_limb))
qdel(old_limb)
new_limb.try_attach_limb(src, special = special)
/mob/living/carbon/has_hand_for_held_index(i)
- if(!i)
+ if(!i || length(hand_bodyparts) < i)
return FALSE
var/obj/item/bodypart/hand_instance = hand_bodyparts[i]
if(hand_instance && !hand_instance.bodypart_disabled)
diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm
index 58e67b9f3907..b9c959bb7dfa 100644
--- a/code/modules/surgery/organs/_organ.dm
+++ b/code/modules/surgery/organs/_organ.dm
@@ -325,6 +325,11 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
for(var/obj/item/organ/organ as anything in organs)
organ.set_organ_damage(0)
set_heartattack(FALSE)
+
+ // Ears have aditional vаr "deaf", need to update it too
+ var/obj/item/organ/internal/ears/ears = get_organ_slot(ORGAN_SLOT_EARS)
+ ears?.adjustEarDamage(0, -INFINITY) // full heal ears deafness
+
return
// Default organ fixing handling
@@ -359,7 +364,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
if(!ears)
ears = new()
ears.Insert(src)
- ears.set_organ_damage(0)
+ ears.adjustEarDamage(-INFINITY, -INFINITY) // actually do: set_organ_damage(0) and deaf = 0
var/obj/item/organ/internal/butt/butt = get_organ_slot(ORGAN_SLOT_BUTT)
if(!butt)
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 3655de094e75..1cbbd1bca1b2 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -418,9 +418,8 @@
else
healium_euphoria = EUPHORIA_INACTIVE
// Stun/Sleep side-effects.
- if(healium_pp > healium_para_min)
- // Random chance to stun mob. Timing not in seconds to have a much higher variation
- breather.Unconscious(rand(3 SECONDS, 5 SECONDS))
+ if(healium_pp > healium_para_min && !breather.IsSleeping() && prob(30))
+ breather.Sleeping(rand(3 SECONDS, 5 SECONDS))
// Metabolize to reagent when concentration is high enough.
if(healium_pp > healium_sleep_min)
breather.reagents.add_reagent(/datum/reagent/healium, max(0, 1 - breather.reagents.get_reagent_amount(/datum/reagent/healium)))
diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm
index 98ee48074f3c..3c82f629cb51 100644
--- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm
+++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm
@@ -2,16 +2,18 @@
name = "biological battery"
icon_state = "stomach-p" //Welp. At least it's more unique in functionaliy.
desc = "A crystal-like organ that stores the electric charge of ethereals."
- organ_traits = list(TRAIT_NOHUNGER) // We have our own hunger mechanic.
+ //organ_traits = list(TRAIT_NOHUNGER) // We have our own hunger mechanic. //Monkestation Removal, we have our OWN hunger mechanic.
///basically satiety but electrical
var/crystal_charge = ETHEREAL_CHARGE_FULL
///used to keep ethereals from spam draining power sources
var/drain_time = 0
+/* //Monkestation Removal
/obj/item/organ/internal/stomach/ethereal/on_life(seconds_per_tick, times_fired)
. = ..()
adjust_charge(-ETHEREAL_CHARGE_FACTOR * seconds_per_tick)
handle_charge(owner, seconds_per_tick, times_fired)
+*/
/obj/item/organ/internal/stomach/ethereal/on_insert(mob/living/carbon/stomach_owner)
. = ..()
@@ -31,15 +33,18 @@
/obj/item/organ/internal/stomach/ethereal/proc/charge(datum/source, amount, repairs)
SIGNAL_HANDLER
+ if(!ishuman(owner))
+ return
+ var/mob/living/carbon/human/human = owner
if(!repairs)
adjust_charge(amount / 3.5)
return
- if(crystal_charge < ETHEREAL_CHARGE_FULL - amount / 3.5)
+ if(owner.blood_volume < BLOOD_VOLUME_NORMAL - amount / 3.5)
adjust_charge(amount / 3.5)
return
- if(crystal_charge > ETHEREAL_CHARGE_OVERLOAD) //prevents reduction of charge of overcharged ethereals
+ if(owner.blood_volume > 700) //prevents reduction of charge of overcharged ethereals
return
- adjust_charge(ETHEREAL_CHARGE_FULL - crystal_charge) //perfectly tops off an ethereal if the amount of power that would be applied would go into overcharge
+ adjust_charge(BLOOD_VOLUME_NORMAL - human.blood_volume) //perfectly tops off an ethereal if the amount of power that would be applied would go into overcharge
/obj/item/organ/internal/stomach/ethereal/proc/on_electrocute(datum/source, shock_damage, siemens_coeff = 1, flags = NONE)
SIGNAL_HANDLER
@@ -49,7 +54,13 @@
to_chat(owner, span_notice("You absorb some of the shock into your body!"))
/obj/item/organ/internal/stomach/ethereal/proc/adjust_charge(amount)
- crystal_charge = clamp(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_DANGEROUS)
+ //crystal_charge = clamp(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_DANGEROUS) Monkestation Removal
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human = owner
+ if(istype(human.dna.species, /datum/species/ethereal))
+ var/datum/species/ethereal/species = human.dna.species
+ var/amount_adjusted = (BLOOD_VOLUME_NORMAL * amount)/ETHEREAL_CHARGE_FULL
+ species.adjust_charge(human, amount_adjusted, FALSE)
/obj/item/organ/internal/stomach/ethereal/proc/handle_charge(mob/living/carbon/carbon, seconds_per_tick, times_fired)
switch(crystal_charge)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 64bd496f2bbb..9e185d8f5368 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -249,27 +249,27 @@
"window" = list(
"key" = window_key,
"size" = window_size,
- "fancy" = user.client.prefs.read_preference(/datum/preference/toggle/tgui_fancy),
- "locked" = user.client.prefs.read_preference(/datum/preference/toggle/tgui_lock),
+ "fancy" = user.client?.prefs?.read_preference(/datum/preference/toggle/tgui_fancy),
+ "locked" = user.client?.prefs?.read_preference(/datum/preference/toggle/tgui_lock),
),
"client" = list(
- "ckey" = user.client.ckey,
- "address" = user.client.address,
- "computer_id" = user.client.computer_id,
+ "ckey" = user.client?.ckey,
+ "address" = user.client?.address,
+ "computer_id" = user.client?.computer_id,
),
"user" = list(
"name" = "[user]",
"observer" = isobserver(user),
),
)
- var/data = custom_data || with_data && src_object.ui_data(user)
+ var/data = custom_data || with_data && src_object?.ui_data(user)
if(data)
json_data["data"] = data
- var/static_data = with_static_data && src_object.ui_static_data(user)
+ var/static_data = with_static_data && src_object?.ui_static_data(user)
if(static_data)
json_data["static_data"] = static_data
- if(src_object.tgui_shared_states)
- json_data["shared"] = src_object.tgui_shared_states
+ if(src_object?.tgui_shared_states)
+ json_data["shared"] = src_object?.tgui_shared_states
return json_data
/**
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index 82d8d794d9af..a506d952e361 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -78,7 +78,7 @@
log_tgui(client,
context = "[id]/initialize",
window = src)
- if(!client)
+ if(QDELETED(client))
return
src.initial_fancy = fancy
src.initial_assets = assets
@@ -129,7 +129,7 @@
// Detect whether the control is a browser
is_browser = winexists(client, id) == "BROWSER"
// Instruct the client to signal UI when the window is closed.
- if(!is_browser)
+ if(!is_browser && !QDELETED(client)) // monkestation: extra anti-runtime checks
winset(client, id, "on-close=\"uiclose [id]\"")
/**
diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm
index 444d67812ae1..a69d5120e2f3 100644
--- a/code/modules/tgui_input/say_modal/modal.dm
+++ b/code/modules/tgui_input/say_modal/modal.dm
@@ -36,6 +36,7 @@
/datum/tgui_say/New(client/client, id)
src.client = client
window = new(client, id)
+ winset(client, "tgui_say", "size=1,1;is-visible=0;")
window.subscribe(src, PROC_REF(on_message))
window.is_browser = TRUE
@@ -62,7 +63,9 @@
*/
/datum/tgui_say/proc/load()
window_open = FALSE
- winshow(client, "tgui_say", FALSE)
+
+ winset(client, "tgui_say", "pos=848,500;size=231,30;is-visible=0;")
+
window.send_message("props", list(
lightMode = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode),
maxLength = max_length,
@@ -84,9 +87,7 @@
window_open = TRUE
if(payload["channel"] != OOC_CHANNEL && payload["channel"] != LOOC_CHANNEL && (payload["channel"] != ADMIN_CHANNEL) && (payload["channel"] != MENTOR_CHANNEL)) // monke: add LOOC
start_thinking()
- if(client.typing_indicators)
- log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators enabled.")
- else
+ if(!client.typing_indicators)
log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.")
return TRUE
@@ -97,9 +98,7 @@
/datum/tgui_say/proc/close()
window_open = FALSE
stop_thinking()
- if(client.typing_indicators)
- log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators enabled.")
- else
+ if(!client.typing_indicators)
log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators DISABLED.")
/**
@@ -117,10 +116,10 @@
close()
return TRUE
if (type == "thinking")
- if(payload["mode"] == TRUE)
+ if(payload["visible"] == TRUE)
start_thinking()
return TRUE
- if(payload["mode"] == FALSE)
+ if(payload["visible"] == FALSE)
stop_thinking()
return TRUE
return FALSE
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png
index a8a72e429e72..399627ac15de 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png
index 36487472d38f..1f4079b84a67 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png differ
diff --git a/config/jobconfig.toml b/config/jobconfig.toml
index 1a6a7334be9d..8c607c37023e 100644
--- a/config/jobconfig.toml
+++ b/config/jobconfig.toml
@@ -13,7 +13,7 @@
## The game will not read any line that is commented out with a '#', as to allow you to defer to codebase defaults.
## If you want to override the codebase values, add the value and then uncomment that line by removing the # from the job key's name.
## Ensure that the key is flush, do not introduce any whitespaces when you uncomment a key. For example:
-## "# Total Positions" should always be changed to "Total Positions", no additional spacing.
+## "# Total Positions" should always be changed to "Total Positions", no additional spacing.
## Best of luck editing!
[AI]
@@ -163,7 +163,7 @@
[PRISONER]
"# Playtime Requirements" = 0
"# Required Account Age" = 0
-"# Spawn Positions" = 2
+"# Spawn Positions" = 5
"# Total Positions" = 0
[PSYCHOLOGIST]
diff --git a/config/monkestation/ruins.toml b/config/monkestation/ruins.toml
new file mode 100644
index 000000000000..838b7f119661
--- /dev/null
+++ b/config/monkestation/ruins.toml
@@ -0,0 +1,2 @@
+["/datum/map_template/ruin/space/oldstation"]
+always_place = true
diff --git a/html/changelogs/AutoChangeLog-pr-1853.yml b/html/changelogs/AutoChangeLog-pr-1853.yml
new file mode 100644
index 000000000000..b0043f3f5c1b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1853.yml
@@ -0,0 +1,4 @@
+author: "Oricana-16"
+delete-after: True
+changes:
+ - rscadd: "Adds \"Conversation Filter\" nanite suppression program."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1867.yml b/html/changelogs/AutoChangeLog-pr-1867.yml
new file mode 100644
index 000000000000..3d94eecdf148
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1867.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - config: "Add a config that allows for overriding ruin template variables, for example, forcing a space ruin to always spawn, changing its cost or weight, etc."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1966.yml b/html/changelogs/AutoChangeLog-pr-1966.yml
new file mode 100644
index 000000000000..ca8cde6c7033
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1966.yml
@@ -0,0 +1,10 @@
+author: "AberrantQuerist Noodlecat Zestybastard"
+delete-after: True
+changes:
+ - rscadd: "Ethereals now use their blood as charge, and their stomach as a method of recharge, instead of the stomach occupying the entire charge mechanic."
+ - rscadd: "Ethereal Eyes"
+ - rscadd: "Ethereal Horns"
+ - rscadd: "Ethereal Tails"
+ - bugfix: "Ethereal meat no longer tastes like meat, as they are crystalline beings, and now tastes like glass(mmm crunchy)"
+ - bugfix: "Ethereals now correctly turn grey after dying."
+ - image: "New Sprites for ethereals"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1973.yml b/html/changelogs/AutoChangeLog-pr-1973.yml
new file mode 100644
index 000000000000..afa103bbaff4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1973.yml
@@ -0,0 +1,5 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - balance: "Halves the amount of slime ooze needed for crossbreeds, except for regenerative extracts."
+ - code_imp: "Changed slime recipes to use defines for the required amount of ooze, rather than hard-set numbers."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1975.yml b/html/changelogs/AutoChangeLog-pr-1975.yml
new file mode 100644
index 000000000000..1e6ff6196ee4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1975.yml
@@ -0,0 +1,4 @@
+author: "MichiRecRoom"
+delete-after: True
+changes:
+ - rscadd: "Fax machines are now deconstructable in the same way as many other machines: Screwdriver, then crowbar."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2029.yml b/html/changelogs/AutoChangeLog-pr-2029.yml
new file mode 100644
index 000000000000..652294b9d133
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2029.yml
@@ -0,0 +1,4 @@
+author: "Absolucy, Xander3359"
+delete-after: True
+changes:
+ - qol: "You can now open airlocks (That you have access to) while inside a stealth implant box"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2030.yml b/html/changelogs/AutoChangeLog-pr-2030.yml
new file mode 100644
index 000000000000..e2486dd74d5d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2030.yml
@@ -0,0 +1,4 @@
+author: "Absolucy, improvedname"
+delete-after: True
+changes:
+ - qol: "Arrivals shuttle is now more player friendly"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2033.yml b/html/changelogs/AutoChangeLog-pr-2033.yml
new file mode 100644
index 000000000000..ade9de644881
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2033.yml
@@ -0,0 +1,5 @@
+author: "Absolucy, Melbert"
+delete-after: True
+changes:
+ - qol: "Wizard Spellbook is now alphabetized."
+ - qol: "Wizard Spellbook now has a search bar!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2042.yml b/html/changelogs/AutoChangeLog-pr-2042.yml
new file mode 100644
index 000000000000..082a51598762
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2042.yml
@@ -0,0 +1,4 @@
+author: "Absolucy, grungussuss"
+delete-after: True
+changes:
+ - qol: "suit sensors can now be maxed by ctrl clicking your jumpsuit\\"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2056.yml b/html/changelogs/AutoChangeLog-pr-2056.yml
new file mode 100644
index 000000000000..1f0c02e42d56
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2056.yml
@@ -0,0 +1,4 @@
+author: "RikuTheKiller"
+delete-after: True
+changes:
+ - bugfix: "Hardlight spear implants now work on anyone with opposable thumbs rather than only humans."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2060.yml b/html/changelogs/AutoChangeLog-pr-2060.yml
new file mode 100644
index 000000000000..8e880f9e0bec
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2060.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - balance: "Changeling blind stings no longer stack."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2068.yml b/html/changelogs/AutoChangeLog-pr-2068.yml
new file mode 100644
index 000000000000..188e24a89509
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2068.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - bugfix: "Fixed a weird body horror bug that could happen with guillotines, resulting in a second, unremovable fake head."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2075.yml b/html/changelogs/AutoChangeLog-pr-2075.yml
new file mode 100644
index 000000000000..8e0573d73978
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2075.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - qol: "Curators can now rename their weapons with a pen."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2082.yml b/html/changelogs/AutoChangeLog-pr-2082.yml
deleted file mode 100644
index 7f2f4b76176d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2082.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Absolucy"
-delete-after: True
-changes:
- - bugfix: "Fixed a runtime error (albeit a harmless one) relating to wooden barricades being deconstructed."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2091.yml b/html/changelogs/AutoChangeLog-pr-2091.yml
deleted file mode 100644
index a0fe9ee2e371..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2091.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Uristthedorf"
-delete-after: True
-changes:
- - bugfix: "Speed related fixes from TG, including preventing adamantine armor slowdown from being nullified."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2097.yml b/html/changelogs/AutoChangeLog-pr-2097.yml
new file mode 100644
index 000000000000..90ec4584716e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2097.yml
@@ -0,0 +1,4 @@
+author: "DexeeXI"
+delete-after: True
+changes:
+ - qol: "Bounty Hunter Ships now require proper IDs to operate the doors. If Johnny Greytide still somehow gets past this, one can expect them to be hung on MEAT HOOKS!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2102.yml b/html/changelogs/AutoChangeLog-pr-2102.yml
new file mode 100644
index 000000000000..1c448e4c7156
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2102.yml
@@ -0,0 +1,6 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - bugfix: "Fixed rare cases where a bloodsucker would be stuck in permanent torpor, i.e if they were a species such as zombie or skeleton."
+ - bugfix: "Fixed bloodsucker abilities such as Mesmerize spamming balloon alerts after success."
+ - bugfix: "Fixed various runtime errors relating to bloodsuckers."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2103.yml b/html/changelogs/AutoChangeLog-pr-2103.yml
new file mode 100644
index 000000000000..7f818304c218
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2103.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - qol: "Players now keep their name when turned into a gorilla."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2105.yml b/html/changelogs/AutoChangeLog-pr-2105.yml
new file mode 100644
index 000000000000..67e0ab61391a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2105.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - balance: "Reduces the number of plant DNA samples needed to complete the DNA vault to 8-15."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2109.yml b/html/changelogs/AutoChangeLog-pr-2109.yml
new file mode 100644
index 000000000000..08eb1ca42c50
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2109.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - qol: "rats no longer spawn on multiz cable hubs"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2130.yml b/html/changelogs/AutoChangeLog-pr-2130.yml
new file mode 100644
index 000000000000..f3c79098677b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2130.yml
@@ -0,0 +1,5 @@
+author: "DexeeXI"
+delete-after: True
+changes:
+ - rscdel: "Removed the ID console on Box"
+ - rscdel: "Removed a redundant console on Icebox."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2150.yml b/html/changelogs/AutoChangeLog-pr-2150.yml
new file mode 100644
index 000000000000..0328409d08d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2150.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - bugfix: "Nametags should be far more consistent with the mob's actual name now."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2151.yml b/html/changelogs/AutoChangeLog-pr-2151.yml
new file mode 100644
index 000000000000..2771e7847b5e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2151.yml
@@ -0,0 +1,8 @@
+author: "Absolucy, Aylong"
+delete-after: True
+changes:
+ - qol: "General settings tab into TGchat, looks better now, and is more convenient to use. Also, each button has a font written on it."
+ - rscadd: "Added Mute button into Chat Tabs settings, it disables tab unread counter."
+ - rscadd: "Added Clear chat button into General settings, you can clear your dirty chat like you did it before TGchat."
+ - bugfix: "Case-sensitive highlighting now works properly."
+ - rscadd: "Added an option to enable/disable individual chat highlights."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2173.yml b/html/changelogs/AutoChangeLog-pr-2173.yml
new file mode 100644
index 000000000000..b05d1b3b29b2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2173.yml
@@ -0,0 +1,4 @@
+author: "lmenvs"
+delete-after: True
+changes:
+ - rscadd: "Raw spaghetti now has a chance to spawn with the correctly spelled name."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2177.yml b/html/changelogs/AutoChangeLog-pr-2177.yml
new file mode 100644
index 000000000000..09c7c85663ad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2177.yml
@@ -0,0 +1,6 @@
+author: "RikuTheKiller"
+delete-after: True
+changes:
+ - balance: "Pouring mannitol on brains now removes all basic and severe traumas."
+ - bugfix: "Pouring mannitol on brains works properly again."
+ - bugfix: "Pouring plasma on oozeling cores works better and has a warning for having too little plasma."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2180.yml b/html/changelogs/AutoChangeLog-pr-2180.yml
new file mode 100644
index 000000000000..0b673a17e5c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2180.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - rscdel: "Removes Advanced Tranquility, which is only intended for bitrunner stuff, from the maint pill pool. Normal Tranquility is still available."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml
new file mode 100644
index 000000000000..9668d76ac8a9
--- /dev/null
+++ b/html/changelogs/archive/2024-06.yml
@@ -0,0 +1,90 @@
+2024-06-01:
+ Absolucy:
+ - bugfix: Fixed a runtime error (albeit a harmless one) relating to wooden barricades
+ being deconstructed.
+ - bugfix: Added a lot more sanity checking to liquid processing, which should make
+ it much harder for liquid processing to completely break.
+ Gboster-0:
+ - rscadd: the Rapid Pipe Dispenser was bumped up to modern TG, all fear the atmosian
+ powergame
+ KnigTheThrasher:
+ - rscadd: Reworked entire delta perma
+ - rscadd: Bitrunner dens in perma
+ - rscadd: Bitrunning is prisoners job now
+ - rscadd: Improved permabrig to actually fit 5 people (updated kitchen, botany and
+ stuff)
+ - rscdel: Removed bitrunners
+ - rscdel: Removed increased power consumption from upgrading parts
+ - config: bumped prisoner count to 5
+ Uristthedorf:
+ - bugfix: Speed related fixes from TG, including preventing adamantine armor slowdown
+ from being nullified.
+ - qol: Clones made in an experimental cloner that don't have a mind will be deleted.
+2024-06-02:
+ Gboster-0:
+ - rscadd: Meters can now be again placed on layers 1 and 5, thanks TG for removing
+ that originally
+ MichiRecRoom:
+ - qol: The Centcom Arena now accepts pacifists! Their pacifism will be removed for
+ the purposes of the fight.
+ - bugfix: The Arena will now properly take the wager from each person's pocket,
+ rather than twice from the first person's pocket.
+2024-06-04:
+ Absolucy:
+ - bugfix: Fixed the Mining Office APC not being wired on Meta.
+ - bugfix: Fixed some various runtime errors.
+ - qol: Shuttles will no longer show their current destination as a choice while
+ in transit.
+ - spellcheck: Adjusted font size from 30px to 15px.
+ - bugfix: Fixed a bug that would cause you to be unable to lean again if you tried
+ leaning while facing the wrong direction.
+ - balance: Supermatter zap power generation scales with the delta time between its
+ last zaps, preventing faster zapping from scaling power generation to extreme
+ levels.
+ - bugfix: Fixes supermatter zap rate not scaling properly. It should zap much faster
+ at higher energy levels as intended.
+ - qol: Changeling chemical generation scales with the world's delta time, making
+ its rate independent of subsystem lag.
+ - qol: Revenant essence generation scales with the world's delta time, making its
+ rate independent of subsystem lag.
+ - qol: Xenomorph plasma generation and resin healing scales with the world's delta
+ time, making their rates independent of subsystem lag.
+ - qol: The "Explosive Planted" alert for C4 actually shows the C4.
+ - bugfix: Now falsewalls visually don't close when they shouldn't.
+ - bugfix: Aheal now properly heals ear deafness.
+ - bugfix: The shuttle will no longer delete you while you are in jaunt.
+ - bugfix: You will now be ejected from Space Phase if you lose your focus or lose
+ consciousness somehow during the jaunt.
+ - bugfix: Fix a rare issue where a turf would remain permanently "elevated" if an
+ elevated object was initialized inside of a non-turf object.
+ - bugfix: Holodisk recording gives the right vfx again. Bonus, the rays work with
+ it now too!
+2024-06-05:
+ Absolucy:
+ - refactor: Tgui Say is rewritten, becoming "much more performant". Hey, that's
+ what it says on the tin! I'm not from marketing!
+ - bugfix: Tguisay drag zones are now ever so slightly larger around the corner of
+ the window.
+ - bugfix: Pressing one of the chat open keys (T/Y/M/O) will no longer change channels
+ if it's already open.
+ - bugfix: Fix color selection in VV not working.
+ - rscdel: Removed the Supermatter Syndrome symptom.
+ - bugfix: Fixed a runtime error relating to viral extrapolators.
+ CannibalHunter:
+ - rscadd: Sandstone stool
+ - rscadd: Sandstone table
+ - rscadd: Sandstone sarcophagus
+ lmenvs:
+ - rscadd: Adds donator items for ellie. Thank you for your patronage!
+ - rscadd: Adds Pim, Glep and Mr. Frog plushes, complete with their own squeaks. These
+ are all available to donators in the loadout.
+2024-06-06:
+ Absolucy:
+ - rscdel: Removed the doorjacking objective from ninjas.
+ - bugfix: Fixed some errors relating to oozeling revival balloon alerts.
+ - code_imp: Added a stack traces + fallback behavior for invalid usage of the `balloon_alert`
+ proc.
+ - bugfix: Fixed an error relating to Mythril.
+ Gboster-0:
+ - rscadd: The spraycan gun has cometh into existance, feed it with spraycans and
+ print it from an engineering or service protolathe
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index 1e7fcef6f6a0..3e7726842a24 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/mob/species/human/human_face.dmi b/icons/mob/species/human/human_face.dmi
index 04d3f66cf6ac..a65ab1a0e4ee 100644
Binary files a/icons/mob/species/human/human_face.dmi and b/icons/mob/species/human/human_face.dmi differ
diff --git a/icons/obj/atmospherics/pipes/disposal.dmi b/icons/obj/atmospherics/pipes/disposal.dmi
index 450d8e8f8abf..8487f3dd58c8 100644
Binary files a/icons/obj/atmospherics/pipes/disposal.dmi and b/icons/obj/atmospherics/pipes/disposal.dmi differ
diff --git a/icons/obj/atmospherics/pipes/transit_tube.dmi b/icons/obj/atmospherics/pipes/transit_tube.dmi
index 966e20d68415..30a23beed166 100644
Binary files a/icons/obj/atmospherics/pipes/transit_tube.dmi and b/icons/obj/atmospherics/pipes/transit_tube.dmi differ
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index 1bac2552d07b..e1cd286f90c7 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ
diff --git a/lua/SS13_base.lua b/lua/SS13_base.lua
index ddacb345fd5c..ea04c8c6503d 100644
--- a/lua/SS13_base.lua
+++ b/lua/SS13_base.lua
@@ -1,3 +1,6 @@
+local timer = require("timer")
+local state = require("state")
+
local SS13 = {}
__SS13_signal_handlers = __SS13_signal_handlers or {}
@@ -6,12 +9,7 @@ SS13.SSlua = dm.global_vars.vars.SSlua
SS13.global_proc = "some_magic_bullshit"
-for _, state in SS13.SSlua.vars.states do
- if state.vars.internal_id == dm.state_id then
- SS13.state = state
- break
- end
-end
+SS13.state = state.state
function SS13.get_runner_ckey()
return SS13.state:get_var("ckey_last_runner")
@@ -25,12 +23,16 @@ function SS13.istype(thing, type)
return dm.global_proc("_istype", thing, dm.global_proc("_text2path", type)) == 1
end
+function SS13.start_tracking(datum)
+ local references = SS13.state.vars.references
+ references:add(datum)
+ SS13.state:call_proc("clear_on_delete", datum)
+end
+
function SS13.new(type, ...)
- local datum = SS13.new_untracked(type, table.unpack({...}))
+ local datum = SS13.new_untracked(type, ...)
if datum then
- local references = SS13.state.vars.references
- references:add(datum)
- SS13.state:call_proc("clear_on_delete", datum)
+ SS13.start_tracking(datum)
return datum
end
end
@@ -75,58 +77,45 @@ function SS13.await(thing_to_call, proc_to_call, ...)
return return_value, runtime_message
end
-function SS13.register_signal(datum, signal, func, make_easy_clear_function)
+function SS13.register_signal(datum, signal, func)
if not SS13.istype(datum, "/datum") then
return
end
- if not __SS13_signal_handlers[datum] then
- __SS13_signal_handlers[datum] = {}
+ if not SS13.is_valid(datum) then
+ error("Tried to register a signal on a deleted datum!", 2)
+ return
+ end
+ local datumWeakRef = dm.global_proc("WEAKREF", datum)
+ if not __SS13_signal_handlers[datumWeakRef] then
+ __SS13_signal_handlers[datumWeakRef] = {}
end
if signal == "_cleanup" then
return
end
- if not __SS13_signal_handlers[datum][signal] then
- __SS13_signal_handlers[datum][signal] = {}
+ if not __SS13_signal_handlers[datumWeakRef][signal] then
+ __SS13_signal_handlers[datumWeakRef][signal] = {}
end
local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
+ local callbackWeakRef = dm.global_proc("WEAKREF", callback)
callback:call_proc("RegisterSignal", datum, signal, "Invoke")
- local path = { "__SS13_signal_handlers", dm.global_proc("WEAKREF", datum), signal, dm.global_proc("WEAKREF", callback), "func" }
+ local path = { "__SS13_signal_handlers", datumWeakRef, signal, callbackWeakRef, "func" }
callback.vars.arguments = { path }
- if not __SS13_signal_handlers[datum]["_cleanup"] then
- local cleanup_path = { "__SS13_signal_handlers", dm.global_proc("WEAKREF", datum), "_cleanup", "func" }
- local cleanup_callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first", cleanup_path)
- cleanup_callback:call_proc("RegisterSignal", datum, "parent_qdeleting", "Invoke")
- __SS13_signal_handlers[datum]["_cleanup"] = {
- func = function(datum)
- SS13.signal_handler_cleanup(datum)
- SS13.stop_tracking(cleanup_callback)
- end,
- callback = cleanup_callback,
- }
- end
- if signal == "parent_qdeleting" then --We want to make sure that the cleanup function is the very last signal handler called.
- local comp_lookup = datum.vars._listen_lookup
- if comp_lookup then
- local lookup_for_signal = comp_lookup.entries.parent_qdeleting
- if lookup_for_signal and not SS13.istype(lookup_for_signal, "/datum") then
- local cleanup_callback_index =
- dm.global_proc("_list_find", lookup_for_signal, __SS13_signal_handlers[datum]["_cleanup"].callback)
- if cleanup_callback_index ~= 0 and cleanup_callback_index ~= #comp_lookup then
- dm.global_proc("_list_swap", lookup_for_signal, cleanup_callback_index, #lookup_for_signal)
- end
- end
- end
- end
- __SS13_signal_handlers[datum][signal][callback] = { func = func, callback = callback }
- if make_easy_clear_function then
- local clear_function_name = "clear_signal_" .. tostring(datum) .. "_" .. signal .. "_" .. tostring(callback)
- SS13[clear_function_name] = function()
- if callback then
- SS13.unregister_signal(datum, signal, callback)
- end
- SS13[clear_function_name] = nil
+ -- Turfs don't remove their signals on deletion.
+ if not __SS13_signal_handlers[datumWeakRef]._cleanup and not SS13.istype(datum, "/turf") then
+ local cleanupCallback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
+ local cleanupPath = { "__SS13_signal_handlers", datumWeakRef, "_cleanup"}
+ cleanupCallback.vars.arguments = { cleanupPath }
+ cleanupCallback:call_proc("RegisterSignal", datum, "parent_qdeleting", "Invoke")
+ __SS13_signal_handlers[datumWeakRef]._cleanup = function(datum)
+ SS13.start_tracking(datumWeakRef)
+ timer.set_timeout(0, function()
+ SS13.signal_handler_cleanup(datumWeakRef)
+ SS13.stop_tracking(cleanupCallback)
+ SS13.stop_tracking(datumWeakRef)
+ end)
end
end
+ __SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef] = { func = func, callback = callback }
return callback
end
@@ -143,51 +132,58 @@ function SS13.unregister_signal(datum, signal, callback)
return
end
local handler_callback = handler_info.callback
- handler_callback:call_proc("UnregisterSignal", datum, signal)
+ local callbackWeakRef = dm.global_proc("WEAKREF", handler_callback)
+ if not SS13.istype(datum, "/datum/weakref") then
+ handler_callback:call_proc("UnregisterSignal", datum, signal)
+ else
+ local actualDatum = datum:call_proc("hard_resolve")
+ if SS13.is_valid(actualDatum) then
+ handler_callback:call_proc("UnregisterSignal", actualDatum, signal)
+ end
+ end
SS13.stop_tracking(handler_callback)
end
- local function clear_easy_clear_function(callback_to_clear)
- local clear_function_name = "clear_signal_" .. tostring(datum) .. "_" .. signal .. "_" .. tostring(callback_to_clear)
- SS13[clear_function_name] = nil
+ local datumWeakRef = datum
+ if not SS13.istype(datum, "/datum/weakref") then
+ datumWeakRef = dm.global_proc("WEAKREF", datum)
end
-
- if not __SS13_signal_handlers[datum] then
+ if not __SS13_signal_handlers[datumWeakRef] then
return
end
+
if signal == "_cleanup" then
return
end
- if not __SS13_signal_handlers[datum][signal] then
+
+ if not __SS13_signal_handlers[datumWeakRef][signal] then
return
end
if not callback then
- for handler_key, handler_info in __SS13_signal_handlers[datum][signal] do
- clear_easy_clear_function(handler_key)
+ for handler_key, handler_info in __SS13_signal_handlers[datumWeakRef][signal] do
clear_handler(handler_info)
end
- __SS13_signal_handlers[datum][signal] = nil
+ __SS13_signal_handlers[datumWeakRef][signal] = nil
else
if not SS13.istype(callback, "/datum/callback") then
return
end
- clear_easy_clear_function(callback)
- clear_handler(__SS13_signal_handlers[datum][signal][callback])
- __SS13_signal_handlers[datum][signal][callback] = nil
+ local callbackWeakRef = dm.global_proc("WEAKREF", callback)
+ clear_handler(__SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef])
+ __SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef] = nil
end
end
-function SS13.signal_handler_cleanup(datum)
- if not __SS13_signal_handlers[datum] then
+function SS13.signal_handler_cleanup(datumWeakRef)
+ if not __SS13_signal_handlers[datumWeakRef] then
return
end
- for signal, _ in __SS13_signal_handlers[datum] do
- SS13.unregister_signal(datum, signal)
+ for signal, _ in __SS13_signal_handlers[datumWeakRef] do
+ SS13.unregister_signal(datumWeakRef, signal)
end
-
- __SS13_signal_handlers[datum] = nil
+ __SS13_signal_handlers[datumWeakRef] = nil
end
return SS13
diff --git a/lua/docs/handler_group.md b/lua/docs/handler_group.md
new file mode 100644
index 000000000000..7856ff58b485
--- /dev/null
+++ b/lua/docs/handler_group.md
@@ -0,0 +1,66 @@
+# Handler Group
+
+This module is for registering signals on a datum or several datums and being able to clear them all at once without having to unregister them manually. This is particularly useful if you register signals on a datum and need to clear them later without accidentally unregistering unrelated signals
+
+## Functions
+
+### HandlerGroup.new()
+Creates a new handler group instance
+
+### HandlerGroup:register_signal(datum, signal, func)
+Registers a signal on a datum, exactly the same as `SS13.register_signal`
+
+### HandlerGroup:clear()
+Clears all registered signals that have been registered by this handler group.
+
+### HandlerGroup:clear_on(datum, signal, func)
+Clears all registered signals that have been registered by this handler group when a signal is called on the specified datum. Additionally, a function can be ran before it is cleared
+
+### HandlerGroup.register_once(datum, signal func)
+Identical to just creating a new HandlerGroup instance and calling `clear_on(datum, signal, func)`.
+
+The idea is to register a signal and clear it after it has been called once.
+
+## Examples
+
+The following examples showcase why using handler groups can make life easier in specific situations.
+
+### Explode when mob enters location
+This function creates a 1 tile-wide explosion at the specified location if a specific mob walks over it. The explosion won't happen if the mob dies. This function should be callable on the same mob for different locations. The function should be self-contained, it should not affect other registered signals that the mob may have registered.
+
+#### Without Handler Groups
+```lua
+local function explodeAtLocation(mobVar, position)
+ local deathCallback
+ local moveCallback
+ local function unlinkFromMob()
+ SS13.unregister_signal(mobVar, "living_death", deathCallback)
+ SS13.unregister_signal(mobVar, "movable_moved", moveCallback)
+ end
+ deathCallback = SS13.register_signal(mobVar, "living_death", function(_, gibbed)
+ unlinkFromMob()
+ end)
+ moveCallback = SS13.register_signal(mobVar, "movable_moved", function(_, oldLoc)
+ if mobVar:get_var("loc") == position then
+ -- Creates a 1 tile-wide explosion at the specified position
+ dm.global_proc("explosion", position, 1, 0, 0)
+ unlinkFromMob()
+ end
+ end)
+end
+```
+
+#### With Handler Groups
+```lua
+local function explodeAtLocation(mobVar, position)
+ local handler = handler_group.new()
+ handler:clear_on(mobVar, "living_death")
+ handler:register_signal(mobVar, "movable_moved", function(_, oldLoc)
+ if mobVar:get_var("loc") == position then
+ -- Creates a 1 tile-wide explosion at the specified position
+ dm.global_proc("explosion", position, 1, 0, 0)
+ handler:clear()
+ end
+ end)
+end
+```
diff --git a/lua/handler_group.lua b/lua/handler_group.lua
new file mode 100644
index 000000000000..0246d33c7448
--- /dev/null
+++ b/lua/handler_group.lua
@@ -0,0 +1,49 @@
+local SS13 = require('SS13')
+local HandlerGroup = {}
+HandlerGroup.__index = HandlerGroup
+
+function HandlerGroup.new()
+ return setmetatable({
+ registered = {}
+ }, HandlerGroup)
+end
+
+-- Registers a signal on a datum for this handler group instance.
+function HandlerGroup:register_signal(datum, signal, func)
+ local callback = SS13.register_signal(datum, signal, func)
+ if not callback then
+ return
+ end
+ table.insert(self.registered, { datum = dm.global_proc("WEAKREF", datum), signal = signal, callback = callback })
+end
+
+-- Clears all the signals that have been registered on this HandlerGroup
+function HandlerGroup:clear()
+ for _, data in self.registered do
+ if not data.callback or not data.datum then
+ continue
+ end
+ SS13.unregister_signal(data.datum, data.signal, data.callback)
+ end
+ table.clear(self.registered)
+end
+
+-- Clears all the signals that have been registered on this HandlerGroup when a specific signal is sent on a datum.
+function HandlerGroup:clear_on(datum, signal, func)
+ SS13.register_signal(datum, signal, function(...)
+ if func then
+ func(...)
+ end
+ self:clear()
+ end)
+end
+
+-- Registers a signal on a datum and clears it after it is called once.
+function HandlerGroup.register_once(datum, signal, func)
+ local callback = HandlerGroup.new()
+ callback:clear_on(datum, signal, func)
+ return callback
+end
+
+
+return HandlerGroup
diff --git a/lua/state.lua b/lua/state.lua
new file mode 100644
index 000000000000..080ee9f7eb32
--- /dev/null
+++ b/lua/state.lua
@@ -0,0 +1,9 @@
+local SSlua = dm.global_vars:get_var("SSlua")
+
+for _, state in SSlua:get_var("states") do
+ if state:get_var("internal_id") == dm.state_id then
+ return { state = state }
+ end
+end
+
+return { state = nil }
diff --git a/lua/timer.lua b/lua/timer.lua
index 605e5b98a2e5..8619bbb54a29 100644
--- a/lua/timer.lua
+++ b/lua/timer.lua
@@ -1,6 +1,8 @@
-local SS13 = require("SS13_base")
+local state = require("state")
+
local Timer = {}
+local SSlua = dm.global_vars:get_var("SSlua")
__Timer_timers = __Timer_timers or {}
__Timer_callbacks = __Timer_callbacks or {}
@@ -35,7 +37,7 @@ function __stop_internal_timer(func)
end
__Timer_timer_processing = __Timer_timer_processing or false
-SS13.state:set_var("timer_enabled", 1)
+state.state:set_var("timer_enabled", 1)
__Timer_timer_process = function(seconds_per_tick)
if __Timer_timer_processing then
return 0
@@ -50,7 +52,7 @@ __Timer_timer_process = function(seconds_per_tick)
sleep()
end
if time >= timeData.executeTime then
- SS13.state:get_var("functions_to_execute"):add(func)
+ state.state:get_var("functions_to_execute"):add(func)
timeData.executing = true
end
end
@@ -61,7 +63,7 @@ end
function Timer.wait(time)
local next_yield_index = __next_yield_index
__add_internal_timer(function()
- SS13.SSlua:call_proc("queue_resume", SS13.state, next_yield_index)
+ SSlua:call_proc("queue_resume", state.state, next_yield_index)
end, time * 10, false)
coroutine.yield()
end
diff --git a/monkestation/code/area/areas/station.dm b/monkestation/code/area/areas/station.dm
index 1b92c97cbd0c..4a614b90986c 100644
--- a/monkestation/code/area/areas/station.dm
+++ b/monkestation/code/area/areas/station.dm
@@ -15,6 +15,12 @@
icon = 'monkestation/icons/area/areas_station.dmi'
icon_state = "patho_iso"
+/area/station/security/bitden
+ name = "Bitrunning Den"
+ desc = "Office of bitrunners, houses their equipment."
+ icon = 'monkestation/icons/area/areas_station.dmi'
+ icon_state = "bit_den"
+
// QM office replacement so the windows are shit brown and not blue!
/area/station/cargo/quartermaster
diff --git a/monkestation/code/datums/quirks/neutral_quirks.dm b/monkestation/code/datums/quirks/neutral_quirks.dm
index 748c52c746d9..17093beb751f 100644
--- a/monkestation/code/datums/quirks/neutral_quirks.dm
+++ b/monkestation/code/datums/quirks/neutral_quirks.dm
@@ -9,8 +9,7 @@
. = ..()
if (ishuman(quirk_holder))
var/mob/living/carbon/human/gojira = quirk_holder
- if(gojira.dna)
- gojira.dna.add_mutation(/datum/mutation/human/gigantism)
+ gojira.dna?.add_mutation(/datum/mutation/human/gigantism)
/datum/quirk/anime
name = "Anime"
@@ -61,7 +60,7 @@
/datum/quirk/clown_disbelief/add(client/client_source)
. = ..()
- if(!quirk_holder)
+ if(QDELETED(quirk_holder))
return
RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, PROC_REF(enable))
RegisterSignal(quirk_holder, COMSIG_MOB_LOGOUT, PROC_REF(disable))
@@ -78,10 +77,14 @@
/datum/quirk/clown_disbelief/proc/enable(datum/source)
for(var/image/image as anything in GLOB.hidden_image_holders["clown"])
+ if(QDELETED(quirk_holder?.client))
+ break
quirk_holder.client.images += image
/datum/quirk/clown_disbelief/proc/disable(datum/source)
for(var/image/image as anything in GLOB.hidden_image_holders["clown"])
+ if(QDELETED(quirk_holder?.client))
+ break
quirk_holder.client.images -= image
diff --git a/monkestation/code/datums/ruins.dm b/monkestation/code/datums/ruins.dm
new file mode 100644
index 000000000000..62df9d83204e
--- /dev/null
+++ b/monkestation/code/datums/ruins.dm
@@ -0,0 +1,32 @@
+GLOBAL_LIST_INIT(ruin_config, load_ruin_config())
+#define RUIN_CONFIG_FILE "config/monkestation/ruins.toml"
+
+/datum/map_template/ruin/New()
+ . = ..()
+ var/list/this_ruin_config = GLOB.ruin_config[type]
+ if(this_ruin_config)
+ var/overrides = 0
+ for(var/variable in this_ruin_config)
+ if(!(variable in vars))
+ stack_trace("Invalid ruin configuration variable [variable] in ruin ([type]) variable changes.")
+ continue
+ vars[variable] = this_ruin_config[variable]
+ overrides += 1
+ log_config("Applied [overrides] var overrides for [type] from ruin config.")
+
+/proc/load_ruin_config()
+ . = list()
+ if(!fexists(RUIN_CONFIG_FILE))
+ log_config("No ruin config file found, using empty config.")
+ return
+ var/list/ruin_config = rustg_read_toml_file(RUIN_CONFIG_FILE)
+ if(!length(ruin_config))
+ log_config("ruin token config file is empty, using empty config.")
+ return
+ for(var/ruin_config_id in ruin_config)
+ var/ruin_path = text2path(ruin_config_id)
+ if(!ispath(ruin_path, /datum/map_template/ruin))
+ continue
+ .[ruin_path] = ruin_config[ruin_config_id]
+
+#undef RUIN_CONFIG_FILE
diff --git a/monkestation/code/game/objects/effects/anomalies/_anomalies.dm b/monkestation/code/game/objects/effects/anomalies/_anomalies.dm
index 76a036465fe1..67676be94e8d 100644
--- a/monkestation/code/game/objects/effects/anomalies/_anomalies.dm
+++ b/monkestation/code/game/objects/effects/anomalies/_anomalies.dm
@@ -1,23 +1,6 @@
-/obj/effect/anomaly
- /// If TRUE, the anomaly is contained to its impact_area.
- var/contained = FALSE
-
/obj/effect/anomaly/proc/scan_anomaly(mob/user, obj/item/scanner)
if(!aSignal)
return FALSE
playsound(get_turf(user), 'sound/machines/ping.ogg', vol = 30, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE)
to_chat(user, span_boldnotice("Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code]."))
return TRUE
-
-/obj/effect/anomaly/stabilize(anchor, has_core)
- . = ..()
- contained = TRUE
-
-/obj/effect/anomaly/Move(atom/newloc, direct, glide_size_override, update_dir)
- if(contained)
- if(impact_area != get_area(newloc))
- return FALSE
- else if(impact_area != get_area(src)) // if we somehow escaped ANYWAYS, let's just go poof
- qdel(src)
- return FALSE
- return ..()
diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
index b6ce1e948893..9b3640913404 100644
--- a/monkestation/code/game/objects/items/choice_beacon.dm
+++ b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -69,6 +69,7 @@
pod.explosionSize = list(0,0,0,0)
your_pet.name = name
your_pet.real_name = name
+ your_pet.update_name_tag() // monkestation edit: name tags
if(isbasicmob(your_pet))
var/mob/living/basic/pet = your_pet
diff --git a/monkestation/code/game/objects/items/food/spaghetti.dm b/monkestation/code/game/objects/items/food/spaghetti.dm
index d81ea73a4e32..4e127dc134b7 100644
--- a/monkestation/code/game/objects/items/food/spaghetti.dm
+++ b/monkestation/code/game/objects/items/food/spaghetti.dm
@@ -1,3 +1,9 @@
+/obj/item/food/spaghetti/raw/Initialize(mapload)
+ . = ..()
+ var random_names = list("spagti", "spagooter", "spaghetti", "spaget", "sgetti", "spagotti", "spugetti", "spacegetti", "bisgetti")
+ name = pick(random_names)
+
+
/obj/item/food/spaghetti/security
name = "Robust pasta"
desc = "Only the truly robust can eat this safely."
diff --git a/monkestation/code/game/objects/items/implants/hardlight.dm b/monkestation/code/game/objects/items/implants/hardlight.dm
index b7715fa579f6..d85536126869 100644
--- a/monkestation/code/game/objects/items/implants/hardlight.dm
+++ b/monkestation/code/game/objects/items/implants/hardlight.dm
@@ -123,7 +123,7 @@
cooldown_time = 20 SECONDS
invocation_type = INVOCATION_NONE
- spell_requirements = SPELL_REQUIRES_HUMAN
+ spell_requirements = NONE
antimagic_flags = NONE
spell_max_level = 5 //max is actually 7(the point where the sprites stop working), but the implant can only reach 5
diff --git a/monkestation/code/game/objects/items/mop.dm b/monkestation/code/game/objects/items/mop.dm
new file mode 100644
index 000000000000..eb2939354443
--- /dev/null
+++ b/monkestation/code/game/objects/items/mop.dm
@@ -0,0 +1,26 @@
+/obj/item/mop/proc/attack_on_liquids_turf(obj/item/mop/the_mop, turf/target, mob/user, obj/effect/abstract/liquid_turf/liquids)
+ if(!user.Adjacent(target))
+ return FALSE
+ var/free_space = max_reagent_volume - reagents.total_volume
+ var/speed_mult = 1
+ var/datum/liquid_group/targeted_group = target?.liquids?.liquid_group
+ while(!QDELETED(targeted_group))
+ if(speed_mult >= 0.2)
+ speed_mult -= 0.05
+ if(free_space <= 0)
+ to_chat(user, span_warning("Your [src] can't absorb any more!"))
+ return TRUE
+ if(!do_after(user, src.mopspeed * speed_mult, target = target))
+ break
+ if(the_mop.reagents.total_volume == the_mop.max_reagent_volume)
+ to_chat(user, span_warning("Your [src] can't absorb any more!"))
+ break
+ if(targeted_group?.reagents_per_turf)
+ targeted_group?.trans_to_seperate_group(the_mop.reagents, min(targeted_group?.reagents_per_turf, 5))
+ to_chat(user, span_notice("You soak up some liquids with \the [src]."))
+ else if(!QDELETED(target?.liquids?.liquid_group))
+ targeted_group = target.liquids.liquid_group
+ else
+ break
+ user.changeNext_move(CLICK_CD_MELEE)
+ return TRUE
diff --git a/monkestation/code/game/objects/items/spraycan_gun.dm b/monkestation/code/game/objects/items/spraycan_gun.dm
new file mode 100644
index 000000000000..9a16013af54d
--- /dev/null
+++ b/monkestation/code/game/objects/items/spraycan_gun.dm
@@ -0,0 +1,86 @@
+/obj/item/toy/crayon/spraycan/use_on(atom/target, mob/user, params)
+ if(istype(target, /obj/item/toy/crayon/spraycan/gun))
+ var/obj/item/toy/crayon/spraycan/gun/gun = target
+ if(gun.contained_spraycan)
+ gun.unload_spraycan()
+ gun.load_spraycan(src)
+ return FALSE
+
+ return ..()
+
+/obj/item/toy/crayon/spraycan/gun
+ name = "Spraycan gun"
+ desc = "used for carefull painting of various surfaces"
+ icon = 'monkestation/icons/obj/misc.dmi'
+ // this actually gets overridden by icon_uncapped because of shitcode in spraycans, use it as a R&D design icon var instead
+ icon_state = "spraycan_gun_filled"
+ icon_uncapped = "spraycan_gun_empty"
+
+ charges = 0
+ has_cap = FALSE
+ is_capped = FALSE
+ overlay_paint_colour = FALSE
+
+ var/obj/item/toy/crayon/spraycan/contained_spraycan
+
+/obj/item/toy/crayon/spraycan/gun/examine()
+ . = ..()
+ if(contained_spraycan)
+ . += span_notice("It's spraycan slot is full, you can alt+click it to release the can or use another can onto it to replace it.")
+ else
+ . += span_notice("It's spraycan slot is empty, you can slot a spraycan into it by clicking the gun with the spraycan")
+
+/obj/item/toy/crayon/spraycan/gun/set_painting_tool_color(chosen_color)
+ . = ..()
+ icon_state = contained_spraycan ? "spraycan_gun_filled" : icon_uncapped
+
+/obj/item/toy/crayon/spraycan/gun/AltClick(mob/user)
+ if(contained_spraycan)
+ unload_spraycan()
+
+/obj/item/toy/crayon/spraycan/gun/refill()
+ if(!charges)
+ return charges_left = charges
+
+ return ..()
+
+/obj/item/toy/crayon/spraycan/gun/use_charges(mob/user, amount = 1, requires_full = TRUE)
+ if(contained_spraycan?.charges == -1) // What's the point?
+ . = amount
+ return refill()
+
+ if(check_empty(user, amount, requires_full))
+ return FALSE
+ else
+ . = min(contained_spraycan.charges_left, amount)
+ contained_spraycan.charges_left -= .
+ charges_left -= .
+
+/obj/item/toy/crayon/spraycan/gun/check_empty(mob/user, amount = 1, requires_full = TRUE)
+ if(!contained_spraycan)
+ balloon_alert(user, "no spraycan!")
+ return TRUE
+ if(contained_spraycan.charges == -1)
+ return FALSE
+ if(!contained_spraycan.charges_left)
+ balloon_alert(user, "tank empty!")
+ return TRUE
+ if(contained_spraycan.charges_left < amount && requires_full)
+ balloon_alert(user, "not enough left!")
+ return TRUE
+
+ return FALSE
+
+/obj/item/toy/crayon/spraycan/gun/proc/load_spraycan(obj/item/toy/crayon/spraycan/wanted_spraycan)
+ wanted_spraycan.forceMove(src)
+ contained_spraycan = wanted_spraycan
+ charges = contained_spraycan.charges_left
+ refill()
+ icon_state = "spraycan_gun_filled"
+
+/obj/item/toy/crayon/spraycan/gun/proc/unload_spraycan()
+ contained_spraycan.forceMove(drop_location(src))
+ contained_spraycan = null
+ charges = 0
+ refill()
+ icon_state = icon_uncapped
diff --git a/monkestation/code/game/objects/structures/beds_chairs/chair.dm b/monkestation/code/game/objects/structures/beds_chairs/chair.dm
new file mode 100644
index 000000000000..83cc49eb7282
--- /dev/null
+++ b/monkestation/code/game/objects/structures/beds_chairs/chair.dm
@@ -0,0 +1,18 @@
+//sandstone chair start
+/obj/structure/chair/stool/sandstone
+ name = "sandstone stool"
+ desc = "Apply dummy thick cheeks."
+ icon = 'monkestation/icons/obj/sandstone_structures.dmi'
+ icon_state = "stool"
+ resistance_flags = FIRE_PROOF
+ can_buckle = FALSE
+ buildstackamount = 1
+ item_chair = /obj/item/chair/stool/sandstone
+
+/obj/item/chair/stool/sandstone
+ name = "sandstone stool"
+ icon = 'monkestation/icons/obj/sandstone_structures.dmi'
+ icon_state = "stool_toppled"
+ inhand_icon_state = null
+ origin_type = /obj/structure/chair/stool/sandstone
+//sandstone chair end
diff --git a/monkestation/code/game/objects/structures/crates_lockers/crates.dm b/monkestation/code/game/objects/structures/crates_lockers/crates.dm
new file mode 100644
index 000000000000..ba065295e805
--- /dev/null
+++ b/monkestation/code/game/objects/structures/crates_lockers/crates.dm
@@ -0,0 +1,14 @@
+/obj/structure/closet/crate/coffin/sandstonesarcophagus
+ name = "sandstone sarcophagus"
+ desc = "It's a burial receptacle for the dearly departed. A sARcophaGUS, it usually contains a caDaVER."
+ icon = 'monkestation/icons/obj/sandstone_structures.dmi'
+ icon_state = "sarcophagus"
+ resistance_flags = FIRE_PROOF
+ max_integrity = 70
+ material_drop = /obj/item/stack/sheet/mineral/sandstone
+ material_drop_amount = 8
+ open_sound = 'sound/machines/wooden_closet_open.ogg'
+ close_sound = 'sound/machines/wooden_closet_close.ogg'
+ open_sound_volume = 25
+ close_sound_volume = 50
+ can_install_electronics = FALSE
diff --git a/monkestation/code/game/objects/structures/tables_racks.dm b/monkestation/code/game/objects/structures/tables_racks.dm
new file mode 100644
index 000000000000..20ac1c115258
--- /dev/null
+++ b/monkestation/code/game/objects/structures/tables_racks.dm
@@ -0,0 +1,12 @@
+/obj/structure/table/sandstone
+ name = "sandstone table"
+ desc = "Woah! A sandstone TABLE!!"
+ icon = 'monkestation/icons/obj/smooth_structures/sandstone_table.dmi'
+ icon_state = "brass_table-0" //brass table is my best friend
+ base_icon_state = "brass_table" //brass table is my best friend
+ resistance_flags = FIRE_PROOF
+ buildstack = /obj/item/stack/sheet/mineral/sandstone
+ buildstackamount = 6
+ framestackamount = 0
+ smoothing_groups = SMOOTH_GROUP_SANDSTONE_TABLES
+ canSmoothWith = SMOOTH_GROUP_SANDSTONE_TABLES
diff --git a/monkestation/code/modules/admin/verbs/kick_player_by_ckey.dm b/monkestation/code/modules/admin/verbs/kick_player_by_ckey.dm
new file mode 100644
index 000000000000..c9170b06b468
--- /dev/null
+++ b/monkestation/code/modules/admin/verbs/kick_player_by_ckey.dm
@@ -0,0 +1,19 @@
+/datum/admins/proc/kick_player_by_ckey()
+ set name = "Kick Player (by ckey)"
+ set category = "Admin"
+
+ // Pretty much everything here except the client selection is copied straight from
+ // `code/modules/admin/topic.dm`, proc `/datum/admins/Topic()`, href `"boot2"`. If it breaks
+ // here, it was probably broken there too.
+ if(!check_rights(R_ADMIN))
+ return
+
+ var/client/to_kick = input(usr, "Select a ckey to kick.", "Select a ckey") as null|anything in sort_list(GLOB.clients)
+ if(!to_kick)
+ return
+
+ var/confirmation = alert(usr, "Kick [key_name(to_kick)]?", "Confirm", "Yes", "No")
+ if(confirmation != "Yes")
+ return
+
+ kick_client(to_kick)
diff --git a/monkestation/code/modules/antagonists/_common/antag_hud.dm b/monkestation/code/modules/antagonists/_common/antag_hud.dm
index 55bf9b62cad8..5da6e1a1e4f1 100644
--- a/monkestation/code/modules/antagonists/_common/antag_hud.dm
+++ b/monkestation/code/modules/antagonists/_common/antag_hud.dm
@@ -2,8 +2,8 @@
///The key or list of keys that are valid to see this hud, if unset then it will display to everyone with the antag datum like normal
var/list/valid_keys
-/datum/atom_hud/alternate_appearance/basic/has_antagonist/mobShouldSee(mob/M)
- var/datum/antagonist/antag_datum = M.mind?.has_antag_datum(antag_datum_type)
+/datum/atom_hud/alternate_appearance/basic/has_antagonist/mobShouldSee(mob/target)
+ var/datum/antagonist/antag_datum = target?.mind?.has_antag_datum(antag_datum_type)
if(!antag_datum)
return FALSE
diff --git a/monkestation/code/modules/antagonists/changeling/powers/tiny_prick.dm b/monkestation/code/modules/antagonists/changeling/powers/tiny_prick.dm
new file mode 100644
index 000000000000..98a49d37f1cb
--- /dev/null
+++ b/monkestation/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -0,0 +1,12 @@
+/datum/action/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target)
+ var/obj/item/organ/internal/eyes/eyes = target.get_organ_slot(ORGAN_SLOT_EYES)
+ if(!eyes)
+ user.balloon_alert(user, "no eyes!")
+ return FALSE
+
+ log_combat(user, target, "stung", "blind sting")
+ to_chat(target, span_danger("Your eyes burn horrifically!"))
+ eyes.apply_organ_damage(eyes.maxHealth * 0.8, maximum = eyes.maxHealth * 0.8)
+ target.set_temp_blindness_if_lower(40 SECONDS)
+ target.set_eye_blur_if_lower(80 SECONDS)
+ return TRUE
diff --git a/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm b/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm
index 0722c3b9e8f0..1e0520de7d1d 100644
--- a/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm
+++ b/monkestation/code/modules/art_sci_overrides/artifact_components/_base_component.dm
@@ -232,7 +232,8 @@
artifact_activate()
/datum/component/artifact/proc/stimulate_from_turf_heat(turf/target)
- process_stimuli(STIMULUS_HEAT, target.return_air().temperature, FALSE)
+ if(!QDELETED(target))
+ process_stimuli(STIMULUS_HEAT, target.return_air().temperature, FALSE)
/datum/component/artifact/proc/stimulate_from_rad_act(intensity)
process_stimuli(STIMULUS_RADIATION, intensity)
diff --git a/monkestation/code/modules/balloon_alert/balloon_alert.dm b/monkestation/code/modules/balloon_alert/balloon_alert.dm
new file mode 100644
index 000000000000..1fba56c771bf
--- /dev/null
+++ b/monkestation/code/modules/balloon_alert/balloon_alert.dm
@@ -0,0 +1,5 @@
+/atom/balloon_alert(mob/viewer, text)
+ if(istext(viewer) && isnull(text))
+ stack_trace("Attempted to call balloon_alert with only one argument! This is invalid, but we'll assume that src is the intended viewer.")
+ return ..(src, viewer)
+ return ..()
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm
index 7cf8ea6c97e5..61b4f905b52a 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm
@@ -41,7 +41,7 @@
if(!master || (master == owner.current))
return TRUE
var/datum/antagonist/bloodsucker/bloodsuckerdatum = master.mind.has_antag_datum(/datum/antagonist/bloodsucker)
- if(bloodsuckerdatum && bloodsuckerdatum.broke_masquerade)
+ if(bloodsuckerdatum?.broke_masquerade)
//vassal stealing
return TRUE
to_chat(owner.current, span_danger("[conversion_target]'s mind is overwhelmed with too much external force to put your own!"))
@@ -52,7 +52,7 @@
* time, ranges from 1 at 20 pop to 4 at 40 pop
*/
/datum/antagonist/bloodsucker/proc/return_current_max_vassals()
- var/total_players = GLOB.joined_player_list.len
+ var/total_players = length(GLOB.joined_player_list)
switch(total_players)
if(1 to 20)
return 1
@@ -72,8 +72,7 @@
return FALSE
//Check if they used to be a Vassal and was stolen.
- var/datum/antagonist/vassal/old_vassal = conversion_target.mind.has_antag_datum(/datum/antagonist/vassal)
- if(old_vassal)
+ if(IS_VASSAL(conversion_target))
conversion_target.mind.remove_antag_datum(/datum/antagonist/vassal)
var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.has_antag_datum(/datum/antagonist/bloodsucker)
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_datum.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_datum.dm
index 613f44e9d4fb..ab4a55f220a8 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_datum.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_datum.dm
@@ -341,7 +341,7 @@
// Default Report
var/objectives_complete = TRUE
- if(objectives.len)
+ if(length(objectives))
report += printobjectives(objectives)
for(var/datum/objective/objective in objectives)
if(objective.objective_name == "Optional Objective")
@@ -351,10 +351,10 @@
break
// Now list their vassals
- if(vassals.len)
- report += ""
+ if(length(vassals))
+ report += span_header("Their Vassals were...")
for(var/datum/antagonist/vassal/all_vassals as anything in vassals)
- if(!all_vassals.owner)
+ if(QDELETED(all_vassals?.owner))
continue
var/list/vassal_report = list()
vassal_report += "[all_vassals.owner.name]"
@@ -367,7 +367,7 @@
vassal_report += " and was the Revenge Vassal"
report += vassal_report.Join()
- if(objectives.len == 0 || objectives_complete)
+ if(!length(objectives) || objectives_complete)
report += "The [name] was successful!"
else
report += "The [name] has failed!"
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_flaws.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_flaws.dm
index ec4f8617f7dc..0c218d51879c 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_flaws.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_flaws.dm
@@ -8,24 +8,21 @@
* person_selecting - Mob override for stuff like Admins selecting someone's clan.
*/
/datum/antagonist/bloodsucker/proc/assign_clan_and_bane(mob/person_selecting)
- if(my_clan)
+ if(my_clan || owner.current.has_status_effect(/datum/status_effect/frenzy))
return
- if(owner.current.has_status_effect(/datum/status_effect/frenzy))
- return
- if(!person_selecting)
- person_selecting = owner.current
+ person_selecting ||= owner.current
var/list/options = list()
var/list/radial_display = list()
for(var/datum/bloodsucker_clan/all_clans as anything in typesof(/datum/bloodsucker_clan))
- if(!initial(all_clans.joinable_clan)) //flavortext only
+ if(!all_clans::joinable_clan) //flavortext only
continue
- options[initial(all_clans.name)] = all_clans
+ options[all_clans::name] = all_clans
var/datum/radial_menu_choice/option = new
- option.image = image(icon = initial(all_clans.join_icon), icon_state = initial(all_clans.join_icon_state))
- option.info = "[initial(all_clans.name)] - [span_boldnotice(initial(all_clans.join_description))]"
- radial_display[initial(all_clans.name)] = option
+ option.image = image(icon = all_clans::join_icon, icon_state = all_clans::join_icon_state)
+ option.info = "[all_clans::name] - [span_boldnotice(all_clans::join_description)]"
+ radial_display[all_clans::name] = option
var/chosen_clan = show_radial_menu(person_selecting, owner.current, radial_display)
chosen_clan = options[chosen_clan]
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_frenzy.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_frenzy.dm
index c8ece8cc349c..9f123142c6da 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_frenzy.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_frenzy.dm
@@ -67,7 +67,7 @@
owner.add_client_colour(/datum/client_colour/cursed_heart_blood)
var/obj/cuffs = user.get_item_by_slot(ITEM_SLOT_HANDCUFFED)
var/obj/legcuffs = user.get_item_by_slot(ITEM_SLOT_LEGCUFFED)
- if(user.handcuffed || user.legcuffed)
+ if(!QDELETED(user.handcuffed) || !QDELETED(user.legcuffed))
user.clear_cuffs(cuffs, TRUE)
user.clear_cuffs(legcuffs, TRUE)
bloodsuckerdatum.frenzied = TRUE
@@ -90,6 +90,6 @@
/datum/status_effect/frenzy/tick()
var/mob/living/carbon/human/user = owner
- if(!bloodsuckerdatum.frenzied)
+ if(!bloodsuckerdatum?.frenzied)
return
user.adjustFireLoss(1.5 + (bloodsuckerdatum.humanity_lost / 10))
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_guardian.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_guardian.dm
index 0dc2d13e4a72..b913e05f59c8 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_guardian.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_guardian.dm
@@ -16,7 +16,7 @@
if(length(guardians) && !allow_multiple)
balloon_alert(user, "already have one!")
return
- if(user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling) && !allow_changeling)
+ if(user.mind?.has_antag_datum(/datum/antagonist/changeling) && !allow_changeling)
to_chat(user, ling_failure)
return
if(used)
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_hud.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_hud.dm
index dc3b4aef8586..3b8adbf4efec 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_hud.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_hud.dm
@@ -43,8 +43,7 @@
else if(bloodsucker_blood_volume > BLOOD_VOLUME_BAD)
valuecolor = "#FFAAAA"
- if(blood_display)
- blood_display.maptext = FORMAT_BLOODSUCKER_HUD_TEXT(valuecolor, bloodsucker_blood_volume)
+ blood_display?.maptext = FORMAT_BLOODSUCKER_HUD_TEXT(valuecolor, bloodsucker_blood_volume)
if(vamprank_display)
if(bloodsucker_level_unspent > 0)
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_life.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_life.dm
index a76d864d3215..4c370841d8de 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_life.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_life.dm
@@ -10,10 +10,10 @@
if(!owner)
INVOKE_ASYNC(src, PROC_REF(HandleDeath))
return
- if(HAS_TRAIT(owner.current, TRAIT_NODEATH))
+ if(HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT))
check_end_torpor()
// Deduct Blood
- if(owner.current.stat == CONSCIOUS && !HAS_TRAIT(owner.current, TRAIT_IMMOBILIZED) && !HAS_TRAIT(owner.current, TRAIT_NODEATH))
+ if(owner.current.stat == CONSCIOUS && !HAS_TRAIT(owner.current, TRAIT_IMMOBILIZED) && !HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT))
INVOKE_ASYNC(src, PROC_REF(AddBloodVolume), -BLOODSUCKER_PASSIVE_BLOOD_DRAIN) // -.1 currently
if(HandleHealing())
if((COOLDOWN_FINISHED(src, bloodsucker_spam_healing)) && bloodsucker_blood_volume > 0)
@@ -83,7 +83,7 @@
/datum/antagonist/bloodsucker/proc/HandleHealing(mult = 1)
var/actual_regen = bloodsucker_regen_rate + additional_regen
// Don't heal if I'm staked or on Masquerade (+ not in a Coffin). Masqueraded Bloodsuckers in a Coffin however, will heal.
- if(owner.current.am_staked() || (HAS_TRAIT(owner.current, TRAIT_MASQUERADE) && !HAS_TRAIT(owner.current, TRAIT_NODEATH)))
+ if(owner.current.am_staked() || (HAS_TRAIT(owner.current, TRAIT_MASQUERADE) && !HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT)))
return FALSE
owner.current.adjustCloneLoss(-1 * (actual_regen * 4) * mult, 0)
owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (actual_regen * 4) * mult) //adjustBrainLoss(-1 * (actual_regen * 4) * mult, 0)
@@ -95,7 +95,7 @@
var/fireheal = 0 // BURN: Heal in Coffin while Fakedeath, or when damage above maxhealth (you can never fully heal fire)
// Checks if you're in a coffin here, additionally checks for Torpor right below it.
var/amInCoffin = istype(user.loc, /obj/structure/closet/crate/coffin)
- if(amInCoffin && HAS_TRAIT(user, TRAIT_NODEATH))
+ if(amInCoffin && HAS_TRAIT_FROM(user, TRAIT_NODEATH, TORPOR_TRAIT))
if(HAS_TRAIT(owner.current, TRAIT_MASQUERADE) && (COOLDOWN_FINISHED(src, bloodsucker_spam_healing)))
to_chat(user, span_alert("You do not heal while your Masquerade ability is active."))
COOLDOWN_START(src, bloodsucker_spam_healing, BLOODSUCKER_SPAM_MASQUERADE)
@@ -108,7 +108,7 @@
if(check_limbs(costMult))
return TRUE
// In Torpor, but not in a Coffin? Heal faster anyways.
- else if(HAS_TRAIT(user, TRAIT_NODEATH))
+ else if(HAS_TRAIT_FROM(user, TRAIT_NODEATH, TORPOR_TRAIT))
fireheal = min(user.getFireLoss_nonProsthetic(), actual_regen) / 1.2 // 20% slower than being in a coffin
mult *= 3
// Heal if Damaged
@@ -123,7 +123,7 @@
var/limb_regen_cost = 50 * -costMult
var/mob/living/carbon/user = owner.current
var/list/missing = user.get_missing_limbs()
- if(missing.len && (bloodsucker_blood_volume < limb_regen_cost + 5))
+ if(length(missing) && (bloodsucker_blood_volume < limb_regen_cost + 5))
return FALSE
for(var/missing_limb in missing) //Find ONE Limb and regenerate it.
user.regenerate_limb(missing_limb, FALSE)
@@ -155,7 +155,7 @@
organ.set_organ_damage(0)
if(!HAS_TRAIT(bloodsuckeruser, TRAIT_MASQUERADE))
var/obj/item/organ/internal/heart/current_heart = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_HEART)
- current_heart.beating = FALSE
+ current_heart?.beating = FALSE
var/obj/item/organ/internal/eyes/current_eyes = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_EYES)
if(current_eyes)
current_eyes.flash_protect = max(initial(current_eyes.flash_protect) - 1, FLASH_PROTECTION_SENSITIVE)
@@ -199,7 +199,7 @@
FinalDeath()
return
// Temporary Death? Convert to Torpor.
- if(HAS_TRAIT(owner.current, TRAIT_NODEATH))
+ if(HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT))
return
to_chat(owner.current, span_danger("Your immortal body will not yet relinquish your soul to the abyss. You enter Torpor."))
check_begin_torpor(TRUE)
@@ -215,7 +215,7 @@
if(bloodsucker_blood_volume >= FRENZY_THRESHOLD_EXIT && frenzied)
owner.current.remove_status_effect(/datum/status_effect/frenzy)
// BLOOD_VOLUME_BAD: [224] - Jitter
- if(bloodsucker_blood_volume < BLOOD_VOLUME_BAD && prob(0.5) && !HAS_TRAIT(owner.current, TRAIT_NODEATH) && !HAS_TRAIT(owner.current, TRAIT_MASQUERADE))
+ if(bloodsucker_blood_volume < BLOOD_VOLUME_BAD && prob(0.5) && !HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT) && !HAS_TRAIT(owner.current, TRAIT_MASQUERADE))
owner.current.set_timed_status_effect(3 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
// BLOOD_VOLUME_SURVIVE: [122] - Blur Vision
if(bloodsucker_blood_volume < BLOOD_VOLUME_SURVIVE)
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_misc_procs.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_misc_procs.dm
index 44f1d7373183..198af5c7a787 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_misc_procs.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_misc_procs.dm
@@ -87,7 +87,7 @@
///Disables all powers, accounting for torpor
/datum/antagonist/bloodsucker/proc/DisableAllPowers(forced = FALSE)
for(var/datum/action/cooldown/bloodsucker/power as anything in powers)
- if(forced || ((power.check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT(owner.current, TRAIT_NODEATH)))
+ if(forced || ((power.check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT)))
if(power.active)
power.DeactivatePower()
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_objectives.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_objectives.dm
index 367ecff1796d..187782cd2128 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_objectives.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_objectives.dm
@@ -32,7 +32,7 @@
/// Check Vassals and get their occupations
/datum/objective/bloodsucker/proc/get_vassal_occupations()
var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.has_antag_datum(/datum/antagonist/bloodsucker)
- if(!bloodsuckerdatum || !bloodsuckerdatum.vassals.len)
+ if(!length(bloodsuckerdatum?.vassals))
return FALSE
var/list/all_vassal_jobs = list()
var/vassal_job
@@ -310,7 +310,7 @@
var/list/datum/mind/monsters = list()
for(var/datum/antagonist/monster in GLOB.antagonists)
var/datum/mind/brain = monster.owner
- if(!brain || brain == owner)
+ if(QDELETED(brain) || brain == owner)
continue
if(brain.current.stat == DEAD)
continue
@@ -319,7 +319,7 @@
if(brain.has_antag_datum(/datum/antagonist/changeling))
monsters += brain
- return completed || !monsters.len
+ return completed || !length(monsters)
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_overwrites.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_overwrites.dm
index 542efe455700..4b7131c9a119 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_overwrites.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_overwrites.dm
@@ -20,12 +20,8 @@
/mob/living/carbon/transfer_blood_to(atom/movable/AM, amount, forced)
. = ..()
- if(!mind)
- return
- var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(/datum/antagonist/bloodsucker)
- if(!bloodsuckerdatum)
- return
- bloodsuckerdatum.bloodsucker_blood_volume -= amount
+ var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind?.has_antag_datum(/datum/antagonist/bloodsucker)
+ bloodsuckerdatum?.bloodsucker_blood_volume -= amount
/// Prevents using a Memento Mori
/obj/item/clothing/neck/necklace/memento_mori/memento(mob/living/carbon/human/user)
@@ -42,10 +38,9 @@
// Used when analyzing a Bloodsucker, Masquerade will hide brain traumas (Unless you're a Beefman)
/mob/living/carbon/get_traumas()
- if(!mind)
+ if(QDELETED(mind))
return ..()
- var/datum/antagonist/bloodsucker/bloodsuckerdatum = IS_BLOODSUCKER(src)
- if(bloodsuckerdatum && HAS_TRAIT(src, TRAIT_MASQUERADE))
+ if(IS_BLOODSUCKER(src) && HAS_TRAIT(src, TRAIT_MASQUERADE))
return
return ..()
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm
index 0f06a8d5a7a1..3710f20a6e8a 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm
@@ -23,7 +23,7 @@
/obj/item/soulstone/bloodsucker/get_ghost_to_replace_shade(mob/living/carbon/victim, mob/user)
var/mob/dead/observer/chosen_ghost = victim.get_ghost(FALSE, TRUE)
- if(!chosen_ghost || !chosen_ghost.client)
+ if(QDELETED(chosen_ghost?.client))
victim.dust()
return FALSE
victim.unequip_everything()
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_sol.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_sol.dm
index 6d6e73766c2f..93e5af1852f5 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_sol.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_sol.dm
@@ -66,7 +66,7 @@
if(owner.current.am_staked() && COOLDOWN_FINISHED(src, bloodsucker_spam_sol_burn))
to_chat(owner.current, span_userdanger("You are staked! Remove the offending weapon from your heart before sleeping."))
COOLDOWN_START(src, bloodsucker_spam_sol_burn, BLOODSUCKER_SPAM_SOL) //This should happen twice per Sol
- if(!HAS_TRAIT(owner.current, TRAIT_NODEATH))
+ if(!HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT))
check_begin_torpor(TRUE)
owner.current.add_mood_event("vampsleep", /datum/mood_event/coffinsleep)
return
@@ -122,7 +122,7 @@
var/total_burn = user.getFireLoss_nonProsthetic()
var/total_damage = total_brute + total_burn
/// Checks - Not daylight & Has more than 10 Brute/Burn & not already in Torpor
- if(!SSsunlight.sunlight_active && total_damage >= 10 && !HAS_TRAIT(owner.current, TRAIT_NODEATH))
+ if(!SSsunlight.sunlight_active && total_damage >= 10 && !HAS_TRAIT_FROM(owner.current, TRAIT_NODEATH, TORPOR_TRAIT))
torpor_begin()
/datum/antagonist/bloodsucker/proc/check_end_torpor()
@@ -147,7 +147,7 @@
// Force them to go to sleep
REMOVE_TRAIT(owner.current, TRAIT_SLEEPIMMUNE, BLOODSUCKER_TRAIT)
// Without this, you'll just keep dying while you recover.
- owner.current.add_traits(list(TRAIT_NODEATH, TRAIT_FAKEDEATH, TRAIT_DEATHCOMA, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE), BLOODSUCKER_TRAIT)
+ owner.current.add_traits(list(TRAIT_NODEATH, TRAIT_FAKEDEATH, TRAIT_DEATHCOMA, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE), TORPOR_TRAIT)
owner.current.set_timed_status_effect(0 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
// Disable ALL Powers
DisableAllPowers()
@@ -155,7 +155,7 @@
/datum/antagonist/bloodsucker/proc/torpor_end()
owner.current.grab_ghost()
to_chat(owner.current, span_warning("You have recovered from Torpor."))
- owner.current.remove_traits(list(TRAIT_NODEATH, TRAIT_FAKEDEATH, TRAIT_DEATHCOMA, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE), BLOODSUCKER_TRAIT)
+ REMOVE_TRAITS_IN(owner.current, TORPOR_TRAIT)
if(!HAS_TRAIT(owner.current, TRAIT_MASQUERADE))
ADD_TRAIT(owner.current, TRAIT_SLEEPIMMUNE, BLOODSUCKER_TRAIT)
heal_vampire_organs()
diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_traumas.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_traumas.dm
index 5f0c49f66da5..c7c5ea037ba7 100644
--- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_traumas.dm
+++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_traumas.dm
@@ -56,7 +56,7 @@
// Delete Next Portal if it's time (it will remove its partner)
var/obj/effect/client_image_holder/phobetor/first_on_the_stack = created_firsts[1]
- if(created_firsts.len && world.time >= first_on_the_stack.created_on + first_on_the_stack.exist_length)
+ if(length(created_firsts) && world.time >= first_on_the_stack.created_on + first_on_the_stack.exist_length)
var/targetGate = first_on_the_stack
created_firsts -= targetGate
qdel(targetGate)
diff --git a/monkestation/code/modules/bloodsuckers/clans/_clan_base.dm b/monkestation/code/modules/bloodsuckers/clans/_clan_base.dm
index 2ec636bc03c0..be5c3549ce1a 100644
--- a/monkestation/code/modules/bloodsuckers/clans/_clan_base.dm
+++ b/monkestation/code/modules/bloodsuckers/clans/_clan_base.dm
@@ -150,7 +150,7 @@
if(initial(power.purchase_flags) & BLOODSUCKER_CAN_BUY && !(locate(power) in bloodsuckerdatum.powers))
options[initial(power.name)] = power
- if(options.len < 1)
+ if(length(options) < 1)
to_chat(bloodsuckerdatum.owner.current, span_notice("You grow more ancient by the night!"))
else
// Give them the UI to purchase a power.
@@ -242,7 +242,7 @@
option.info = "[initial(vassaldatums.name)] - [span_boldnotice(initial(vassaldatums.vassal_description))]"
radial_display[initial(vassaldatums.name)] = option
- if(!options.len)
+ if(!length(options))
return
to_chat(bloodsuckerdatum.owner.current, span_notice("You can change who this Vassal is, who are they to you?"))
diff --git a/monkestation/code/modules/bloodsuckers/clans/tremere.dm b/monkestation/code/modules/bloodsuckers/clans/tremere.dm
index 2ad604beb5c4..35e5c8d06609 100644
--- a/monkestation/code/modules/bloodsuckers/clans/tremere.dm
+++ b/monkestation/code/modules/bloodsuckers/clans/tremere.dm
@@ -41,7 +41,7 @@
continue
options[initial(power.name)] = power
- if(options.len < 1)
+ if(length(options) < 1)
to_chat(bloodsuckerdatum.owner.current, span_notice("You grow more ancient by the night!"))
else
// Give them the UI to purchase a power.
diff --git a/monkestation/code/modules/bloodsuckers/clans/venture.dm b/monkestation/code/modules/bloodsuckers/clans/venture.dm
index c68c259e443e..173e6bc7fe29 100644
--- a/monkestation/code/modules/bloodsuckers/clans/venture.dm
+++ b/monkestation/code/modules/bloodsuckers/clans/venture.dm
@@ -32,7 +32,7 @@
if(initial(power.purchase_flags) & VASSAL_CAN_BUY && !(locate(power) in vassaldatum.powers))
options[initial(power.name)] = power
- if(options.len < 1)
+ if(length(options) < 1)
to_chat(bloodsuckerdatum.owner.current, span_notice("You grow more ancient by the night!"))
else
// Give them the UI to purchase a power.
diff --git a/monkestation/code/modules/bloodsuckers/controllers/sunlight.dm b/monkestation/code/modules/bloodsuckers/controllers/sunlight.dm
index 4545647f0c67..fbdc4676532f 100644
--- a/monkestation/code/modules/bloodsuckers/controllers/sunlight.dm
+++ b/monkestation/code/modules/bloodsuckers/controllers/sunlight.dm
@@ -38,7 +38,7 @@ SUBSYSTEM_DEF(sunlight)
issued_XP = FALSE
//randomize the next sol timer
time_til_cycle = round(rand((TIME_BLOODSUCKER_NIGHT-TIME_BLOODSUCKER_SOL_DELAY), (TIME_BLOODSUCKER_NIGHT+TIME_BLOODSUCKER_SOL_DELAY)), 1)
- message_admins("BLOODSUCKER NOTICE: Daylight Ended. Resetting to Night (Lasts for [time_til_cycle / 60] minutes.")
+ message_admins("BLOODSUCKER NOTICE: Daylight Ended. Resetting to Night (Lasts for [DisplayTimeText(time_til_cycle * 0.1)])")
SEND_SIGNAL(src, COMSIG_SOL_END)
warn_daylight(
danger_level = DANGER_LEVEL_SOL_ENDED,
@@ -52,14 +52,14 @@ SUBSYSTEM_DEF(sunlight)
SEND_SIGNAL(src, COMSIG_SOL_NEAR_START)
warn_daylight(
danger_level = DANGER_LEVEL_FIRST_WARNING,
- vampire_warning_message = span_danger("Solar Flares will bombard the station with dangerous UV radiation in [TIME_BLOODSUCKER_DAY_WARN / 60] minutes. Prepare to seek cover in a coffin or closet."),
+ vampire_warning_message = span_danger("Solar Flares will bombard the station with dangerous UV radiation in [DisplayTimeText(TIME_BLOODSUCKER_DAY_WARN * 0.1)]. Prepare to seek cover in a coffin or closet."),
)
if(TIME_BLOODSUCKER_DAY_FINAL_WARN)
- message_admins("BLOODSUCKER NOTICE: Daylight beginning in [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds.)")
+ message_admins("BLOODSUCKER NOTICE: Daylight beginning in [DisplayTimeText(TIME_BLOODSUCKER_DAY_FINAL_WARN * 0.1)].)")
warn_daylight(
danger_level = DANGER_LEVEL_SECOND_WARNING,
- vampire_warning_message = span_userdanger("Solar Flares are about to bombard the station! You have [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds to find cover!"),
- vassal_warning_message = span_danger("In [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds, your master will be at risk of a Solar Flare. Make sure they find cover!"),
+ vampire_warning_message = span_userdanger("Solar Flares are about to bombard the station! You have [DisplayTimeText(TIME_BLOODSUCKER_DAY_FINAL_WARN * 0.1)] to find cover!"),
+ vassal_warning_message = span_danger("In [DisplayTimeText(TIME_BLOODSUCKER_DAY_FINAL_WARN * 0.1)], your master will be at risk of a Solar Flare. Make sure they find cover!"),
)
if(TIME_BLOODSUCKER_BURN_INTERVAL)
warn_daylight(
@@ -70,10 +70,10 @@ SUBSYSTEM_DEF(sunlight)
sunlight_active = TRUE
//set the timer to countdown daytime now.
time_til_cycle = TIME_BLOODSUCKER_DAY
- message_admins("BLOODSUCKER NOTICE: Daylight Beginning (Lasts for [TIME_BLOODSUCKER_DAY / 60] minutes.)")
+ message_admins("BLOODSUCKER NOTICE: Daylight Beginning (Lasts for [DisplayTimeText(TIME_BLOODSUCKER_DAY * 0.1)])")
warn_daylight(
danger_level = DANGER_LEVEL_SOL_ROSE,
- vampire_warning_message = span_userdanger("Solar flares bombard the station with deadly UV light! Stay in cover for the next [TIME_BLOODSUCKER_DAY / 60] minutes or risk Final Death!"),
+ vampire_warning_message = span_userdanger("Solar flares bombard the station with deadly UV light! Stay in cover for the next [DisplayTimeText(TIME_BLOODSUCKER_DAY * 0.1)] or risk Final Death!"),
vassal_warning_message = span_userdanger("Solar flares bombard the station with UV light!"),
)
diff --git a/monkestation/code/modules/bloodsuckers/monster_hunters/hunter_rulesets.dm b/monkestation/code/modules/bloodsuckers/monster_hunters/hunter_rulesets.dm
index aa190a0c2d30..614c1d16825b 100644
--- a/monkestation/code/modules/bloodsuckers/monster_hunters/hunter_rulesets.dm
+++ b/monkestation/code/modules/bloodsuckers/monster_hunters/hunter_rulesets.dm
@@ -44,7 +44,7 @@
living_players -= player
/datum/dynamic_ruleset/midround/monsterhunter/ready(forced = FALSE)
- if(required_candidates > living_players.len)
+ if(required_candidates > length(living_players))
return FALSE
var/count = 0
for(var/datum/antagonist/monster as anything in GLOB.antagonists)
diff --git a/monkestation/code/modules/bloodsuckers/monster_hunters/hunting_contracts.dm b/monkestation/code/modules/bloodsuckers/monster_hunters/hunting_contracts.dm
index 48e2edf69067..a0bfe651d46d 100644
--- a/monkestation/code/modules/bloodsuckers/monster_hunters/hunting_contracts.dm
+++ b/monkestation/code/modules/bloodsuckers/monster_hunters/hunting_contracts.dm
@@ -42,7 +42,7 @@
data["bought"] = bought
data["items"] = list()
data["objectives"] = list()
- if(weapons.len)
+ if(length(weapons))
for(var/datum/hunter_weapons/contraband as anything in weapons)
data["items"] += list(list(
"id" = contraband.type,
diff --git a/monkestation/code/modules/bloodsuckers/powers/_base_power.dm b/monkestation/code/modules/bloodsuckers/powers/_base_power.dm
index ad5fbd493758..8f0d9b3596fc 100644
--- a/monkestation/code/modules/bloodsuckers/powers/_base_power.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/_base_power.dm
@@ -54,7 +54,7 @@
return ..()
/datum/action/cooldown/bloodsucker/IsAvailable(feedback = FALSE)
- return next_use_time <= world.time
+ return COOLDOWN_FINISHED(src, next_use_time)
/datum/action/cooldown/bloodsucker/Grant(mob/user)
. = ..()
@@ -76,7 +76,7 @@
return TRUE
/datum/action/cooldown/bloodsucker/proc/can_pay_cost()
- if(!owner || !owner.mind)
+ if(QDELETED(owner) || QDELETED(owner.mind))
return FALSE
// Cooldown?
if(!COOLDOWN_FINISHED(src, next_use_time))
@@ -108,7 +108,7 @@
if(!isliving(user))
return FALSE
// Torpor?
- if((check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT(user, TRAIT_NODEATH))
+ if((check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT_FROM(user, TRAIT_NODEATH, TORPOR_TRAIT))
to_chat(user, span_warning("Not while you're in Torpor."))
return FALSE
// Frenzy?
@@ -186,9 +186,11 @@
/datum/action/cooldown/bloodsucker/process(seconds_per_tick)
SHOULD_CALL_PARENT(TRUE) //Need this to call parent so the cooldown system works
. = ..()
+ if(!active) // if we're not active anyways, then we shouldn't be processing!!!
+ return PROCESS_KILL
if(!ContinueActive(owner)) // We can't afford the Power? Deactivate it.
DeactivatePower()
- return FALSE
+ return PROCESS_KILL
// We can keep this up (For now), so Pay Cost!
if(!(power_flags & BP_AM_COSTLESS_UNCONSCIOUS) && owner.stat != CONSCIOUS)
if(bloodsuckerdatum_power)
diff --git a/monkestation/code/modules/bloodsuckers/powers/feed.dm b/monkestation/code/modules/bloodsuckers/powers/feed.dm
index c8fb13fbc6fc..e0dc8f11717c 100644
--- a/monkestation/code/modules/bloodsuckers/powers/feed.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/feed.dm
@@ -42,7 +42,7 @@
return TRUE
/datum/action/cooldown/bloodsucker/feed/ContinueActive(mob/living/user, mob/living/target)
- if(!target)
+ if(QDELETED(user) || QDELETED(target))
return FALSE
if(!user.Adjacent(target))
return FALSE
@@ -50,8 +50,8 @@
/datum/action/cooldown/bloodsucker/feed/DeactivatePower()
var/mob/living/user = owner
- if(target_ref)
- var/mob/living/feed_target = target_ref.resolve()
+ var/mob/living/feed_target = target_ref?.resolve()
+ if(!QDELETED(feed_target))
log_combat(user, feed_target, "fed on blood", addition="(and took [blood_taken] blood)")
to_chat(user, span_notice("You slowly release [feed_target]."))
if(feed_target.stat == DEAD)
@@ -105,7 +105,7 @@
//check if we were seen
for(var/mob/living/watchers in oviewers(FEED_NOTICE_RANGE) - feed_target)
- if(!watchers.client)
+ if(QDELETED(watchers.client))
continue
if(watchers.has_unlimited_silicon_privilege)
continue
@@ -127,7 +127,10 @@
if(!active) //If we aren't active (running on SSfastprocess)
return ..() //Manage our cooldown timers
var/mob/living/user = owner
- var/mob/living/feed_target = target_ref.resolve()
+ var/mob/living/feed_target = target_ref?.resolve()
+ if(QDELETED(feed_target))
+ DeactivatePower()
+ return PROCESS_KILL
if(!ContinueActive(user, feed_target))
if(!silent_feed)
user.visible_message(
@@ -149,7 +152,7 @@
feed_target.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = CANT_WOUND)
INVOKE_ASYNC(feed_target, TYPE_PROC_REF(/mob, emote), "scream")
DeactivatePower()
- return
+ return PROCESS_KILL
var/feed_strength_mult = 0
if(bloodsuckerdatum_power.frenzied)
@@ -163,7 +166,7 @@
if(feed_strength_mult > 5 && feed_target.stat < DEAD)
user.add_mood_event("drankblood", /datum/mood_event/drankblood)
// Drank mindless as Ventrue? - BAD
- if((bloodsuckerdatum_power.my_clan && bloodsuckerdatum_power.my_clan.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY) && !feed_target.mind)
+ if(bloodsuckerdatum_power.my_clan?.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY && QDELETED(feed_target.mind))
user.add_mood_event("drankblood", /datum/mood_event/drankblood_bad)
if(feed_target.stat >= DEAD)
user.add_mood_event("drankblood", /datum/mood_event/drankblood_dead)
@@ -180,18 +183,18 @@
if(bloodsuckerdatum_power.bloodsucker_blood_volume >= bloodsuckerdatum_power.max_blood_volume)
user.balloon_alert(owner, "full on blood!")
DeactivatePower()
- return
+ return PROCESS_KILL
if(feed_target.blood_volume <= 0)
user.balloon_alert(owner, "no blood left!")
DeactivatePower()
- return
+ return PROCESS_KILL
owner.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, TRUE)
//play sound to target to show they're dying.
if(owner.pulling == feed_target && owner.grab_state >= GRAB_AGGRESSIVE)
feed_target.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, TRUE)
/datum/action/cooldown/bloodsucker/feed/proc/find_target()
- if(owner.pulling && isliving(owner.pulling))
+ if(isliving(owner.pulling) && !QDELING(owner.pulling))
if(!can_feed_from(owner.pulling, give_warnings = TRUE))
return FALSE
target_ref = WEAKREF(owner.pulling)
@@ -221,7 +224,7 @@
/datum/action/cooldown/bloodsucker/feed/proc/can_feed_from(mob/living/target, give_warnings = FALSE)
if(istype(target, /mob/living/basic/mouse))
- if(bloodsuckerdatum_power.my_clan && bloodsuckerdatum_power.my_clan.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY)
+ if(bloodsuckerdatum_power.my_clan?.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY)
if(give_warnings)
owner.balloon_alert(owner, "too disgusting!")
return FALSE
@@ -239,7 +242,7 @@
if(give_warnings)
owner.balloon_alert(owner, "suit too thick!")
return FALSE
- if((bloodsuckerdatum_power.my_clan && bloodsuckerdatum_power.my_clan.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY) && !target_user.mind && !bloodsuckerdatum_power.frenzied)
+ if(bloodsuckerdatum_power.my_clan?.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY && QDELETED(target_user.mind) && !bloodsuckerdatum_power.frenzied)
if(give_warnings)
owner.balloon_alert(owner, "cant drink from mindless!")
return FALSE
diff --git a/monkestation/code/modules/bloodsuckers/powers/go_home.dm b/monkestation/code/modules/bloodsuckers/powers/go_home.dm
index 5b55a8ec9c64..2ed6e80df16f 100644
--- a/monkestation/code/modules/bloodsuckers/powers/go_home.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/go_home.dm
@@ -38,7 +38,7 @@
if(!.)
return FALSE
/// Have No Lair (NOTE: You only got this power if you had a lair, so this means it's destroyed)
- if(!istype(bloodsuckerdatum_power) || !bloodsuckerdatum_power.coffin)
+ if(!istype(bloodsuckerdatum_power) || QDELETED(bloodsuckerdatum_power.coffin))
owner.balloon_alert(owner, "coffin was destroyed!")
return FALSE
return TRUE
@@ -69,7 +69,7 @@
return FALSE
if(!isturf(owner.loc))
return FALSE
- if(!bloodsuckerdatum_power.coffin)
+ if(QDELETED(bloodsuckerdatum_power.coffin))
user.balloon_alert(user, "coffin destroyed!")
to_chat(owner, span_warning("Your coffin has been destroyed! You no longer have a destination."))
return FALSE
@@ -84,9 +84,9 @@
var/drop_item = FALSE
var/turf/current_turf = get_turf(owner)
// If we aren't in the dark, anyone watching us will cause us to drop out stuff
- if(current_turf && current_turf.lighting_object && current_turf.get_lumcount() >= 0.2)
+ if(!QDELETED(current_turf?.lighting_object) && current_turf.get_lumcount() >= 0.2)
for(var/mob/living/watchers in viewers(world.view, get_turf(owner)) - owner)
- if(!watchers.client)
+ if(QDELETED(watchers.client))
continue
if(watchers.has_unlimited_silicon_privilege)
continue
diff --git a/monkestation/code/modules/bloodsuckers/powers/targeted/_base_targeted.dm b/monkestation/code/modules/bloodsuckers/powers/targeted/_base_targeted.dm
index 629d0c8dbeea..0be110110c32 100644
--- a/monkestation/code/modules/bloodsuckers/powers/targeted/_base_targeted.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/targeted/_base_targeted.dm
@@ -22,7 +22,7 @@
unset_click_ability(remove_from)
/datum/action/cooldown/bloodsucker/targeted/Trigger(trigger_flags, atom/target)
- if((active) && can_deactivate())
+ if(active && can_deactivate())
DeactivatePower()
return FALSE
if(!can_pay_cost(owner) || !can_use(owner, trigger_flags))
@@ -32,7 +32,7 @@
to_chat(owner, span_announce("[prefire_message]"))
ActivatePower(trigger_flags)
- if(target)
+ if(!QDELETED(target))
return InterceptClickOn(owner, null, target)
return set_click_ability(owner)
diff --git a/monkestation/code/modules/bloodsuckers/powers/targeted/brawn.dm b/monkestation/code/modules/bloodsuckers/powers/targeted/brawn.dm
index 23ae039e1468..bef71df41110 100644
--- a/monkestation/code/modules/bloodsuckers/powers/targeted/brawn.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/targeted/brawn.dm
@@ -78,11 +78,7 @@
// This is its own proc because its done twice, to repeat code copypaste.
/datum/action/cooldown/bloodsucker/targeted/brawn/proc/break_closet(mob/living/carbon/human/user, obj/structure/closet/closet)
- if(closet)
- closet.welded = FALSE
- closet.locked = FALSE
- closet.broken = TRUE
- closet.open()
+ closet?.bust_open()
/datum/action/cooldown/bloodsucker/targeted/brawn/proc/escape_puller()
if(!owner.pulledby) // || owner.pulledby.grab_state <= GRAB_PASSIVE)
diff --git a/monkestation/code/modules/bloodsuckers/powers/targeted/lunge.dm b/monkestation/code/modules/bloodsuckers/powers/targeted/lunge.dm
index d43420807c48..543819c68cff 100644
--- a/monkestation/code/modules/bloodsuckers/powers/targeted/lunge.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/targeted/lunge.dm
@@ -29,10 +29,10 @@
if(!.)
return FALSE
// Are we being grabbed?
- if(user.pulledby && user.pulledby.grab_state >= GRAB_AGGRESSIVE)
+ if(!QDELETED(user.pulledby) && user.pulledby.grab_state >= GRAB_AGGRESSIVE)
owner.balloon_alert(user, "grabbed!")
return FALSE
- if(user.pulling)
+ if(!QDELETED(user.pulling))
owner.balloon_alert(user, "grabbing someone!")
return FALSE
return TRUE
diff --git a/monkestation/code/modules/bloodsuckers/powers/targeted/mesmerize.dm b/monkestation/code/modules/bloodsuckers/powers/targeted/mesmerize.dm
index 2c3f038bdf85..e783221ba7ba 100644
--- a/monkestation/code/modules/bloodsuckers/powers/targeted/mesmerize.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/targeted/mesmerize.dm
@@ -66,7 +66,7 @@
return FALSE
// Dead/Unconscious
if(current_target.stat > CONSCIOUS)
- owner.balloon_alert(owner, "[current_target] is not [(current_target.stat == DEAD || HAS_TRAIT(current_target, TRAIT_FAKEDEATH)) ? "alive" : "conscious"].")
+ owner.balloon_alert(owner, "[current_target] is not [(current_target.stat == DEAD || HAS_TRAIT_NOT_FROM(current_target, TRAIT_FAKEDEATH, SPECIES_TRAIT)) ? "alive" : "conscious"].")
return FALSE
// Target has eyes?
if(!current_target.get_organ_slot(ORGAN_SLOT_EYES) && !issilicon(current_target))
@@ -108,22 +108,22 @@
if(!do_after(user, 4 SECONDS, mesmerized_target, NONE, TRUE, extra_checks = CALLBACK(src, PROC_REF(ContinueActive), user, mesmerized_target)))
return
- var/power_time = 9 SECONDS + level_current * 1.5 SECONDS
+ var/power_time = (9 SECONDS) + level_current * (1.5 SECONDS)
if(IS_MONSTERHUNTER(mesmerized_target))
to_chat(mesmerized_target, span_notice("You feel your eyes burn for a while, but it passes."))
return
- if(HAS_TRAIT_FROM(mesmerized_target, TRAIT_MUTE, BLOODSUCKER_TRAIT))
+ if(HAS_TRAIT_FROM(mesmerized_target, TRAIT_MUTE, MESMERIZED_TRAIT))
owner.balloon_alert(owner, "[mesmerized_target] is already in a hypnotic gaze.")
return
if(iscarbon(mesmerized_target))
owner.balloon_alert(owner, "successfully mesmerized [mesmerized_target].")
if(level_current >= 2)
- ADD_TRAIT(mesmerized_target, TRAIT_MUTE, BLOODSUCKER_TRAIT)
+ ADD_TRAIT(mesmerized_target, TRAIT_MUTE, MESMERIZED_TRAIT)
mesmerized_target.Immobilize(power_time)
mesmerized_target.adjust_silence(power_time)
//mesmerized_target.silent += power_time / 10 // Silent isn't based on ticks.
- mesmerized_target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move // mesmerized_target.changeNext_move(power_time) // check click.dm
- ADD_TRAIT(mesmerized_target, TRAIT_NO_TRANSFORM, BLOODSUCKER_TRAIT)// <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
+ COOLDOWN_START(mesmerized_target, next_move, power_time) // <--- Use direct change instead. We want an unmodified delay to their next move // mesmerized_target.changeNext_move(power_time) // check click.dm
+ ADD_TRAIT(mesmerized_target, TRAIT_NO_TRANSFORM, MESMERIZED_TRAIT)// <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
addtimer(CALLBACK(src, PROC_REF(end_mesmerize), user, mesmerized_target), power_time)
power_activated_sucessfully() // PAY COST! BEGIN COOLDOWN!
@@ -132,8 +132,7 @@
. = ..()
/datum/action/cooldown/bloodsucker/targeted/mesmerize/proc/end_mesmerize(mob/living/user, mob/living/target)
- REMOVE_TRAIT(target, TRAIT_NO_TRANSFORM, BLOODSUCKER_TRAIT)
- REMOVE_TRAIT(target, TRAIT_MUTE, BLOODSUCKER_TRAIT)
+ REMOVE_TRAITS_IN(target, MESMERIZED_TRAIT)
// They Woke Up! (Notice if within view)
if(istype(user) && target.stat == CONSCIOUS && (target in view(6, get_turf(user))))
owner.balloon_alert(owner, "[target] snapped out of their trance.")
diff --git a/monkestation/code/modules/bloodsuckers/powers/targeted/trespass.dm b/monkestation/code/modules/bloodsuckers/powers/targeted/trespass.dm
index 2671c281a987..93fc78d9c9ed 100644
--- a/monkestation/code/modules/bloodsuckers/powers/targeted/trespass.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/targeted/trespass.dm
@@ -71,7 +71,7 @@
)
// Effect Origin
var/sound_strength = max(60, 70 - level_current * 10)
- playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', sound_strength, 1)
+ playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', vol = sound_strength, vary = TRUE)
var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread()
puff.set_up(3, 0, my_turf)
puff.start()
@@ -99,7 +99,7 @@
user.density = 1
user.invisibility = invis_was
// Effect Destination
- playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', 60, 1)
+ playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', vol = 60, vary = TRUE)
puff = new /datum/effect_system/steam_spread/()
puff.effect_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke
puff.set_up(3, 0, target_turf)
diff --git a/monkestation/code/modules/bloodsuckers/powers/vassal/vassal_fold.dm b/monkestation/code/modules/bloodsuckers/powers/vassal/vassal_fold.dm
index ddafc6f15f90..b768a32b7571 100644
--- a/monkestation/code/modules/bloodsuckers/powers/vassal/vassal_fold.dm
+++ b/monkestation/code/modules/bloodsuckers/powers/vassal/vassal_fold.dm
@@ -27,7 +27,7 @@
return FALSE
if(trigger_flags & TRIGGER_SECONDARY_ACTION)
- if(!revenge_vassal.ex_vassals.len)
+ if(!length(revenge_vassal.ex_vassals))
owner.balloon_alert(owner, "no vassals!")
return FALSE
return TRUE
diff --git a/monkestation/code/modules/bloodsuckers/structures/bloodsucker_objects.dm b/monkestation/code/modules/bloodsuckers/structures/bloodsucker_objects.dm
index e0f079cf9e77..817d0347f045 100644
--- a/monkestation/code/modules/bloodsuckers/structures/bloodsucker_objects.dm
+++ b/monkestation/code/modules/bloodsuckers/structures/bloodsucker_objects.dm
@@ -93,7 +93,7 @@
return TRUE
if(stat >= UNCONSCIOUS)
return TRUE
- if(HAS_TRAIT(src, TRAIT_NODEATH))
+ if(HAS_TRAIT_FROM(src, TRAIT_NODEATH, TORPOR_TRAIT))
return TRUE
return FALSE
diff --git a/monkestation/code/modules/bloodsuckers/vassals/types/revenge.dm b/monkestation/code/modules/bloodsuckers/vassals/types/revenge.dm
index cd59223a6aa6..32ca44cec90c 100644
--- a/monkestation/code/modules/bloodsuckers/vassals/types/revenge.dm
+++ b/monkestation/code/modules/bloodsuckers/vassals/types/revenge.dm
@@ -20,12 +20,12 @@
/datum/antagonist/vassal/revenge/roundend_report()
var/list/report = list()
report += printplayer(owner)
- if(objectives.len)
+ if(length(objectives))
report += printobjectives(objectives)
// Now list their vassals
- if(ex_vassals.len)
- report += ""
+ if(length(ex_vassals))
+ report += span_header("The Vassals brought back into the fold were...")
for(var/datum/antagonist/ex_vassal/all_vassals as anything in ex_vassals)
if(!all_vassals.owner)
continue
diff --git a/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm b/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm
index caded862b530..8bb5aad0410e 100644
--- a/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm
+++ b/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm
@@ -100,7 +100,7 @@
UnregisterSignal(owner.current, COMSIG_ATOM_EXAMINE)
UnregisterSignal(SSsunlight, COMSIG_SOL_WARNING_GIVEN)
//Free them from their Master
- if(master && master.owner)
+ if(!QDELETED(master?.owner))
if(special_type && master.special_vassals[special_type])
master.special_vassals[special_type] -= src
master.vassals -= src
@@ -109,7 +109,7 @@
for(var/allstatus_traits in owner.current._status_traits)
REMOVE_TRAIT(owner.current, allstatus_traits, BLOODSUCKER_TRAIT)
//Remove Recuperate Power
- while(powers.len)
+ while(length(powers))
var/datum/action/cooldown/bloodsucker/power = pick(powers)
powers -= power
power.Remove(owner.current)
diff --git a/monkestation/code/modules/bloodsuckers/vassals/vassal_misc_procs.dm b/monkestation/code/modules/bloodsuckers/vassals/vassal_misc_procs.dm
index 042a0ee3f644..21fad31fa24e 100644
--- a/monkestation/code/modules/bloodsuckers/vassals/vassal_misc_procs.dm
+++ b/monkestation/code/modules/bloodsuckers/vassals/vassal_misc_procs.dm
@@ -69,4 +69,4 @@
//send alerts of completion
to_chat(master, span_danger("You have turned [vassal_owner.current] into your [vassaldatum.name]! They will no longer be deconverted upon Mindshielding!"))
to_chat(vassal_owner, span_notice("As Blood drips over your body, you feel closer to your Master... You are now the Favorite Vassal!"))
- vassal_owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 75, FALSE, pressure_affected = FALSE)
+ vassal_owner.current.playsound_local(null, 'sound/magic/mutate.ogg', vol = 75, vary = FALSE, pressure_affected = FALSE)
diff --git a/monkestation/code/modules/cassettes/machines/media/jukebox.dm b/monkestation/code/modules/cassettes/machines/media/jukebox.dm
index 6926bfcdde76..7c117a531ef3 100644
--- a/monkestation/code/modules/cassettes/machines/media/jukebox.dm
+++ b/monkestation/code/modules/cassettes/machines/media/jukebox.dm
@@ -98,7 +98,7 @@
if(default_deconstruction_screwdriver(user, W))
return
- if(default_deconstruction_crowbar(user, W))
+ if(default_deconstruction_crowbar(W))
return
if(W.tool_behaviour == TOOL_WRENCH)
if(playing)
@@ -220,7 +220,7 @@
if(default_deconstruction_screwdriver(user, W))
return
- if(default_deconstruction_crowbar(user, W))
+ if(default_deconstruction_crowbar(W))
return
if(W.tool_behaviour == TOOL_WRENCH)
if(playing)
diff --git a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
index 71f6524ee833..2ad3e7a4f200 100644
--- a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
+++ b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
@@ -247,6 +247,7 @@
"Convict",
"Felon",
"Inmate",
+ "Gamer",
)
/datum/job/psychologist
diff --git a/monkestation/code/modules/client/preferences/species_features/ethereal.dm b/monkestation/code/modules/client/preferences/species_features/ethereal.dm
new file mode 100644
index 000000000000..d0b79ffe1e9a
--- /dev/null
+++ b/monkestation/code/modules/client/preferences/species_features/ethereal.dm
@@ -0,0 +1,33 @@
+/datum/preference/choiced/ethereal_horns
+ savefile_key = "feature_ethereal_horns"
+ savefile_identifier = PREFERENCE_CHARACTER
+ category = PREFERENCE_CATEGORY_FEATURES
+ main_feature_name = "Ethereal Horns"
+ should_generate_icons = TRUE
+
+/datum/preference/choiced/ethereal_horns/init_possible_values()
+ return possible_values_for_sprite_accessory_list_for_body_part(
+ GLOB.ethereal_horns_list,
+ "ethereal_horns",
+ list("ADJ", "FRONT"),
+ )
+
+/datum/preference/choiced/ethereal_horns/apply_to_human(mob/living/carbon/human/target, value)
+ target.dna.features["ethereal_horns"] = value
+
+/datum/preference/choiced/ethereal_tail
+ savefile_key = "feature_ethereal_tail"
+ savefile_identifier = PREFERENCE_CHARACTER
+ category = PREFERENCE_CATEGORY_FEATURES
+ main_feature_name = "Ethereal Tail"
+ should_generate_icons = TRUE
+
+/datum/preference/choiced/ethereal_tail/init_possible_values()
+ return possible_values_for_sprite_accessory_list_for_body_part(
+ GLOB.ethereal_tail_list,
+ "ethereal_tail",
+ list("BEHIND", "FRONT"),
+ )
+
+/datum/preference/choiced/ethereal_tail/apply_to_human(mob/living/carbon/human/target, value)
+ target.dna.features["ethereal_tail"] = value
diff --git a/monkestation/code/modules/clothing/head/misc.dm b/monkestation/code/modules/clothing/head/misc.dm
index 7d49579577e5..1cbd1f14d7f0 100644
--- a/monkestation/code/modules/clothing/head/misc.dm
+++ b/monkestation/code/modules/clothing/head/misc.dm
@@ -30,40 +30,36 @@
set category = "Object"
set src in usr
- if(!isliving(usr))
+ if(!isliving(usr) || !can_use(usr) || !length(contents))
return
- if(!can_use(usr))
- return
- if(src.contents)
- update_hats(REMOVE_HAT,usr)
+ update_hats(REMOVE_HAT, usr)
/obj/item/clothing/head/proc/restore_initial() //Why can't initial() be called directly by something?
name = initial(name)
desc = initial(desc)
-/obj/item/clothing/head/proc/throw_hats(var/hat_count, var/turf/wearer_location, var/mob/user)
+/obj/item/clothing/head/proc/throw_hats(hat_count, turf/wearer_location, mob/user)
for(var/obj/item/clothing/head/throwing_hat in contents)
var/destination = get_edge_target_turf(wearer_location, pick(GLOB.alldirs))
if(!hat_count) //Only throw X number of hats
break
throwing_hat.forceMove(wearer_location)
- throwing_hat.throw_at(destination, rand(1,4), 10)
+ throwing_hat.throw_at(destination, rand(1, 4), 10)
hat_count--
- update_hats(0, user)
+ update_hats(NONE, user)
if(user)
- user.visible_message("[user]'s hats go flying off!")
-
-/obj/item/clothing/head/proc/update_hats(var/hat_removal, var/mob/living/user)
+ user.visible_message(span_warning("[user]'s hats go flying off!"))
+/obj/item/clothing/head/proc/update_hats(hat_removal, mob/living/user)
if(hat_removal)
- var/obj/item/clothing/head/hat_to_remove = contents[contents.len] //Get the last item in the hat and hand it to the user.
+ var/obj/item/clothing/head/hat_to_remove = contents[length(contents)] //Get the last item in the hat and hand it to the user.
hat_to_remove.restore_initial()
- remove_verb(hat_to_remove, /obj/item/clothing/head/verb/detach_stacked_hat)
+ remove_verb(user, /obj/item/clothing/head/verb/detach_stacked_hat)
user.put_in_hands(hat_to_remove)
cut_overlays()
- if(contents)
+ if(length(contents))
//This section prepares the in-hand and on-ground icon states for the hats.
var/current_hat = 1
for(var/obj/item/clothing/head/selected_hat in contents)
@@ -79,7 +75,7 @@
add_verb(user, /obj/item/clothing/head/verb/detach_stacked_hat) //Verb for removing hats.
- switch(contents.len) //Section for naming/description
+ switch(length(contents)) //Section for naming/description
if(0)
name = initial(name)
desc = initial(desc)
diff --git a/monkestation/code/modules/cybernetics/augments/_base_changes.dm b/monkestation/code/modules/cybernetics/augments/_base_changes.dm
index 6bc28c0510a8..b4efe1b01517 100644
--- a/monkestation/code/modules/cybernetics/augments/_base_changes.dm
+++ b/monkestation/code/modules/cybernetics/augments/_base_changes.dm
@@ -16,17 +16,14 @@
///how many times we failed to hack this
var/failed_count = 0
-/obj/item/organ/internal/cyberimp/New(mob/M = null)
- if(iscarbon(M))
- src.Insert(M)
+/obj/item/organ/internal/cyberimp/Initialize(mapload)
+ . = ..()
+ if(iscarbon(loc))
+ Insert(loc)
if(implant_overlay) // <- this is old code that is better replaced with bodypart_overlays
var/mutable_appearance/overlay = mutable_appearance(icon, implant_overlay)
overlay.color = implant_color
add_overlay(overlay)
- return ..()
-
-/obj/item/organ/internal/cyberimp/Initialize(mapload)
- . = ..()
update_icon()
/obj/item/organ/internal/cyberimp/Destroy()
@@ -37,44 +34,48 @@
/obj/item/organ/internal/cyberimp/examine(mob/user)
. = ..()
if(hacked)
- . += "It seems to have been tinkered with."
+ . += span_warning("It seems to have been tinkered with.")
if(HAS_TRAIT(user, TRAIT_DIAGNOSTIC_HUD) || HAS_TRAIT(user, TRAIT_MEDICAL_HUD))
var/display = ""
var/list/check_list = encode_info[SECURITY_PROTOCOL]
- if(check_list.len)
+ if(length(check_list))
for(var/security in check_list)
display += "[uppertext(security)], "
- . += "It's security protocols are [display] for the implant to function it requires at least one of them to be shared with the cyberlink."
+ . += span_notice("Its security protocols are [display] for the implant to function it requires at least one of them to be shared with the cyberlink.")
+ else
+ . += span_notice("It does not require any security protocols.")
check_list = encode_info[ENCODE_PROTOCOL]
- if(check_list.len)
+ if(length(check_list))
display = ""
for(var/encode in check_list)
display += "[uppertext(encode)], "
- . += "It's encoding protocols are [display] for the implant to function it requires at least one of them to be shared with the cyberlink."
+ . += span_notice("Its encoding protocols are [display] for the implant to function it requires at least one of them to be shared with the cyberlink.")
+ else
+ . += "It does not require any encoding protocols."
check_list = encode_info[OPERATING_PROTOCOL]
- if(check_list.len)
+ if(length(check_list))
display = ""
for(var/operating in check_list)
display += "[uppertext(operating)], "
- . += "It's operating protocols are [display]for the implant to function it requires the operating protocols match the cyberlink's."
+ . += span_notice("Its operating protocols are [display]for the implant to function it requires the operating protocols match the cyberlink's.")
+ else
+ . += span_notice("It does not require any operating protocols.")
else
- . += "You can see the encoding information of this implant by wearing a diagnostic hud or medical hud."
+ . += span_notice("You can see the encoding information of this implant by wearing a diagnostic hud or medical hud.")
/obj/item/organ/internal/cyberimp/emp_act(severity)
. = ..()
- if(severity == EMP_HEAVY && prob(5) && !owner)
- to_chat(owner," cyberlink beeps: ERR03 HEAVY ELECTROMAGNETIC MALFUNCTION DETECTED IN [uppertext(name)].DAMAGE DETECTED, INTERNAL MEMORY DAMAGED. ")
+ if(severity == EMP_HEAVY && prob(5) && QDELETED(owner))
+ to_chat(owner, span_danger("cyberlink beeps: ERR03 HEAVY ELECTROMAGNETIC MALFUNCTION DETECTED IN [uppertext(name)].DAMAGE DETECTED, INTERNAL MEMORY DAMAGED."))
random_encode()
else
- to_chat(owner," cyberlink beeps: ERR02 ELECTROMAGNETIC MALFUNCTION DETECTED IN [uppertext(name)] ")
+ to_chat(owner, span_danger("cyberlink beeps: ERR02 ELECTROMAGNETIC MALFUNCTION DETECTED IN [uppertext(name)]"))
/obj/item/organ/internal/cyberimp/Insert(mob/living/carbon/receiver, special, drop_if_replaced)
var/obj/item/bodypart/limb = receiver.get_bodypart(deprecise_zone(zone))
. = ..()
if(visual_implant)
- if(!.)
- return
- if(!limb)
+ if(!. || QDELETED(limb))
return FALSE
ownerlimb = limb
@@ -159,12 +160,8 @@
var/obj/item/cyberlink_connector/connector
var/extended = FALSE
-/obj/item/organ/internal/cyberimp/cyberlink/Insert(mob/living/carbon/M, special, drop_if_replaced)
- for(var/X in M.organs)
- var/obj/item/organ/O = X
- if(!istype(O,/obj/item/organ/internal/cyberimp))
- continue
- var/obj/item/organ/internal/cyberimp/cyber = O
+/obj/item/organ/internal/cyberimp/cyberlink/Insert(mob/living/carbon/user, special, drop_if_replaced)
+ for(var/obj/item/organ/internal/cyberimp/cyber in user.organs)
cyber.update_implants()
return ..()
diff --git a/monkestation/code/modules/cybernetics/augments/chest_augments.dm b/monkestation/code/modules/cybernetics/augments/chest_augments.dm
index 8605335cb4d4..073dcbfc7b1a 100644
--- a/monkestation/code/modules/cybernetics/augments/chest_augments.dm
+++ b/monkestation/code/modules/cybernetics/augments/chest_augments.dm
@@ -5,9 +5,9 @@
icon_state = "implant-toolkit"
w_class = WEIGHT_CLASS_SMALL
encode_info = AUGMENT_NT_LOWLEVEL
-
- var/double_legged = FALSE
+ implant_overlay = "chest_implant_overlay"
slot = ORGAN_SLOT_SPINAL
+ var/double_legged = FALSE
/datum/action/item_action/organ_action/sandy
name = "Sandevistan Activation"
diff --git a/monkestation/code/modules/cybernetics/elements/dancing.dm b/monkestation/code/modules/cybernetics/elements/dancing.dm
index 113b9f15d218..eba79e3c7607 100644
--- a/monkestation/code/modules/cybernetics/elements/dancing.dm
+++ b/monkestation/code/modules/cybernetics/elements/dancing.dm
@@ -103,7 +103,7 @@
INVOKE_ASYNC(chosen_dance, TYPE_PROC_REF(/datum/dance, trigger_dance), parent)
//ADD_TRAIT(target, TRAIT_IMMOBILIZED, trait_source)
ADD_TRAIT(parent, TRAIT_DANCING, trait_source)
- RegisterSignal(parent, dancing_stop_signals, PROC_REF(stop_dancing))
+ RegisterSignals(parent, dancing_stop_signals, PROC_REF(stop_dancing))
/datum/component/dancing/Destroy(force, silent)
REMOVE_TRAIT(parent, TRAIT_DANCING, trait_source)
diff --git a/monkestation/code/modules/cybernetics/implant_items/cyberlink_connector.dm b/monkestation/code/modules/cybernetics/implant_items/cyberlink_connector.dm
index e6fd30c12301..b0a44b2a6b80 100644
--- a/monkestation/code/modules/cybernetics/implant_items/cyberlink_connector.dm
+++ b/monkestation/code/modules/cybernetics/implant_items/cyberlink_connector.dm
@@ -25,7 +25,7 @@
/obj/item/cyberlink_connector/Destroy()
. = ..()
parent_cyberlink = null
- if(linked_target)
+ if(!QDELETED(linked_target))
qdel(linked_target.GetComponent(/datum/component/leash))
linked_target = null
cleanup()
@@ -40,7 +40,7 @@
return
if(ishuman(target))
- if(linked_target && (target != linked_target))
+ if(!QDELETED(linked_target) && (target != linked_target))
return
if(target != user)
return
@@ -66,9 +66,9 @@
if(!istype(target,/obj/item/organ/internal/cyberimp) || istype(target,/obj/item/organ/internal/cyberimp/cyberlink))
return
- if(!parent_cyberlink)
+ if(QDELETED(parent_cyberlink))
var/obj/item/organ/internal/cyberimp/cyberlink/link = user.get_organ_slot(ORGAN_SLOT_LINK)
- if(!link)
+ if(QDELETED(link))
to_chat(user, span_notice("NO CYBERLINK DETECTED") )
return
parent_cyberlink = link
@@ -104,7 +104,7 @@
size = max(4, size--)
diffrences = max(1, diffrences--)
- if(!game_list.len)
+ if(!length(game_list))
for(var/i in 1 to diffrences)
var/datum/hacking_minigame/game = new/datum/hacking_minigame(size)
game.generate()
@@ -114,7 +114,7 @@
/obj/item/cyberlink_connector/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
- if(!isliving(user))
+ if(!isliving(user) || !isliving(target))
return
var/mob/living/target_living = target
var/obj/item/organ/internal/cyberimp/cyberlink/link = target_living.get_organ_slot(ORGAN_SLOT_LINK)
@@ -130,12 +130,12 @@
/obj/item/cyberlink_connector/AltClick(mob/user)
. = ..()
- if(!linked_target)
+ if(QDELETED(linked_target))
return
clear_target_link()
/obj/item/cyberlink_connector/proc/clear_target_link()
- if(linked_target)
+ if(!QDELETED(linked_target))
qdel(linked_target.GetComponent(/datum/component/leash))
linked_target = null
@@ -148,7 +148,7 @@
/obj/item/cyberlink_connector/proc/hack_success(success as num)
var/mob/living/to_display = current_user
- if(linked_target)
+ if(!QDELETED(linked_target))
to_display = linked_target
for(var/info in cybernetic.encode_info)
if(cybernetic.encode_info[info] == NO_PROTOCOL)
@@ -166,7 +166,7 @@
/obj/item/cyberlink_connector/proc/hack_failure(failed as num)
var/chance = rand(0, 40*failed)
var/mob/living/to_damage = current_user
- if(linked_target)
+ if(!QDELETED(linked_target))
to_damage = linked_target
switch(chance)
if(0 to 25)
@@ -212,7 +212,7 @@
failed++
if(finished)
- hack_success(game_list.len)
+ hack_success(length(game_list))
if(end_game)
hack_failure(failed)
diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm
index 03e5e58682e4..c9cc62d8adc4 100644
--- a/monkestation/code/modules/donator/code/datum/loadout.dm
+++ b/monkestation/code/modules/donator/code/datum/loadout.dm
@@ -1,3 +1,23 @@
+//assorted plushes
+/datum/loadout_item/toys/pim
+ name = "Pim Plush"
+ item_path = /obj/item/toy/plush/pim
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/toys/glep
+ name = "Glep Plush"
+ item_path = /obj/item/toy/plush/glep
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/toys/mr_frog
+ name = "Mr. Frog Plush"
+ item_path = /obj/item/toy/plush/mr_frog
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+
//bidlink
/datum/loadout_item/suit/cirno_outfit
@@ -394,6 +414,7 @@
item_path = /obj/item/clothing/neck/bell
donator_only = TRUE
requires_purchase = FALSE
+
//OLIVER ITEMS
/datum/loadout_item/suit/jacket_oliver
name = "Scarved Jacket"
@@ -408,3 +429,44 @@
donator_only = TRUE
requires_purchase = FALSE
restricted_roles = list(JOB_SECURITY_OFFICER,JOB_SECURITY_ASSISTANT,JOB_HEAD_OF_SECURITY,JOB_WARDEN)
+
+
+//elliethedarksun
+/datum/loadout_item/pocket_items/donator/gumball_goblin
+ name = "Pet Delivery Beacon - Gumball Goblin"
+ item_path = /obj/item/choice_beacon/pet/donator/gumball_goblin
+ donator_only = TRUE
+ requires_purchase = FALSE
+ ckeywhitelist = list("elliethedarksun")
+
+/datum/loadout_item/suit/gumball_wizard_robe
+ name = "Gumball Wizard Robe"
+ item_path = /obj/item/clothing/suit/costume/gumball_wizard_robe
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/head/gumball_wizard_hat
+ name = "Gumball Wizard Hat"
+ item_path = /obj/item/clothing/head/costume/gumball_wizard_hat
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/effects/gumball_goblin
+ ckeywhitelist = list("elliethedarksun")
+ name = "Quil Maid Transformation"
+ item_path = /obj/item/effect_granter/donator/gumball_goblin
+ requires_purchase = FALSE
+
+/datum/loadout_item/toys/gumball_goblin
+ name = "Gumball Goblin Plush"
+ item_path = /obj/item/toy/plush/gumball_goblin
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+
+//ThePooba
+/datum/loadout_item/mask/poob_mask
+ name = "Yellow gas mask"
+ item_path = /obj/item/clothing/mask/breath/poob_mask
+ donator_only = TRUE
+ requires_purchase = FALSE
diff --git a/monkestation/code/modules/donator/code/item/choice_beacon.dm b/monkestation/code/modules/donator/code/item/choice_beacon.dm
index f4f118ed6ff3..56641275ddcf 100644
--- a/monkestation/code/modules/donator/code/item/choice_beacon.dm
+++ b/monkestation/code/modules/donator/code/item/choice_beacon.dm
@@ -80,3 +80,8 @@
name = "Quil Maid"
default_name = "Quil Maid"
donator_pet = /mob/living/basic/pet/quilmaid
+
+/obj/item/choice_beacon/pet/donator/gumball_goblin
+ name = "Gumball Goblin"
+ default_name = "Gumball Goblin"
+ donator_pet = /mob/living/basic/pet/gumball_goblin
diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm
index aa424628347d..2deda702bbfd 100644
--- a/monkestation/code/modules/donator/code/item/clothing.dm
+++ b/monkestation/code/modules/donator/code/item/clothing.dm
@@ -389,3 +389,30 @@
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "sechud_terminated"
+
+
+/obj/item/clothing/suit/costume/gumball_wizard_robe
+ name = "\improper Gumball Wizard Robe"
+ desc = "A robe adorned with brightly colored gumballs."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "gumball_wizard_robe"
+ inhand_icon_state = null
+ body_parts_covered = CHEST|ARMS|LEGS
+
+/obj/item/clothing/head/costume/gumball_wizard_hat
+ name = "\improper Gumball Wizard Robe"
+ desc = "A hat adorned with a brightly colored jewel."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "gumball_wizard_hat"
+ inhand_icon_state = null
+
+/obj/item/clothing/mask/breath/poob_mask
+ name = "yellow gas mask"
+ desc = "An old mask that seems fitted for a lizard person, it's yellow with straps everywhere."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "poob_mask"
+ inhand_icon_state = null
+ flags_inv = HIDEFACE
diff --git a/monkestation/code/modules/donator/code/item/effects.dm b/monkestation/code/modules/donator/code/item/effects.dm
index 391092770b75..9e2ad29a4840 100644
--- a/monkestation/code/modules/donator/code/item/effects.dm
+++ b/monkestation/code/modules/donator/code/item/effects.dm
@@ -78,4 +78,8 @@
icon_state = "quil_maid"
animal_transformation = /mob/living/basic/pet/quilmaid
-
+//ellie
+/obj/item/effect_granter/donator/gumball_goblin
+ name = "gumball goblin transformation"
+ icon_state = "gumball_goblin"
+ animal_transformation = /mob/living/basic/pet/gumball_goblin
diff --git a/monkestation/code/modules/donator/code/item/plush.dm b/monkestation/code/modules/donator/code/item/plush.dm
index e0f255c7934a..3c52312b8aa0 100644
--- a/monkestation/code/modules/donator/code/item/plush.dm
+++ b/monkestation/code/modules/donator/code/item/plush.dm
@@ -67,3 +67,35 @@
desc = "A plush of the Lizard Basil. ~Handcrafted lovingly for quilark"
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "quilark"
+
+/obj/item/toy/plush/gumball_goblin
+ name = "gumball goblin plush"
+ desc = "A plush of a Gumball Goblin. He was abducted while pondering his gumballs. Help. ~Handcrafted lovingly for elliethedarksun"
+ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+ icon_state = "gumball_goblin"
+
+
+/obj/item/toy/plush/glep
+ name = "glep plush"
+ desc = "A plush of Glep."
+ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+ icon_state = "glep"
+ squeak_override = list('monkestation/code/modules/donator/sounds/glep1.ogg'=1,
+ 'monkestation/code/modules/donator/sounds/glep2.ogg'=1,
+ 'monkestation/code/modules/donator/sounds/glep3.ogg'=1)
+
+/obj/item/toy/plush/mr_frog
+ name = "mr frog plush"
+ desc = "A plush of a classic beloved television star, Mr. Frog."
+ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+ icon_state = "mr_frog"
+ squeak_override = list('monkestation/code/modules/donator/sounds/mr_frog1.ogg'=1,
+ 'monkestation/code/modules/donator/sounds/mr_frog2.ogg'=1,
+ 'monkestation/code/modules/donator/sounds/mr_frog3.ogg'=1)
+
+/obj/item/toy/plush/pim
+ name = "pim plush"
+ desc = "A plush of Pim."
+ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+ icon_state = "pim"
+ squeak_override = list('monkestation/code/modules/donator/sounds/pim.ogg'=1)
diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm
index e3249af4062a..b37e26fb8f86 100644
--- a/monkestation/code/modules/donator/code/mob/pets.dm
+++ b/monkestation/code/modules/donator/code/mob/pets.dm
@@ -147,3 +147,48 @@
gold_core_spawnable = NO_SPAWN
ai_controller = /datum/ai_controller/basic_controller/
+/mob/living/basic/pet/gumball_goblin
+ name = "Gumball Goblin"
+ desc = "AAAAAAAAAAAAAAAA"
+ icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
+ icon_state = "gumball_goblin"
+ icon_living = "gumball_goblin"
+ icon_dead = "gumball_goblin_dead"
+ gold_core_spawnable = NO_SPAWN
+
+ ///Ability
+ var/datum/action/cooldown/lay_gumball/gumball_ability
+
+
+/mob/living/basic/pet/gumball_goblin/Initialize(mapload)
+ . = ..()
+ gumball_ability = new()
+ gumball_ability.Grant(src)
+
+
+///drops peels around the mob when activated
+/datum/action/cooldown/lay_gumball
+ name = "Lay gumball"
+ desc = "Produce a gumball"
+ cooldown_time = 15 SECONDS
+ button_icon_state = "gumball"
+ button_icon = 'icons/obj/food/lollipop.dmi'
+ background_icon_state = "bg_nature"
+ overlay_icon_state = "bg_nature_border"
+ ///which type of gumballs to spawn
+ var/gumball_type = /obj/item/food/gumball
+ ///How many gumballs to spawn
+ var/gumball_amount = 1
+
+/datum/action/cooldown/lay_gumball/Activate(atom/target)
+ . = ..()
+ var/list/reachable_turfs = list()
+ for(var/turf/adjacent_turf in RANGE_TURFS(1, owner.loc))
+ if(adjacent_turf == owner.loc || !owner.CanReach(adjacent_turf) || !isopenturf(adjacent_turf))
+ continue
+ reachable_turfs += adjacent_turf
+
+ var/gumballs_to_spawn = min(gumball_amount, reachable_turfs.len)
+ for(var/i in 1 to gumballs_to_spawn)
+ new gumball_type(pick_n_take(reachable_turfs))
+ StartCooldown()
diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi
index 0f755a0e9124..ccc65751100f 100644
Binary files a/monkestation/code/modules/donator/icons/mob/clothing.dmi and b/monkestation/code/modules/donator/icons/mob/clothing.dmi differ
diff --git a/monkestation/code/modules/donator/icons/mob/pets.dmi b/monkestation/code/modules/donator/icons/mob/pets.dmi
index 05dd1be7e402..fd26b6586c4e 100644
Binary files a/monkestation/code/modules/donator/icons/mob/pets.dmi and b/monkestation/code/modules/donator/icons/mob/pets.dmi differ
diff --git a/monkestation/code/modules/donator/icons/obj/clothing.dmi b/monkestation/code/modules/donator/icons/obj/clothing.dmi
index c13052638a29..bb00fd40713f 100644
Binary files a/monkestation/code/modules/donator/icons/obj/clothing.dmi and b/monkestation/code/modules/donator/icons/obj/clothing.dmi differ
diff --git a/monkestation/code/modules/donator/icons/obj/plushes.dmi b/monkestation/code/modules/donator/icons/obj/plushes.dmi
index 373cbdd5fdba..6422e52b77a8 100644
Binary files a/monkestation/code/modules/donator/icons/obj/plushes.dmi and b/monkestation/code/modules/donator/icons/obj/plushes.dmi differ
diff --git a/monkestation/code/modules/donator/sounds/glep1.ogg b/monkestation/code/modules/donator/sounds/glep1.ogg
new file mode 100644
index 000000000000..628ac7bc79f9
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/glep1.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/glep2.ogg b/monkestation/code/modules/donator/sounds/glep2.ogg
new file mode 100644
index 000000000000..92f4ecc9964d
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/glep2.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/glep3.ogg b/monkestation/code/modules/donator/sounds/glep3.ogg
new file mode 100644
index 000000000000..9019af378755
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/glep3.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/mr_frog1.ogg b/monkestation/code/modules/donator/sounds/mr_frog1.ogg
new file mode 100644
index 000000000000..93318671a97e
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/mr_frog1.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/mr_frog2.ogg b/monkestation/code/modules/donator/sounds/mr_frog2.ogg
new file mode 100644
index 000000000000..e0a4a5da579a
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/mr_frog2.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/mr_frog3.ogg b/monkestation/code/modules/donator/sounds/mr_frog3.ogg
new file mode 100644
index 000000000000..066bd78c1a33
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/mr_frog3.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/pim.ogg b/monkestation/code/modules/donator/sounds/pim.ogg
new file mode 100644
index 000000000000..59f46f087c6a
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/pim.ogg differ
diff --git a/monkestation/code/modules/ghost_players/arena/fight_button.dm b/monkestation/code/modules/ghost_players/arena/fight_button.dm
index 494b68f8c2e7..cd077bb3063e 100644
--- a/monkestation/code/modules/ghost_players/arena/fight_button.dm
+++ b/monkestation/code/modules/ghost_players/arena/fight_button.dm
@@ -1,6 +1,6 @@
/obj/structure/fight_button
name = "duel requestor 3000"
- desc = "A button that displays your intent to duel aswell as the weapon of choice and stakes of the duel."
+ desc = "A button that displays your intent to duel as well as the weapon of choice and stakes of the duel."
icon_state = "comp_button1"
icon = 'goon/icons/obj/mechcomp.dmi'
@@ -117,8 +117,8 @@
/obj/structure/fight_button/proc/set_rules(mob/living/carbon/human/ghost/user)
var/max_amount = user.client.prefs.metacoins
- var/choice = tgui_input_number(user, "How much would you like to wager?", "[src.name]", 100, max_amount, 0)
- if(!choice)
+ var/choice = tgui_input_number(user, "How much would you like to wager?", "[src.name]", default = min(max_amount, 100), max_value = max_amount, min_value = 0)
+ if(!isnum(choice))
return FALSE
payout = choice
@@ -134,41 +134,37 @@
say("One or more of the players have left the area, match has been cancelled!")
return
-
if(!player_one.client.prefs.adjust_metacoins(player_one.ckey, -payout, "Added to the Payout"))
return
- if(!player_two.client.prefs.adjust_metacoins(player_one.ckey, -payout, "Added to the Payout"))
+ if(!player_two.client.prefs.adjust_metacoins(player_two.ckey, -payout, "Added to the Payout"))
player_one.client.prefs.adjust_metacoins(player_one.ckey, payout, "Opponent left, reimbursed.")
return
+ var/turf/player_one_spot = locate(148, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1])
+ prep_player(player_one, player_one_spot)
+ var/turf/player_two_spot = locate(164, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1])
+ prep_player(player_two, player_two_spot)
- player_one.unequip_everything()
- player_one.fully_heal()
-
- player_two.unequip_everything()
- player_two.fully_heal()
+/obj/structure/fight_button/proc/prep_player(mob/living/carbon/human/ghost/player, turf/move_to)
+ player.unequip_everything()
+ player.fully_heal()
- var/obj/item/one_weapon = new weapon_of_choice(src)
- spawned_weapons += WEAKREF(one_weapon)
- var/turf/one_spot = locate(148, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1])
- player_one.forceMove(one_spot)
- player_one.equipOutfit(/datum/outfit/ghost_player)
- player_one.put_in_active_hand(one_weapon, TRUE)
- player_one.dueling = TRUE
- SEND_SIGNAL(player_one, COMSIG_HUMAN_BEGIN_DUEL)
+ if(HAS_TRAIT(player, TRAIT_PACIFISM))
+ to_chat(player, span_notice("Your pacifism has been removed."))
+ // null will remove the trait from all sources
+ REMOVE_TRAIT(player, TRAIT_PACIFISM, null)
- var/obj/item/two_weapon = new weapon_of_choice(src)
- spawned_weapons += WEAKREF(two_weapon)
- var/turf/two_spot = locate(164, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1])
- player_two.forceMove(two_spot)
- player_two.equipOutfit(/datum/outfit/ghost_player)
- player_two.put_in_active_hand(two_weapon, TRUE)
- player_two.dueling = TRUE
- SEND_SIGNAL(player_two, COMSIG_HUMAN_BEGIN_DUEL)
+ var/obj/item/weapon = new weapon_of_choice(src)
+ spawned_weapons += WEAKREF(weapon)
+ player.forceMove(move_to)
+ player.equipOutfit(/datum/outfit/ghost_player)
+ player.put_in_active_hand(weapon, TRUE)
+ player.dueling = TRUE
+ SEND_SIGNAL(player, COMSIG_HUMAN_BEGIN_DUEL)
/obj/structure/fight_button/proc/end_duel(mob/living/carbon/human/ghost/loser)
if(loser == player_one)
- player_two.client.prefs.adjust_metacoins(player_one.ckey, payout * 2, "Won Duel.", donator_multipler = FALSE)
+ player_two.client.prefs.adjust_metacoins(player_two.ckey, payout * 2, "Won Duel.", donator_multipler = FALSE)
else if(loser == player_two)
player_one.client.prefs.adjust_metacoins(player_one.ckey, payout * 2, "Won Duel.", donator_multipler = FALSE)
addtimer(CALLBACK(src, GLOBAL_PROC_REF(reset_arena_area)), 5 SECONDS)
diff --git a/monkestation/code/modules/jobs/job_types/curator.dm b/monkestation/code/modules/jobs/job_types/curator.dm
index 08aaaea47b53..7e7c3b76d961 100644
--- a/monkestation/code/modules/jobs/job_types/curator.dm
+++ b/monkestation/code/modules/jobs/job_types/curator.dm
@@ -2,3 +2,12 @@
. = ..()
if(spawned.mind)
ADD_TRAIT(spawned.mind, TRAIT_OCCULTIST, JOB_TRAIT)
+
+/obj/item/melee/curator_whip
+ obj_flags = parent_type::obj_flags | UNIQUE_RENAME
+
+/obj/item/claymore/weak/ceremonial
+ obj_flags = parent_type::obj_flags | UNIQUE_RENAME
+
+/obj/item/knife/hunting
+ obj_flags = parent_type::obj_flags | UNIQUE_RENAME
diff --git a/monkestation/code/modules/mapping/access_helpers.dm b/monkestation/code/modules/mapping/access_helpers.dm
index e335d07792ce..d7ca77d18035 100644
--- a/monkestation/code/modules/mapping/access_helpers.dm
+++ b/monkestation/code/modules/mapping/access_helpers.dm
@@ -31,3 +31,7 @@
/obj/effect/mapping_helpers/airlock/access/any/security/permabrig/get_access()
. = ..()
. += list(ACCESS_PERMABRIG, ACCESS_BRIG)
+
+/obj/effect/mapping_helpers/airlock/access/any/away/bounty_hunter/get_access()
+ . = ..()
+ . += list(ACCESS_BOUNTY_HUNTER)
diff --git a/monkestation/code/modules/mentor/mentor_help.dm b/monkestation/code/modules/mentor/mentor_help.dm
index dc75543f9f41..d8879867c609 100644
--- a/monkestation/code/modules/mentor/mentor_help.dm
+++ b/monkestation/code/modules/mentor/mentor_help.dm
@@ -80,7 +80,7 @@
/// Send the Mhelp to all Mentors/Admins
for(var/client/honked_clients in GLOB.mentors | GLOB.admins)
- if(honked_clients.mentor_datum.not_active)
+ if(QDELETED(honked_clients?.mentor_datum) || honked_clients?.mentor_datum?.not_active)
continue
honked_clients << 'sound/items/bikehorn.ogg'
to_chat(honked_clients,
diff --git a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ethereal_horns.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ethereal_horns.dm
new file mode 100644
index 000000000000..c5ed93a8a100
--- /dev/null
+++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ethereal_horns.dm
@@ -0,0 +1,35 @@
+/datum/sprite_accessory/ethereal_horns
+ icon = 'monkestation/icons/mob/species/ethereal/ethereal_horns.dmi'
+ color_src = MUTCOLORS
+
+/datum/sprite_accessory/ethereal_horns/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/ethereal_horns/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/ethereal_horns/helm
+ name = "Helm"
+ icon_state = "helm"
+
+/datum/sprite_accessory/ethereal_horns/lunar
+ name = "Lunar"
+ icon_state = "lunar"
+
+/datum/sprite_accessory/ethereal_horns/inward
+ name = "Inward"
+ icon_state = "inward"
+
+/datum/sprite_accessory/ethereal_horns/majesty
+ name = "Majesty"
+ icon_state = "majesty"
+
+/datum/sprite_accessory/ethereal_horns/clipped
+ name = "Clipped"
+ icon_state = "clipped"
+
+/datum/sprite_accessory/ethereal_horns/sharp
+ name = "Sharp"
+ icon_state = "sharp"
diff --git a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ethereal_tail.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ethereal_tail.dm
new file mode 100644
index 000000000000..5ccec9b8e836
--- /dev/null
+++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ethereal_tail.dm
@@ -0,0 +1,19 @@
+/datum/sprite_accessory/tails/ethereal
+ icon = 'monkestation/icons/mob/species/ethereal/ethereal_tail.dmi'
+ color_src = MUTCOLORS
+
+/datum/sprite_accessory/tails/ethereal/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/tails/ethereal/long
+ name = "Long"
+ icon_state = "long"
+
+/datum/sprite_accessory/tails/ethereal/bifurcated
+ name = "Bifurcated"
+ icon_state = "bifurcated"
+
+/datum/sprite_accessory/tails/ethereal/stubby
+ name = "Stubby"
+ icon_state = "stubby"
diff --git a/monkestation/code/modules/mob/living/carbon/carbon_defense.dm b/monkestation/code/modules/mob/living/carbon/carbon_defense.dm
index 21f728669dcd..119e9be002f6 100644
--- a/monkestation/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/monkestation/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,12 +1,11 @@
-/mob/living/carbon/extrapolator_act(mob/user, obj/item/extrapolator/E, scan = TRUE)
- if(istype(E) && diseases.len)
+/mob/living/carbon/extrapolator_act(mob/user, obj/item/extrapolator/extrapolator, scan = TRUE)
+ if(istype(extrapolator) && length(diseases))
if(scan)
- E.scan(src, diseases, user)
+ extrapolator.scan(src, diseases, user)
else
- E.extrapolate(src, diseases, user)
+ extrapolator.extrapolate(src, diseases, user)
return TRUE
- else
- return FALSE
+ return FALSE
/mob/living/carbon/is_pepper_proof(check_flags = ALL)
if(HAS_TRAIT(src, TRAIT_NOBREATH) && is_eyes_covered())
diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm
index 819313ee9b0e..d90d953b961c 100644
--- a/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm
@@ -1,23 +1,285 @@
-/datum/species/ethereal/get_laugh_sound(mob/living/carbon/human/ethereal)
- return 'monkestation/sound/voice/laugh/ethereal/ethereal_laugh_1.ogg'
-
/datum/species/ethereal
+ name = "\improper Ethereal"
+ id = SPECIES_ETHEREAL
+ meat = /obj/item/food/meat/slab/human/mutant/ethereal
+ mutantlungs = /obj/item/organ/internal/lungs/ethereal
+ mutantstomach = /obj/item/organ/internal/stomach/ethereal
+ mutanteyes = /obj/item/organ/internal/eyes/ethereal
+ mutanttongue = /obj/item/organ/internal/tongue/ethereal
+ mutantheart = /obj/item/organ/internal/heart/ethereal
+ external_organs = list(
+ /obj/item/organ/external/ethereal_horns = "None",
+ /obj/item/organ/external/tail/ethereal = "None")
+ exotic_blood = /datum/reagent/consumable/liquidelectricity //Liquid Electricity. fuck you think of something better gamer
+ exotic_bloodtype = "LE"
+ siemens_coeff = 0.5 //They thrive on energy
+ brutemod = 1.25 //They're weak to punches
payday_modifier = 1
- sexes = TRUE
+ inherent_traits = list(
+ TRAIT_NOHUNGER,
+ TRAIT_NO_BLOODLOSS_DAMAGE, //we handle that species-side.
+ )
species_traits = list(
DYNCOLORS,
NO_UNDERWEAR,
HAIR,
+ EYECOLOR,
FACEHAIR,
)
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ species_cookie = /obj/item/food/energybar
+ species_language_holder = /datum/language_holder/ethereal
+ toxic_food = NONE
+ // Body temperature for ethereals is much higher then humans as they like hotter environments
+ bodytemp_normal = (BODYTEMP_NORMAL + 50)
+ bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C
+ // Cold temperatures hurt faster as it is harder to move with out the heat energy
+ bodytemp_cold_damage_limit = (T20C - 10) // about 10c
+ hair_color = "fixedmutcolor"
+ hair_alpha = 180
+
+ bodypart_overrides = list(
+ BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ethereal,
+ BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/ethereal,
+ BODY_ZONE_HEAD = /obj/item/bodypart/head/ethereal,
+ BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/ethereal,
+ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/ethereal,
+ BODY_ZONE_CHEST = /obj/item/bodypart/chest/ethereal,
+ )
+
+ var/current_color
+ var/EMPeffect = FALSE
+ var/emageffect = FALSE
+ var/r1
+ var/g1
+ var/b1
+ var/static/r2 = 237
+ var/static/g2 = 164
+ var/static/b2 = 149
+ var/obj/effect/dummy/lighting_obj/ethereal_light
+ var/default_color
+
+/datum/species/ethereal/Destroy(force)
+ QDEL_NULL(ethereal_light)
+ return ..()
/datum/species/ethereal/on_species_gain(mob/living/carbon/new_ethereal, datum/species/old_species, pref_load)
. = ..()
+ if(!ishuman(new_ethereal))
+ return
+ var/mob/living/carbon/human/ethereal = new_ethereal
+ default_color = ethereal.dna.features["ethcolor"]
+ r1 = GETREDPART(default_color)
+ g1 = GETGREENPART(default_color)
+ b1 = GETBLUEPART(default_color)
+ RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act))
+ RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
+ RegisterSignal(ethereal, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
RegisterSignal(new_ethereal, COMSIG_ATOM_AFTER_ATTACKEDBY, PROC_REF(on_after_attackedby))
+ ethereal_light = ethereal.mob_light(light_type = /obj/effect/dummy/lighting_obj/moblight/species)
+ spec_updatehealth(ethereal)
+ new_ethereal.set_safe_hunger_level()
+ update_mail_goodies(ethereal)
+
+ var/obj/item/organ/internal/heart/ethereal/ethereal_heart = new_ethereal.get_organ_slot(ORGAN_SLOT_HEART)
+ ethereal_heart.ethereal_color = default_color
+
+ for(var/obj/item/bodypart/limb as anything in new_ethereal.bodyparts)
+ if(limb.limb_id == SPECIES_ETHEREAL)
+ limb.update_limb(is_creating = TRUE)
/datum/species/ethereal/on_species_loss(mob/living/carbon/human/former_ethereal, datum/species/new_species, pref_load)
- . = ..()
+ UnregisterSignal(former_ethereal, COMSIG_ATOM_EMAG_ACT)
+ UnregisterSignal(former_ethereal, COMSIG_ATOM_EMP_ACT)
+ UnregisterSignal(former_ethereal, COMSIG_LIGHT_EATER_ACT)
UnregisterSignal(former_ethereal, COMSIG_ATOM_AFTER_ATTACKEDBY)
+ QDEL_NULL(ethereal_light)
+ return ..()
+
+/datum/species/ethereal/update_quirk_mail_goodies(mob/living/carbon/human/recipient, datum/quirk/quirk, list/mail_goodies = list())
+ if(istype(quirk, /datum/quirk/blooddeficiency))
+ mail_goodies += list(
+ /obj/item/reagent_containers/blood/ethereal
+ )
+ return ..()
+
+/datum/species/ethereal/random_name(gender,unique,lastname)
+ if(unique)
+ return random_unique_ethereal_name()
+
+ var/randname = ethereal_name()
+
+ return randname
+
+/datum/species/ethereal/randomize_features(mob/living/carbon/human/human_mob)
+ human_mob.dna.features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
+
+
+/datum/species/ethereal/spec_life(mob/living/carbon/human/ethereal, seconds_per_tick, times_fired)
+ if(ethereal.stat == DEAD)
+ return
+ adjust_charge(ethereal, -ETHEREAL_BLOOD_CHARGE_FACTOR * seconds_per_tick, TRUE)
+ handle_charge(ethereal, seconds_per_tick, times_fired)
+
+/datum/species/ethereal/proc/adjust_charge(mob/living/carbon/human/ethereal, amount, passive)
+ if(passive)
+ if(ethereal.blood_volume < ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE) //Do not apply the clamp if its below the passive reduction level(no infinite blood sorry)
+ return
+ if(ethereal.blood_volume + amount < ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE+1)
+ ethereal.blood_volume = ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE+1 //bottom them off here if the end result would be less than the stopping point.
+ ethereal.blood_volume = clamp(ethereal.blood_volume + amount, ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE+1, ETHEREAL_BLOOD_CHARGE_DANGEROUS)
+ return
+ ethereal.blood_volume = clamp(ethereal.blood_volume + amount, ETHEREAL_BLOOD_CHARGE_NONE, ETHEREAL_BLOOD_CHARGE_DANGEROUS)
+
+/datum/species/ethereal/proc/handle_charge(mob/living/carbon/human/ethereal, seconds_per_tick, times_fired)
+ brutemod = 1.15
+ var/word = pick("like you can't breathe","your lungs locking up","extremely lethargic")
+ switch(ethereal.blood_volume)
+ if(-INFINITY to ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE)
+ ethereal.add_mood_event("charge", /datum/mood_event/decharged)
+ ethereal.clear_alert("ethereal_overcharge")
+ ethereal.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/emptycell/ethereal)
+ brutemod = 2
+ if(SPT_PROB(7.5, seconds_per_tick))
+ to_chat(src, span_warning("You feel [word]."))
+ ethereal.adjustOxyLoss(round(0.01 * (ETHEREAL_BLOOD_CHARGE_LOW - ethereal.blood_volume) * seconds_per_tick, 1))
+ if(ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE to ETHEREAL_BLOOD_CHARGE_LOW)
+ ethereal.clear_alert("ethereal_overcharge")
+ ethereal.add_mood_event("charge", /datum/mood_event/decharged)
+ ethereal.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 3)
+ brutemod = 1.5
+ if(ethereal.health > 10.5)
+ ethereal.apply_damage(0.155 * seconds_per_tick, TOX, null, null, ethereal)
+ if(ETHEREAL_BLOOD_CHARGE_LOW to ETHEREAL_BLOOD_CHARGE_NORMAL)
+ ethereal.clear_alert("ethereal_overcharge")
+ ethereal.add_mood_event("charge", /datum/mood_event/lowpower)
+ ethereal.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 2)
+ brutemod = 1.25
+ if(ETHEREAL_BLOOD_CHARGE_ALMOSTFULL to ETHEREAL_BLOOD_CHARGE_FULL)
+ ethereal.clear_alert("ethereal_overcharge")
+ ethereal.clear_alert("ethereal_charge")
+ ethereal.add_mood_event("charge", /datum/mood_event/charged)
+ brutemod = 1
+ if(ETHEREAL_BLOOD_CHARGE_FULL to ETHEREAL_BLOOD_CHARGE_OVERLOAD)
+ ethereal.clear_alert("ethereal_charge")
+ ethereal.add_mood_event("charge", /datum/mood_event/overcharged)
+ ethereal.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 1)
+ brutemod = 1.25
+ if(ETHEREAL_BLOOD_CHARGE_OVERLOAD to ETHEREAL_BLOOD_CHARGE_DANGEROUS)
+ ethereal.clear_alert("ethereal_charge")
+ ethereal.add_mood_event("charge", /datum/mood_event/supercharged)
+ ethereal.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 2)
+ ethereal.apply_damage(0.2 * seconds_per_tick, TOX, null, null, ethereal)
+ brutemod = 1.5
+ if(SPT_PROB(5, seconds_per_tick)) // 5% each seacond for ethereals to explosively release excess energy if it reaches dangerous levels
+ discharge_process(ethereal)
+ else
+ ethereal.clear_mood_event("charge")
+ ethereal.clear_alert(ALERT_ETHEREAL_CHARGE)
+ ethereal.clear_alert(ALERT_ETHEREAL_OVERCHARGE)
+
+/datum/species/ethereal/proc/discharge_process(mob/living/carbon/human/ethereal)
+ to_chat(ethereal, span_warning("You begin to lose control over your charge!"))
+ ethereal.visible_message(span_danger("[ethereal] begins to spark violently!"))
+
+ var/static/mutable_appearance/overcharge //shameless copycode from lightning spell
+ overcharge = overcharge || mutable_appearance('icons/effects/effects.dmi', "electricity", EFFECTS_LAYER)
+ ethereal.add_overlay(overcharge)
+
+ if(do_after(ethereal, 5 SECONDS, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED)))
+ ethereal.flash_lighting_fx(5, 7, ethereal.dna.species.fixed_mut_color ? ethereal.dna.species.fixed_mut_color : ethereal.dna.features["mcolor"])
+
+ playsound(ethereal, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
+ ethereal.cut_overlay(overcharge)
+ tesla_zap(ethereal, 2, ethereal.blood_volume*9, ZAP_OBJ_DAMAGE | ZAP_GENERATES_POWER | ZAP_ALLOW_DUPLICATES)
+ adjust_charge(ethereal, ETHEREAL_BLOOD_CHARGE_FULL - ethereal.blood_volume)
+ ethereal.visible_message(span_danger("[ethereal] violently discharges energy!"), span_warning("You violently discharge energy!"))
+
+ ethereal.Paralyze(100)
+
+/datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/ethereal)
+ . = ..()
+ if(!ethereal_light)
+ return
+ if(default_color != ethereal.dna.features["ethcolor"])
+ var/new_color = ethereal.dna.features["ethcolor"]
+ r1 = GETREDPART(new_color)
+ g1 = GETGREENPART(new_color)
+ b1 = GETBLUEPART(new_color)
+ if(ethereal.stat != DEAD && !EMPeffect)
+ var/healthpercent = max(ethereal.health, 0) / 100
+ if(!emageffect)
+ current_color = rgb(r2 + ((r1-r2)*healthpercent), g2 + ((g1-g2)*healthpercent), b2 + ((b1-b2)*healthpercent))
+ ethereal_light.set_light_range_power_color(1 + (2 * healthpercent), 1 + round(0.5 * healthpercent), current_color)
+ ethereal_light.set_light_on(TRUE)
+ fixed_mut_color = current_color
+ else
+ ethereal_light.set_light_on(FALSE)
+ current_color = rgb(230, 230, 230)
+ fixed_mut_color = current_color
+ ethereal.hair_color = current_color
+ ethereal.facial_hair_color = current_color
+ if(ethereal.organs_slot["horns"])
+ var/obj/item/organ/external/horms = ethereal.organs_slot["horns"]
+ horms.bodypart_overlay.draw_color = current_color
+ if(ethereal.organs_slot["tail"])
+ var/obj/item/organ/external/tail = ethereal.organs_slot["tail"]
+ tail.bodypart_overlay.draw_color = current_color
+ ethereal.update_body()
+
+/datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/H, severity)
+ SIGNAL_HANDLER
+ EMPeffect = TRUE
+ spec_updatehealth(H)
+ to_chat(H, span_notice("You feel the light of your body leave you."))
+ switch(severity)
+ if(EMP_LIGHT)
+ addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds
+ if(EMP_HEAVY)
+ addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds
+
+/datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/H, mob/user)
+ SIGNAL_HANDLER
+ if(emageffect)
+ return FALSE
+ emageffect = TRUE
+ if(user)
+ to_chat(user, span_notice("You tap [H] on the back with your card."))
+ H.visible_message(span_danger("[H] starts flickering in an array of colors!"))
+ handle_emag(H)
+ addtimer(CALLBACK(src, PROC_REF(stop_emag), H), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass.
+ return TRUE
+
+/// Special handling for getting hit with a light eater
+/datum/species/ethereal/proc/on_light_eater(mob/living/carbon/human/source, datum/light_eater)
+ SIGNAL_HANDLER
+ source.emp_act(EMP_LIGHT)
+ return COMPONENT_BLOCK_LIGHT_EATER
+
+/datum/species/ethereal/proc/stop_emp(mob/living/carbon/human/H)
+ EMPeffect = FALSE
+ spec_updatehealth(H)
+ to_chat(H, span_notice("You feel more energized as your shine comes back."))
+
+
+/datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/H)
+ if(!emageffect)
+ return
+ current_color = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
+ spec_updatehealth(H)
+ addtimer(CALLBACK(src, PROC_REF(handle_emag), H), 5) //Call ourselves every 0.5 seconds to change color
+
+/datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/H)
+ emageffect = FALSE
+ spec_updatehealth(H)
+ H.visible_message(span_danger("[H] stops flickering and goes back to their normal state!"))
+
+/datum/species/ethereal/get_features()
+ var/list/features = ..()
+
+ features += "feature_ethcolor"
+
+ return features
/datum/species/ethereal/proc/on_after_attackedby(mob/living/lightbulb, obj/item/item, mob/living/user, proximity_flag, click_parameters)
SIGNAL_HANDLER
@@ -27,3 +289,63 @@
cig.light()
user.visible_message(span_notice("[user] quickly strikes [item] across [lightbulb]'s skin, [lightbulb.p_their()] warmth lighting it!"))
return COMPONENT_NO_AFTERATTACK
+
+/datum/species/ethereal/get_scream_sound(mob/living/carbon/human/ethereal)
+ return pick(
+ 'sound/voice/ethereal/ethereal_scream_1.ogg',
+ 'sound/voice/ethereal/ethereal_scream_2.ogg',
+ 'sound/voice/ethereal/ethereal_scream_3.ogg',
+ )
+
+/datum/species/ethereal/get_laugh_sound(mob/living/carbon/human/ethereal)
+ return 'monkestation/sound/voice/laugh/ethereal/ethereal_laugh_1.ogg'
+
+/datum/species/ethereal/get_species_description()
+ return "Coming from the planet of Sprout, the theocratic ethereals are \
+ separated socially by caste, and espouse a dogma of aiding the weak and \
+ downtrodden."
+
+/datum/species/ethereal/create_pref_unique_perks()
+ var/list/to_add = list()
+
+ to_add += list(
+ list(
+ SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
+ SPECIES_PERK_ICON = "bolt",
+ SPECIES_PERK_NAME = "Shockingly Tasty",
+ SPECIES_PERK_DESC = "Ethereals can feed on electricity from APCs, and do not otherwise need to eat.",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
+ SPECIES_PERK_ICON = "lightbulb",
+ SPECIES_PERK_NAME = "Disco Ball",
+ SPECIES_PERK_DESC = "Ethereals passively generate their own light.",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK,
+ SPECIES_PERK_ICON = "gem",
+ SPECIES_PERK_NAME = "Crystal Core",
+ SPECIES_PERK_DESC = "The Ethereal's heart will encase them in crystal should they die, returning them to life after a time - \
+ at the cost of a permanent brain trauma.",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK,
+ SPECIES_PERK_ICON = "fist-raised",
+ SPECIES_PERK_NAME = "Elemental Attacker",
+ SPECIES_PERK_DESC = "Ethereals deal burn damage with their punches instead of brute.",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
+ SPECIES_PERK_ICON = "biohazard",
+ SPECIES_PERK_NAME = "Starving Artist",
+ SPECIES_PERK_DESC = "Ethereals take toxin damage while starving.",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
+ SPECIES_PERK_ICON = "shield-halved",
+ SPECIES_PERK_NAME = "Power(Only) Armor",
+ SPECIES_PERK_DESC = "You take increased brute damage the less power you have. ",
+ ),
+ )
+
+ return to_add
diff --git a/monkestation/code/modules/mob/login.dm b/monkestation/code/modules/mob/login.dm
new file mode 100644
index 000000000000..9f7768fb04b8
--- /dev/null
+++ b/monkestation/code/modules/mob/login.dm
@@ -0,0 +1,13 @@
+/mob/Login()
+ . = ..()
+ if(!. || QDELETED(client))
+ return FALSE
+
+ if(QDELETED(client?.patreon))
+ client?.patreon = new(client)
+
+ if(QDELETED(client?.twitch))
+ client?.twitch = new(client)
+
+ if(QDELETED(client?.client_token_holder))
+ client?.client_token_holder = new(client)
diff --git a/monkestation/code/modules/mob/transform_procs.dm b/monkestation/code/modules/mob/transform_procs.dm
new file mode 100644
index 000000000000..959dab0c66b6
--- /dev/null
+++ b/monkestation/code/modules/mob/transform_procs.dm
@@ -0,0 +1,9 @@
+/mob/living/carbon/gorillize(keep_name = null)
+ var/old_name = real_name || name
+ if(isnull(keep_name))
+ keep_name = !isnull(key)
+ var/mob/living/basic/gorilla/gorilla = ..()
+ if(keep_name && old_name && gorilla)
+ gorilla.name = gorilla.real_name = old_name
+ gorilla.update_name_tag(old_name)
+ return gorilla
diff --git a/monkestation/code/modules/overwatch/client_info.dm b/monkestation/code/modules/overwatch/client_info.dm
new file mode 100644
index 000000000000..70583ae44298
--- /dev/null
+++ b/monkestation/code/modules/overwatch/client_info.dm
@@ -0,0 +1,40 @@
+/datum/ip_info
+ var/is_loaded = FALSE
+ var/is_whitelisted = FALSE
+
+ var/ip
+ var/ip_as
+ var/ip_mobile
+ var/ip_proxy
+ var/ip_hosting
+
+/client
+ var/datum/ip_info/ip_info = new
+
+/client/proc/Overwatch_ASN_panel()
+ set category = "Server"
+ set name = "Overwatch ASN Panel"
+
+ if(!SSdbcore.Connect())
+ to_chat(usr, span_warning("Failed to establish database connection"))
+ return
+
+ if(!check_rights(R_SERVER))
+ return
+
+ new /datum/overwatch_asn_panel(src)
+
+
+/client/proc/Overwatch_WhitelistPanel()
+ set category = "Server"
+ set name = "Overwatch WL Panel"
+
+ if(!SSdbcore.Connect())
+ to_chat(usr, span_warning("Failed to establish database connection"))
+ return
+
+ if(!check_rights(R_BAN))
+ return
+
+ new /datum/overwatch_wl_panel(src)
+
diff --git a/monkestation/code/modules/overwatch/panels/asn_panel.dm b/monkestation/code/modules/overwatch/panels/asn_panel.dm
new file mode 100644
index 000000000000..505fac86c2d7
--- /dev/null
+++ b/monkestation/code/modules/overwatch/panels/asn_panel.dm
@@ -0,0 +1,69 @@
+/datum/overwatch_asn_panel
+ var/client/holder // client of who is holding this
+
+/datum/overwatch_asn_panel/New(user)
+ if(user)
+ setup(user)
+ else
+ qdel(src)
+ return
+
+/datum/overwatch_asn_panel/proc/setup(user) // client or mob
+ if(!SSdbcore.Connect())
+ to_chat(holder, span_warning("Failed to establish database connection"))
+ qdel(src)
+ return
+
+ if(istype(user, /client))
+ var/client/user_client = user
+ holder = user_client
+ else
+ var/mob/user_mob = user
+ holder = user_mob.client
+
+ if(!check_rights(R_SERVER, TRUE, holder))
+ qdel(src)
+ return
+
+ ui_interact(holder.mob)
+
+/datum/overwatch_asn_panel/ui_state(mob/user)
+ return GLOB.admin_state // admin only
+
+/datum/overwatch_asn_panel/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "OverwatchASNManager")
+ ui.open()
+
+/datum/overwatch_asn_panel/ui_data(mob/user, ui_key)
+ . = SSoverwatch.tgui_panel_asn_data
+
+/datum/overwatch_asn_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ if(..())
+ return
+ switch(action)
+ if("asn_remove_entry")
+ if(!params["asn"])
+ return TRUE
+ if(SSoverwatch.RemoveASNban(params["asn"], holder))
+ SStgui.update_uis(src)
+ else
+ return TRUE
+ if("asn_add_entry")
+ if(!params["ip"])
+ return TRUE
+ if(SSoverwatch.AddASNban(params["ip"], holder))
+ SStgui.update_uis(src)
+ else
+ return TRUE
+
+ if(!length(SSoverwatch.tgui_panel_asn_data))
+ qdel(src) //For some unknown reason it refuses to update UI when it goes from 1 to 0 entries, so last item gets stuck. I can't fix it now, maybe later. ~Tsuru
+ return
+
+ SStgui.update_user_uis(holder.mob)
+ return TRUE
+
+/datum/overwatch_asn_panel/ui_close(mob/user)
+ qdel(src)
diff --git a/monkestation/code/modules/overwatch/panels/whitelist_panel.dm b/monkestation/code/modules/overwatch/panels/whitelist_panel.dm
new file mode 100644
index 000000000000..e6eb5306b1de
--- /dev/null
+++ b/monkestation/code/modules/overwatch/panels/whitelist_panel.dm
@@ -0,0 +1,69 @@
+/datum/overwatch_wl_panel
+ var/client/holder // client of who is holding this
+
+/datum/overwatch_wl_panel/New(user)
+ if(user)
+ setup(user)
+ else
+ qdel(src)
+ return
+
+/datum/overwatch_wl_panel/proc/setup(user) // client or mob
+ if(!SSdbcore.Connect())
+ to_chat(holder, span_warning("Failed to establish database connection"))
+ qdel(src)
+ return
+
+ if(istype(user, /client))
+ var/client/user_client = user
+ holder = user_client
+ else
+ var/mob/user_mob = user
+ holder = user_mob.client
+
+ if(!check_rights(R_BAN, TRUE, holder))
+ qdel(src)
+ return
+
+ ui_interact(holder.mob)
+
+/datum/overwatch_wl_panel/ui_state(mob/user)
+ return GLOB.admin_state // admin only
+
+/datum/overwatch_wl_panel/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "OverwatchWhitelistPanel")
+ ui.open()
+
+/datum/overwatch_wl_panel/ui_data(mob/user)
+ . = SSoverwatch.tgui_panel_wl_data
+
+/datum/overwatch_wl_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ if(..())
+ return
+ switch(action)
+ if("wl_remove_entry")
+ if(!params["ckey"])
+ return TRUE
+ if(SSoverwatch.RemoveFromWhitelist(params["ckey"], holder))
+ SStgui.update_uis(src)
+ else
+ return TRUE
+ if("wl_add_ckey")
+ if(!params["ckey"])
+ return TRUE
+ if(SSoverwatch.AddToWhitelist(params["ckey"], holder))
+ SStgui.update_uis(src)
+ else
+ return TRUE
+
+ if(!length(SSoverwatch.tgui_panel_wl_data))
+ qdel(src) //Same as ASN. ~Tsuru
+ return
+
+ SStgui.update_user_uis(holder.mob)
+ return TRUE
+
+/datum/overwatch_wl_panel/ui_close(mob/user)
+ qdel(src)
diff --git a/monkestation/code/modules/overwatch/subsystem.dm b/monkestation/code/modules/overwatch/subsystem.dm
new file mode 100644
index 000000000000..cccf55d66fcc
--- /dev/null
+++ b/monkestation/code/modules/overwatch/subsystem.dm
@@ -0,0 +1,445 @@
+SUBSYSTEM_DEF(overwatch)
+ name = "Overwatch"
+ init_order = INIT_ORDER_OW
+ flags = SS_NO_FIRE
+
+ var/max_error_count = 4
+
+ var/is_active = FALSE
+ var/error_counter = 0
+
+ ///accounts younger than this in days are interviewed
+ var/minimum_player_age = 7
+ ///max number of active non role bans to be considered for interview
+ var/max_ban_count = 2
+
+ var/list/tgui_panel_asn_data = list()
+ var/list/tgui_panel_wl_data = list()
+
+ var/list/client/postponed_client_queue = list()
+
+/datum/controller/subsystem/overwatch/Initialize(timeofday)
+
+ if(!CONFIG_GET(flag/sql_enabled))
+ log_sql("Overwatch could not be loaded without SQL enabled")
+ return ..()
+
+ Toggle()
+ return ..()
+
+/datum/controller/subsystem/overwatch/stat_entry(msg)
+ return "[is_active ? "ACTIVE" : "OFFLINE"]"
+
+/datum/controller/subsystem/overwatch/proc/Toggle(mob/user)
+ if (!initialized && user)
+ return
+
+ if(!is_active && !SSdbcore.Connect())
+ log_sql("Overwatch could not be loaded because the DB connection could not be established.")
+ return
+
+ is_active = !is_active
+ log_access("Overwatch is [is_active ? "enabled" : "disabled"]!")
+
+ . = is_active
+ if(!.)
+ return
+
+ tgui_panel_asn_data = GetAsnBanlistDatabase()
+ tgui_panel_wl_data = GetWhitelistDatabase()
+
+ var/list/clients_to_check = postponed_client_queue.Copy()
+ postponed_client_queue.Cut()
+ for (var/client/C in clients_to_check)
+ CollectClientData(C)
+ HandleClientAccessCheck(C, postponed = TRUE)
+ HandleASNbanCheck(C, postponed = TRUE)
+ CHECK_TICK
+
+/datum/controller/subsystem/overwatch/proc/CheckDBCon()
+ if(is_active && SSdbcore.Connect())
+ return TRUE
+
+ is_active = FALSE
+ log_access("A Database error has occured. Overwatch is automatically disabled.")
+ return FALSE
+
+
+/datum/controller/subsystem/overwatch/proc/CollectClientData(client/C)
+ ASSERT(istype(C))
+
+ var/_ip_addr = C.address
+
+ if(!is_active)
+ postponed_client_queue.Add(C)
+ return
+
+ if(!CheckDBCon())
+ return
+
+ C.ip_info.is_whitelisted = CheckWhitelist(C.ckey)
+
+ if(!_ip_addr || _ip_addr == "127.0.0.1")
+ return
+
+ var/list/response = GetAPIresponse(_ip_addr, C)
+
+ if(!response || !C)
+ return
+
+ C.ip_info.ip = _ip_addr
+ C.ip_info.ip_as = response["as"]
+ C.ip_info.ip_mobile = response["mobile"]
+ C.ip_info.ip_proxy = response["proxy"]
+ C.ip_info.ip_hosting = response["hosting"]
+
+ C.ip_info.is_loaded = TRUE
+ return
+
+/datum/controller/subsystem/overwatch/proc/GetAPIresponse(ip, client/C = null)
+ var/list/response = LoadCachedData(ip)
+
+ if(response && C)
+ log_access("Overwatch data for [C] ([ip]) is loaded from cache!")
+
+ while(!response && is_active && error_counter < max_error_count)
+ var/list/http = world.Export("http://ip-api.com/json/[ip]?fields=17025024")
+
+ if(!http)
+ if(C)
+ log_access("Overwatch: API connection failed, could not check [C], retrying.")
+ else
+ log_access("Overwatch: API connection failed, could not check [ip], retrying.")
+ error_counter += 1
+ sleep(2)
+ continue
+
+ var/raw_response = file2text(http["CONTENT"])
+
+ try
+ response = json_decode(raw_response)
+ catch (var/exception/e)
+ log_access("Overwatch: JSON decode error, could not check [C]. JSON decode error: [e.name]")
+ return
+
+ if(response["status"] == "fail")
+ log_access("Overwatch: Request error, could not check [C]. CheckIP response: [response["message"]]")
+ return
+
+ if(C)
+ log_access("Overwatch data for [C]([ip]) is loaded from external API!")
+ CacheData(ip, raw_response)
+
+ if(error_counter >= max_error_count && is_active)
+ message_admins("Overwatch was disabled due to connection errors!")
+ log_access("Overwatch was disabled due to connection errors!")
+ is_active = FALSE
+ return
+
+ return response
+
+/datum/controller/subsystem/overwatch/proc/CheckForAccess(client/C)
+ ASSERT(istype(C))
+
+ if(!is_active)
+ return TRUE
+
+ if(!CheckDBCon())
+ return TRUE
+
+ if(!C.address || C.holder)
+ return TRUE
+
+ if(C.ip_info.is_whitelisted)
+ return TRUE
+
+ if(C.ip_info.is_loaded)
+ if(!C.ip_info.ip_proxy && !C.ip_info.ip_hosting)
+ return TRUE
+ return FALSE
+
+ if(FetchPlayerAge(C) <= minimum_player_age)
+ log_access("[C.ckey]'s account is under the minimum player age, adding into the interview queue")
+ return FALSE
+
+ if(CheckActiveBans(C))
+ log_access("[C.ckey] has 2 or more active perma bans and has been added to the interview queue.")
+ return FALSE
+
+ log_access("Overwatch failed to load info for [C.ckey].")
+ return TRUE
+
+/datum/controller/subsystem/overwatch/proc/CheckWhitelist(ckey)
+ . = FALSE
+
+ if(!CheckDBCon())
+ return
+
+ var/datum/db_query/query = SSdbcore.NewQuery("SELECT ckey FROM overwatch_whitelist WHERE ckey = '[ckey]'")
+ query.Execute()
+
+ if(query.NextRow())
+ . = TRUE
+
+ qdel(query)
+
+ return
+
+/datum/controller/subsystem/overwatch/proc/CheckASNban(client/C)
+ ASSERT(istype(C))
+
+ . = TRUE
+
+ if(!is_active)
+ return
+
+ if(!CheckDBCon())
+ return
+
+ if(C.ip_info.is_whitelisted)
+ return
+
+ var/datum/db_query/query = SSdbcore.NewQuery("SELECT `asn` FROM overwatch_asn_ban WHERE asn = '[C.ip_info.ip_as]'")
+ query.Execute()
+
+ if(query.NextRow())
+ . = FALSE
+
+ qdel(query)
+
+ return
+
+/datum/controller/subsystem/overwatch/proc/LoadCachedData(ip)
+ ASSERT(istext(ip))
+
+ if(!CheckDBCon())
+ return FALSE
+
+ var/datum/db_query/_Cache_select_query = SSdbcore.NewQuery("SELECT response FROM overwatch_ip_cache WHERE ip = '[ip]'")
+ _Cache_select_query.Execute()
+
+ if(!_Cache_select_query.NextRow())
+ . = FALSE
+ else
+ . = json_decode(_Cache_select_query.item[1])
+
+ qdel(_Cache_select_query)
+ return
+
+/datum/controller/subsystem/overwatch/proc/CacheData(ip, raw_response)
+ ASSERT(istext(ip))
+ ASSERT(istext(raw_response))
+
+ if(!CheckDBCon())
+ return FALSE
+
+ var/datum/db_query/_Cache_insert_query = SSdbcore.NewQuery({"
+ INSERT INTO overwatch_ip_cache (ip, response)
+ VALUES (:ip, :raw_response)
+ ON DUPLICATE KEY UPDATE
+ response = :raw_response"},
+ list("ip" = ip, "raw_response" = raw_response))
+ _Cache_insert_query.Execute()
+ qdel(_Cache_insert_query)
+
+ return TRUE
+
+/datum/controller/subsystem/overwatch/proc/AddToWhitelist(ckey_input, client/Admin)
+ ASSERT(istype(Admin))
+
+ if(!CheckDBCon())
+ return
+
+ var/ckey = new_sql_sanitize_text(ckey(ckey_input))
+
+ if(!ckey)
+ return
+
+ var/datum/db_query/_Whitelist_Query = SSdbcore.NewQuery("INSERT INTO overwatch_whitelist (`ckey`, `a_ckey`, `timestamp`) VALUES ('[ckey]', '[Admin.ckey]', Now())")
+ _Whitelist_Query.Execute()
+ qdel(_Whitelist_Query)
+
+ tgui_panel_wl_data = GetWhitelistDatabase()
+ log_access("added [ckey] to Overwatch whitelist.")
+
+ return TRUE
+
+/datum/controller/subsystem/overwatch/proc/RemoveFromWhitelist(ckey, client/Admin)
+ if(!CheckDBCon())
+ return FALSE
+
+ if(!CheckWhitelist(ckey))
+ return
+
+ var/datum/db_query/_Whitelist_Query = SSdbcore.NewQuery("DELETE FROM overwatch_whitelist WHERE `ckey` = '[ckey]'")
+ _Whitelist_Query.Execute()
+ qdel(_Whitelist_Query)
+
+ tgui_panel_wl_data = GetWhitelistDatabase()
+ log_access("removed [ckey] from Overwatch whitelist.", Admin.mob)
+
+ return TRUE
+
+/datum/controller/subsystem/overwatch/proc/GetWhitelistDatabase()
+ var/datum/db_query/_Whitelist_DB_Select_Query = SSdbcore.NewQuery("SELECT `ckey`, `a_ckey`, `timestamp` from overwatch_whitelist")
+ _Whitelist_DB_Select_Query.Execute()
+
+ var/list/result = list()
+
+ while(_Whitelist_DB_Select_Query.NextRow())
+ var/list/row = list()
+ row["ckey"] = _Whitelist_DB_Select_Query.item[1]
+ row["a_ckey"] = _Whitelist_DB_Select_Query.item[2]
+ row["timestamp"] = _Whitelist_DB_Select_Query.item[3]
+
+ result["displayData"] += list(row)
+
+ qdel(_Whitelist_DB_Select_Query)
+
+ return result
+
+/datum/controller/subsystem/overwatch/proc/AddASNban(address, client/Admin)
+ if(!CheckDBCon())
+ return
+
+ if(!check_rights(R_SERVER, TRUE))
+ return
+
+ var/ip = remove_all_spaces(new_sql_sanitize_text(address))
+
+ if(length(ip) > 16)
+ return
+
+ var/list/response = GetAPIresponse(ip)
+
+ var/ip_as = response["as"]
+
+ var/datum/db_query/_ASban_Insert_Query = SSdbcore.NewQuery("INSERT INTO overwatch_asn_ban (`ip`, `asn`, `a_ckey`, `timestamp`) VALUES ('[ip]', '[ip_as]', '[Admin.ckey]', Now())")
+ _ASban_Insert_Query.Execute()
+ qdel(_ASban_Insert_Query)
+
+ tgui_panel_asn_data = GetAsnBanlistDatabase()
+ log_access("has added '[ip_as]' to the Overwatch ASN banlist.", Admin)
+
+ return TRUE
+
+/datum/controller/subsystem/overwatch/proc/RemoveASNban(ip_as, client/Admin)
+ if(!CheckDBCon())
+ return
+
+ if(!check_rights(R_SERVER, TRUE))
+ return
+
+ var/datum/db_query/_ASban_Delete_Query = SSdbcore.NewQuery("DELETE FROM overwatch_asn_ban WHERE `asn` = '[ip_as]'")
+ _ASban_Delete_Query.Execute()
+ qdel(_ASban_Delete_Query)
+
+ tgui_panel_asn_data = GetAsnBanlistDatabase()
+ log_access("has removed '[ip_as]' from the Overwatch ASN banlist.", Admin)
+
+ return TRUE
+
+
+/datum/controller/subsystem/overwatch/proc/GetAsnBanlistDatabase()
+ var/datum/db_query/_ASN_Banlist_Select_Query = SSdbcore.NewQuery("SELECT `asn`, `timestamp`, `a_ckey` from overwatch_asn_ban")
+ _ASN_Banlist_Select_Query.Execute()
+
+ var/list/result = list()
+
+ while(_ASN_Banlist_Select_Query.NextRow())
+ var/list/row = list()
+ row["asn"] = _ASN_Banlist_Select_Query.item[1]
+ row["timestamp"] = _ASN_Banlist_Select_Query.item[2]
+ row["a_ckey"] = _ASN_Banlist_Select_Query.item[3]
+
+ result["displayData"] += list(row)
+
+ qdel(_ASN_Banlist_Select_Query)
+
+ return result
+
+
+/datum/controller/subsystem/overwatch/proc/HandleClientAccessCheck(client/C, postponed = 0)
+ if(!SSoverwatch.CheckForAccess(C) && !(C.ckey in GLOB.admin_datums))
+ if(!postponed)
+ C.log_client_to_db_connection_log()
+ log_access(span_notice("Overwatch: Failed Login: [C.key]/[C.ckey]([C.address])([C.computer_id]) failed to pass Overwatch check."))
+ //qdel(C)
+ return TRUE
+ return FALSE
+
+/datum/controller/subsystem/overwatch/proc/HandleASNbanCheck(client/C, postponed = 0)
+ if(!SSoverwatch.CheckASNban(C) && !(C.ckey in GLOB.admin_datums))
+ if(!postponed)
+ C.log_client_to_db_connection_log()
+ log_access(span_notice("Overwatch: Failed Login: [C.key]/[C.ckey]([C.address])([C.computer_id]) failed to pass ASN ban check."))
+ qdel(C)
+ return
+
+/datum/controller/subsystem/overwatch/proc/FetchPlayerAge(client/C, connection_data)
+ var/cached_player_age = C.set_client_age_from_db(connection_data) //we have to cache this because other shit may change it and we need it's current value now down below.
+ if (isnum(cached_player_age) && cached_player_age == -1)
+ C.account_join_date = C.findJoinDate()
+ if(C.account_join_date)
+ var/datum/db_query/query_datediff = SSdbcore.NewQuery(
+ "SELECT DATEDIFF(Now(), :account_join_date)",
+ list("account_join_date" = C.account_join_date)
+ )
+ if(!query_datediff.Execute())
+ qdel(query_datediff)
+ return
+ if(query_datediff.NextRow())
+ cached_player_age = text2num(query_datediff.item[1])
+ qdel(query_datediff)
+ return cached_player_age
+
+/datum/controller/subsystem/overwatch/proc/CheckActiveBans(client/C)
+ if(C.ckey in GLOB.interviews.approved_ckeys) // if these are already approved no point querying as they will be allowed regardless
+ return
+ var/living_minutes = C.get_exp_living(TRUE)
+ if(living_minutes >= 30)
+ return
+
+ if(!CONFIG_GET(string/centcom_ban_db))
+ return
+
+ var/datum/http_request/request = new()
+ request.prepare(RUSTG_HTTP_METHOD_GET, "[CONFIG_GET(string/centcom_ban_db)]/[C.ckey]", "", "")
+ request.begin_async()
+ UNTIL(request.is_complete())
+ var/datum/http_response/response = request.into_response()
+ var/list/bans
+ if(response.errored)
+ return
+ if(response.status_code != 200)
+ return
+ if(response.body == "[]")
+ return
+ var/active_ban_count = 0
+ bans = json_decode(response["body"])
+ for(var/list/ban in bans)
+ if(ban["type"] != "Server")
+ continue
+ if(!ban["active"])
+ continue
+ active_ban_count++
+
+ if(active_ban_count >= max_ban_count)
+ return TRUE
+ return FALSE
+
+/client/proc/Overwatch_toggle()
+ set category = "Server"
+ set name = "Toggle Overwatch"
+
+ if(!check_rights(R_SERVER))
+ return
+
+ if(!SSdbcore.Connect())
+ to_chat(usr, span_notice("The Database is not connected!"))
+ return
+
+ var/overwatch_status = SSoverwatch.Toggle()
+ log_access("has [overwatch_status ? "enabled" : "disabled"] the Overwatch system!")
+
+
diff --git a/monkestation/code/modules/paperwork/fax.dm b/monkestation/code/modules/paperwork/fax.dm
new file mode 100644
index 000000000000..325b25b0258f
--- /dev/null
+++ b/monkestation/code/modules/paperwork/fax.dm
@@ -0,0 +1,2 @@
+/obj/machinery/fax/crowbar_act(mob/living/user, obj/item/tool)
+ return default_deconstruction_crowbar(tool)
diff --git a/monkestation/code/modules/possession/_mob_holder.dm b/monkestation/code/modules/possession/_mob_holder.dm
index 6b0479f42495..c8c356239ce8 100644
--- a/monkestation/code/modules/possession/_mob_holder.dm
+++ b/monkestation/code/modules/possession/_mob_holder.dm
@@ -63,6 +63,7 @@
desc = stored_item.desc
name = stored_item.name
real_name = stored_item.name
+ update_name_tag()
/mob/living/basic/possession_holder/create_overlay_index()
var/list/new_overlays[2]
diff --git a/monkestation/code/modules/ranching/name_tags/name_tag.dm b/monkestation/code/modules/ranching/name_tags/name_tag.dm
index 292f533d7779..ec613c35001b 100644
--- a/monkestation/code/modules/ranching/name_tags/name_tag.dm
+++ b/monkestation/code/modules/ranching/name_tags/name_tag.dm
@@ -58,6 +58,8 @@
QDEL_NULL(shadow)
/mob/proc/update_name_tag(passed_name)
+ if(QDELETED(name_tag))
+ return
if(!passed_name)
passed_name = name
@@ -66,6 +68,14 @@
passed_name = copytext(passed_name, 1, the_check)
name_tag.set_name(name)
+/mob/fully_replace_character_name(oldname, newname)
+ . = ..()
+ if(oldname != real_name)
+ update_name_tag(real_name)
+
+/mob/living/set_name()
+ . = ..()
+ update_name_tag()
/obj/effect/name_tag
plane = PLANE_NAME_TAGS
diff --git a/monkestation/code/modules/reagents/misc.dm b/monkestation/code/modules/reagents/misc.dm
index 5b5caa81ed95..26c1b1e08add 100644
--- a/monkestation/code/modules/reagents/misc.dm
+++ b/monkestation/code/modules/reagents/misc.dm
@@ -5,6 +5,9 @@
/datum/reagent/romerol
restricted = TRUE
+/datum/reagent/gondola_mutation_toxin/virtual_domain
+ restricted = TRUE // STOP SHOVING ALL THE WINDOWS AROUND
+
// Reagents that shouldn't be in the random pool, as they're either completely useless or shouldn't exist on their own.
/datum/reagent/slime_ooze
restricted = TRUE
diff --git a/monkestation/code/modules/research/designs/multi-department_designs.dm b/monkestation/code/modules/research/designs/multi-department_designs.dm
new file mode 100644
index 000000000000..246b1751a8b4
--- /dev/null
+++ b/monkestation/code/modules/research/designs/multi-department_designs.dm
@@ -0,0 +1,11 @@
+/datum/design/spraycan_gun
+ name = "Spraycan Gun"
+ id = "spraycan_gun"
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
+ build_path = /obj/item/toy/crayon/spraycan/gun
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_ENGINEERING
diff --git a/monkestation/code/modules/research/designs/nanite_designs.dm b/monkestation/code/modules/research/designs/nanite_designs.dm
index 544b639692f3..d91e9b32a770 100644
--- a/monkestation/code/modules/research/designs/nanite_designs.dm
+++ b/monkestation/code/modules/research/designs/nanite_designs.dm
@@ -469,6 +469,13 @@
program_type = /datum/nanite_program/bad_mood
category = list("Suppression Nanites")
+/datum/design/nanites/conversation_filter
+ name = "Conversation Filter"
+ desc = "The nanites pre-process words, granting the ability to filter out certain phrases."
+ id = "word_filter_nanites"
+ program_type = /datum/nanite_program/conversation_filter
+ category = list("Suppression Nanites")
+
////////////////////SENSOR NANITES//////////////////////////////////////
/datum/design/nanites/sensor_health
diff --git a/monkestation/code/modules/research/nanites/nanite_programs/suppression.dm b/monkestation/code/modules/research/nanites/nanite_programs/suppression.dm
index f0c21fc651fc..0a33beb70ec6 100644
--- a/monkestation/code/modules/research/nanites/nanite_programs/suppression.dm
+++ b/monkestation/code/modules/research/nanites/nanite_programs/suppression.dm
@@ -268,3 +268,49 @@
/datum/nanite_program/bad_mood/disable_passive_effect()
. = ..()
host_mob.clear_mood_event("nanite_sadness")
+
+/datum/nanite_program/conversation_filter
+ name = "Conversation Filter"
+ desc = "The nanites pre-process words, granting the ability to filter out certain phrases."
+ use_rate = 0.1
+ unique = FALSE
+ rogue_types = list(/datum/nanite_program/brain_misfire)
+
+/datum/nanite_program/conversation_filter/register_extra_settings()
+ . = ..()
+ extra_settings[NES_INVALID_PHRASE] = new /datum/nanite_extra_setting/text("")
+ extra_settings[NES_PHRASE_REPLACEMENT] = new /datum/nanite_extra_setting/text("\[Invalid Phrase Detected.\]")
+ extra_settings[NES_REPLACEMENT_MODE] = new /datum/nanite_extra_setting/boolean(TRUE, "Whole Sentence", "Phrase Only")
+
+/datum/nanite_program/conversation_filter/on_mob_add()
+ . = ..()
+ RegisterSignal(host_mob, COMSIG_MOVABLE_HEAR, PROC_REF(on_hear))
+
+/datum/nanite_program/conversation_filter/on_mob_remove()
+ UnregisterSignal(host_mob, COMSIG_MOVABLE_HEAR)
+
+/datum/nanite_program/conversation_filter/proc/on_hear(datum/source, list/hearing_args)
+ SIGNAL_HANDLER
+
+ if(!activated)
+ return
+
+ var/datum/nanite_extra_setting/phrase = extra_settings[NES_INVALID_PHRASE]
+ var/datum/nanite_extra_setting/replacement_mode = extra_settings[NES_REPLACEMENT_MODE]
+ var/datum/nanite_extra_setting/replacement_setting = extra_settings[NES_PHRASE_REPLACEMENT]
+ var/replacement_phrase = replacement_setting.get_value()
+
+ if(!phrase.get_value())
+ return
+
+ if(!replacement_phrase)
+ replacement_phrase = ""
+
+ if(findtext(hearing_args[HEARING_RAW_MESSAGE], phrase.get_value()))
+ if (replacement_mode.get_value())
+ hearing_args[HEARING_RAW_MESSAGE] = replacement_phrase
+ else
+ var/message = hearing_args[HEARING_RAW_MESSAGE]
+ message = replacetext(message, phrase.get_value(), replacement_phrase)
+ hearing_args[HEARING_RAW_MESSAGE] = message
+
diff --git a/monkestation/code/modules/research/nanites/nanite_programs/utility.dm b/monkestation/code/modules/research/nanites/nanite_programs/utility.dm
index 07e1a7367b2f..901feecec89a 100644
--- a/monkestation/code/modules/research/nanites/nanite_programs/utility.dm
+++ b/monkestation/code/modules/research/nanites/nanite_programs/utility.dm
@@ -250,12 +250,12 @@
if(!iscarbon(host_mob))
return FALSE
var/mob/living/carbon/C = host_mob
- if(C.nutrition <= NUTRITION_LEVEL_WELL_FED)
+ if(C.nutrition <= NUTRITION_LEVEL_STARVING) //It's the nanite programmer's job to make sure nanites don't starve the host, also allows a saboteur to starve everyone who has nanites.
return FALSE
return ..()
/datum/nanite_program/metabolic_synthesis/active_effect()
- host_mob.adjust_nutrition(-0.5)
+ host_mob.adjust_nutrition(-0.25)
/datum/nanite_program/access
name = "Subdermal ID"
diff --git a/monkestation/code/modules/research/techweb/all_nodes.dm b/monkestation/code/modules/research/techweb/all_nodes.dm
index 698a9c07f4fe..71a2f10f00bd 100644
--- a/monkestation/code/modules/research/techweb/all_nodes.dm
+++ b/monkestation/code/modules/research/techweb/all_nodes.dm
@@ -101,6 +101,7 @@
"paralyzing_nanites",
"selfscan_nanites",
"stun_nanites",
+ "word_filter_nanites",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000, TECHWEB_POINT_TYPE_NANITES = 1000)
diff --git a/monkestation/code/modules/slash_commands/world_topics.dm b/monkestation/code/modules/slash_commands/world_topics.dm
index b2c98015065e..9ea6f092f11d 100644
--- a/monkestation/code/modules/slash_commands/world_topics.dm
+++ b/monkestation/code/modules/slash_commands/world_topics.dm
@@ -4,7 +4,6 @@
/datum/world_topic/status_webhook/Run(list/input)
- . = ..()
var/datum/discord_embed/embed = new()
embed.title = "Status"
diff --git a/monkestation/code/modules/slimecore/components/latch_feeding.dm b/monkestation/code/modules/slimecore/components/latch_feeding.dm
index 5780c4b45efb..67f46be4d621 100644
--- a/monkestation/code/modules/slimecore/components/latch_feeding.dm
+++ b/monkestation/code/modules/slimecore/components/latch_feeding.dm
@@ -16,7 +16,7 @@
/datum/component/latch_feeding/Initialize(atom/movable/target, damage_type, damage_amount, hunger_restore, stops_at_crit, datum/callback/callback, checks_loc = TRUE)
. = ..()
src.target = target
- if(!target)
+ if(QDELETED(target))
return COMPONENT_INCOMPATIBLE
src.damage_type = damage_type
@@ -74,7 +74,7 @@
/datum/component/latch_feeding/proc/unlatch_target(living = TRUE, silent = FALSE)
var/mob/basic_mob = parent
- if(!target)
+ if(QDELETED(target))
return
if(basic_mob.buckled)
if(!living)
@@ -92,7 +92,7 @@
basic_mob.buckled.unbuckle_mob(basic_mob, force=TRUE)
/datum/component/latch_feeding/proc/check_buckled(mob/living/source, atom/movable/new_buckled)
- if(!new_buckled && !unlatching)
+ if(QDELETED(new_buckled) && !unlatching)
unlatching = TRUE
unlatch_target()
qdel(src)
@@ -103,7 +103,7 @@
qdel(src)
/datum/component/latch_feeding/process(seconds_per_tick)
- if(!target)
+ if(QDELETED(target))
qdel(src)
return
@@ -118,6 +118,7 @@
else
living_target.apply_damage(damage_amount, BRUTE, spread_damage = TRUE)
- if(parent) // ??? I was getting runtimes for no parent but IDK how
+ if(!QDELETED(parent)) // ??? I was getting runtimes for no parent but IDK how
SEND_SIGNAL(parent, COMSIG_MOB_FEED, target, hunger_restore)
+ if(!QDELETED(target)) // and I've also seen runtimes for this. i'm confused. ~lucy
SEND_SIGNAL(target, COMSIG_MOB_FED_ON, parent, hunger_restore)
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm
index 3138caf36bbf..9a38dfa3316d 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm
@@ -2,8 +2,8 @@
output_item = /obj/item/slimecross/burning/grey
/datum/compressor_recipe/crossbreed/burning/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/grey
@@ -15,140 +15,140 @@
/datum/compressor_recipe/crossbreed/burning/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/purple
/datum/compressor_recipe/crossbreed/burning/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/blue
/datum/compressor_recipe/crossbreed/burning/metal
required_oozes = list(
- /datum/reagent/slime_ooze/metal = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/metal
/datum/compressor_recipe/crossbreed/burning/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/yellow
/datum/compressor_recipe/crossbreed/burning/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/darkpurple
/datum/compressor_recipe/crossbreed/burning/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/darkblue
/datum/compressor_recipe/crossbreed/burning/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/silver
/datum/compressor_recipe/crossbreed/burning/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/bluespace
/datum/compressor_recipe/crossbreed/burning/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/cerulean
/datum/compressor_recipe/crossbreed/burning/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/sepia
/datum/compressor_recipe/crossbreed/burning/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/pyrite
/datum/compressor_recipe/crossbreed/burning/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/red
/datum/compressor_recipe/crossbreed/burning/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/green
/datum/compressor_recipe/crossbreed/burning/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/pink
/datum/compressor_recipe/crossbreed/burning/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/gold
/datum/compressor_recipe/crossbreed/burning/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/oil
/datum/compressor_recipe/crossbreed/burning/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/black
/datum/compressor_recipe/crossbreed/burning/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/lightpink
/datum/compressor_recipe/crossbreed/burning/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/adamantine
/datum/compressor_recipe/crossbreed/burning/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/burning/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm
index b93b35eff4de..ea10f043c388 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm
@@ -3,36 +3,36 @@
/datum/compressor_recipe/crossbreed/charged/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/grey
/datum/compressor_recipe/crossbreed/charged/orange
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/orange
/datum/compressor_recipe/crossbreed/charged/metal
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/metal
/datum/compressor_recipe/crossbreed/charged/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/purple
/datum/compressor_recipe/crossbreed/charged/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/blue
@@ -44,112 +44,112 @@
/datum/compressor_recipe/crossbreed/charged/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/darkpurple
/datum/compressor_recipe/crossbreed/charged/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/darkblue
/datum/compressor_recipe/crossbreed/charged/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/silver
/datum/compressor_recipe/crossbreed/charged/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/bluespace
/datum/compressor_recipe/crossbreed/charged/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/sepia
/datum/compressor_recipe/crossbreed/charged/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/pyrite
/datum/compressor_recipe/crossbreed/charged/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/red
/datum/compressor_recipe/crossbreed/charged/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/green
/datum/compressor_recipe/crossbreed/charged/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/pink
/datum/compressor_recipe/crossbreed/charged/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/gold
/datum/compressor_recipe/crossbreed/charged/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/oil
/datum/compressor_recipe/crossbreed/charged/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/black
/datum/compressor_recipe/crossbreed/charged/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/lightpink
/datum/compressor_recipe/crossbreed/charged/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/adamantine
/datum/compressor_recipe/crossbreed/charged/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/cerulean
/datum/compressor_recipe/crossbreed/charged/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/yellow = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/charged/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/chilling.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/chilling.dm
index e902f179f5fd..e49851d55825 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/chilling.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/chilling.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/chilling/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/grey
/datum/compressor_recipe/crossbreed/chilling/orange
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/orange
/datum/compressor_recipe/crossbreed/chilling/metal
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/metal
/datum/compressor_recipe/crossbreed/chilling/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/purple
/datum/compressor_recipe/crossbreed/chilling/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/blue
/datum/compressor_recipe/crossbreed/chilling/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/yellow
/datum/compressor_recipe/crossbreed/chilling/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/darkpurple
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/chilling/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/silver
/datum/compressor_recipe/crossbreed/chilling/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/bluespace
/datum/compressor_recipe/crossbreed/chilling/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/sepia
/datum/compressor_recipe/crossbreed/chilling/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/pyrite
/datum/compressor_recipe/crossbreed/chilling/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/red
/datum/compressor_recipe/crossbreed/chilling/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/green
/datum/compressor_recipe/crossbreed/chilling/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/pink
/datum/compressor_recipe/crossbreed/chilling/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/gold
/datum/compressor_recipe/crossbreed/chilling/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/oil
/datum/compressor_recipe/crossbreed/chilling/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/black
/datum/compressor_recipe/crossbreed/chilling/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/lightpink
/datum/compressor_recipe/crossbreed/chilling/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/adamantine
/datum/compressor_recipe/crossbreed/chilling/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/cerulean
/datum/compressor_recipe/crossbreed/chilling/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/darkblue = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/chilling/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/colors.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/colors.dm
index ff9d3754bcd6..a1fd66605217 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/colors.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/colors.dm
@@ -1,87 +1,87 @@
/datum/compressor_recipe/grey
- required_oozes = list(/datum/reagent/slime_ooze/grey = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/grey = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/grey
/datum/compressor_recipe/metal
- required_oozes = list(/datum/reagent/slime_ooze/metal = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/metal = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/metal
/datum/compressor_recipe/orange
- required_oozes = list(/datum/reagent/slime_ooze/orange = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/orange = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/orange
/datum/compressor_recipe/purple
- required_oozes = list(/datum/reagent/slime_ooze/purple = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/purple = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/purple
/datum/compressor_recipe/yellow
- required_oozes = list(/datum/reagent/slime_ooze/yellow = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/yellow = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/yellow
/datum/compressor_recipe/darkpurple
- required_oozes = list(/datum/reagent/slime_ooze/darkpurple = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/darkpurple = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/darkpurple
/datum/compressor_recipe/darkblue
- required_oozes = list(/datum/reagent/slime_ooze/darkblue = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/darkblue = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/darkblue
/datum/compressor_recipe/silver
- required_oozes = list(/datum/reagent/slime_ooze/silver = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/silver = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/silver
/datum/compressor_recipe/blue
- required_oozes = list(/datum/reagent/slime_ooze/blue = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/blue = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/blue
/datum/compressor_recipe/cerulean
- required_oozes = list(/datum/reagent/slime_ooze/cerulean = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/cerulean = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/cerulean
/datum/compressor_recipe/sepia
- required_oozes = list(/datum/reagent/slime_ooze/sepia = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/sepia = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/sepia
/datum/compressor_recipe/bluespace
- required_oozes = list(/datum/reagent/slime_ooze/bluespace = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/bluespace = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/bluespace
/datum/compressor_recipe/pyrite
- required_oozes = list(/datum/reagent/slime_ooze/pyrite = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/pyrite = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/pyrite
/datum/compressor_recipe/red
- required_oozes = list(/datum/reagent/slime_ooze/red = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/red = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/red
/datum/compressor_recipe/green
- required_oozes = list(/datum/reagent/slime_ooze/green = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/green = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/green
/datum/compressor_recipe/pink
- required_oozes = list(/datum/reagent/slime_ooze/pink = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/pink = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/pink
/datum/compressor_recipe/oil
- required_oozes = list(/datum/reagent/slime_ooze/oil = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/oil = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/oil
/datum/compressor_recipe/black
- required_oozes = list(/datum/reagent/slime_ooze/black = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/black = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/black
/datum/compressor_recipe/lightpink
- required_oozes = list(/datum/reagent/slime_ooze/lightpink = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/lightpink = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/lightpink
/datum/compressor_recipe/adamantine
- required_oozes = list(/datum/reagent/slime_ooze/adamantine = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/adamantine = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/adamantine
/datum/compressor_recipe/rainbow
- required_oozes = list(/datum/reagent/slime_ooze/rainbow = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/rainbow = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/rainbow
/datum/compressor_recipe/gold
- required_oozes = list(/datum/reagent/slime_ooze/gold = 20)
+ required_oozes = list(/datum/reagent/slime_ooze/gold = EXTRACT_RECIPE_OOZE_AMOUNT)
output_item = /obj/item/slime_extract/gold
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/consuming.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/consuming.dm
index ce77d9f1407f..9ace8a2f0d8a 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/consuming.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/consuming.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/consuming/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/grey
/datum/compressor_recipe/crossbreed/consuming/orange
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/orange
/datum/compressor_recipe/crossbreed/consuming/metal
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/metal
/datum/compressor_recipe/crossbreed/consuming/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/purple
/datum/compressor_recipe/crossbreed/consuming/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/blue
/datum/compressor_recipe/crossbreed/consuming/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/yellow
/datum/compressor_recipe/crossbreed/consuming/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/darkpurple
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/consuming/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/silver
/datum/compressor_recipe/crossbreed/consuming/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/bluespace
/datum/compressor_recipe/crossbreed/consuming/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/sepia
/datum/compressor_recipe/crossbreed/consuming/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/pyrite
/datum/compressor_recipe/crossbreed/consuming/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/red
/datum/compressor_recipe/crossbreed/consuming/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/green
/datum/compressor_recipe/crossbreed/consuming/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/pink
/datum/compressor_recipe/crossbreed/consuming/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/gold
/datum/compressor_recipe/crossbreed/consuming/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/oil
/datum/compressor_recipe/crossbreed/consuming/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/black
/datum/compressor_recipe/crossbreed/consuming/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/lightpink
/datum/compressor_recipe/crossbreed/consuming/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/adamantine
/datum/compressor_recipe/crossbreed/consuming/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/cerulean
/datum/compressor_recipe/crossbreed/consuming/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/silver = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/consuming/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/industrial.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/industrial.dm
index 07a54976d8da..4e553e19022d 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/industrial.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/industrial.dm
@@ -3,8 +3,8 @@
/datum/compressor_recipe/crossbreed/industrial/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/grey
@@ -16,140 +16,140 @@
/datum/compressor_recipe/crossbreed/industrial/orange
required_oozes = list(
- /datum/reagent/slime_ooze/metal = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/orange
/datum/compressor_recipe/crossbreed/industrial/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/purple
/datum/compressor_recipe/crossbreed/industrial/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/blue
/datum/compressor_recipe/crossbreed/industrial/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/yellow
/datum/compressor_recipe/crossbreed/industrial/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/darkpurple
/datum/compressor_recipe/crossbreed/industrial/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/darkblue
/datum/compressor_recipe/crossbreed/industrial/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/silver
/datum/compressor_recipe/crossbreed/industrial/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/bluespace
/datum/compressor_recipe/crossbreed/industrial/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/sepia
/datum/compressor_recipe/crossbreed/industrial/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/pyrite
/datum/compressor_recipe/crossbreed/industrial/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/red
/datum/compressor_recipe/crossbreed/industrial/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/green
/datum/compressor_recipe/crossbreed/industrial/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/pink
/datum/compressor_recipe/crossbreed/industrial/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/gold
/datum/compressor_recipe/crossbreed/industrial/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/oil
/datum/compressor_recipe/crossbreed/industrial/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/black
/datum/compressor_recipe/crossbreed/industrial/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/lightpink
/datum/compressor_recipe/crossbreed/industrial/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/adamantine
/datum/compressor_recipe/crossbreed/industrial/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/cerulean
/datum/compressor_recipe/crossbreed/industrial/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/industrial/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/prismatic.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/prismatic.dm
index c891dda82357..06f0959a5210 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/prismatic.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/prismatic.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/prismatic/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/grey
/datum/compressor_recipe/crossbreed/prismatic/orange
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/orange
/datum/compressor_recipe/crossbreed/prismatic/metal
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/metal
/datum/compressor_recipe/crossbreed/prismatic/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/purple
/datum/compressor_recipe/crossbreed/prismatic/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/blue
/datum/compressor_recipe/crossbreed/prismatic/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/yellow
/datum/compressor_recipe/crossbreed/prismatic/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/darkpurple
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/prismatic/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/silver
/datum/compressor_recipe/crossbreed/prismatic/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/bluespace
/datum/compressor_recipe/crossbreed/prismatic/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/sepia
/datum/compressor_recipe/crossbreed/prismatic/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/darkblue
/datum/compressor_recipe/crossbreed/prismatic/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/red
/datum/compressor_recipe/crossbreed/prismatic/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/green
/datum/compressor_recipe/crossbreed/prismatic/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/pink
/datum/compressor_recipe/crossbreed/prismatic/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/gold
/datum/compressor_recipe/crossbreed/prismatic/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/oil
/datum/compressor_recipe/crossbreed/prismatic/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/black
/datum/compressor_recipe/crossbreed/prismatic/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/lightpink
/datum/compressor_recipe/crossbreed/prismatic/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/adamantine
/datum/compressor_recipe/crossbreed/prismatic/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/cerulean
/datum/compressor_recipe/crossbreed/prismatic/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/pyrite = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/prismatic/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/recurring.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/recurring.dm
index fc0b74619efa..3081efb89d78 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/recurring.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/recurring.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/recurring/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/grey
/datum/compressor_recipe/crossbreed/recurring/orange
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/orange
/datum/compressor_recipe/crossbreed/recurring/metal
required_oozes = list(
- /datum/reagent/slime_ooze/cerulean = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/metal
/datum/compressor_recipe/crossbreed/recurring/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/purple
/datum/compressor_recipe/crossbreed/recurring/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/blue
/datum/compressor_recipe/crossbreed/recurring/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/yellow
/datum/compressor_recipe/crossbreed/recurring/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/darkpurple
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/recurring/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/silver
/datum/compressor_recipe/crossbreed/recurring/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/bluespace
/datum/compressor_recipe/crossbreed/recurring/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/sepia
/datum/compressor_recipe/crossbreed/recurring/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/darkblue
/datum/compressor_recipe/crossbreed/recurring/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/red
/datum/compressor_recipe/crossbreed/recurring/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/green
/datum/compressor_recipe/crossbreed/recurring/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/pink
/datum/compressor_recipe/crossbreed/recurring/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/gold
/datum/compressor_recipe/crossbreed/recurring/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/oil
/datum/compressor_recipe/crossbreed/recurring/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/black
/datum/compressor_recipe/crossbreed/recurring/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/lightpink
/datum/compressor_recipe/crossbreed/recurring/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/adamantine
/datum/compressor_recipe/crossbreed/recurring/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/pyrite
/datum/compressor_recipe/crossbreed/recurring/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/recurring/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/regenerative.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/regenerative.dm
index afaa3cb751da..78c9f1121b44 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/regenerative.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/regenerative.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/regenerative/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/grey = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/grey
/datum/compressor_recipe/crossbreed/regenerative/orange
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/orange
/datum/compressor_recipe/crossbreed/regenerative/metal
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/metal
/datum/compressor_recipe/crossbreed/regenerative/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/cerulean
/datum/compressor_recipe/crossbreed/regenerative/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/blue = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/blue
/datum/compressor_recipe/crossbreed/regenerative/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/yellow = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/yellow
/datum/compressor_recipe/crossbreed/regenerative/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/darkpurple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/darkpurple
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/regenerative/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/silver = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/silver
/datum/compressor_recipe/crossbreed/regenerative/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/bluespace = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/bluespace
/datum/compressor_recipe/crossbreed/regenerative/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/sepia = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/sepia
/datum/compressor_recipe/crossbreed/regenerative/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/darkblue = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/darkblue
/datum/compressor_recipe/crossbreed/regenerative/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/red = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/red
/datum/compressor_recipe/crossbreed/regenerative/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/green = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/green
/datum/compressor_recipe/crossbreed/regenerative/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/pink = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/pink
/datum/compressor_recipe/crossbreed/regenerative/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/gold = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/gold
/datum/compressor_recipe/crossbreed/regenerative/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/oil = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/oil
/datum/compressor_recipe/crossbreed/regenerative/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/black = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/black
/datum/compressor_recipe/crossbreed/regenerative/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/lightpink = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/lightpink
/datum/compressor_recipe/crossbreed/regenerative/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/adamantine = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/adamantine
/datum/compressor_recipe/crossbreed/regenerative/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/pyrite = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/pyrite
/datum/compressor_recipe/crossbreed/regenerative/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/purple = 500,
+ /datum/reagent/slime_ooze/rainbow = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/purple = REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/regenerative/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/reproductive.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/reproductive.dm
index f583194de434..c7e9edf4a314 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/reproductive.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/reproductive.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/reproductive/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/purple
/datum/compressor_recipe/crossbreed/reproductive/orange
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/orange
/datum/compressor_recipe/crossbreed/reproductive/metal
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/metal
/datum/compressor_recipe/crossbreed/reproductive/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/cerulean
/datum/compressor_recipe/crossbreed/reproductive/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/blue
/datum/compressor_recipe/crossbreed/reproductive/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/yellow
/datum/compressor_recipe/crossbreed/reproductive/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/darkpurple
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/reproductive/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/silver
/datum/compressor_recipe/crossbreed/reproductive/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/bluespace
/datum/compressor_recipe/crossbreed/reproductive/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/sepia
/datum/compressor_recipe/crossbreed/reproductive/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/darkblue
/datum/compressor_recipe/crossbreed/reproductive/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/red
/datum/compressor_recipe/crossbreed/reproductive/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/green
/datum/compressor_recipe/crossbreed/reproductive/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/pink
/datum/compressor_recipe/crossbreed/reproductive/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/gold
/datum/compressor_recipe/crossbreed/reproductive/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/oil
/datum/compressor_recipe/crossbreed/reproductive/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/black
/datum/compressor_recipe/crossbreed/reproductive/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/lightpink
/datum/compressor_recipe/crossbreed/reproductive/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/adamantine
/datum/compressor_recipe/crossbreed/reproductive/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/pyrite
/datum/compressor_recipe/crossbreed/reproductive/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/grey = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/reproductive/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/selfsustaining.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/selfsustaining.dm
index 60d960c607d9..b47c2d87c072 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/selfsustaining.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/selfsustaining.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/selfsustaining/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/purple
/datum/compressor_recipe/crossbreed/selfsustaining/orange
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/orange
/datum/compressor_recipe/crossbreed/selfsustaining/metal
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/metal
/datum/compressor_recipe/crossbreed/selfsustaining/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/cerulean
/datum/compressor_recipe/crossbreed/selfsustaining/blue
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/blue
/datum/compressor_recipe/crossbreed/selfsustaining/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/yellow
/datum/compressor_recipe/crossbreed/selfsustaining/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/grey
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/selfsustaining/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/silver
/datum/compressor_recipe/crossbreed/selfsustaining/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/bluespace
/datum/compressor_recipe/crossbreed/selfsustaining/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/sepia
/datum/compressor_recipe/crossbreed/selfsustaining/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/darkblue
/datum/compressor_recipe/crossbreed/selfsustaining/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/red
/datum/compressor_recipe/crossbreed/selfsustaining/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/green
/datum/compressor_recipe/crossbreed/selfsustaining/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/pink
/datum/compressor_recipe/crossbreed/selfsustaining/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/gold
/datum/compressor_recipe/crossbreed/selfsustaining/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/oil
/datum/compressor_recipe/crossbreed/selfsustaining/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/black
/datum/compressor_recipe/crossbreed/selfsustaining/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/lightpink
/datum/compressor_recipe/crossbreed/selfsustaining/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/adamantine
/datum/compressor_recipe/crossbreed/selfsustaining/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/pyrite
/datum/compressor_recipe/crossbreed/selfsustaining/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/darkpurple = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/selfsustaining/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/stabilized.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/stabilized.dm
index 446563660f71..4347b713b1dd 100644
--- a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/stabilized.dm
+++ b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/stabilized.dm
@@ -3,50 +3,50 @@
/datum/compressor_recipe/crossbreed/stabilized/purple
required_oozes = list(
- /datum/reagent/slime_ooze/purple = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/purple
/datum/compressor_recipe/crossbreed/stabilized/orange
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/orange = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/orange
/datum/compressor_recipe/crossbreed/stabilized/metal
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/metal = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/metal
/datum/compressor_recipe/crossbreed/stabilized/cerulean
required_oozes = list(
- /datum/reagent/slime_ooze/blue = 500,
- /datum/reagent/slime_ooze/cerulean = 500,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/cerulean
/datum/compressor_recipe/crossbreed/stabilized/darkpurple
required_oozes = list(
- /datum/reagent/slime_ooze/darkpurple = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/darkpurple
/datum/compressor_recipe/crossbreed/stabilized/yellow
required_oozes = list(
- /datum/reagent/slime_ooze/yellow = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/yellow
/datum/compressor_recipe/crossbreed/stabilized/grey
required_oozes = list(
- /datum/reagent/slime_ooze/grey = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/grey
@@ -58,98 +58,98 @@
/datum/compressor_recipe/crossbreed/stabilized/silver
required_oozes = list(
- /datum/reagent/slime_ooze/silver = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/silver
/datum/compressor_recipe/crossbreed/stabilized/bluespace
required_oozes = list(
- /datum/reagent/slime_ooze/bluespace = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/bluespace
/datum/compressor_recipe/crossbreed/stabilized/sepia
required_oozes = list(
- /datum/reagent/slime_ooze/sepia = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/sepia
/datum/compressor_recipe/crossbreed/stabilized/darkblue
required_oozes = list(
- /datum/reagent/slime_ooze/darkblue = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/darkblue
/datum/compressor_recipe/crossbreed/stabilized/red
required_oozes = list(
- /datum/reagent/slime_ooze/red = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/red
/datum/compressor_recipe/crossbreed/stabilized/green
required_oozes = list(
- /datum/reagent/slime_ooze/green = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/green
/datum/compressor_recipe/crossbreed/stabilized/pink
required_oozes = list(
- /datum/reagent/slime_ooze/pink = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/pink
/datum/compressor_recipe/crossbreed/stabilized/gold
required_oozes = list(
- /datum/reagent/slime_ooze/gold = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/gold
/datum/compressor_recipe/crossbreed/stabilized/oil
required_oozes = list(
- /datum/reagent/slime_ooze/oil = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/oil
/datum/compressor_recipe/crossbreed/stabilized/black
required_oozes = list(
- /datum/reagent/slime_ooze/black = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/black
/datum/compressor_recipe/crossbreed/stabilized/lightpink
required_oozes = list(
- /datum/reagent/slime_ooze/lightpink = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/lightpink
/datum/compressor_recipe/crossbreed/stabilized/adamantine
required_oozes = list(
- /datum/reagent/slime_ooze/adamantine = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/adamantine
/datum/compressor_recipe/crossbreed/stabilized/pyrite
required_oozes = list(
- /datum/reagent/slime_ooze/pyrite = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/pyrite
/datum/compressor_recipe/crossbreed/stabilized/rainbow
required_oozes = list(
- /datum/reagent/slime_ooze/rainbow = 500,
- /datum/reagent/slime_ooze/blue = 500,
+ /datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+ /datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
)
output_item = /obj/item/slimecross/stabilized/rainbow
diff --git a/monkestation/code/modules/slimecore/mobs/_base_slime.dm b/monkestation/code/modules/slimecore/mobs/_base_slime.dm
index 7b188eeda3ce..97ae376a9704 100644
--- a/monkestation/code/modules/slimecore/mobs/_base_slime.dm
+++ b/monkestation/code/modules/slimecore/mobs/_base_slime.dm
@@ -303,6 +303,7 @@
else
name = "[current_color.name] [(slime_flags & ADULT_SLIME) ? "adult" : "baby"] slime ([number])"
real_name = name
+ update_name_tag()
return ..()
/mob/living/basic/slime/proc/start_split()
diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm b/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm
index c3144bcdb1ad..7c29149f7786 100644
--- a/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm
+++ b/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm
@@ -5,6 +5,8 @@
/datum/material_trait/magical/on_trait_add(atom/movable/parent)
. = ..()
parent.AddComponent(/datum/component/fantasy)
+ ADD_TRAIT(parent, TRAIT_INNATELY_FANTASTICAL_ITEM, REF(src)) // DO THIS LAST OR WE WILL NEVER GET OUR BONUSES!!!
/datum/material_trait/magical/on_remove(atom/movable/parent)
+ REMOVE_TRAIT(parent, TRAIT_INNATELY_FANTASTICAL_ITEM, REF(src)) // DO THIS FIRST OR WE WILL NEVER GET OUR BONUSES DELETED!!!
qdel(parent.GetComponent(/datum/component/fantasy))
diff --git a/monkestation/code/modules/smithing/oozelings/body/organs.dm b/monkestation/code/modules/smithing/oozelings/body/organs.dm
index f5ad81e3cbab..be2c7bd315cb 100644
--- a/monkestation/code/modules/smithing/oozelings/body/organs.dm
+++ b/monkestation/code/modules/smithing/oozelings/body/organs.dm
@@ -188,18 +188,35 @@
/// Makes it so that when a slime's core has plasma poured on it, it builds a new body and moves the brain into it.
/obj/item/organ/internal/brain/slime/check_for_repair(obj/item/item, mob/user)
- if(damage && item.is_drainable() && item.reagents.has_reagent(/datum/reagent/toxin/plasma) && item.reagents.get_reagent_amount(/datum/reagent/toxin/plasma) >= 100) //attempt to heal the brain
+ if(damage && item.is_drainable() && item.reagents.has_reagent(/datum/reagent/toxin/plasma)) //attempt to heal the brain
+ if (item.reagents.get_reagent_amount(/datum/reagent/toxin/plasma) < 100)
+ user.balloon_alert(user, "too little plasma!")
+ return FALSE
+
+ user.visible_message(
+ span_notice("[user] starts to slowly pour the contents of [item] onto [src]. It seems to bubble and roil, beginning to stretch its cytoskeleton outwards..."),
+ span_notice("You start to slowly pour the contents of [item] onto [src]. It seems to bubble and roil, beginning to stretch its membrane outwards..."),
+ span_hear("You hear bubbling.")
+ )
- user.visible_message(span_notice("[user] starts to slowly pour the contents of [item] onto [src]. It seems to bubble and roil, beginning to stretch its cytoskeleton outwards..."), span_notice("You start to slowly pour the contents of [item] onto [src]. It seems to bubble and roil, beginning to stretch its membrane outwards..."))
if(!do_after(user, 30 SECONDS, src))
to_chat(user, span_warning("You failed to pour the contents of [item] onto [src]!"))
- return TRUE
+ return FALSE
+
+ if (item.reagents.get_reagent_amount(/datum/reagent/toxin/plasma) < 100) // minor exploit but might as well patch it
+ user.balloon_alert(user, "too little plasma!")
+ return FALSE
+
+ user.visible_message(
+ span_notice("[user] pours the contents of [item] onto [src], causing it to form a proper cytoplasm and outer membrane."),
+ span_notice("You pour the contents of [item] onto [src], causing it to form a proper cytoplasm and outer membrane."),
+ span_hear("You hear a splat.")
+ )
- user.visible_message(span_notice("[user] pours the contents of [item] onto [src], causing it to form a proper cytoplasm and outer membrane."), span_notice("You pour the contents of [item] onto [src], causing it to form a proper cytoplasm and outer membrane."))
- item.reagents.clear_reagents() //removes the whole shit
+ item.reagents.remove_reagent(/datum/reagent/toxin/plasma, 100)
rebuild_body(user)
return TRUE
- return FALSE
+ return ..()
/obj/item/organ/internal/brain/slime/proc/drop_items_to_ground(turf/turf)
for(var/atom/movable/item as anything in stored_items)
@@ -210,7 +227,7 @@
if(rebuilt)
return
rebuilt = TRUE
- set_organ_damage(-maxHealth) //heals 2 damage per unit of mannitol, and by using "set_organ_damage", we clear the failing variable if that was up
+ set_organ_damage(-maxHealth) // heals the brain fully
if(gps_active) // making sure the gps signal is removed if it's active on revival
gps_active = FALSE
@@ -219,23 +236,20 @@
//we have the plasma. we can rebuild them.
brainmob.mind.grab_ghost()
if(isnull(brainmob))
- if(user)
- user.balloon_alert("This brain is not a viable candidate for repair!")
+ user?.balloon_alert(user, "This brain is not a viable candidate for repair!")
return TRUE
if(isnull(brainmob.stored_dna))
- if(user)
- user.balloon_alert("This brain does not contain any dna!")
+ user?.balloon_alert(user, "This brain does not contain any dna!")
return TRUE
if(isnull(brainmob.client))
- if(user)
- user.balloon_alert("This brain does not contain a mind!")
+ user?.balloon_alert(user, "This brain does not contain a mind!")
return TRUE
var/mob/living/carbon/human/new_body = new /mob/living/carbon/human(drop_location())
brainmob.client?.prefs?.safe_transfer_prefs_to(new_body)
new_body.underwear = "Nude"
- new_body.undershirt = "Nude" //Which undershirt the player wants
- new_body.socks = "Nude" //Which socks the player wants
+ new_body.undershirt = "Nude"
+ new_body.socks = "Nude"
stored_dna.transfer_identity(new_body, transfer_SE = TRUE)
new_body.dna.features["mcolor"] = new_body.dna.features["mcolor"]
new_body.dna.update_uf_block(DNA_MUTANT_COLOR_BLOCK)
diff --git a/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm b/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm
index 2a2ea1a8545a..85db21d7e072 100644
--- a/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm
+++ b/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm
@@ -12,7 +12,7 @@
/obj/item/bodypart/arm/right/ethereal
icon_greyscale = 'monkestation/icons/mob/species/ethereal/bodyparts.dmi'
-/obj/item/bodypart/leg/right/ethereal
+/obj/item/bodypart/leg/left/ethereal
icon_greyscale = 'monkestation/icons/mob/species/ethereal/bodyparts.dmi'
/obj/item/bodypart/leg/right/ethereal
diff --git a/monkestation/code/modules/surgery/organs/external/ethereal_accessories.dm b/monkestation/code/modules/surgery/organs/external/ethereal_accessories.dm
new file mode 100644
index 000000000000..3fd637f3e771
--- /dev/null
+++ b/monkestation/code/modules/surgery/organs/external/ethereal_accessories.dm
@@ -0,0 +1,43 @@
+/obj/item/organ/external/ethereal_horns
+ name = "ethereal horns"
+ desc = "These seemingly decorative horns are actually sensory organs, albiet somewhat vegistal ones in their current enviroment, for detecting nearby electromagnetic fields. They are also extremely sensitive, a fact that which whatever poor ethereal you took these from is probably heavily aware of."
+ icon_state = "ethereal_horns"
+ icon = 'monkestation/icons/obj/medical/organs/organs.dmi'
+
+ preference = "feature_ethereal_horns"
+ zone = BODY_ZONE_HEAD
+ slot = ORGAN_SLOT_EXTERNAL_HORNS
+
+ use_mob_sprite_as_obj_sprite = TRUE
+ bodypart_overlay = /datum/bodypart_overlay/mutant/ethereal_horns
+
+/datum/bodypart_overlay/mutant/ethereal_horns
+ layers = EXTERNAL_FRONT|EXTERNAL_ADJACENT
+ feature_key = "ethereal_horns"
+
+/datum/bodypart_overlay/mutant/ethereal_horns/get_global_feature_list()
+ return GLOB.ethereal_horns_list
+
+/datum/bodypart_overlay/mutant/ethereal_horns/can_draw_on_bodypart(mob/living/carbon/human/human)
+ if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
+ return FALSE
+
+ return TRUE
+
+/obj/item/organ/external/tail/ethereal
+ name = "ethereal tail"
+ desc = "A severed ethereal tail, it reminds you of a bundle of fiber optic cable."
+ icon_state = "ethereal_horns"
+ icon = 'monkestation/icons/obj/medical/organs/organs.dmi'
+
+ preference = "feature_ethereal_tail"
+
+ use_mob_sprite_as_obj_sprite = TRUE
+ bodypart_overlay = /datum/bodypart_overlay/mutant/tail/ethereal
+
+/datum/bodypart_overlay/mutant/tail/ethereal
+ layers = EXTERNAL_FRONT|EXTERNAL_BEHIND
+ feature_key = "ethereal_tail"
+
+/datum/bodypart_overlay/mutant/tail/ethereal/get_global_feature_list()
+ return GLOB.ethereal_tail_list
diff --git a/monkestation/code/modules/surgery/organs/internal/eyes.dm b/monkestation/code/modules/surgery/organs/internal/eyes.dm
index e43b251973a0..076ebd4e1457 100644
--- a/monkestation/code/modules/surgery/organs/internal/eyes.dm
+++ b/monkestation/code/modules/surgery/organs/internal/eyes.dm
@@ -42,3 +42,6 @@
icon = 'monkestation/icons/obj/medical/organs/organs.dmi'
eye_icon_state = "floraneyes"
icon_state = "floran_eyeballs"
+
+/obj/item/organ/internal/eyes/ethereal
+ eye_icon_state = "etherealeyes"
diff --git a/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm b/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm
index d3c3e7e11357..1e711c760c71 100644
--- a/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm
+++ b/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm
@@ -48,6 +48,7 @@
new_mob.mind.add_antag_datum(transformed_antag_datum)
new_mob.name = affected_mob.real_name
new_mob.real_name = new_mob.name
+ new_mob.update_name_tag()
qdel(affected_mob)
/datum/symptom/transformation/proc/replace_banned_player(mob/living/new_mob, mob/living/affected_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed.
diff --git a/monkestation/code/modules/virology/disease/symtoms/stage3.dm b/monkestation/code/modules/virology/disease/symtoms/stage3.dm
index 78e7e4cd0373..f1f9413f4169 100644
--- a/monkestation/code/modules/virology/disease/symtoms/stage3.dm
+++ b/monkestation/code/modules/virology/disease/symtoms/stage3.dm
@@ -492,52 +492,6 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list())
mob.adjustBruteLoss(-get_damage)
mob.adjustToxLoss(max(1,get_damage * multiplier / 5))
-/datum/symptom/mommi_hallucination
- name = "Supermatter Syndrome"
- desc = "Causes the infected to experience engineering-related hallucinations."
- stage = 3
- badness = EFFECT_DANGER_ANNOYING
-
-/datum/symptom/mommi_hallucination/activate(mob/living/carbon/mob)
- if(prob(50))
- mob << sound('sound/effects/supermatter.ogg', volume = 25)
-
- var/mob/living/silicon/robot/mommi = /mob/living/silicon/robot
- for(var/mob/living/M in viewers(mob))
- if(M == mob)
- continue
-
- var/image/crab = image(icon = null)
- crab.appearance = initial(mommi.appearance)
-
- crab.loc = M
- crab.override = 1
-
- var/client/client = mob.client
- if(client)
- client.images += crab
- var/duration = rand(60 SECONDS, 120 SECONDS)
-
- spawn(duration)
- if(client)
- client.images.Remove(crab)
-
- var/list/turf_list = list()
- for(var/turf/turf in spiral_block(get_turf(mob), 40))
- if(prob(4))
- turf_list += turf
- if(turf_list.len)
- for(var/turf/open/floor/turf in turf_list)
- var/image/supermatter = image('icons/obj/engine/supermatter.dmi', turf ,"sm", ABOVE_MOB_LAYER)
-
- var/client/client = mob.client
- if(client)
- client.images += supermatter
- var/duration = rand(60 SECONDS, 120 SECONDS)
-
- spawn(duration)
- if(client)
- client.images.Remove(supermatter)
/datum/symptom/wendigo_hallucination
diff --git a/monkestation/icons/area/areas_station.dmi b/monkestation/icons/area/areas_station.dmi
index 4fbabcddc3bb..2206a3437d85 100644
Binary files a/monkestation/icons/area/areas_station.dmi and b/monkestation/icons/area/areas_station.dmi differ
diff --git a/monkestation/icons/mob/species/ethereal/bodyparts.dmi b/monkestation/icons/mob/species/ethereal/bodyparts.dmi
index f54fb12f996a..d562fb10d030 100644
Binary files a/monkestation/icons/mob/species/ethereal/bodyparts.dmi and b/monkestation/icons/mob/species/ethereal/bodyparts.dmi differ
diff --git a/monkestation/icons/mob/species/ethereal/ethereal_horns.dmi b/monkestation/icons/mob/species/ethereal/ethereal_horns.dmi
new file mode 100644
index 000000000000..1016275aa9b5
Binary files /dev/null and b/monkestation/icons/mob/species/ethereal/ethereal_horns.dmi differ
diff --git a/monkestation/icons/mob/species/ethereal/ethereal_tail.dmi b/monkestation/icons/mob/species/ethereal/ethereal_tail.dmi
new file mode 100644
index 000000000000..3774c4c41b03
Binary files /dev/null and b/monkestation/icons/mob/species/ethereal/ethereal_tail.dmi differ
diff --git a/monkestation/icons/obj/atmospherics/pipes/disposal.dmi b/monkestation/icons/obj/atmospherics/pipes/disposal.dmi
index 6fbc7f0674a7..758e20732d63 100644
Binary files a/monkestation/icons/obj/atmospherics/pipes/disposal.dmi and b/monkestation/icons/obj/atmospherics/pipes/disposal.dmi differ
diff --git a/monkestation/icons/obj/medical/organs/organs.dmi b/monkestation/icons/obj/medical/organs/organs.dmi
index 05102aa69188..92ae523927f4 100644
Binary files a/monkestation/icons/obj/medical/organs/organs.dmi and b/monkestation/icons/obj/medical/organs/organs.dmi differ
diff --git a/monkestation/icons/obj/misc.dmi b/monkestation/icons/obj/misc.dmi
index dd778366ccb9..533da229a7f6 100644
Binary files a/monkestation/icons/obj/misc.dmi and b/monkestation/icons/obj/misc.dmi differ
diff --git a/monkestation/icons/obj/sandstone_structures.dmi b/monkestation/icons/obj/sandstone_structures.dmi
new file mode 100644
index 000000000000..547624b7ba41
Binary files /dev/null and b/monkestation/icons/obj/sandstone_structures.dmi differ
diff --git a/monkestation/icons/obj/smooth_structures/sandstone_table.dmi b/monkestation/icons/obj/smooth_structures/sandstone_table.dmi
new file mode 100644
index 000000000000..9c354967472e
Binary files /dev/null and b/monkestation/icons/obj/smooth_structures/sandstone_table.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index a88c219a875f..a83dceeec382 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -417,6 +417,7 @@
#include "code\__DEFINES\~monkestation\misc.dm"
#include "code\__DEFINES\~monkestation\mobs.dm"
#include "code\__DEFINES\~monkestation\oozeling.dm"
+#include "code\__DEFINES\~monkestation\overwatch.dm"
#include "code\__DEFINES\~monkestation\particles.dm"
#include "code\__DEFINES\~monkestation\physics.dm"
#include "code\__DEFINES\~monkestation\power.dm"
@@ -555,6 +556,8 @@
#include "code\__HELPERS\~monkestation-helpers\announcements.dm"
#include "code\__HELPERS\~monkestation-helpers\antags.dm"
#include "code\__HELPERS\~monkestation-helpers\atoms.dm"
+#include "code\__HELPERS\~monkestation-helpers\clients.dm"
+#include "code\__HELPERS\~monkestation-helpers\cmp.dm"
#include "code\__HELPERS\~monkestation-helpers\icon_smoothing.dm"
#include "code\__HELPERS\~monkestation-helpers\roundend.dm"
#include "code\__HELPERS\~monkestation-helpers\time.dm"
@@ -3065,7 +3068,6 @@
#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_interact.dm"
#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_modes.dm"
#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_thresholds.dm"
-#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_variants.dm"
#include "code\modules\atmospherics\machinery\components\components_base.dm"
#include "code\modules\atmospherics\machinery\components\tank.dm"
#include "code\modules\atmospherics\machinery\components\binary_devices\binary_devices.dm"
@@ -5718,6 +5720,7 @@
#include "monkestation\code\datums\interaction_particle.dm"
#include "monkestation\code\datums\meta_tokens.dm"
#include "monkestation\code\datums\patreon_data.dm"
+#include "monkestation\code\datums\ruins.dm"
#include "monkestation\code\datums\stamina_container.dm"
#include "monkestation\code\datums\twitch_data.dm"
#include "monkestation\code\datums\achievements\misc_achievements.dm"
@@ -5785,9 +5788,11 @@
#include "monkestation\code\game\objects\items\gravity_gun.dm"
#include "monkestation\code\game\objects\items\jukebox_beacon.dm"
#include "monkestation\code\game\objects\items\miningweapons.dm"
+#include "monkestation\code\game\objects\items\mop.dm"
#include "monkestation\code\game\objects\items\mothlet_grenade.dm"
#include "monkestation\code\game\objects\items\plushies.dm"
#include "monkestation\code\game\objects\items\recursive_gift.dm"
+#include "monkestation\code\game\objects\items\spraycan_gun.dm"
#include "monkestation\code\game\objects\items\stickers.dm"
#include "monkestation\code\game\objects\items\superglue.dm"
#include "monkestation\code\game\objects\items\venom_knife.dm"
@@ -5821,6 +5826,9 @@
#include "monkestation\code\game\objects\items\storage\boxes.dm"
#include "monkestation\code\game\objects\items\storage\crate.dm"
#include "monkestation\code\game\objects\items\storage\uplink_kits.dm"
+#include "monkestation\code\game\objects\structures\tables_racks.dm"
+#include "monkestation\code\game\objects\structures\beds_chairs\chair.dm"
+#include "monkestation\code\game\objects\structures\crates_lockers\crates.dm"
#include "monkestation\code\game\turfs\open\water.dm"
#include "monkestation\code\game\turfs\open\floor\misc_floor.dm"
#include "monkestation\code\modules\_paperwork\paper_premade.dm"
@@ -5831,6 +5839,7 @@
#include "monkestation\code\modules\admin\smites\dagothstripsmite.dm"
#include "monkestation\code\modules\admin\smites\phobia_christian_minecraft.dm"
#include "monkestation\code\modules\admin\smites\where_are_your_fingers.dm"
+#include "monkestation\code\modules\admin\verbs\kick_player_by_ckey.dm"
#include "monkestation\code\modules\aesthetics\airlock\airlock.dm"
#include "monkestation\code\modules\aesthetics\items\clothing.dm"
#include "monkestation\code\modules\aesthetics\mapping\tilecoloring.dm"
@@ -5895,6 +5904,7 @@
#include "monkestation\code\modules\antagonists\brother\actions\gear.dm"
#include "monkestation\code\modules\antagonists\brother\gear\_gear.dm"
#include "monkestation\code\modules\antagonists\brother\gear\recipes.dm"
+#include "monkestation\code\modules\antagonists\changeling\powers\tiny_prick.dm"
#include "monkestation\code\modules\antagonists\clock_cult\area.dm"
#include "monkestation\code\modules\antagonists\clock_cult\dynamic_ruleset.dm"
#include "monkestation\code\modules\antagonists\clock_cult\globals.dm"
@@ -6106,6 +6116,7 @@
#include "monkestation\code\modules\art_sci_overrides\faults\zap.dm"
#include "monkestation\code\modules\assembly\flash.dm"
#include "monkestation\code\modules\atmospherics\machinery\air_alarm\air_alarm_ac.dm"
+#include "monkestation\code\modules\balloon_alert\balloon_alert.dm"
#include "monkestation\code\modules\ballpit\ballbit_sink.dm"
#include "monkestation\code\modules\ballpit\ballpit.dm"
#include "monkestation\code\modules\bitrunners\code\ability_disks.dm"
@@ -6291,6 +6302,7 @@
#include "monkestation\code\modules\client\preferences\alt_jobs\_job.dm"
#include "monkestation\code\modules\client\preferences\alt_jobs\titles.dm"
#include "monkestation\code\modules\client\preferences\species_features\arachnid.dm"
+#include "monkestation\code\modules\client\preferences\species_features\ethereal.dm"
#include "monkestation\code\modules\client\preferences\species_features\floran.dm"
#include "monkestation\code\modules\client\preferences\species_features\goblin.dm"
#include "monkestation\code\modules\client\preferences\species_features\ipc.dm"
@@ -6588,14 +6600,18 @@
#include "monkestation\code\modules\mining\accelerators\repeater.dm"
#include "monkestation\code\modules\mining\accelerators\shockwave.dm"
#include "monkestation\code\modules\mining\accelerators\shotgun.dm"
+#include "monkestation\code\modules\mob\login.dm"
#include "monkestation\code\modules\mob\mob.dm"
#include "monkestation\code\modules\mob\mob_defines.dm"
+#include "monkestation\code\modules\mob\transform_procs.dm"
#include "monkestation\code\modules\mob\dead\new_player\new_player.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\_base.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\anime.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\arachnid_appendages.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\arachnid_chelicerae.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\clockwork_sprites.dm"
+#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\ethereal_horns.dm"
+#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\ethereal_tail.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\floran_leaves.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\goblin_accessories.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\hair.dm"
@@ -6771,6 +6787,11 @@
#include "monkestation\code\modules\outdoors\code\screen_alerts\alert.dm"
#include "monkestation\code\modules\outdoors\code\screen_alerts\blurb.dm"
#include "monkestation\code\modules\outdoors\code\sunlight\sunlight_object.dm"
+#include "monkestation\code\modules\overwatch\client_info.dm"
+#include "monkestation\code\modules\overwatch\subsystem.dm"
+#include "monkestation\code\modules\overwatch\panels\asn_panel.dm"
+#include "monkestation\code\modules\overwatch\panels\whitelist_panel.dm"
+#include "monkestation\code\modules\paperwork\fax.dm"
#include "monkestation\code\modules\physics\atom_movables.dm"
#include "monkestation\code\modules\physics\physics_component.dm"
#include "monkestation\code\modules\physics\physics_SS.dm"
@@ -6908,6 +6929,7 @@
#include "monkestation\code\modules\research\designs\mecha_designs.dm"
#include "monkestation\code\modules\research\designs\mechfabricator_designs.dm"
#include "monkestation\code\modules\research\designs\medical_designs.dm"
+#include "monkestation\code\modules\research\designs\multi-department_designs.dm"
#include "monkestation\code\modules\research\designs\nanite_designs.dm"
#include "monkestation\code\modules\research\designs\security_designs.dm"
#include "monkestation\code\modules\research\nanites\nanite_chamber.dm"
@@ -7155,6 +7177,7 @@
#include "monkestation\code\modules\surgery\organs\augments.dm"
#include "monkestation\code\modules\surgery\organs\autosurgeon.dm"
#include "monkestation\code\modules\surgery\organs\external\anime.dm"
+#include "monkestation\code\modules\surgery\organs\external\ethereal_accessories.dm"
#include "monkestation\code\modules\surgery\organs\external\floran_accessories.dm"
#include "monkestation\code\modules\surgery\organs\external\goblin_accessories.dm"
#include "monkestation\code\modules\surgery\organs\external\ipc.dm"
diff --git a/tgui/packages/common/keys.ts b/tgui/packages/common/keys.ts
new file mode 100644
index 000000000000..61b79992b486
--- /dev/null
+++ b/tgui/packages/common/keys.ts
@@ -0,0 +1,39 @@
+/**
+ * ### Key codes.
+ * event.keyCode is deprecated, use this reference instead.
+ *
+ * Handles modifier keys (Shift, Alt, Control) and arrow keys.
+ *
+ * For alphabetical keys, use the actual character (e.g. 'a') instead of the key code.
+ *
+ * Something isn't here that you want? Just add it:
+ * @url https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values
+ * @usage
+ * ```ts
+ * import { KEY } from 'tgui/common/keys';
+ *
+ * if (event.key === KEY.Enter) {
+ * // do something
+ * }
+ * ```
+ */
+export enum KEY {
+ Alt = 'Alt',
+ Backspace = 'Backspace',
+ Control = 'Control',
+ Delete = 'Delete',
+ Down = 'Down',
+ End = 'End',
+ Enter = 'Enter',
+ Escape = 'Esc',
+ Home = 'Home',
+ Insert = 'Insert',
+ Left = 'Left',
+ PageDown = 'PageDown',
+ PageUp = 'PageUp',
+ Right = 'Right',
+ Shift = 'Shift',
+ Space = ' ',
+ Tab = 'Tab',
+ Up = 'Up',
+}
diff --git a/tgui/packages/common/timer.js b/tgui/packages/common/timer.ts
similarity index 59%
rename from tgui/packages/common/timer.js
rename to tgui/packages/common/timer.ts
index 7d89e935b9b5..49d36484200b 100644
--- a/tgui/packages/common/timer.js
+++ b/tgui/packages/common/timer.ts
@@ -10,9 +10,13 @@
* called for N milliseconds. If `immediate` is passed, trigger the
* function on the leading edge, instead of the trailing.
*/
-export const debounce = (fn, time, immediate = false) => {
- let timeout;
- return (...args) => {
+export const debounce = any>(
+ fn: F,
+ time: number,
+ immediate = false
+): ((...args: Parameters) => void) => {
+ let timeout: ReturnType | null;
+ return (...args: Parameters) => {
const later = () => {
timeout = null;
if (!immediate) {
@@ -20,7 +24,7 @@ export const debounce = (fn, time, immediate = false) => {
}
};
const callNow = immediate && !timeout;
- clearTimeout(timeout);
+ clearTimeout(timeout!);
timeout = setTimeout(later, time);
if (callNow) {
fn(...args);
@@ -32,18 +36,24 @@ export const debounce = (fn, time, immediate = false) => {
* Returns a function, that, when invoked, will only be triggered at most once
* during a given window of time.
*/
-export const throttle = (fn, time) => {
- let previouslyRun, queuedToRun;
- return function invokeFn(...args) {
+export const throttle = any>(
+ fn: F,
+ time: number
+): ((...args: Parameters) => void) => {
+ let previouslyRun: number | null,
+ queuedToRun: ReturnType | null;
+ return function invokeFn(...args: Parameters) {
const now = Date.now();
- queuedToRun = clearTimeout(queuedToRun);
+ if (queuedToRun) {
+ clearTimeout(queuedToRun);
+ }
if (!previouslyRun || now - previouslyRun >= time) {
fn.apply(null, args);
previouslyRun = now;
} else {
queuedToRun = setTimeout(
- invokeFn.bind(null, ...args),
- time - (now - previouslyRun)
+ () => invokeFn(...args),
+ time - (now - (previouslyRun ?? 0))
);
}
};
@@ -54,5 +64,5 @@ export const throttle = (fn, time) => {
*
* @param {number} time
*/
-export const sleep = (time) =>
+export const sleep = (time: number): Promise =>
new Promise((resolve) => setTimeout(resolve, time));
diff --git a/tgui/packages/tgui-panel/chat/ChatPageSettings.js b/tgui/packages/tgui-panel/chat/ChatPageSettings.js
index c0d9962d2531..8a8384835043 100644
--- a/tgui/packages/tgui-panel/chat/ChatPageSettings.js
+++ b/tgui/packages/tgui-panel/chat/ChatPageSettings.js
@@ -16,9 +16,9 @@ export const ChatPageSettings = (props, context) => {
return (
-
+
dispatch(
@@ -30,8 +30,25 @@ export const ChatPageSettings = (props, context) => {
}
/>
+
+
+ dispatch(
+ updateChatPage({
+ pageId: page.id,
+ hideUnreadCount: !page.hideUnreadCount,
+ })
+ )
+ }
+ />
+
+ }
+ />
diff --git a/tgui/packages/tgui-panel/chat/ChatTabs.js b/tgui/packages/tgui-panel/chat/ChatTabs.js
index 1d4f6f65edfe..e20e6c278915 100644
--- a/tgui/packages/tgui-panel/chat/ChatTabs.js
+++ b/tgui/packages/tgui-panel/chat/ChatTabs.js
@@ -37,6 +37,7 @@ export const ChatTabs = (props, context) => {
key={page.id}
selected={page === currentPage}
rightSlot={
+ !page.hideUnreadCount &&
page.unreadCount > 0 && (
)
diff --git a/tgui/packages/tgui-panel/chat/actions.js b/tgui/packages/tgui-panel/chat/actions.js
index e9919fcfa2b8..802801e63497 100644
--- a/tgui/packages/tgui-panel/chat/actions.js
+++ b/tgui/packages/tgui-panel/chat/actions.js
@@ -9,6 +9,7 @@ import { createPage } from './model';
export const loadChat = createAction('chat/load');
export const rebuildChat = createAction('chat/rebuild');
+export const clearChat = createAction('chat/clear');
export const updateMessageCount = createAction('chat/updateMessageCount');
export const addChatPage = createAction('chat/addPage', () => ({
payload: createPage(),
diff --git a/tgui/packages/tgui-panel/chat/middleware.js b/tgui/packages/tgui-panel/chat/middleware.js
index ecafbd23641f..05fb6041ce08 100644
--- a/tgui/packages/tgui-panel/chat/middleware.js
+++ b/tgui/packages/tgui-panel/chat/middleware.js
@@ -8,7 +8,7 @@ import DOMPurify from 'dompurify';
import { storage } from 'common/storage';
import { loadSettings, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from '../settings/actions';
import { selectSettings } from '../settings/selectors';
-import { addChatPage, changeChatPage, changeScrollTracking, loadChat, rebuildChat, removeChatPage, saveChatToDisk, toggleAcceptedType, updateMessageCount } from './actions';
+import { addChatPage, changeChatPage, changeScrollTracking, clearChat, loadChat, rebuildChat, removeChatPage, saveChatToDisk, toggleAcceptedType, updateMessageCount } from './actions';
import { MAX_PERSISTED_MESSAGES, MESSAGE_SAVE_INTERVAL } from './constants';
import { createMessage, serializeMessage } from './model';
import { chatRenderer } from './renderer';
@@ -173,6 +173,10 @@ export const chatMiddleware = (store) => {
chatRenderer.saveToDisk();
return;
}
+ if (type === clearChat.type) {
+ chatRenderer.clearChat();
+ return;
+ }
return next(action);
};
};
diff --git a/tgui/packages/tgui-panel/chat/model.js b/tgui/packages/tgui-panel/chat/model.js
index fa12153890d8..99292e74fc01 100644
--- a/tgui/packages/tgui-panel/chat/model.js
+++ b/tgui/packages/tgui-panel/chat/model.js
@@ -22,6 +22,7 @@ export const createPage = (obj) => {
name: 'New Tab',
acceptedTypes: acceptedTypes,
unreadCount: 0,
+ hideUnreadCount: false,
createdAt: Date.now(),
...obj,
};
diff --git a/tgui/packages/tgui-panel/chat/renderer.js b/tgui/packages/tgui-panel/chat/renderer.js
index f7ce9277cf68..e8fb0970cf15 100644
--- a/tgui/packages/tgui-panel/chat/renderer.js
+++ b/tgui/packages/tgui-panel/chat/renderer.js
@@ -192,7 +192,8 @@ class ChatRenderer {
const highlightWholeMessage = setting.highlightWholeMessage;
const matchWord = setting.matchWord;
const matchCase = setting.matchCase;
- const allowedRegex = /^[a-z0-9_\-$/^[\s\]\\]+$/gi;
+ const enabled = setting.enabled;
+ const allowedRegex = /^[a-zа-яё0-9_\-$/^[\s\]\\]+$/gi;
const lines = String(text)
.split(',')
.map((str) => str.trim())
@@ -247,6 +248,7 @@ class ChatRenderer {
this.highlightParsers = [];
}
this.highlightParsers.push({
+ enabled,
highlightWords,
highlightRegex,
highlightColor,
@@ -402,17 +404,19 @@ class ChatRenderer {
// Highlight text
if (!message.avoidHighlighting && this.highlightParsers) {
- this.highlightParsers.map((parser) => {
- const highlighted = highlightNode(
- node,
- parser.highlightRegex,
- parser.highlightWords,
- (text) => createHighlightNode(text, parser.highlightColor)
- );
- if (highlighted && parser.highlightWholeMessage) {
- node.className += ' ChatMessage--highlighted';
- }
- });
+ this.highlightParsers
+ .filter((parser) => parser.enabled)
+ .map((parser) => {
+ const highlighted = highlightNode(
+ node,
+ parser.highlightRegex,
+ parser.highlightWords,
+ (text) => createHighlightNode(text, parser.highlightColor)
+ );
+ if (highlighted && parser.highlightWholeMessage) {
+ node.className += ' ChatMessage--highlighted';
+ }
+ });
}
// Linkify text
const linkifyNodes = node.querySelectorAll('.linkify');
@@ -537,6 +541,29 @@ class ChatRenderer {
});
}
+ /**
+ * @clearChat
+ * @copyright 2023
+ * @author Cheffie
+ * @link https://github.com/CheffieGithub
+ * @license MIT
+ */
+ clearChat() {
+ const messages = this.visibleMessages;
+ this.visibleMessages = [];
+ for (let i = 0; i < messages.length; i++) {
+ const message = messages[i];
+ this.rootNode.removeChild(message.node);
+ // Mark this message as pruned
+ message.node = 'pruned';
+ }
+ // Remove pruned messages from the message array
+ this.messages = this.messages.filter(
+ (message) => message.node !== 'pruned'
+ );
+ logger.log(`Cleared chat`);
+ }
+
saveToDisk() {
// Allow only on IE11
if (Byond.IS_LTE_IE10) {
diff --git a/tgui/packages/tgui-panel/chat/replaceInTextNode.js b/tgui/packages/tgui-panel/chat/replaceInTextNode.js
index 753997b3b821..8e616ea26cda 100644
--- a/tgui/packages/tgui-panel/chat/replaceInTextNode.js
+++ b/tgui/packages/tgui-panel/chat/replaceInTextNode.js
@@ -93,7 +93,7 @@ export const replaceInTextNode = (regex, words, createNode) => (node) => {
for (let word of words) {
// Capture if the word is at the beginning, end, middle,
// or by itself in a message
- wordRegexStr += `^${word}\\W|\\W${word}\\W|\\W${word}$|^${word}$`;
+ wordRegexStr += `^${word}\\s\\W|\\s\\W${word}\\s\\W|\\s\\W${word}$|^${word}\\s\\W$`;
// Make sure the last character for the expression is NOT '|'
if (++i !== words.length) {
wordRegexStr += '|';
diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.js b/tgui/packages/tgui-panel/settings/SettingsPanel.js
index 90abe4e36b26..c68fa0cd5012 100644
--- a/tgui/packages/tgui-panel/settings/SettingsPanel.js
+++ b/tgui/packages/tgui-panel/settings/SettingsPanel.js
@@ -5,13 +5,14 @@
*/
import { toFixed } from 'common/math';
+import { capitalize } from 'common/string';
import { useLocalState } from 'tgui/backend';
import { useDispatch, useSelector } from 'common/redux';
-import { Box, Button, ColorBox, Divider, Dropdown, Flex, Input, LabeledList, NumberInput, Section, Stack, Tabs, TextArea } from 'tgui/components';
+import { Box, Button, Collapsible, ColorBox, Divider, Stack, Input, LabeledList, NumberInput, Section, Tabs, TextArea } from 'tgui/components';
import { ChatPageSettings } from '../chat';
import { rebuildChat, saveChatToDisk } from '../chat/actions';
import { THEMES } from '../themes';
-import { changeSettingsTab, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from './actions';
+import { clearChat, changeSettingsTab, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from './actions';
import { SETTINGS_TABS, FONTS, MAX_HIGHLIGHT_SETTINGS } from './constants';
import { selectActiveTab, selectSettings, selectHighlightSettings, selectHighlightSettingById } from './selectors';
@@ -60,37 +61,61 @@ export const SettingsGeneral = (props, context) => {
-
- dispatch(
- updateSettings({
- theme: value,
- })
- )
- }
- />
+ {THEMES.map((THEME) => (
+
-
-
- {(!freeFont && (
-
- dispatch(
- updateSettings({
- fontFamily: value,
- })
- )
- }
- />
- )) || (
+
+ {(!freeFont && (
+ {
+ setFreeFont(!freeFont);
+ }}
+ />
+ }>
+ {FONTS.map((FONT) => (
+
+ )) || (
+
+ onChange={(value) =>
dispatch(
updateSettings({
fontFamily: value,
@@ -98,24 +123,22 @@ export const SettingsGeneral = (props, context) => {
)
}
/>
- )}
-
-
-
-
+
{
value={fontSize}
unit="px"
format={(value) => toFixed(value)}
- onChange={(e, value) =>
+ onChange={(value) =>
dispatch(
updateSettings({
fontSize: value,
@@ -134,14 +157,14 @@ export const SettingsGeneral = (props, context) => {
toFixed(value, 2)}
- onDrag={(e, value) =>
+ onDrag={(value) =>
dispatch(
updateSettings({
lineHeight: value,
@@ -152,9 +175,24 @@ export const SettingsGeneral = (props, context) => {
-
+
+
+
+
+ dispatch(clearChat())}
+ />
+
+
);
};
@@ -163,30 +201,28 @@ const TextHighlightSettings = (props, context) => {
const highlightSettings = useSelector(context, selectHighlightSettings);
const dispatch = useDispatch(context);
return (
-
-
-
- {highlightSettings.map((id, i) => (
-
+
+ {highlightSettings.map((id, i) => (
+
+ ))}
+ {highlightSettings.length < MAX_HIGHLIGHT_SETTINGS && (
+
+
-
+
+ )}
+