diff --git a/_maps/RandomZLevels/away_mission/SnowCabin.dmm b/_maps/RandomZLevels/away_mission/SnowCabin.dmm
index dda382c4b7..e7f5341bea 100644
--- a/_maps/RandomZLevels/away_mission/SnowCabin.dmm
+++ b/_maps/RandomZLevels/away_mission/SnowCabin.dmm
@@ -4408,7 +4408,7 @@
/area/awaymission/cabin/caves)
"lr" = (
/obj/effect/decal/cleanable/blood/old,
-/obj/item/kitchen/knife/carrotshiv,
+/obj/item/kitchen/knife/shiv/carrot,
/obj/effect/decal/cleanable/glitter/blue{
desc = "It looks like fancy glitter to me.";
name = "icy wind"
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 91931bfd0a..69f26b106a 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -68,118 +68,109 @@
"aai" = (
/turf/closed/wall/r_wall,
/area/security/prison)
-"aaj" = (
-/obj/structure/cable{
- icon_state = "1-4"
+"aam" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
},
/turf/open/floor/plasteel,
-/area/security/prison)
-"aam" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
+/area/security/prison/upper)
"aan" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/ambrosia,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
-/turf/open/floor/grass,
-/area/security/prison)
-"aao" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/plant_analyzer,
-/obj/structure/sign/warning/electricshock{
- pixel_y = 32
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/grass,
-/area/security/prison)
-"aap" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/carrot,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/grass,
-/area/security/prison)
-"aaq" = (
-/obj/machinery/camera{
- c_tag = "Prison Common Room";
- network = list("ss13","prison")
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/item/trash/sosjerky,
+/obj/item/trash/boritos,
+/obj/item/trash/can,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
},
+/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 1
},
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"aao" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"aap" = (
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/obj/structure/sink{
- pixel_y = 20
- },
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/green{
+ dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/security/prison)
-"aar" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/glowshroom,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/grass,
-/area/security/prison)
-"aas" = (
-/obj/structure/sign/warning/electricshock{
- pixel_y = 32
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"aat" = (
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
/area/security/prison)
"aau" = (
-/obj/machinery/biogenerator,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"aav" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/security/prison)
-"aaw" = (
-/obj/machinery/light{
+"aax" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"aay" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/grass,
-/area/security/prison)
-"aax" = (
-/mob/living/simple_animal/mouse/brown/Tom,
-/turf/open/floor/grass,
-/area/security/prison)
-"aay" = (
-/turf/open/floor/plating,
-/area/security/prison)
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"aaz" = (
/obj/machinery/disposal/bin,
/obj/structure/sign/plaques/deempisi{
@@ -207,29 +198,106 @@
/turf/open/floor/plasteel,
/area/service/bar)
"aaA" = (
-/obj/machinery/seed_extractor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
-/area/security/prison)
-"aaB" = (
-/obj/structure/window/reinforced,
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/potato,
-/turf/open/floor/grass,
-/area/security/prison)
+/area/security/prison/upper)
"aaC" = (
-/obj/machinery/hydroponics/soil,
-/obj/structure/window/reinforced,
-/obj/item/seeds/tower,
-/turf/open/floor/grass,
-/area/security/prison)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/holopad,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"aaD" = (
-/obj/structure/window/reinforced,
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/grass,
-/turf/open/floor/grass,
-/area/security/prison)
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"aaE" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Cafeteria"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"aaF" = (
/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"aaG" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"aaH" = (
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"aaI" = (
+/obj/machinery/washing_machine,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"aaK" = (
/obj/effect/turf_decal/tile/green{
dir = 4
},
@@ -239,40 +307,12 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaF" = (
-/obj/structure/window/reinforced,
-/obj/machinery/hydroponics/soil,
-/obj/item/cultivator,
-/turf/open/floor/grass,
-/area/security/prison)
-"aaG" = (
-/obj/machinery/light{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/vr_sleeper{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
-/area/security/prison)
-"aaH" = (
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"aaI" = (
-/obj/structure/bookcase,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaJ" = (
-/obj/structure/chair/stool,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaK" = (
-/obj/machinery/computer/arcade/battle{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"aaL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -300,9 +340,9 @@
/turf/open/floor/plating,
/area/command/heads_quarters/hos)
"aaN" = (
-/obj/structure/chair/sofa/right,
-/turf/open/floor/plasteel,
-/area/security/prison)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"aaO" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -314,25 +354,17 @@
/turf/open/floor/plating,
/area/command/heads_quarters/hos)
"aaP" = (
-/obj/machinery/computer/cryopod{
- dir = 8;
- pixel_x = 26
- },
-/obj/machinery/cryopod{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"aaQ" = (
/turf/closed/wall,
/area/security/warden)
"aaR" = (
-/obj/structure/lattice,
-/obj/structure/sign/warning/securearea{
- pixel_y = -32
- },
-/turf/open/space,
-/area/space/nearstation)
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"aaS" = (
/obj/structure/grille,
/obj/structure/lattice,
@@ -344,31 +376,38 @@
/turf/open/space,
/area/space/nearstation)
"aaU" = (
-/obj/machinery/computer/arcade/orion_trail{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaV" = (
-/obj/structure/table/wood,
-/obj/item/storage/dice,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaW" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/chair/comfy/brown{
- color = "#596479";
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaX" = (
-/obj/structure/window/reinforced,
-/obj/machinery/cryopod{
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "permaouter";
+ name = "Permabrig Transfer";
+ req_access_txt = "2"
+ },
+/turf/open/floor/plasteel/dark,
/area/security/prison)
+"aaV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/closed/wall,
+/area/security/prison/upper)
+"aaW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/security/prison/upper)
"aaY" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate/secure/weapon{
@@ -408,11 +447,21 @@
/turf/open/space,
/area/space/nearstation)
"abb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/turf/closed/wall,
-/area/security/execution/transfer)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"abc" = (
/turf/closed/wall,
/area/security/execution/transfer)
@@ -429,31 +478,89 @@
/turf/closed/wall,
/area/security/execution/transfer)
"abf" = (
-/obj/machinery/vending/sustenance,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"abg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
+/obj/machinery/door/airlock/security/glass{
+ name = "Prison Laundry"
},
-/turf/closed/wall,
-/area/security/execution/transfer)
-"abh" = (
-/obj/machinery/holopad,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"abi" = (
-/obj/machinery/shower{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/item/soap/nanotrasen,
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"abg" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ name = "Cell Block"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
+"abh" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"abi" = (
+/obj/machinery/button/flasher{
+ id = "visitorflash";
+ pixel_x = -6;
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/button/door{
+ id = "visitation";
+ name = "Visitation Shutters";
+ pixel_x = -6;
+ pixel_y = 36;
+ req_access_txt = "2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"abj" = (
-/obj/structure/bedsheetbin/color,
-/obj/structure/table,
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"abk" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -504,14 +611,17 @@
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/port/fore)
"abt" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"abu" = (
/obj/machinery/door/poddoor{
id = "executionspaceblast"
@@ -519,27 +629,23 @@
/turf/open/floor/plating,
/area/security/execution/transfer)
"abv" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/machinery/camera{
+ c_tag = "Prison Cell Block East";
+ dir = 8;
+ network = list("ss13","prison")
},
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"abw" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
},
-/obj/machinery/flasher{
- id = "executionflash";
- pixel_y = 25
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"abx" = (
/obj/machinery/camera/motion{
c_tag = "Armory External Motion Sensor";
@@ -548,10 +654,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/ai_monitored/security/armory)
-"aby" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/security/execution/transfer)
"abz" = (
/obj/machinery/light/small{
dir = 4;
@@ -560,43 +662,30 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"abA" = (
-/obj/machinery/light,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"abB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"abC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"abD" = (
-/obj/machinery/light,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
/area/security/prison)
"abE" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"abF" = (
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"abG" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -633,43 +722,33 @@
/turf/open/floor/plasteel/dark,
/area/security/office)
"abK" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/machinery/button/door{
- id = "permabolt3";
- name = "Cell Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = 25;
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/security/prison)
"abL" = (
/obj/structure/chair/stool,
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/button/door{
- id = "permabolt2";
- name = "Cell Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = 25;
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
/turf/open/floor/plasteel,
-/area/security/prison)
-"abM" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"abN" = (
/obj/effect/landmark/secequipment,
/obj/effect/turf_decal/tile/red{
@@ -731,7 +810,7 @@
},
/obj/machinery/firealarm{
dir = 4;
- pixel_x = -26
+ pixel_x = -24
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/office)
@@ -788,52 +867,46 @@
/turf/closed/wall,
/area/security/prison)
"ace" = (
-/obj/machinery/door/poddoor/preopen{
- id = "permacell3";
- name = "cell blast door"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
},
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt3";
- name = "Cell 3"
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"acf" = (
-/obj/machinery/door/poddoor/preopen{
- id = "permacell2";
- name = "cell blast door"
- },
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt2";
- name = "Cell 2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/security/prison)
"acg" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "visitation";
+ name = "Visitation Shutters"
+ },
+/obj/machinery/door/window/southleft,
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"ach" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/poddoor/preopen{
- id = "permacell1";
- name = "cell blast door"
+/obj/machinery/camera{
+ c_tag = "Prison Visitation";
+ dir = 8;
+ network = list("ss13","prison")
},
-/obj/machinery/door/airlock/public/glass{
- id_tag = "permabolt1";
- name = "Cell 1"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ach" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restroom"
- },
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"aci" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
@@ -949,10 +1022,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"acp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -1038,66 +1113,59 @@
/obj/item/stack/cable_coil/random,
/turf/open/space,
/area/space/nearstation)
-"acz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
"acA" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"acB" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"acC" = (
-/obj/structure/bed,
-/obj/machinery/camera{
- c_tag = "Prison Cell 3";
- network = list("ss13","prison")
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/item/radio/intercom{
- desc = "Talk through this. It looks like it has been modified to not broadcast.";
- name = "Prison Intercom (General)";
- pixel_y = 24;
- prison_radio = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"acD" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/machinery/button/door{
- id = "permabolt1";
- name = "Cell Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = 25;
- specialfunctions = 4
+/obj/effect/landmark/start/prisoner,
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
+"acC" = (
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
/area/security/prison)
+"acD" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "Prison Gate";
+ name = "prison blast door"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"acE" = (
-/obj/structure/bed,
-/obj/machinery/camera{
- c_tag = "Prison Cell 2";
- network = list("ss13","prison")
+/obj/structure/chair{
+ dir = 8
},
-/obj/item/radio/intercom{
- desc = "Talk through this. It looks like it has been modified to not broadcast.";
- name = "Prison Intercom (General)";
- pixel_y = 24;
- prison_radio = 1
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel/dark,
/area/security/prison)
"acF" = (
/obj/machinery/light_switch{
@@ -1110,37 +1178,25 @@
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hos)
"acG" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/prison)
+/turf/closed/wall,
+/area/security/prison/upper)
"acH" = (
-/obj/structure/bed,
-/obj/machinery/camera{
- c_tag = "Prison Cell 1";
- network = list("ss13","prison")
+/obj/structure/window/reinforced/tinted{
+ dir = 8
},
-/obj/item/radio/intercom{
- desc = "Talk through this. It looks like it has been modified to not broadcast.";
- name = "Prison Intercom (General)";
- pixel_y = 24;
- prison_radio = 1
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"acI" = (
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast"
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/westright{
- dir = 1;
- name = "Transfer Room";
- req_access_txt = "2"
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"acI" = (
+/obj/effect/spawner/lootdrop/prison_contraband,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -1148,28 +1204,34 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/red,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison/cells)
"acJ" = (
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"acK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
-/area/security/prison)
-"acK" = (
-/obj/structure/mirror{
- pixel_x = 25
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/area/security/prison/upper)
"acL" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -1178,7 +1240,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28
+ pixel_x = 24
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hos)
@@ -1277,77 +1339,53 @@
},
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/port/fore)
-"acX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/security/execution/transfer)
"acY" = (
-/obj/structure/table,
-/obj/item/paper,
-/obj/item/pen,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"acZ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast"
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/security/execution/transfer)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"ada" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/flasher{
- id = "PCell 3";
- pixel_x = -28
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"adb" = (
-/obj/structure/table,
-/obj/item/paper,
-/obj/item/pen,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"adc" = (
-/obj/machinery/flasher{
- id = "PCell 1";
- pixel_x = -28
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"add" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/flasher{
- id = "PCell 2";
- pixel_x = -28
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ade" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
+"adb" = (
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"adc" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"add" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel/dark,
/area/security/prison)
"adf" = (
-/obj/structure/toilet/secret/prison{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"adg" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -1447,18 +1485,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"adp" = (
-/obj/structure/table,
/obj/effect/turf_decal/tile/red,
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
/turf/open/floor/plasteel,
/area/security/prison)
"adq" = (
@@ -1539,89 +1566,80 @@
},
/turf/open/floor/plasteel,
/area/security/office)
-"adC" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/razor,
-/obj/item/toy/plush/borgplushie{
- desc = "A horrible abomination to God in plushie form. Legends say this is used to torture prisoners by repeatedly beating them in the head with it.. ..It feels sorta heavy.";
- force = 1;
- name = "dogborg plushie";
- throwforce = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
"adD" = (
-/obj/machinery/button/flasher{
- id = "executionflash";
- pixel_x = 24;
- pixel_y = 5
- },
-/obj/machinery/button/door{
- id = "executionspaceblast";
- name = "Vent to Space";
- pixel_x = 25;
- pixel_y = -5;
- req_access_txt = "7"
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"adE" = (
-/obj/structure/table,
-/obj/item/folder/red{
- pixel_x = 3
- },
-/obj/item/taperecorder{
- pixel_x = -3
- },
-/obj/item/assembly/flash/handheld,
-/obj/item/reagent_containers/spray/pepper,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/security/prison/cells)
"adF" = (
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "permaouter";
+ name = "Permabrig Transfer";
+ req_access_txt = "2"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/security/prison)
-"adG" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/security/prison)
-"adH" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Long-Term Cell 3";
- req_access_txt = "2"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"adI" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Long-Term Cell 2";
- req_access_txt = "2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"adJ" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Long-Term Cell 1";
- req_access_txt = "2"
- },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
+"adH" = (
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "permaouter";
+ name = "Permabrig Transfer";
+ req_access_txt = "2"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/security/prison)
+"adI" = (
+/turf/closed/wall/r_wall,
+/area/security/prison/upper)
+"adJ" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Permabrig Visitation";
+ req_access_txt = "2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"adK" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -1630,14 +1648,14 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -26
- },
/obj/machinery/camera{
c_tag = "Brig EVA Storage";
dir = 4
},
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
+ },
/turf/open/floor/plasteel/dark,
/area/security/brig)
"adL" = (
@@ -1797,56 +1815,35 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solars/port/fore)
-"aea" = (
-/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/security/execution/transfer)
"aeb" = (
/obj/structure/table,
-/obj/item/flashlight/lamp,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"aec" = (
-/obj/structure/window/reinforced{
+/obj/item/storage/box/handcuffs{
+ pixel_y = 10
+ },
+/obj/item/storage/box/prisoner{
+ pixel_y = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/turf/open/floor/plating,
-/area/security/execution/transfer)
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"aed" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/machinery/button/ignition{
- id = "executionburn";
- pixel_x = 24;
- pixel_y = 5
- },
-/obj/machinery/button/door{
- id = "executionfireblast";
- name = "Transfer Area Lockdown";
- pixel_x = 25;
- pixel_y = -5;
- req_access_txt = "2"
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/computer/prisoner/management,
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"aee" = (
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"aef" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -1858,76 +1855,71 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/table,
-/obj/item/restraints/handcuffs,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aeg" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/security/execution/transfer)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"aeh" = (
-/obj/machinery/button/door{
- id = "permacell3";
- name = "Cell 3 Lockdown";
- pixel_x = -4;
- pixel_y = 25;
- req_access_txt = "2"
- },
-/obj/machinery/button/flasher{
- id = "PCell 3";
- pixel_x = 6;
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aei" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aej" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aek" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/prison{
- pixel_y = 30
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/light{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"aei" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"aej" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/prison)
-"ael" = (
-/obj/machinery/button/door{
- id = "permacell2";
- name = "Cell 2 Lockdown";
- pixel_x = -4;
- pixel_y = 25;
- req_access_txt = "2"
+"aek" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"ael" = (
/obj/machinery/button/flasher{
id = "PCell 2";
pixel_x = 6;
@@ -1939,21 +1931,24 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aem" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aen" = (
-/obj/machinery/computer/security/telescreen/prison{
- pixel_y = 30
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/camera{
- c_tag = "Prison Hallway";
+ c_tag = "Prison Hallway East";
network = list("ss13","prison")
},
/obj/effect/turf_decal/tile/red{
@@ -1987,37 +1982,26 @@
/turf/open/floor/plasteel,
/area/security/prison)
"aeq" = (
-/obj/machinery/button/door{
- id = "permacell1";
- name = "Cell 1 Lockdown";
- pixel_x = -4;
- pixel_y = 25;
- req_access_txt = "2"
- },
/obj/machinery/button/flasher{
id = "PCell 1";
pixel_x = 6;
pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aer" = (
-/obj/machinery/firealarm{
- pixel_y = 24
- },
/obj/machinery/power/apc{
areastring = "/area/security/prison";
dir = 4;
name = "Prison Wing APC";
pixel_x = 24
},
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -2025,6 +2009,13 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aes" = (
@@ -2217,72 +2208,15 @@
},
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/starboard/fore)
-"aeH" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 8
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/security/execution/transfer)
-"aeI" = (
-/obj/structure/rack,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/obj/item/flashlight{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/tank/internals/anesthetic{
- pixel_x = -3;
- pixel_y = 1
- },
-/obj/item/tank/internals/oxygen/red{
- pixel_x = 3
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"aeJ" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/security/execution/transfer)
-"aeK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
"aeL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"aeM" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable{
@@ -2294,26 +2228,17 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/security/prison)
-"aeN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- aiControlDisabled = 1;
- name = "Prisoner Transfer Centre";
- req_access_txt = "2"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
"aeO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -2333,22 +2258,24 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aeQ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aeR" = (
@@ -2358,16 +2285,10 @@
/turf/open/floor/plating,
/area/hallway/secondary/exit)
"aeS" = (
-/obj/structure/closet/secure_closet/brig,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -2718,61 +2639,45 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hos)
-"aft" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 5
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/security/execution/transfer)
"afu" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/execution/transfer)
-"afv" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/secure_closet/brig,
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
+"afv" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"afw" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- layer = 2.4
- },
-/obj/machinery/door/window/southleft{
- base_state = "right";
- dir = 4;
- icon_state = "right";
- name = "Armory";
- req_access_txt = "2"
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/security/execution/transfer)
-"afx" = (
-/obj/machinery/light_switch{
- pixel_x = 25
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 9
- },
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"afy" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"afz" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -2784,24 +2689,34 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"afA" = (
-/turf/closed/wall/r_wall,
-/area/security/execution/transfer)
+/obj/structure/reagent_dispensers/peppertank{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"afB" = (
/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"afC" = (
@@ -2832,21 +2747,16 @@
/turf/open/floor/plating,
/area/hallway/secondary/exit)
"afF" = (
-/obj/structure/table,
-/obj/item/assembly/signaler,
-/obj/item/clothing/suit/straight_jacket,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/light{
+ light_color = "#d1dfff"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"afG" = (
-/obj/structure/table,
-/obj/item/storage/box/hug,
-/obj/item/razor{
- pixel_x = -6
- },
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -3083,39 +2993,59 @@
/area/security/range)
"agf" = (
/obj/structure/table,
-/obj/item/stack/sheet/metal,
-/obj/item/storage/box/bodybags,
-/obj/item/pen,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/item/clothing/gloves/color/orange,
+/obj/item/restraints/handcuffs,
+/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"agg" = (
-/obj/structure/closet/secure_closet/injection,
-/obj/structure/cable,
-/obj/machinery/power/apc{
- areastring = "/area/security/execution/transfer";
- name = "Prisoner Transfer Centre";
- pixel_y = -27
+/obj/structure/table,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"agh" = (
/obj/structure/table,
-/obj/item/electropack,
-/obj/item/screwdriver,
-/obj/item/wrench,
-/obj/item/clothing/head/helmet,
-/obj/item/assembly/signaler,
-/obj/machinery/light/small,
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
+/obj/item/storage/box/hug,
+/obj/item/razor{
+ pixel_x = -6
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/light{
+ light_color = "#d1dfff"
},
/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
+/area/security/prison)
"agi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -3973,19 +3903,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/processing)
-"ahE" = (
-/obj/structure/closet/secure_closet/brig,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
"ahF" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4425,12 +4342,6 @@
},
/turf/open/floor/plasteel,
/area/security/office)
-"ail" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/security/range)
"aim" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -5849,15 +5760,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/engine,
/area/science/xenobiology)
-"akQ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
"akR" = (
/obj/machinery/camera{
c_tag = "Security Office";
@@ -7080,11 +6982,6 @@
id = "Cell 2";
name = "Cell 2 Locker"
},
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
/obj/structure/cable{
icon_state = "1-4"
},
@@ -7692,7 +7589,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 24;
+ pixel_x = 26;
pixel_y = -28
},
/turf/open/floor/plasteel,
@@ -8834,11 +8731,6 @@
id = "Cell 3";
name = "Cell 3 Locker"
},
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
/obj/structure/cable{
icon_state = "1-4"
},
@@ -9154,7 +9046,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28
+ pixel_x = 24
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -9228,7 +9120,7 @@
},
/obj/machinery/firealarm{
dir = 8;
- pixel_x = 28
+ pixel_x = 24
},
/turf/open/floor/plasteel,
/area/security/processing)
@@ -13640,16 +13532,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/commons/dorms)
-"aFk" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
"aFm" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -24757,8 +24639,8 @@
dir = 4
},
/obj/machinery/posialert{
- pixel_x = 30;
- pixel_y = -2
+ pixel_x = 29;
+ pixel_y = -4
},
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
@@ -45522,6 +45404,9 @@
/obj/machinery/door/airlock/external{
req_access_txt = "13"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
@@ -50357,11 +50242,6 @@
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/security/processing)
-"cxW" = (
-/obj/structure/lattice,
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/space/nearstation)
"cxY" = (
/obj/machinery/camera{
c_tag = "Arrivals Escape Pod 1";
@@ -50618,6 +50498,12 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
+"czP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/security/prison/cells)
"czQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -51336,6 +51222,20 @@
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
/area/service/kitchen)
+"cCr" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"cCs" = (
/obj/structure/closet/emcloset,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -51861,6 +51761,22 @@
/obj/structure/sign/poster/official/cohiba_robusto_ad,
/turf/closed/wall,
/area/service/lawoffice)
+"cJA" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"cJW" = (
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel,
@@ -51917,6 +51833,20 @@
"cNd" = (
/turf/open/space/basic,
/area/space/station_ruins)
+"cNi" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "Prison Gate";
+ name = "prison blast door"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"cNE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
@@ -52148,6 +52078,10 @@
/obj/item/folder/blue,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"cSp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/security/prison/upper)
"cSA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -52415,6 +52349,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/main)
+"cTo" = (
+/obj/structure/table/wood,
+/obj/item/storage/dice,
+/obj/item/instrument/piano_synth,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"cTD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52544,6 +52485,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"cVE" = (
+/obj/machinery/computer/cryopod{
+ pixel_y = 26
+ },
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"cVK" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -52555,6 +52503,16 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"cYf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"cZe" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -52672,6 +52630,22 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
+"dfj" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"dfL" = (
/obj/structure/reagent_dispensers/keg/gargle,
/turf/open/floor/wood,
@@ -52739,6 +52713,16 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/paramedic)
+"dnX" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dqb" = (
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
@@ -52785,6 +52769,17 @@
},
/turf/closed/wall,
/area/science/circuit)
+"dxv" = (
+/obj/machinery/camera{
+ c_tag = "Prison Cafeteria";
+ dir = 8;
+ network = list("ss13","prison")
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dxF" = (
/obj/machinery/gear_painter,
/turf/open/floor/wood,
@@ -52817,24 +52812,38 @@
/turf/open/floor/plating,
/area/security/brig)
"dyS" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Cafeteria"
},
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/security/prison)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"dzi" = (
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/carpet,
/area/commons/cryopod)
+"dzK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dAe" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 1
@@ -52842,6 +52851,11 @@
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"dCd" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"dCr" = (
/obj/structure/pool/Rboard,
/turf/open/floor/plasteel/yellowsiding{
@@ -52892,6 +52906,27 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"dIZ" = (
+/turf/open/floor/padded,
+/area/security/execution/transfer)
+"dJu" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"dJL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52911,6 +52946,24 @@
/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
/area/maintenance/bar)
+"dLi" = (
+/obj/machinery/hydroponics/soil,
+/obj/item/cultivator,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"dLZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dMj" = (
/obj/machinery/space_heater,
/obj/effect/turf_decal/stripes/line{
@@ -52924,6 +52977,12 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"dNP" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dPk" = (
/obj/structure/closet{
name = "Costume Closet"
@@ -52950,6 +53009,32 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"dPs" = (
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"dPE" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dQD" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
@@ -52957,6 +53042,26 @@
},
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
+"dQS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
+"dSh" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"dTI" = (
/obj/structure/urinal{
pixel_y = 32
@@ -52981,6 +53086,22 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/command/gateway)
+"dYQ" = (
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"dYZ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -53005,6 +53126,13 @@
},
/turf/open/space,
/area/solars/starboard/fore)
+"ebo" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"ecg" = (
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 4
@@ -53017,6 +53145,10 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
+"ecB" = (
+/obj/item/toy/beach_ball/holoball,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"edj" = (
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
@@ -53080,6 +53212,25 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"ejr" = (
+/obj/machinery/door/airlock/security{
+ name = "Permanent Cell 4"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"eky" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/baguette,
@@ -53098,6 +53249,17 @@
},
/turf/open/floor/wood,
/area/service/bar)
+"emf" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Permabrig Maintenance";
+ req_access_txt = "1"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"ene" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -53123,6 +53285,47 @@
/obj/structure/table/wood/poker,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"eoJ" = (
+/obj/machinery/door/airlock/security{
+ name = "Permanent Cell 5"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
+"eoR" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"epj" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"epD" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/machinery/light{
@@ -53134,21 +53337,27 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness)
-"eqd" = (
-/obj/item/electropack/shockcollar,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/security/prison)
+"epG" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"eqq" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/turf/open/floor/plasteel,
/area/engineering/atmos)
"eqA" = (
-/obj/machinery/shower{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"esK" = (
/obj/machinery/door/airlock/maintenance/abandoned{
name = "Chemical Storage";
@@ -53180,6 +53389,17 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/service/library)
+"etr" = (
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"eus" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/stripes/line{
@@ -53187,6 +53407,37 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"evc" = (
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Prison Forestry";
+ dir = 4;
+ network = list("ss13","prison")
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"evh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/camera{
+ c_tag = "Prison Workshop";
+ dir = 4;
+ network = list("ss13","prison")
+ },
+/obj/item/stack/sticky_tape,
+/obj/item/stack/sheet/cardboard{
+ amount = 14
+ },
+/obj/item/stack/packageWrap,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"evR" = (
/turf/open/floor/plating,
/area/maintenance/bar)
@@ -53317,6 +53568,19 @@
},
/turf/closed/wall/r_wall,
/area/engineering/gravity_generator)
+"eDf" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"eDz" = (
/obj/structure/cable/white{
icon_state = "2-8"
@@ -53325,6 +53589,31 @@
icon_state = "panelscorched"
},
/area/maintenance/starboard/aft)
+"eDF" = (
+/obj/effect/landmark/event_spawn,
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"eDJ" = (
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"eFx" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -53361,6 +53650,14 @@
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"eIW" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"eJa" = (
/obj/structure/table/wood/poker,
/obj/item/toy/cards/deck{
@@ -53371,6 +53668,22 @@
},
/turf/open/floor/wood,
/area/service/bar)
+"eJu" = (
+/obj/machinery/button/door{
+ id = "executionspaceblast";
+ name = "Vent to Space";
+ pixel_x = 25;
+ pixel_y = -5;
+ req_access_txt = "7"
+ },
+/obj/machinery/button/flasher{
+ id = "executionflash";
+ pixel_x = 24;
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"eMs" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -53400,10 +53713,49 @@
/obj/structure/grille,
/turf/open/space/basic,
/area/space/nearstation)
+"eRS" = (
+/obj/structure/table,
+/obj/item/folder/red{
+ pixel_x = 3
+ },
+/obj/item/taperecorder{
+ pixel_x = -3
+ },
+/obj/item/assembly/flash/handheld,
+/obj/item/reagent_containers/spray/pepper,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"eSe" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/carpet,
/area/commons/dorms)
+"eSJ" = (
+/obj/machinery/button/ignition{
+ id = "executionburn";
+ pixel_x = 24;
+ pixel_y = 5
+ },
+/obj/machinery/button/door{
+ id = "executionfireblast";
+ name = "Transfer Area Lockdown";
+ pixel_x = 25;
+ pixel_y = -5;
+ req_access_txt = "2"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"eTA" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -53474,6 +53826,15 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
+"eXI" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"eXL" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 10
@@ -53485,11 +53846,66 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"eZI" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 10
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"eZS" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"fbp" = (
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
+"fbr" = (
+/obj/machinery/door/window/southleft{
+ base_state = "right";
+ dir = 4;
+ icon_state = "right";
+ name = "Transfer Chamber Configuration";
+ req_access_txt = "2"
+ },
+/obj/machinery/atmospherics/pipe/simple{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
+"fbY" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/red,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"fcd" = (
/obj/structure/chair/sofa/right{
dir = 8
@@ -53498,6 +53914,10 @@
icon_state = "platingdmg1"
},
/area/maintenance/port/fore)
+"fcj" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/space)
"fcn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
@@ -53515,11 +53935,61 @@
},
/turf/closed/wall/r_wall,
/area/science/mixing)
+"fdJ" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"fdQ" = (
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plating,
/area/maintenance/fore)
+"fdR" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/prison/cells";
+ damage_deflection = 21;
+ desc = "A control terminal for the area's electrical systems. It's secured with a durable antitampering plasteel cage.";
+ dir = 4;
+ name = "Armored Prison Wing Cells APC";
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
+"fdS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"feE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -53535,6 +54005,19 @@
},
/turf/open/floor/wood,
/area/service/bar)
+"fgd" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"fgl" = (
/obj/structure/closet/crate/bin,
/obj/item/coin/silver,
@@ -53563,6 +54046,23 @@
},
/turf/closed/wall,
/area/maintenance/disposal/incinerator)
+"fiR" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"fjS" = (
/obj/structure/closet/radiation,
/turf/open/floor/plasteel,
@@ -53623,6 +54123,19 @@
},
/turf/open/floor/wood/wood_diagonal,
/area/maintenance/port/fore)
+"fmR" = (
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"fnC" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -53755,9 +54268,8 @@
/turf/open/floor/wood/wood_large,
/area/service/chapel/main)
"fty" = (
-/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
/turf/open/space,
/area/space/nearstation)
"ftE" = (
@@ -53953,6 +54465,16 @@
},
/turf/open/floor/plasteel,
/area/service/hydroponics)
+"fFR" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"fGf" = (
/obj/machinery/smartfridge/disks{
pixel_y = 2
@@ -53996,6 +54518,17 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"fKN" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"fLN" = (
/obj/machinery/chem_dispenser/drinks/beer{
dir = 1
@@ -54007,6 +54540,46 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
+"fMF" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Prison Laundry"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"fMY" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"fNB" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/prison/cells)
"fNN" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -54091,6 +54664,18 @@
},
/turf/open/floor/wood,
/area/service/bar)
+"fZh" = (
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "QMLoad"
+ },
+/obj/machinery/door/poddoor{
+ id = "QMLoaddoor";
+ name = "supply dock loading door"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/cargo/storage)
"fZm" = (
/obj/structure/chair/sofa/left,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -54151,11 +54736,6 @@
},
/turf/open/floor/plating,
/area/construction)
-"gbu" = (
-/obj/structure/bed,
-/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/plating,
-/area/security/prison)
"gbT" = (
/obj/item/storage/box/lights/mixed,
/obj/machinery/power/apc{
@@ -54169,6 +54749,13 @@
},
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
+"gcm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"gcx" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -54187,6 +54774,35 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"gcV" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"gcX" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp,
+/obj/item/stack/sheet/metal,
+/obj/item/storage/box/bodybags,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
+"gcY" = (
+/obj/structure/weightmachine/weightlifter,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"geg" = (
/obj/machinery/light/small{
dir = 8
@@ -54196,6 +54812,16 @@
/obj/item/reagent_containers/food/snacks/egg/yellow,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"gfw" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"gfC" = (
/obj/effect/turf_decal/tile/red,
/obj/structure/chair{
@@ -54218,6 +54844,18 @@
},
/turf/open/floor/plasteel/white,
/area/medical/surgery)
+"ggT" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"ghD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -54225,6 +54863,26 @@
"giy" = (
/turf/open/floor/carpet/arcade,
/area/commons/arcade)
+"giE" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/landmark/start/prisoner,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"giT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -54255,6 +54913,13 @@
/obj/item/poster/random_contraband,
/turf/open/floor/plasteel,
/area/commons/locker)
+"goJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"gpD" = (
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -54280,6 +54945,10 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"grd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/security/prison/upper)
"grr" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -54325,10 +54994,38 @@
/obj/machinery/meter,
/turf/closed/wall/r_wall,
/area/engineering/atmos)
+"gxK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/security/prison/cells)
"gyr" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/brig)
+"gyy" = (
+/obj/machinery/door/airlock/security{
+ name = "Isolation Cell";
+ req_access_txt = "2"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"gyQ" = (
/turf/open/floor/plasteel/freezer,
/area/commons/toilet)
@@ -54374,16 +55071,16 @@
/turf/open/floor/plasteel/dark,
/area/command/gateway)
"gDP" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 28
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/item/radio/intercom{
pixel_y = 20
},
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
/turf/open/floor/plasteel,
/area/security/processing)
"gDZ" = (
@@ -54450,6 +55147,15 @@
/obj/structure/bedsheetbin/towel,
/turf/open/floor/wood/wood_diagonal,
/area/maintenance/port/fore)
+"gLu" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"gLw" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -54491,6 +55197,25 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"gMB" = (
+/obj/machinery/door/airlock/security{
+ name = "Permanent Cell 6"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"gMD" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 6
@@ -54515,15 +55240,15 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/sign/poster/official/high_class_martini{
+ pixel_x = -32
+ },
/mob/living/simple_animal/bot/mulebot{
beacon_freq = 1400;
home_destination = "QM #1";
name = "Massive Load";
suffix = "#1"
},
-/obj/structure/sign/poster/official/high_class_martini{
- pixel_x = -32
- },
/turf/open/floor/carpet/royalblue,
/area/maintenance/starboard/aft)
"gOZ" = (
@@ -54532,6 +55257,13 @@
},
/turf/open/floor/plating,
/area/commons/fitness)
+"gPY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"gQr" = (
/obj/machinery/atmospherics/components/binary/valve/digital{
name = "gas to sauna"
@@ -54549,6 +55281,23 @@
},
/turf/open/floor/carpet,
/area/service/library)
+"gSj" = (
+/obj/machinery/door/airlock/security{
+ name = "Permanent Cell 3"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"gTx" = (
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -54570,6 +55319,11 @@
},
/turf/closed/wall/r_wall,
/area/engineering/gravity_generator)
+"gVc" = (
+/obj/machinery/vending/sustenance,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"gWd" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -54583,6 +55337,19 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"gXu" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"gYo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -54614,6 +55381,18 @@
dir = 8
},
/area/medical/surgery)
+"gZT" = (
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/prison/port";
+ dir = 8;
+ name = "Prison Port Maintenance APC";
+ pixel_x = -25
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"haM" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -54645,6 +55424,21 @@
icon_state = "platingdmg1"
},
/area/maintenance/starboard/aft)
+"hch" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"hcA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -54691,6 +55485,9 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"hkA" = (
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"hlS" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -54722,6 +55519,15 @@
},
/turf/open/floor/wood/wood_diagonal,
/area/maintenance/port/fore)
+"hnp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"hnU" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -54757,6 +55563,16 @@
},
/turf/open/floor/plasteel/dark,
/area/command/gateway)
+"hpY" = (
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"hrF" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -54789,11 +55605,44 @@
},
/turf/open/floor/plating,
/area/command/gateway)
+"hvC" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"hxg" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"hxn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/green/visible,
/turf/open/floor/plating,
/area/engineering/atmos)
+"hzs" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/plate_press,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"hzC" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"hzK" = (
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 1
@@ -54816,6 +55665,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"hEL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"hGH" = (
/obj/machinery/door/airlock{
desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
@@ -54846,6 +55702,21 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"hJO" = (
+/obj/structure/closet/crate/trashcart,
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/item/trash/chips,
+/obj/item/trash/candy,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/security/prison/upper)
+"hKo" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/prison/cells)
"hMs" = (
/obj/structure/table,
/obj/item/storage/box/bodybags,
@@ -54876,6 +55747,12 @@
},
/turf/closed/wall,
/area/cargo/warehouse)
+"hQw" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/space)
"hQX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -54962,6 +55839,11 @@
"ibK" = (
/turf/open/floor/plasteel,
/area/security/processing)
+"icS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"idK" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -54986,6 +55868,16 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"ifM" = (
+/obj/machinery/shower{
+ dir = 8;
+ pixel_y = -4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"ihR" = (
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
@@ -55000,14 +55892,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/cafeteria,
/area/commons/locker)
-"iiU" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/maintenance/aft)
"iiW" = (
/turf/open/floor/wood,
/area/maintenance/bar)
@@ -55050,6 +55934,19 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"ili" = (
+/obj/structure/table,
+/obj/item/electropack,
+/obj/item/screwdriver,
+/obj/item/wrench,
+/obj/item/clothing/head/helmet,
+/obj/item/assembly/signaler,
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"imk" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
@@ -55097,6 +55994,21 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"iqi" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+ c_tag = "Prison Laundry";
+ dir = 4;
+ network = list("ss13","prison")
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"iql" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -55158,6 +56070,15 @@
/obj/structure/table/optable,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
+"iwU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"iyG" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -55178,12 +56099,41 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"iBj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/space)
+"iBq" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"iBv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"iCN" = (
+/obj/machinery/door/airlock{
+ name = "Permabrig Showers"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"iDo" = (
/obj/structure/grille,
/turf/open/space/basic,
@@ -55260,6 +56210,14 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"iMy" = (
+/obj/structure/chair/sofa/right,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"iNn" = (
/obj/machinery/camera{
c_tag = "Kitchen Cold Room"
@@ -55525,11 +56483,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
-"jjC" = (
-/obj/structure/table/wood,
-/obj/item/toy/cards/deck,
-/turf/open/floor/plasteel,
-/area/security/prison)
"jkx" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/computer/slot_machine,
@@ -55546,6 +56499,14 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel,
/area/cargo/office)
+"jlQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"jmL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -55562,6 +56523,9 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness)
+"jnk" = (
+/turf/closed/wall/r_wall,
+/area/maintenance/prison/starboard)
"jnV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -55602,10 +56566,25 @@
},
/turf/open/floor/carpet/arcade,
/area/commons/arcade)
+"jqK" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"jrE" = (
/obj/item/beacon,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"jrR" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jsO" = (
/obj/machinery/hydroponics/soil{
pixel_y = 8
@@ -55643,10 +56622,63 @@
/obj/structure/closet/athletic_mixed,
/turf/open/floor/plasteel,
/area/commons/fitness)
+"jvB" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"jvO" = (
+/obj/structure/rack,
+/obj/item/flashlight{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/item/tank/internals/anesthetic{
+ pixel_x = -3;
+ pixel_y = 1
+ },
+/obj/item/tank/internals/oxygen/red{
+ pixel_x = 3
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"jwH" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/service/hydroponics)
+"jxx" = (
+/obj/machinery/door/airlock/security{
+ name = "Prison Yard"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"jxF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -55696,6 +56728,14 @@
dir = 8
},
/area/commons/fitness)
+"jBf" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 1"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
"jBi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -55805,6 +56845,20 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"jHp" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jHt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
@@ -55840,6 +56894,16 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"jIH" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jIW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -55854,6 +56918,37 @@
},
/turf/open/floor/wood,
/area/maintenance/port/aft)
+"jJP" = (
+/obj/structure/sign/warning/securearea{
+ pixel_x = 32
+ },
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"jKc" = (
+/obj/structure/closet/secure_closet/injection,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/execution/transfer";
+ dir = 1;
+ name = "Prisoner Transfer Centre";
+ pixel_y = 23
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
+"jKm" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jKP" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -55875,12 +56970,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/engineering/engine_smes)
-"jLv" = (
-/obj/structure/sign/warning/securearea{
- pixel_x = 32
- },
-/turf/open/space,
-/area/space)
"jLJ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small,
@@ -55913,12 +57002,64 @@
},
/turf/open/floor/plating/rust,
/area/maintenance/port/fore)
-"jRw" = (
-/obj/machinery/computer/arcade/minesweeper{
+"jNN" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
+"jOB" = (
+/obj/machinery/door/airlock/security{
+ name = "Prison Forestry"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"jRw" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
+"jRW" = (
+/obj/item/reagent_containers/glass/bucket,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jSD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -55939,6 +57080,39 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
+"jSY" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"jTy" = (
+/obj/machinery/washing_machine,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"jUN" = (
+/obj/structure/table/reinforced,
+/obj/structure/reagent_dispensers/servingdish,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jUV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -55955,6 +57129,20 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"jVP" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"jVV" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jVX" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -55966,6 +57154,13 @@
dir = 1
},
/area/engineering/atmos)
+"jYl" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"jZT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -56006,6 +57201,42 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/turf/open/space/basic,
/area/space/nearstation)
+"kcB" = (
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/camera{
+ c_tag = "Prison Isolation Cell";
+ dir = 8;
+ network = list("ss13","prison");
+ view_range = 5
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/execution/transfer)
+"kcR" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"kdF" = (
/obj/structure/window/reinforced{
dir = 1
@@ -56028,6 +57259,16 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/range)
+"kdX" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 1"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
"ker" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral,
@@ -56040,15 +57281,19 @@
/turf/open/floor/plasteel,
/area/commons/dorms)
"keM" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "Prison Gate";
+ name = "prison blast door"
},
-/obj/structure/window/reinforced{
- dir = 8
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/machinery/washing_machine,
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"kfv" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -56058,6 +57303,16 @@
},
/turf/open/floor/plating,
/area/engineering/storage/tech)
+"kfG" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck,
+/obj/item/instrument/harmonica,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kfS" = (
/turf/closed/wall/rust,
/area/maintenance/starboard/aft)
@@ -56073,12 +57328,18 @@
},
/area/maintenance/starboard)
"kgr" = (
-/obj/machinery/light/small{
- brightness = 3;
+/obj/machinery/cryopod{
dir = 8
},
-/turf/open/floor/plating,
-/area/security/prison)
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"kgB" = (
/obj/machinery/vending/snack/orange,
/obj/machinery/light{
@@ -56103,6 +57364,22 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"khO" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ aiControlDisabled = 1;
+ name = "Prisoner Transfer Centre";
+ req_access_txt = "2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"khV" = (
/obj/machinery/vending/cola/red,
/obj/structure/sign/poster/contraband/robust_softdrinks{
@@ -56153,6 +57430,13 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
+"kkb" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kkK" = (
/obj/machinery/vending/autodrobe,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -56167,6 +57451,16 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"kma" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/prison/cells)
"kmw" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -56204,6 +57498,27 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"knA" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"kob" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
@@ -56225,6 +57540,27 @@
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/commons/fitness)
+"ksa" = (
+/obj/structure/closet/secure_closet/brig,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"ktP" = (
/obj/machinery/power/smes{
charge = 5e+006
@@ -56240,6 +57576,17 @@
"ktS" = (
/turf/open/space/basic,
/area/space/nearstation)
+"ktW" = (
+/obj/machinery/hydroponics/soil,
+/obj/item/plant_analyzer,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kuh" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -56277,10 +57624,6 @@
/obj/item/trash/candy,
/turf/open/floor/plating,
/area/maintenance/port/fore)
-"kvl" = (
-/obj/structure/grille,
-/turf/closed/wall/r_wall,
-/area/space/nearstation)
"kvL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -56387,6 +57730,18 @@
/obj/effect/landmark/stationroom/box/engine,
/turf/open/space/basic,
/area/space)
+"kGj" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kGv" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -56410,6 +57765,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"kGL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"kHd" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -56442,6 +57802,36 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"kLK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"kMn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+ c_tag = "Permabrig North";
+ dir = 4;
+ network = list("ss13","prison")
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kMt" = (
/obj/machinery/computer/prisoner/gulag_teleporter_computer,
/turf/open/floor/plasteel,
@@ -56461,6 +57851,13 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"kOE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kOL" = (
/obj/structure/table/glass,
/turf/open/floor/wood/wood_large,
@@ -56537,6 +57934,14 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"kUn" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"kUC" = (
/obj/machinery/chem_master/condimaster,
/turf/open/floor/plating,
@@ -56573,6 +57978,24 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"kYm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"kZS" = (
/obj/machinery/light{
dir = 8
@@ -56606,6 +58029,27 @@
},
/turf/closed/wall/r_wall,
/area/command/gateway)
+"ldT" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"ldY" = (
+/obj/machinery/door/airlock/security{
+ name = "Firing Range";
+ req_access_txt = "2"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/security/prison)
"leE" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -56656,6 +58100,13 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"lht" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"lhQ" = (
/obj/machinery/power/floodlight,
/obj/structure/cable{
@@ -56663,6 +58114,17 @@
},
/turf/open/floor/plating,
/area/engineering/atmos)
+"lic" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lip" = (
/obj/structure/closet{
name = "Suit Closet"
@@ -56688,6 +58150,12 @@
/obj/item/clothing/under/rank/civilian/lawyer/red,
/turf/open/floor/plasteel,
/area/commons/locker)
+"liJ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"ljV" = (
/obj/machinery/airalarm{
dir = 8;
@@ -56708,6 +58176,18 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"llb" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lnk" = (
/obj/item/radio/intercom{
pixel_y = 25
@@ -56722,6 +58202,11 @@
icon_state = "wood-broken6"
},
/area/maintenance/bar)
+"lpx" = (
+/obj/structure/window,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"lpQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/spawner/structure/window/reinforced,
@@ -56773,12 +58258,31 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"ltm" = (
+/obj/structure/chair/comfy/brown{
+ color = "#66b266";
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"ltv" = (
/mob/living/simple_animal/bot/cleanbot{
name = "Honest Work"
},
/turf/open/floor/carpet/royalblue,
/area/maintenance/starboard/aft)
+"ltw" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"ltK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -56791,12 +58295,49 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"lux" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/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/lootdrop/prison_contraband,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lva" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/floor/plasteel,
/area/service/hydroponics)
+"lvc" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lwN" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -56818,17 +58359,29 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engineering/atmos)
-"lzT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/mob/living/simple_animal/pet/dog/cheems,
-/turf/open/floor/plasteel,
-/area/cargo/sorting)
"lAB" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/science/circuit)
+"lAD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+ c_tag = "Prison Cell Block Central";
+ dir = 1;
+ network = list("ss13","prison")
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"lAH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -56848,6 +58401,26 @@
dir = 1
},
/area/hallway/secondary/entry)
+"lBk" = (
+/obj/machinery/door/airlock/security{
+ name = "Prison Yard"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"lBz" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -56871,6 +58444,39 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"lCt" = (
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"lDm" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
+"lGm" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"lGV" = (
/obj/machinery/button/door{
id = "maintdiy";
@@ -56880,6 +58486,9 @@
},
/turf/open/floor/plating,
/area/service/abandoned_gambling_den)
+"lJA" = (
+/turf/closed/wall,
+/area/security/prison/cells)
"lJC" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -56889,6 +58498,13 @@
},
/turf/open/floor/plating,
/area/security/office)
+"lJS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison)
"lKj" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
@@ -56898,6 +58514,16 @@
"lLf" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/command/nuke_storage)
+"lLu" = (
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lLA" = (
/obj/machinery/computer/slot_machine{
balance = 15;
@@ -56930,6 +58556,13 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
+"lNQ" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#d1dfff"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lOr" = (
/obj/structure/table,
/obj/machinery/light/floor,
@@ -56991,6 +58624,13 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/carpet,
/area/commons/dorms)
+"lUU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"lVy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/decal/cleanable/dirt,
@@ -57005,6 +58645,18 @@
/obj/item/light/tube/broken,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"lYI" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"lZa" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -57045,6 +58697,17 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/brig)
+"lZp" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"lZs" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
@@ -57078,10 +58741,40 @@
dir = 4
},
/area/service/theater)
+"maP" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"maT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/maintenance/disposal/incinerator)
+"maU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"mbC" = (
+/turf/closed/wall/r_wall,
+/area/security/execution/transfer)
"mbU" = (
/obj/machinery/vr_sleeper{
dir = 8
@@ -57125,10 +58818,59 @@
/obj/structure/bed,
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"mhv" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Visitation Observation";
+ req_access_txt = "2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"mjr" = (
/obj/structure/reagent_dispensers/keg/milk,
/turf/open/floor/wood,
/area/service/bar)
+"mjJ" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
+"mke" = (
+/obj/machinery/camera{
+ c_tag = "Prison Common Room";
+ dir = 8;
+ network = list("ss13","prison")
+ },
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"mkv" = (
/obj/machinery/camera{
c_tag = "Gravity Generator Room";
@@ -57171,11 +58913,28 @@
},
/turf/open/floor/plasteel/freezer,
/area/commons/toilet/locker)
+"mnu" = (
+/obj/machinery/cryopod{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"mnC" = (
/obj/structure/target_stake,
/obj/item/target/syndicate,
/turf/open/floor/plating,
/area/security/range)
+"moe" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"mos" = (
/obj/machinery/light/small{
dir = 8
@@ -57233,6 +58992,17 @@
icon_state = "wood-broken5"
},
/area/maintenance/bar)
+"mpY" = (
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bottle/ammonia,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"mqo" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -57255,6 +59025,14 @@
},
/turf/open/floor/plasteel,
/area/commons/locker)
+"mqQ" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"mqZ" = (
/obj/item/reagent_containers/glass/beaker,
/turf/open/floor/plating,
@@ -57263,10 +59041,51 @@
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/wood,
/area/maintenance/bar)
+"msp" = (
+/obj/machinery/computer/arcade/orion_trail,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"mte" = (
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/glass/bowl,
+/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/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"mtU" = (
/obj/structure/sign/departments/holy,
/turf/closed/wall,
/area/service/chapel/main)
+"mui" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Common Room"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"muv" = (
/obj/item/radio/intercom{
pixel_y = 25
@@ -57281,6 +59100,29 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"mvV" = (
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/bed{
+ dir = 8
+ },
+/obj/item/bedsheet/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"mwj" = (
/obj/structure/noticeboard{
dir = 8;
@@ -57291,6 +59133,16 @@
},
/turf/open/floor/wood,
/area/command/meeting_room)
+"mwN" = (
+/obj/structure/chair/sofa/left,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"mwS" = (
/turf/open/floor/plating{
icon_state = "platingdmg3"
@@ -57306,6 +59158,21 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/security/office)
+"mxZ" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/item/clothing/under/rank/prisoner,
+/obj/item/clothing/under/rank/prisoner,
+/obj/item/clothing/under/rank/prisoner/skirt,
+/obj/item/clothing/under/rank/prisoner/skirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"myh" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -57339,6 +59206,30 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"mAT" = (
+/obj/machinery/shower{
+ dir = 8;
+ pixel_y = -4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
+"mCm" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
+"mCo" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"mDZ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -57394,6 +59285,18 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"mHH" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"mHU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/light_construct{
@@ -57402,9 +59305,25 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"mIZ" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/security/prison)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ name = "Cell Block"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"mJf" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -57423,6 +59342,16 @@
/obj/item/electronics/airlock,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"mJy" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"mJH" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/prison/cells)
"mLS" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
@@ -57538,6 +59467,13 @@
},
/turf/open/floor/plasteel,
/area/commons/locker)
+"mZu" = (
+/obj/machinery/door/airlock{
+ name = "Cleaning Closet"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"mZx" = (
/obj/structure/table/glass,
/obj/item/storage/box/matches{
@@ -57546,6 +59482,18 @@
},
/turf/open/floor/wood/wood_large,
/area/service/chapel/main)
+"naj" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"naI" = (
/turf/open/space,
/area/space/station_ruins)
@@ -57566,18 +59514,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/primary/port)
-"nbJ" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "QMLoad2"
- },
-/obj/machinery/door/poddoor{
- id = "QMLoaddoor2";
- name = "supply dock loading door"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/cargo/storage)
"nbT" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -57609,6 +59545,28 @@
},
/turf/open/floor/plasteel/freezer,
/area/commons/toilet)
+"ncU" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "visitation";
+ name = "Visitation Shutters"
+ },
+/obj/structure/window/reinforced,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"ndq" = (
/turf/open/floor/plating,
/area/service/abandoned_gambling_den)
@@ -57633,6 +59591,17 @@
/obj/machinery/vending/autodrobe,
/turf/open/floor/wood,
/area/maintenance/bar)
+"ngq" = (
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"ngs" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -57663,6 +59632,25 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"nko" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/landmark/start/prisoner,
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"nkP" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -57713,17 +59701,53 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/fore)
+"noJ" = (
+/obj/structure/closet/secure_closet/brig,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"noL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"noR" = (
+/obj/structure/sink/kitchen{
+ pixel_y = 28
+ },
+/obj/structure/chair/stool,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"noT" = (
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
/area/maintenance/starboard/aft)
+"nqu" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"nsf" = (
/obj/structure/cable/white{
icon_state = "0-2"
@@ -57756,6 +59780,13 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"ntG" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/mob/living/simple_animal/pet/dog/cheems,
+/turf/open/floor/plasteel,
+/area/cargo/storage)
"nuw" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -57846,6 +59877,21 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"nFA" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"nGf" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/light{
@@ -57910,6 +59956,11 @@
},
/turf/open/floor/plasteel,
/area/commons/locker)
+"nLP" = (
+/obj/item/storage/bag/trash,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"nNF" = (
/obj/machinery/light{
dir = 1
@@ -57933,6 +59984,23 @@
},
/turf/open/floor/wood,
/area/maintenance/starboard/aft)
+"nRO" = (
+/obj/machinery/door/airlock/security{
+ name = "Permanent Cell 2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"nSt" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -57945,6 +60013,10 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"nSI" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"nTG" = (
/obj/structure/chair{
dir = 1
@@ -58002,6 +60074,16 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/turf/open/space,
/area/space/nearstation)
+"nZs" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"nZE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral,
@@ -58036,6 +60118,21 @@
/obj/item/clothing/head/hardhat/cakehat,
/turf/open/floor/wood,
/area/service/bar)
+"obq" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
+"obs" = (
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/padded,
+/area/security/execution/transfer)
"oby" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -58088,6 +60185,12 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"oiY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"okK" = (
/obj/machinery/light/small{
dir = 8
@@ -58144,6 +60247,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"olH" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/prison_contraband,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"omk" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 1
@@ -58169,6 +60277,33 @@
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/security/prison)
+"ooF" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"oqf" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"oqj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -58190,6 +60325,21 @@
},
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
+"oss" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"otC" = (
/obj/machinery/status_display/evac,
/turf/closed/wall/r_wall,
@@ -58282,6 +60432,22 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"ozh" = (
+/obj/machinery/door/window/eastright{
+ dir = 8;
+ name = "Holding Cell"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"oAB" = (
/obj/structure/fireplace{
pixel_y = -6
@@ -58336,6 +60502,11 @@
"oHB" = (
/turf/open/floor/plasteel/dark,
/area/commons/dorms)
+"oIl" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"oIJ" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -58364,6 +60535,14 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"oKB" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"oLl" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -58381,6 +60560,19 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"oPY" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"oQP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/grimy,
@@ -58391,17 +60583,6 @@
},
/turf/closed/wall,
/area/medical/medbay/central)
-"oSl" = (
-/obj/machinery/door/airlock/security{
- name = "Firing Range";
- req_access_txt = "2"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
-/area/security/range)
"oTH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/shower,
@@ -58424,10 +60605,22 @@
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"oUF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"oVo" = (
/obj/structure/pool/ladder,
/turf/open/pool,
/area/commons/fitness/pool)
+"oVL" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"oVN" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
@@ -58439,6 +60632,28 @@
},
/turf/closed/wall/r_wall,
/area/engineering/atmos)
+"oXV" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "visitation";
+ name = "Visitation Shutters"
+ },
+/obj/structure/window/reinforced,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"oZl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/pjs,
@@ -58491,6 +60706,24 @@
},
/turf/open/floor/wood,
/area/service/library)
+"peD" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"peE" = (
+/obj/structure/table/reinforced,
+/obj/structure/reagent_dispensers/servingdish,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"pgf" = (
/turf/open/floor/mineral/titanium/blue,
/area/commons/dorms)
@@ -58500,6 +60733,23 @@
},
/turf/open/floor/plating,
/area/security/range)
+"pgq" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Common Room"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"pgZ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -58566,6 +60816,16 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"pnb" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"pnc" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -58681,6 +60941,12 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"pwF" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"pzG" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -58726,6 +60992,18 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"pBd" = (
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/prison/starboard";
+ dir = 8;
+ name = "Prison Starboard Maintenance APC";
+ pixel_x = -25
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"pBp" = (
/obj/effect/landmark/event_spawn,
/turf/closed/wall,
@@ -58759,18 +61037,24 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"pDT" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "QMLoad"
+"pFj" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/obj/machinery/door/poddoor{
- id = "QMLoaddoor";
- name = "supply dock loading door"
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
},
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/cargo/storage)
+/turf/open/floor/plasteel,
+/area/security/execution/transfer)
+"pFt" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"pFY" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -58780,6 +61064,17 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"pGA" = (
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"pHl" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -58815,6 +61110,15 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"pHK" = (
+/obj/machinery/camera{
+ c_tag = "Prison Yard";
+ dir = 4;
+ network = list("ss13","prison")
+ },
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"pHO" = (
/obj/effect/turf_decal/tile/blue,
/obj/structure/sign/poster/contraband/fun_police{
@@ -58822,6 +61126,28 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"pIR" = (
+/obj/structure/closet/secure_closet/brig,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/camera{
+ c_tag = "Prison Hallway West";
+ network = list("ss13","prison")
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"pJR" = (
/obj/structure/disposalpipe/segment,
/obj/structure/chair/comfy/brown{
@@ -58890,6 +61216,25 @@
"pQN" = (
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"pRi" = (
+/obj/structure/table,
+/obj/item/razor,
+/obj/item/toy/plush/borgplushie{
+ desc = "A horrible abomination to God in plushie form. Legends say this is used to torture prisoners by repeatedly beating them in the head with it.. ..It feels sorta heavy.";
+ force = 1;
+ name = "dogborg plushie";
+ throwforce = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"pRj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -58914,6 +61259,39 @@
},
/turf/open/space,
/area/solars/starboard/aft)
+"pTT" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"pUf" = (
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"pUy" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -58955,6 +61333,23 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"pZD" = (
+/obj/machinery/door/airlock/security{
+ name = "Permanent Cell 1"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"qae" = (
/obj/effect/decal/cleanable/vomit,
/obj/effect/decal/cleanable/dirt,
@@ -58969,6 +61364,20 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/service/bar)
+"qbk" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"qcU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"qeb" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -59023,6 +61432,20 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/wood,
/area/service/library)
+"qgj" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"qje" = (
/obj/structure/sign/mining{
pixel_y = 7
@@ -59078,11 +61501,6 @@
icon_state = "panelscorched"
},
/area/maintenance/starboard/aft)
-"qmn" = (
-/obj/machinery/computer/libraryconsole/bookmanagement,
-/obj/structure/table,
-/turf/open/floor/plasteel,
-/area/security/prison)
"qnC" = (
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/white,
@@ -59100,6 +61518,18 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
+"qto" = (
+/obj/machinery/hydroponics/soil,
+/obj/item/shovel/spade,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"qtw" = (
/obj/machinery/door/airlock/external{
dir = 2;
@@ -59134,6 +61564,26 @@
/obj/structure/grille/broken,
/turf/open/space/basic,
/area/space/nearstation)
+"qvc" = (
+/obj/structure/table,
+/obj/structure/window,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ layer = 3.1;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/food/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/food/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/book/manual/chef_recipes,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"qvf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -59143,6 +61593,14 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"qwA" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"qAu" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -59158,6 +61616,9 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"qCc" = (
+/turf/closed/wall,
+/area/maintenance/prison/port)
"qCw" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -59198,6 +61659,20 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
+"qFK" = (
+/obj/machinery/biogenerator,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"qGw" = (
/obj/structure/chair/pew/right{
dir = 8
@@ -59213,6 +61688,15 @@
"qIO" = (
/turf/open/floor/plating/rust,
/area/maintenance/starboard/aft)
+"qIW" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"qJr" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -59225,6 +61709,16 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
+"qLo" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/prison/cells)
"qLy" = (
/obj/structure/chair/sofa/left{
dir = 8
@@ -59262,6 +61756,29 @@
/obj/effect/decal/cleanable/blood/gibs/core,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
+"qNU" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/westright{
+ dir = 2;
+ name = "Transfer Room";
+ req_access_txt = "2"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"qOc" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -59282,6 +61799,36 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"qOY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
+"qQK" = (
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"qRI" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"qSf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
@@ -59341,9 +61888,12 @@
/turf/open/pool,
/area/commons/fitness/pool)
"qXg" = (
-/obj/structure/chair/sofa/left,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/cola/red{
+ onstation = 0
+ },
/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"qXJ" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
@@ -59351,10 +61901,42 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"qYa" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"qZD" = (
/obj/effect/decal/cleanable/egg_smudge,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"qZQ" = (
+/obj/structure/holohoop{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"qZT" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"raH" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 8
@@ -59398,11 +61980,6 @@
id = "Cell 1";
name = "Cell 1 Locker"
},
-/obj/item/radio/headset{
- desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast.";
- name = "prisoner headset";
- prison_radio = 1
- },
/obj/structure/cable{
icon_state = "1-4"
},
@@ -59415,6 +61992,12 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"rcV" = (
+/obj/structure/sign/warning/securearea{
+ pixel_y = -32
+ },
+/turf/open/space/basic,
+/area/space)
"rdl" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -59430,6 +62013,10 @@
},
/turf/open/floor/plasteel/dark,
/area/service/hydroponics)
+"ref" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"reA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -59441,6 +62028,40 @@
/obj/machinery/vending/games,
/turf/open/floor/plasteel,
/area/commons/fitness)
+"reE" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
+"rgu" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 4;
+ layer = 2.4
+ },
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"rgL" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -59522,6 +62143,17 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/commons/dorms)
+"rqq" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"rqE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -59536,6 +62168,18 @@
/obj/item/clothing/under/dress/sundress,
/turf/open/floor/plasteel,
/area/commons/fitness)
+"rsn" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/simple,
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"rsp" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/table,
@@ -59575,6 +62219,27 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/commons/dorms)
+"ruu" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "permaouter";
+ name = "Permabrig Transfer";
+ req_access_txt = "2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"rvr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -59592,12 +62257,12 @@
/turf/open/floor/plasteel,
/area/commons/fitness)
"rvS" = (
-/obj/structure/chair/comfy/brown{
- color = "#66b266";
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/upper)
"rwj" = (
/obj/machinery/light/small{
dir = 1
@@ -59625,6 +62290,21 @@
},
/turf/open/floor/wood/wood_large,
/area/service/chapel/main)
+"ryi" = (
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"ryr" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -59644,12 +62324,41 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"rAW" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/flasher{
+ id = "executionflash";
+ pixel_y = -25
+ },
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"rBq" = (
/obj/item/clothing/head/kitty,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/mask/muzzle,
/turf/open/floor/plating,
/area/maintenance/bar)
+"rBK" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
+"rBY" = (
+/obj/structure/bed,
+/turf/open/floor/padded,
+/area/security/execution/transfer)
"rCl" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -59672,6 +62381,19 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"rDc" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"rDh" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -59690,6 +62412,15 @@
/obj/item/toy/crayon/spraycan/lubecan,
/turf/open/floor/plasteel,
/area/service/theater)
+"rDm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"rGo" = (
/obj/machinery/light/small{
dir = 1
@@ -59782,6 +62513,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"rTj" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"rTo" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
@@ -59796,6 +62533,12 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/medical/medbay/central)
+"rUr" = (
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"rVy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -59891,10 +62634,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/engineering/engine_smes)
-"saX" = (
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/grass,
-/area/security/prison)
"sci" = (
/obj/machinery/vr_sleeper{
dir = 4
@@ -59912,6 +62651,11 @@
dir = 4
},
/area/commons/fitness)
+"sew" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"seP" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -59930,12 +62674,60 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/fore)
+"sfz" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/red,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"shR" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"siz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"ske" = (
+/obj/machinery/camera{
+ c_tag = "Permabrig South";
+ dir = 1;
+ network = list("ss13","prison")
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"slk" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -59990,6 +62782,17 @@
},
/turf/open/floor/plating,
/area/service/abandoned_gambling_den)
+"ssc" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"ssB" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -60017,6 +62820,13 @@
/obj/item/toy/poolnoodle/yellow,
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"suC" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/item/soap/nanotrasen,
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"suN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/event_spawn,
@@ -60025,6 +62835,18 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
+"suS" = (
+/obj/structure/table,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/rice,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"sxs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/table,
@@ -60045,6 +62867,18 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"szf" = (
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"szn" = (
+/turf/closed/wall/r_wall,
+/area/security/prison/cells)
"sAk" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -60054,6 +62888,11 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"sAm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"sAH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -60074,6 +62913,37 @@
icon_state = "wood-broken6"
},
/area/maintenance/bar)
+"sAT" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"sBM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"sCa" = (
/obj/structure/rack,
/obj/item/circuitboard/machine/monkey_recycler,
@@ -60124,6 +62994,12 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"sHd" = (
+/obj/machinery/door/window/southleft{
+ name = "Permabrig Kitchen"
+ },
+/turf/open/floor/plasteel/white,
+/area/security/prison/upper)
"sHx" = (
/obj/structure/table,
/obj/item/book/manual/hydroponics_pod_people{
@@ -60136,6 +63012,13 @@
},
/turf/open/floor/plasteel,
/area/service/hydroponics)
+"sIn" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/prison/starboard)
"sJw" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -60168,6 +63051,12 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness)
+"sKA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/closed/wall,
+/area/security/execution/transfer)
"sKL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/grille/broken,
@@ -60187,6 +63076,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"sMu" = (
+/obj/structure/lattice,
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
"sMG" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -60200,6 +63095,12 @@
/obj/item/storage/secure/briefcase,
/turf/open/floor/plasteel,
/area/commons/locker)
+"sNj" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"sOs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -60325,10 +63226,44 @@
},
/turf/open/floor/plasteel,
/area/service/theater)
+"sYV" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"tal" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/hallway/secondary/service)
+"tbR" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"tcU" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "46"
@@ -60339,6 +63274,37 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/fore)
+"tdd" = (
+/obj/machinery/camera{
+ c_tag = "Prison Cell Block North";
+ dir = 4;
+ network = list("ss13","prison")
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
+"teq" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"teS" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -60365,11 +63331,24 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"thB" = (
-/obj/structure/sign/warning/securearea{
- pixel_y = -32
+/obj/effect/turf_decal/tile/green{
+ dir = 4
},
-/turf/open/space,
-/area/space)
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"tif" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -60388,6 +63367,19 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/commons/dorms)
+"tkx" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"tkB" = (
/obj/structure/sign/poster/official/help_others{
pixel_y = -32
@@ -60408,6 +63400,22 @@
},
/turf/open/floor/plating,
/area/security/range)
+"tnH" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"tnL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -60423,6 +63431,10 @@
},
/turf/open/floor/carpet,
/area/commons/cryopod)
+"tqk" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/closed/wall,
+/area/security/execution/transfer)
"tqB" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -60449,6 +63461,28 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"tso" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"tsq" = (
/obj/structure/cable/white{
icon_state = "0-4"
@@ -60497,6 +63531,48 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"txs" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
+"tyb" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "visitation";
+ name = "Visitation Shutters"
+ },
+/obj/machinery/door/window/southright,
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"tyE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -60544,6 +63620,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engineering/atmos)
+"tAS" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"tBV" = (
/turf/closed/wall,
/area/medical/storage)
@@ -60618,6 +63698,18 @@
dir = 1
},
/area/hallway/secondary/entry)
+"tHO" = (
+/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/plasteel,
+/area/security/prison/upper)
"tIE" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -60635,6 +63727,23 @@
/obj/structure/musician/piano,
/turf/open/floor/wood,
/area/service/theater)
+"tJE" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Isolation Cell";
+ req_access_txt = "2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"tJK" = (
/obj/machinery/door/airlock/engineering{
name = "Gravity Generator";
@@ -60677,6 +63786,12 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"tLC" = (
+/obj/machinery/vr_sleeper{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
@@ -60693,6 +63808,23 @@
},
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
+"tOk" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"tOq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -60704,6 +63836,12 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/maintenance/bar)
+"tPY" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"tRe" = (
/obj/machinery/chem_master,
/turf/open/floor/plasteel/white,
@@ -60762,6 +63900,20 @@
icon_state = "wood-broken5"
},
/area/maintenance/port/fore)
+"tWe" = (
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"tWj" = (
/obj/structure/window/reinforced,
/turf/open/floor/wood,
@@ -60780,6 +63932,12 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"tYg" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"tZa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60836,6 +63994,19 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"ueN" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"ueZ" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -60863,6 +64034,9 @@
dir = 4
},
/area/commons/fitness)
+"ugi" = (
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"ugp" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
@@ -60902,6 +64076,16 @@
/obj/effect/decal/cleanable/blood/gibs/human/lizard/body,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
+"uhK" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"ujv" = (
/obj/structure/sign/departments/restroom,
/turf/closed/wall,
@@ -60964,6 +64148,15 @@
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
+"uql" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"uqu" = (
/obj/machinery/hydroponics/soil{
pixel_y = 8
@@ -60988,6 +64181,17 @@
/obj/machinery/atmospherics/components/binary/valve,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"uuw" = (
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"uuG" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -61132,12 +64336,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/commons/fitness/pool)
-"uEI" = (
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
"uFp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -61174,8 +64372,19 @@
/turf/open/floor/plasteel,
/area/security/processing)
"uGI" = (
-/turf/open/floor/grass,
-/area/security/prison)
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"uHc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -61218,11 +64427,43 @@
/obj/machinery/door/window,
/turf/open/floor/wood,
/area/service/theater)
+"uJY" = (
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"uKW" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"uOd" = (
/turf/open/floor/plasteel/white/side{
dir = 4
},
/area/service/theater)
+"uOm" = (
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse/brown/Tom,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"uOJ" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -61284,6 +64525,12 @@
},
/turf/open/floor/plasteel,
/area/commons/locker)
+"uUb" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"uUP" = (
/obj/structure/cable/white,
/obj/structure/cable/white{
@@ -61325,6 +64572,11 @@
},
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload)
+"uZY" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"vae" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -61424,6 +64676,27 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"vhy" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
+"vim" = (
+/obj/machinery/computer/arcade/minesweeper,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"viF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -61431,6 +64704,28 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"viH" = (
+/obj/machinery/camera{
+ c_tag = "Permabrig Central";
+ dir = 8;
+ network = list("ss13","prison")
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"vjm" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/rag,
@@ -61439,6 +64734,12 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"vli" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
"vmQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -61531,14 +64832,6 @@
icon_state = "platingdmg2"
},
/area/maintenance/starboard/aft)
-"vsE" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
"vsM" = (
/obj/machinery/power/apc/auto_name/south,
/obj/structure/cable,
@@ -61577,6 +64870,25 @@
},
/turf/open/floor/wood,
/area/service/library)
+"vws" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
+"vwQ" = (
+/obj/structure/bookcase,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"vxh" = (
/turf/open/floor/plating{
icon_state = "platingdmg1"
@@ -61681,6 +64993,22 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"vCS" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple,
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"vEi" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -61716,6 +65044,25 @@
},
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
+"vFZ" = (
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/red,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
"vGn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -61757,6 +65104,9 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness)
+"vHK" = (
+/turf/closed/wall,
+/area/maintenance/prison/starboard)
"vHT" = (
/obj/machinery/door/firedoor,
/obj/structure/sign/departments/evac{
@@ -61824,6 +65174,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/fore)
+"vMi" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"vOC" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -61876,6 +65237,14 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"vRN" = (
+/obj/structure/closet/crate,
+/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,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"vTP" = (
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock";
@@ -61886,6 +65255,25 @@
},
/turf/open/floor/plating,
/area/security/processing)
+"vYF" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/cells)
+"vYY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"vZA" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -61903,6 +65291,18 @@
},
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
+"waX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"wbE" = (
/obj/effect/turf_decal/tile/blue{
alpha = 255
@@ -61931,6 +65331,15 @@
"wcR" = (
/turf/open/floor/plasteel/yellowsiding/corner,
/area/commons/fitness/pool)
+"wcS" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"wdr" = (
/obj/machinery/door/window/southleft{
name = "Target Storage"
@@ -61949,6 +65358,21 @@
/obj/structure/girder,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"weW" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"wfC" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -61963,6 +65387,17 @@
/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/maintenance/bar)
+"wgu" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Permabrig Maintenance";
+ req_access_txt = "1"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/prison/port)
"wig" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -61985,6 +65420,18 @@
/obj/item/instrument/recorder,
/turf/open/floor/plating,
/area/maintenance/fore)
+"wjl" = (
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "QMLoad2"
+ },
+/obj/machinery/door/poddoor{
+ id = "QMLoaddoor2";
+ name = "supply dock loading door"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/cargo/storage)
"wkc" = (
/obj/machinery/light/small{
dir = 4
@@ -61997,6 +65444,13 @@
"wkN" = (
/turf/closed/wall,
/area/science/circuit)
+"wkU" = (
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"wlg" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -62007,6 +65461,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"wll" = (
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/turf/open/floor/padded,
+/area/security/execution/transfer)
"wly" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -62030,6 +65493,15 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/engineering/main)
+"wnX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison/cells)
"woR" = (
/obj/machinery/cryopod/tele,
/turf/open/floor/carpet,
@@ -62048,6 +65520,22 @@
},
/turf/open/floor/plating,
/area/construction/mining/aux_base)
+"wpV" = (
+/obj/machinery/seed_extractor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#d1dfff"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"wql" = (
/turf/closed/wall/r_wall,
/area/command/gateway)
@@ -62169,6 +65657,28 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"wAj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"wAN" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"wBd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -62207,6 +65717,12 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"wIl" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/space)
"wII" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/maintenance,
@@ -62284,6 +65800,38 @@
icon_state = "platingdmg3"
},
/area/maintenance/starboard/aft)
+"wVq" = (
+/obj/machinery/door/airlock/security{
+ name = "Prison Workshop"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
+"wVt" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"wVN" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
@@ -62316,11 +65864,9 @@
/turf/open/floor/plasteel,
/area/commons/fitness/pool)
"wYc" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+/obj/structure/table,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"wYn" = (
/obj/structure/plasticflaps/opaque,
/obj/structure/sign/poster/contraband/free_drone{
@@ -62375,6 +65921,20 @@
/obj/item/coin/gold,
/turf/open/floor/plasteel,
/area/commons/fitness)
+"xbP" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xcl" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -62395,6 +65955,13 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"xfW" = (
+/obj/machinery/vr_sleeper{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xgk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -62457,13 +66024,14 @@
/turf/open/floor/plating,
/area/construction)
"xib" = (
-/obj/machinery/door/window/westleft{
- base_state = "right";
- icon_state = "right";
- name = "Unisex Showers"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "Prison Gate";
+ name = "prison blast door"
},
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"xiw" = (
/obj/machinery/door/airlock{
name = "Service Hall";
@@ -62475,6 +66043,26 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
+"xjU" = (
+/obj/machinery/door/airlock/security{
+ name = "Permabrig Visitation"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/security/prison/upper)
"xkd" = (
/obj/machinery/light/small{
dir = 4;
@@ -62509,6 +66097,31 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"xnF" = (
+/obj/machinery/door/airlock/security{
+ name = "Isolation Cell";
+ req_access_txt = "2"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
+"xpH" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
"xqG" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/bar,
@@ -62608,6 +66221,13 @@
},
/turf/open/floor/plasteel,
/area/commons/dorms)
+"xAA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xBk" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -62624,6 +66244,16 @@
/obj/item/radio/headset/headset_cargo,
/turf/open/floor/plasteel,
/area/cargo/storage)
+"xBJ" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xDM" = (
/obj/machinery/camera{
c_tag = "Locker Room South";
@@ -62668,6 +66298,12 @@
},
/turf/open/floor/wood/wood_large,
/area/service/chapel/main)
+"xFj" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xFM" = (
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/head/soft/rainbow,
@@ -62675,6 +66311,20 @@
/obj/item/clothing/under/color/rainbow,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"xGm" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/cells)
"xGQ" = (
/obj/structure/sign/plaques/golden{
pixel_y = 32
@@ -62716,6 +66366,44 @@
},
/turf/open/floor/plating,
/area/security/office)
+"xKl" = (
+/obj/machinery/computer/security/telescreen/prison{
+ pixel_y = 30
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"xLQ" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/security/prison/upper";
+ damage_deflection = 21;
+ desc = "A control terminal for the area's electrical systems. It's secured with a durable antitampering plasteel cage.";
+ dir = 1;
+ name = "Armored Upper Prison Wing APC";
+ pixel_y = 23
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xLX" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/marker_beacon{
@@ -62729,13 +66417,48 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"xOx" = (
-/obj/structure/chair/comfy/brown{
- color = "#596479";
- dir = 1
+"xMg" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"xMS" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison/upper)
+"xNV" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel,
-/area/security/prison)
+/area/security/prison/cells)
+"xOx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
"xPk" = (
/obj/structure/bed,
/obj/machinery/button/door{
@@ -62797,6 +66520,21 @@
/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space/station_ruins)
+"xUC" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"xUL" = (
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
@@ -62846,6 +66584,13 @@
},
/turf/open/floor/plasteel/grimy,
/area/maintenance/starboard/aft)
+"xWS" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/prison/upper)
"xXi" = (
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel,
@@ -62910,6 +66655,22 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/commons/toilet/locker)
+"yco" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/prison/cells)
+"ycL" = (
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/structure/closet/crate,
+/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,
+/turf/open/floor/plating,
+/area/security/prison/upper)
"ycY" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -62941,6 +66702,12 @@
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/hallway/primary/central)
+"yeZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall,
+/area/security/execution/transfer)
"yfX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/carpet/arcade,
@@ -62968,6 +66735,14 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
+"yhI" = (
+/obj/machinery/computer/arcade/battle,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/security/prison/upper)
(1,1,1) = {"
cNd
@@ -72585,7 +76360,7 @@ awZ
ayl
azy
auP
-aFk
+kdX
aaa
aaa
aaa
@@ -72593,7 +76368,7 @@ aaa
aaa
aaa
aaa
-vsE
+jBf
auP
cIh
ayl
@@ -74384,7 +78159,7 @@ axh
aIK
azy
auP
-aFk
+kdX
aaa
aaa
aaa
@@ -74392,7 +78167,7 @@ aaa
aaa
aaa
aaa
-vsE
+jBf
auP
cIh
ayl
@@ -80582,11 +84357,11 @@ aPz
aaa
aaa
boI
-nbJ
+wjl
brJ
boI
brJ
-pDT
+fZh
boI
aaa
aaa
@@ -81012,7 +84787,7 @@ cNd
cNd
cNd
cNd
-cNd
+naI
cNd
cNd
cNd
@@ -81283,11 +85058,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+gXs
+gXs
+gXs
+gXs
aaS
aaS
aaS
@@ -81540,6 +85315,7 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
@@ -81547,13 +85323,12 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -81797,6 +85572,7 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
@@ -81804,13 +85580,12 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -82049,6 +85824,12 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
aaa
aaa
aaa
@@ -82056,18 +85837,12 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -82306,25 +86081,25 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
+gXs
+aaa
+aaa
+aaa
+gXs
+gXs
+gXs
+gXs
+gXs
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -82563,25 +86338,25 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
+gXs
+aaa
+aaa
+aaa
+gXs
+aaa
+aaa
+aaa
+gXs
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -82816,32 +86591,32 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
+gXs
+aaa
+gXs
aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
ali
ali
alU
@@ -83072,33 +86847,33 @@ cNd
aaa
aaa
aaa
+eRz
+eRz
+eRz
+eRz
+eRz
+eRz
+eRz
+eRz
+eRz
+eRz
+eRz
+aaa
+aaa
+aaa
+gXs
+aaa
+aaa
+aaa
+gXs
aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aae
-aaa
-aaa
ali
anL
avY
@@ -83328,31 +87103,31 @@ cNd
cNd
aaa
aaa
+gXs
+eRz
+aaa
+gXs
aaa
aaa
+gXs
aaa
aaa
+gXs
+aaa
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
+aaa
+aae
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -83407,7 +87182,7 @@ aZE
xBw
bjr
ama
-bmh
+ntG
bjr
bjr
bjr
@@ -83585,6 +87360,18 @@ cNd
cNd
aaa
aaa
+gXs
+eRz
+aaa
+aaa
+aaa
+aaa
+gXs
+gXs
+aaa
+gXs
+aaa
+gXs
aaa
aaa
aaa
@@ -83592,24 +87379,12 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -83843,33 +87618,33 @@ cNd
aaa
aaa
aaa
+eRz
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
+rcV
+szn
+hKo
+fNB
+szn
+qLo
+mJH
+szn
+szn
+szn
+szn
+szn
+szn
+mbC
+mbC
+mbC
+mbC
+gXs
+jJP
+gXs
+gXs
+gXs
+gXs
+gXs
+gXs
ali
ali
alU
@@ -84090,44 +87865,44 @@ cNd
cNd
cNd
cNd
+cNd
+cNd
+cNd
+cNd
aaa
aaa
aaa
aaa
+gDl
+aaa
+eRz
+gXs
+gXs
+szn
+suC
+qZT
+dYQ
+lGm
+pwF
+lJA
+mvV
+tso
+lJA
+mvV
+tso
+abc
+dIZ
+wll
+mbC
+abc
+abc
+hEL
+abc
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
+gXs
aaa
aaa
aaa
@@ -84347,44 +88122,44 @@ cNd
cNd
cNd
cNd
+cNd
+cNd
+cNd
+cNd
+aaa
+gXs
aaa
aaa
aaa
aaa
+eRz
+aaa
+aaa
+szn
+mAT
+ifM
+wnX
+mAT
+mAT
+lJA
+giE
+rBK
+lJA
+giE
+rBK
+abc
+obs
+rBY
+mbC
+jvO
+dfj
+fgd
+abc
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
+gXs
aaa
aaa
aaa
@@ -84604,44 +88379,44 @@ cNd
cNd
cNd
cNd
+cNd
+cNd
+cNd
+cNd
aaa
+gXs
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
+fIs
+fIs
+fIs
+eRz
+gXs
+gXs
+szn
+lJA
+czP
+iCN
+lJA
+lJA
+lJA
+czP
+eoJ
+lJA
+czP
+ejr
+abc
+tJE
+hEL
+mbC
+rgu
+fbr
+mCm
+abc
+abc
+abu
+abu
+abu
+abc
aaa
aaa
aaa
@@ -84861,44 +88636,44 @@ cNd
cNd
cNd
cNd
+cNd
+cNd
+cNd
+cNd
+aaa
+gXs
+gXs
+fIs
aaa
aaa
+gXs
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
+gXs
+kma
+fdJ
+hch
+reE
+tdd
+cJA
+tOk
+knA
+vws
+tkx
+epj
+lDm
+xnF
+pFj
+kcB
+gyy
+xUC
+vCS
+gcX
+pRi
+rsn
+qIW
+aca
+ebo
+yeZ
aaa
aaa
aaa
@@ -85120,42 +88895,42 @@ cNd
cNd
aaa
aaa
+eRz
+eRz
+eRz
+sMu
+eRz
+eRz
+gXs
+gXs
+gXs
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
-aae
-aaa
-aaa
-aaa
-aaa
+gXs
+yco
+lZp
+qgj
+lYI
+hzC
+ggT
+fdR
+qwA
+oqf
+wcS
+pFt
+lAD
+lJA
+lJA
+lJA
+szn
+ili
+waX
+mCo
+eRS
+naj
+liJ
+acc
+rAW
+abe
aaa
aaa
aaa
@@ -85377,42 +89152,42 @@ cNd
cNd
aaa
aaa
+eRz
+aaa
+gXs
+gXs
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
+adI
+adI
+adI
+adI
+qCc
+qCc
+wgu
+qCc
+qCc
+qCc
+czP
+gMB
+lJA
+tnH
+wVt
+gSj
+vYF
+txs
+szn
+jKc
+mjJ
+eJu
+eSJ
+qNU
+moe
+acb
+gcm
+tqk
aaa
aaa
aaa
@@ -85634,42 +89409,42 @@ cNd
cNd
aaa
aaa
+eRz
aaa
aaa
+gXs
+aaa
+gXs
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-jLv
-aaa
-aaa
-aaa
-gWo
-gWo
-gWo
-dYZ
-gWo
-gWo
+adI
+hzs
+evh
+ycL
+qCc
+rUr
+jlQ
+gZT
+hQw
+qCc
+kcR
+rBK
+lJA
+weW
+xNV
+gxK
+dJu
+fbY
+szn
+abd
+khO
+enB
+enB
+enB
+enB
+enB
+enB
+sKA
gXs
gXs
gXs
@@ -85891,37 +89666,37 @@ cNd
cNd
aaa
aaa
+sMu
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
-abc
-abc
-abc
+adI
+xWS
+adI
+xWS
+adI
+adI
+lCt
+qcU
+vRN
+qCc
+icS
+mqQ
+qYa
+wIl
+qCc
+sfz
+tbR
+lJA
+ryi
+cCr
+lJA
+lJA
+lJA
+szn
+noJ
+uql
afu
-abc
+acd
wdr
itQ
pgn
@@ -86148,37 +89923,37 @@ cNd
cNd
aaa
aaa
+eRz
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
-abc
-aea
-aeH
-aft
-abc
+oUF
+llb
+eXI
+gLu
+vwQ
+acG
+hzs
+hnp
+jVV
+qCc
+qCc
+qCc
+qCc
+qCc
+qCc
+acG
+acG
+lJA
+maP
+wVt
+nRO
+vYF
+txs
+szn
+ksa
+dQS
+afu
+acd
pDe
dly
mnC
@@ -86231,7 +90006,7 @@ apd
aZH
bnL
cNG
-lzT
+cNJ
cNM
cNI
bnI
@@ -86300,7 +90075,7 @@ bgO
jBA
btG
aaa
-kvl
+iDo
ctv
iDo
aaa
@@ -86405,38 +90180,38 @@ cNd
cNd
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+eRz
aaa
gXs
-gXs
-gXs
-abc
-abu
-abu
-abu
-abc
-abc
-aec
-aeJ
+adI
+lNQ
+eDF
+jYl
+lUU
+acG
+acG
+aaW
+wVq
+acG
+qFK
+jRW
+dLi
+evc
+qto
+pGA
+acG
+mnu
+xGm
+xNV
+gxK
+nko
+vFZ
+szn
+noJ
+uql
afw
-abc
-abc
+acd
+acd
dly
xxp
mcp
@@ -86559,7 +90334,7 @@ aaa
aaa
iDo
ctv
-aaT
+iDo
aaa
aaa
aaa
@@ -86662,38 +90437,38 @@ cNd
cNd
aaa
aaa
+eRz
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aae
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-gXs
-aai
-aai
-aai
+oUF
+iMy
+cTo
+ltm
+kkb
+xfW
+aaN
+kMn
+rDc
+grd
+wpV
+tYg
+tAS
+sAm
+jrR
+teq
+acG
+cVE
abb
abt
-aca
-acz
-acX
-adC
+lJA
+lJA
+lJA
+szn
aeb
-aeI
+uql
afv
agf
-abc
+acd
dly
xxp
mcp
@@ -86816,7 +90591,7 @@ aaa
aaa
iDo
iDo
-aaT
+iDo
aaa
aaa
aaa
@@ -86919,38 +90694,38 @@ cNd
cNd
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aai
-eqd
+eRz
+gXs
+gXs
+adI
+mwN
+kfG
+uJY
+kkb
+tLC
+aaN
+peD
+kGj
+acG
+lux
+gPY
+ktW
+qQK
+uuw
+dPs
+acG
kgr
-abe
-abw
-acc
-acB
-acZ
-adE
-aee
+nFA
+wVt
+pZD
+vYF
+txs
+szn
+pIR
aeL
afy
agh
-abc
+acd
kCa
hnU
vda
@@ -87175,39 +90950,39 @@ cNd
cNd
cNd
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
gXs
-aai
-gbu
+eRz
+aaa
+aaa
+oUF
+xFj
+jKm
+cYf
+kkb
+tAS
+pgq
+peD
+sBM
+acG
+acG
+jOB
+acG
+acG
+acG
+acG
+acG
aay
-abd
+oss
abv
-acb
+lJA
acA
acI
adD
aed
-aeK
-afx
+uql
+afv
agg
-abc
+acd
ovv
dCV
idK
@@ -87432,39 +91207,39 @@ cNd
cNd
cNd
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaf
-aai
-acd
+gXs
+sMu
+gXs
+gXs
+adI
+adI
+yhI
+lLu
+dLZ
+vYY
+mui
+gcV
+lic
+aau
+xbP
+mHH
+fMF
+ueN
+iqi
+fKN
+acG
mIZ
abg
-enB
-aby
-aby
-aby
-aby
+lJA
+lJA
+lJA
+lJA
+szn
aeg
-aeN
+uql
afA
-afA
-abc
+acd
+acd
kuA
laq
kdP
@@ -87687,41 +91462,41 @@ cNd
cNd
cNd
cNd
-cNd
+gXs
+gXs
+gXs
+eRz
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaf
-aaf
-aai
-aai
+oUF
+vim
+kYm
+mke
+hpY
+obq
+fiR
+dPE
+pTT
+jIH
+rqq
+acG
+mxZ
+xMS
+pnb
abf
aaK
jRw
aaU
-acd
+eDJ
acC
ada
adF
aef
aeM
afz
-oSl
-ail
+ldY
+lRb
lRb
vIi
fsj
@@ -87947,34 +91722,34 @@ cNd
cNd
aaa
aaa
+eRz
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
+rcV
+adI
+adI
+adI
+acG
+acG
+acG
+lBk
+jxx
+acG
thB
-aai
-aai
-aai
-aai
+rqq
+acG
+acG
+jTy
aaI
-aat
-aat
-aat
-aat
+acG
+gXu
+wAN
+ruu
ace
-aat
+ref
aat
adH
-aei
+aem
aeO
afJ
sXV
@@ -88204,35 +91979,35 @@ cNd
cNd
aaa
aaa
+eRz
+eRz
+gXs
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaf
-aai
+gXs
+adI
+msp
+pHK
+wkU
+sNj
+rDm
+acG
+sAT
+rqq
aan
-aaw
-aaB
-qmn
-aaJ
-aat
+acG
+acG
+acG
+acG
+xLQ
abh
-aat
acd
+ozh
abK
acY
-adG
+aai
aeh
-aeO
+lJS
ado
afq
afH
@@ -88462,32 +92237,32 @@ cNd
aaa
aaa
aaa
+eRz
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaa
+xWS
+gcY
+oVL
+dSh
+xBJ
+fMY
+acG
+pUf
aam
aap
-saX
+aau
aaD
aau
-aat
-aat
-aat
+vMi
+oKB
+vhy
abA
-acd
-acd
-acd
-acd
+jNN
+hkA
+hkA
+aai
aek
acp
aav
@@ -88719,32 +92494,32 @@ cNd
aaa
aaa
aaa
+eRz
+eRz
+eRz
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaf
-aai
+uKW
+tAS
+tAS
+eoR
+tAS
+ooF
+acG
+viH
+siz
aao
aax
aaC
aaA
-aat
-aat
-aat
+ngq
+tWe
+jHp
aei
-acd
+fFR
acE
add
-adF
+aai
aej
aeQ
adp
@@ -88976,33 +92751,33 @@ cNd
aaa
aaa
aaa
+gXs
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaa
-aam
-aar
+eRz
+gXs
+gXs
+uKW
+oIl
+tAS
+eoR
+ecB
+dnX
+acG
+acG
+mZu
+acG
uGI
aaF
-aat
-aat
+qbk
+ske
aaW
-aat
-abB
-acf
-abM
+xjU
+acG
+acG
+acG
acG
adI
-aem
+xKl
omX
afG
aim
@@ -89233,32 +93008,32 @@ cNd
aaa
aaa
aaa
+gXs
+aaa
+eRz
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaf
-aai
-aaq
+uhK
+xAA
+jSY
+hxg
+acK
+ssc
+acG
+uOm
+nLP
+acG
dyS
aaE
-aat
+aaN
aaN
aaV
rvS
-aat
-acd
+etr
+tyb
abL
adb
-acd
+adI
ael
aeO
afF
@@ -89490,35 +93265,35 @@ cNd
aaa
aaa
aaa
+gXs
+aaa
+eRz
aaa
aaa
-aaa
-aaa
-aae
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaa
-aam
-aaj
-aat
-aat
-aat
+adI
+oIl
+uUb
+eZI
+qZQ
+dNP
+acG
+hJO
+mpY
+acG
+szf
+rDm
+gVc
qXg
-jjC
+acG
xOx
-abD
-acd
-acd
-acd
-acd
+oPY
+ncU
+lvc
+epG
+adI
aen
aeO
-ahE
+afG
afq
aii
afM
@@ -89747,32 +93522,32 @@ cNd
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaf
-aai
-aas
-aat
-aat
-aat
-aat
-uEI
-aat
-abC
-acd
+gXs
+gXs
+eRz
+gXs
+gXs
+adI
+jnk
+emf
+vHK
+vHK
+vHK
+vHK
+vHK
+acG
+acG
+fdS
+qRI
+jvB
+iwU
+acG
+ltw
+eDf
+oXV
acH
adc
-acd
+adI
aeo
aev
aeS
@@ -90006,33 +93781,33 @@ aaa
aaa
aaa
aaa
+eRz
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaa
-aam
-akQ
-aav
-aav
-aav
-aav
-aav
-aav
+jnk
+qOY
+pBd
+kGL
+fcj
+jqK
+vHK
+rTj
+rTj
+goJ
+kLK
+rTj
+hvC
+acG
+oiY
abE
acg
acJ
-ade
+adb
adJ
aep
aeT
-ahE
+afG
aim
ajL
akj
@@ -90263,30 +94038,30 @@ aaa
aaa
aaa
aaa
+eRz
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaf
-aai
-wYc
-wYc
+jnk
+sIn
+eZS
+iBj
+fcj
+iBq
+vHK
+dCd
+aaP
+xpH
aaG
wYc
aaP
-aaX
+acG
keM
xib
-acd
+acG
acD
-acY
-adG
+cNi
+adI
aeq
aeV
agj
@@ -90520,30 +94295,30 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-aaa
-aai
-aai
-aai
-aai
-aai
-aai
-aai
+eRz
+eRz
+gXs
+gXs
+jnk
+jnk
+jnk
+jnk
+vHK
+vHK
+vHK
+xMg
+tPY
+ugi
+lht
+jVP
+tPY
+acG
abj
abF
-acd
-acd
-acd
-acd
+eIW
+mJy
+ldT
+cSp
aeP
afC
agk
@@ -90778,29 +94553,29 @@ aaa
aaa
aaa
aaa
+eRz
aaa
aaa
+gXs
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaf
-aaa
-aaf
-aai
+gXs
+adI
+olH
+mte
+lpx
+nZs
+nZs
+nZs
+sYV
+nZs
+maU
+acG
abi
eqA
ach
-acK
+wAj
adf
-acd
+mhv
aer
afB
agi
@@ -91033,31 +94808,31 @@ aaa
aaa
aaa
aaa
+gDl
+aaa
+eRz
aaa
aaa
+gXs
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
+adI
+noR
+nSI
+sHd
+tAS
+tHO
aaR
-aai
-aai
-aai
-aai
-aai
-aai
-aai
+jUN
+peE
+aaR
+adI
+adI
+adI
+adI
+adI
+adI
+adI
aaZ
aaZ
aiX
@@ -91292,23 +95067,23 @@ aaa
aaa
aaa
aaa
+eRz
+eRz
+eRz
+eRz
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaf
-aaf
+adI
+sew
+suS
+qvc
+adb
+kOE
+dxv
+fmR
+dzK
+adb
+adI
aaT
aaf
abx
@@ -91550,22 +95325,22 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
+eRz
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaf
-aaf
+rcV
+adI
+adI
+adI
+adI
+oUF
+gfw
+adI
+adI
+nqu
+uZY
+adI
aaT
gXs
abG
@@ -91808,21 +95583,21 @@ aaa
aaa
aaa
aaa
+gXs
+eRz
aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
aaa
+gXs
aaa
+gXs
aaa
-aaa
-aaf
-aaa
-aaf
-aaf
abY
gXs
abG
@@ -92062,24 +95837,24 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
+gXs
+gXs
+eRz
+aaa
+gXs
+aaa
+aaa
+gXs
aaa
aaa
aaa
aaa
+gXs
aaa
+gXs
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaf
-aaf
aaT
gXs
abG
@@ -92323,20 +96098,20 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaf
-aaf
+eRz
+eRz
+eRz
+eRz
+eRz
+vli
+eRz
+eRz
+eRz
+eRz
+aaT
+eRz
+aaT
+aaT
aaT
gXs
abG
@@ -92582,18 +96357,18 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
+gXs
+gXs
+gXs
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaf
aaa
aaf
-aaf
+ktS
abY
gXs
abG
@@ -92840,17 +96615,17 @@ aaa
aaa
aaa
aaa
+gXs
+aaa
+gXs
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaf
aaa
aaf
-aaf
+ktS
adR
abo
adR
@@ -93097,17 +96872,17 @@ aaa
aaa
aaa
aaa
+gXs
+aaa
+gXs
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaf
aaa
aaf
-aaf
+ktS
adR
aaY
abJ
@@ -93356,15 +97131,15 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+gXs
+gXs
+gXs
aaf
aaf
aaf
aaf
-aaa
+gXs
abo
abk
abk
@@ -93613,7 +97388,7 @@ aaa
aaa
aaa
aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -93870,7 +97645,7 @@ aaa
aaa
aaa
aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -93878,7 +97653,7 @@ aaa
aaa
aaa
aaf
-aaa
+gXs
abo
abO
abO
@@ -94127,7 +97902,7 @@ aaa
aaa
aaa
aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -94384,11 +98159,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+gXs
+gXs
+gXs
+gXs
aaf
aaf
aaf
@@ -97609,7 +101384,7 @@ aaa
aaa
aaa
aaa
-jAD
+fIs
aaa
aaa
aaa
@@ -98871,7 +102646,7 @@ cCS
bMK
bMK
bMK
-gXs
+gJi
aaa
aaa
aaa
@@ -99385,7 +103160,7 @@ bMK
bMK
bMK
bMK
-aaf
+aag
aoV
aoV
aoV
@@ -103412,7 +107187,7 @@ aaf
aaf
aaf
aaf
-cxW
+aag
alO
anf
anf
@@ -104783,7 +108558,7 @@ czY
cNW
bAw
bAw
-iiU
+kUn
aag
gJi
aaa
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 5f2b3d3883..ed3cdb4fb3 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -9967,6 +9967,7 @@
/area/security/prison)
"axk" = (
/obj/item/storage/pill_bottle/penis_enlargement,
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/freezer,
/area/security/prison)
"axl" = (
@@ -71034,6 +71035,11 @@
/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"kTm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plating,
+/area/security/prison)
"lcD" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
@@ -71107,6 +71113,11 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
+"mTf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
"nvn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -95913,7 +95924,7 @@ adE
aew
afG
agP
-agP
+kTm
aiL
ajT
anu
@@ -95928,7 +95939,7 @@ aHT
aJt
aJN
aQg
-akv
+mTf
aew
ayU
aSQ
@@ -96429,7 +96440,7 @@ afY
agP
agP
aiL
-akv
+mTf
anw
akv
akv
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index f688c72113..452fb97faf 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -10555,6 +10555,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel,
/area/security/prison)
"aMj" = (
@@ -12415,6 +12416,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel,
/area/security/prison)
"aUx" = (
@@ -12461,6 +12463,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel,
/area/security/prison)
"aUA" = (
@@ -12489,6 +12492,7 @@
/area/security/prison)
"aUB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index fce07f89cc..a8d0f7a2dc 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -55930,6 +55930,7 @@
dir = 1;
pixel_y = -22
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/showroomfloor,
/area/security/prison)
"bLR" = (
@@ -59252,6 +59253,7 @@
dir = 1;
pixel_y = -22
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/showroomfloor,
/area/security/prison)
"bRc" = (
@@ -61874,6 +61876,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/showroomfloor,
/area/security/prison)
"bVq" = (
@@ -79349,6 +79352,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"czS" = (
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index c843c4dcf7..2cabe985c8 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -445,6 +445,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel,
/area/security/prison)
"abr" = (
@@ -63068,6 +63069,11 @@
},
/turf/open/space/basic,
/area/space)
+"cZI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
"dcB" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -112475,7 +112481,7 @@ agJ
ahA
ady
bPZ
-adx
+cZI
adx
ama
aNh
@@ -113503,7 +113509,7 @@ afg
agM
ady
ajM
-adx
+cZI
adx
asb
baj
@@ -115302,7 +115308,7 @@ amN
agQ
ady
aiu
-adx
+cZI
adx
amc
beg
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f9e3219544..b0429f75ba 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1345,6 +1345,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel,
/area/security/prison)
"adw" = (
@@ -45120,6 +45121,10 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
+"cUU" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
"cUZ" = (
/obj/docking_port/stationary{
dir = 8;
@@ -81403,6 +81408,13 @@
},
/turf/open/floor/plating,
/area/command/bridge)
+"wXA" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
"wXC" = (
/obj/machinery/light_switch{
pixel_y = 28
@@ -105988,7 +106000,7 @@ abC
acr
acE
adb
-aaR
+cUU
aaR
aem
aeN
@@ -107267,7 +107279,7 @@ aaC
aaI
aaR
abb
-aaI
+wXA
abG
acb
acu
@@ -108044,7 +108056,7 @@ aaR
aaR
aaR
ade
-aaR
+cUU
aaR
aeo
aeV
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 6da36e0b95..cff5a382de 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2708,6 +2708,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel,
/area/security/prison)
"agN" = (
@@ -2736,6 +2737,7 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/freezer,
/area/security/prison)
"agP" = (
@@ -53501,6 +53503,13 @@
"dFJ" = (
/turf/open/floor/engine,
/area/engineering/supermatter)
+"dHg" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
"dHo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -61054,6 +61063,10 @@
},
/turf/closed/wall/r_wall,
/area/science/xenobiology)
+"tVZ" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"tXn" = (
/obj/structure/sink{
dir = 4;
@@ -83113,13 +83126,13 @@ aaa
aem
aeq
aeE
-aeU
+tVZ
afo
afD
aga
aga
agz
-aie
+dHg
aiH
ahm
ahD
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 35348df3d1..d4ab59cbc1 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -42,6 +42,7 @@
#define CLOWN (1<<11)
#define MIME (1<<12)
#define ASSISTANT (1<<13)
+#define PRISONER (1<<14)
#define JOB_AVAILABLE 0
#define JOB_UNAVAILABLE_GENERIC 1
@@ -89,3 +90,4 @@
#define JOB_DISPLAY_ORDER_WARDEN 31
#define JOB_DISPLAY_ORDER_DETECTIVE 32
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33
+#define JOB_DISPLAY_ORDER_PRISONER 34
diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm
index f56cd76a71..37a2fe3746 100644
--- a/code/__DEFINES/maths.dm
+++ b/code/__DEFINES/maths.dm
@@ -222,6 +222,10 @@
/// k is the rate at which is approaches L, x_0 is the point where the function = 0
#define LOGISTIC_FUNCTION(L,k,x,x_0) (L/(1+(NUM_E**(-k*(x-x_0)))))
// )
+/// A function that "linearly" approaches a maximum value of L
+/// k is the rate at which it approaches L (), x_0 is the point where the function = 0
+#define HYPERBOLIC_GROWTH(L,k,x,x_0) ((-(L * L) / ((k * x) + L - (k * x_0))) + L)
+// )
/// Make sure something is a boolean TRUE/FALSE 1/0 value, since things like bitfield & bitflag doesn't always give 1s and 0s.
#define FORCE_BOOLEAN(x) ((x)? TRUE : FALSE)
// )
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 19fd0c0fe7..deb35a077d 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -357,6 +357,7 @@ GLOBAL_LIST_INIT(job_heirlooms, list(
"Janitor" = list(/obj/item/mop),
"Scientist" = list(/obj/item/toy/plush/slimeplushie),
"Assistant" = list(/obj/item/clothing/gloves/cut/family),
+ "Prisoner" = list (/obj/item/pen/blue),
"Chaplain" = list(/obj/item/camera/spooky/family),
"Head of Personnel" = list(/obj/item/pinpointer/ian)
))
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index ed58ee512d..35e5a9a360 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -18,7 +18,7 @@
area_type = /area
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
- /area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle, /area/security/prison/safe, /area/security/prison/toilet)
+ /area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle)
target_trait = ZTRAIT_STATION
immunity_type = "rad"
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 57f4fdb8de..caf8fda213 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -37,7 +37,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ai_monitored/turret_protected/AIsatextAP
name = "AI Sat Ext"
icon_state = "storage"
-
+
/area/arrival
requires_power = FALSE
@@ -296,6 +296,28 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "xenomaint"
area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED
+//Maintenance - Prison
+
+/area/maintenance/prison
+ name = "Prison Maintenance"
+ icon_state = "prison_maintenance"
+
+/area/maintenance/prison/fore
+ name = "Prison Fore Maintenance"
+ icon_state = "prison_maintenance"
+
+/area/maintenance/prison/starboard
+ name = "Prison Starboard Maintenance"
+ icon_state = "prison_maintenance"
+
+/area/maintenance/prison/aft
+ name = "Prison Aft Maintenance"
+ icon_state = "prison_maintenance"
+
+/area/maintenance/prison/port
+ name = "Prison Port Maintenance"
+ icon_state = "prison_maintenance"
+
//Maintenance - Generic
/area/maintenance/arrivals/north
@@ -1393,13 +1415,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Prison Wing"
icon_state = "sec_prison"
-/area/security/prison/toilet //radproof
- name = "Prison Toilet"
- icon_state = "sec_prison_safe"
-
-/area/security/prison/safe //radproof
+/area/security/prison/cells
name = "Prison Wing Cells"
- icon_state = "sec_prison_safe"
+ icon_state = "prison_cells"
/area/security/prison/upper
name = "Upper Prison Wing"
diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm
index 65321f5820..aa8edeaa72 100644
--- a/code/game/gamemodes/bloodsucker/bloodsucker.dm
+++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm
@@ -25,7 +25,7 @@
antag_flag = ROLE_BLOODSUCKER
false_report_weight = 1
chaos = 4
- restricted_jobs = list("AI","Cyborg")
+ restricted_jobs = list("Prisoner", "AI","Cyborg")
protected_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 20
required_enemies = 2
diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm
index eda6b5f9e2..6da31e41bb 100644
--- a/code/game/gamemodes/brother/traitor_bro.dm
+++ b/code/game/gamemodes/brother/traitor_bro.dm
@@ -7,7 +7,7 @@
config_tag = "traitorbro"
required_players = 25
chaos = 5
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
announce_span = "danger"
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 3662f54645..0d6108baf1 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -11,7 +11,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
antag_flag = ROLE_CHANGELING
false_report_weight = 10
chaos = 5
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist
required_players = 15
required_enemies = 1
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index 88a1cde8ce..691111031d 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -4,7 +4,7 @@
false_report_weight = 10
chaos = 6
traitors_possible = 3 //hard limit on traitors if scaling is turned off
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
required_players = 25
required_enemies = 1 // how many of each type are required
recommended_enemies = 3
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index 64ca226c2a..8ff26d5125 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -139,7 +139,7 @@ Credit where due:
required_enemies = 3
recommended_enemies = 5
enemy_minimum_age = 7
- protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //Silicons can eventually be converted
+ protected_jobs = list("Prisoner", "AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //Silicons can eventually be converted
restricted_jobs = list("Chaplain", "Captain")
announce_span = "brass"
announce_text = "Servants of Ratvar are trying to summon the Justiciar!\n\
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index ba9fad7a84..9a49c05739 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -39,7 +39,7 @@
antag_flag = ROLE_CULTIST
false_report_weight = 10
chaos = 8
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 30
required_enemies = 3
diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm
index 9bf7fc0e82..7fe2f91714 100644
--- a/code/game/gamemodes/devil/devil_game_mode.dm
+++ b/code/game/gamemodes/devil/devil_game_mode.dm
@@ -4,7 +4,7 @@
antag_flag = ROLE_DEVIL
false_report_weight = 1
chaos = 3
- protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
+ protected_jobs = list("Prisoner", "Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
required_players = 0
required_enemies = 1
recommended_enemies = 4
diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm
index 1693163fa2..2086653012 100644
--- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm
+++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm
@@ -4,7 +4,7 @@
antag_flag = ROLE_HERETIC
false_report_weight = 5
chaos = 5
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to heretic role blacklist
required_players = 15
required_enemies = 1
diff --git a/code/game/gamemodes/gangs/gangs.dm b/code/game/gamemodes/gangs/gangs.dm
index 100669c487..1352e9340d 100644
--- a/code/game/gamemodes/gangs/gangs.dm
+++ b/code/game/gamemodes/gangs/gangs.dm
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(gangs)
config_tag = "gang"
antag_flag = ROLE_GANG
chaos = 9
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 15
required_enemies = 0
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 419a74d616..5b3e742336 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -13,7 +13,7 @@
antag_flag = ROLE_REV
false_report_weight = 10
chaos = 8
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("Prisoner", "AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 20
required_enemies = 1
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index d42fe615cd..220fbe9978 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -10,7 +10,7 @@
config_tag = "traitor"
antag_flag = ROLE_TRAITOR
false_report_weight = 20 //Reports of traitors are pretty common.
- restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
+ restricted_jobs = list("Prisoner", "Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist
required_players = 0
required_enemies = 1
diff --git a/code/game/machinery/prisonlabor.dm b/code/game/machinery/prisonlabor.dm
new file mode 100644
index 0000000000..b76a62a6be
--- /dev/null
+++ b/code/game/machinery/prisonlabor.dm
@@ -0,0 +1,66 @@
+/obj/machinery/plate_press
+ name = "license plate press"
+ desc = "You know, we're making a lot of license plates for a station with literaly no cars in it."
+ icon = 'icons/obj/machines/prison.dmi'
+ icon_state = "offline"
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 2
+ active_power_usage = 50
+ var/obj/item/stack/license_plates/empty/current_plate
+ var/pressing = FALSE
+
+/obj/machinery/plate_press/update_icon()
+ . = ..()
+ if(!is_operational())
+ icon_state = "offline"
+ else if(pressing)
+ icon_state = "loop"
+ else if(current_plate)
+ icon_state = "online_loaded"
+ else
+ icon_state = "online"
+
+/obj/machinery/plate_press/Destroy()
+ QDEL_NULL(current_plate)
+ . = ..()
+
+/obj/machinery/plate_press/attackby(obj/item/I, mob/living/user, params)
+ if(!is_operational())
+ to_chat(user, "[src] has to be on to do this!")
+ return FALSE
+ if(pressing)
+ to_chat(user, "[src] already has a plate in it!")
+ return FALSE
+ if(istype(I, /obj/item/stack/license_plates/empty))
+ var/obj/item/stack/license_plates/empty/plate = I
+ plate.use(1)
+ current_plate = new plate.type(src, 1) //Spawn a new single sheet in the machine
+ update_icon()
+ else
+ return ..()
+
+/obj/machinery/plate_press/attack_hand(mob/living/user)
+ . = ..()
+ if(!pressing && current_plate)
+ work_press(user)
+
+///This proc attempts to create a plate. User cannot move during this process.
+/obj/machinery/plate_press/proc/work_press(mob/living/user)
+
+ pressing = TRUE
+ update_icon()
+ to_chat(user, "You start pressing a new license plate!")
+
+ if(!do_after(user, 40, target = src))
+ pressing = FALSE
+ update_icon()
+ return FALSE
+
+ use_power(100)
+ to_chat(user, "You finish pressing a new license plate!")
+
+ pressing = FALSE
+ QDEL_NULL(current_plate)
+ update_icon()
+
+ new /obj/item/stack/license_plates/filled(drop_location(), 1)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 6910bb1db0..a484f78b41 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -64,6 +64,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Assistant"
icon_state = "Assistant"
+/obj/effect/landmark/start/prisoner
+ name = "Prisoner"
+ icon_state = "Prisoner"
+
/obj/effect/landmark/start/assistant/override
jobspawn_override = TRUE
delete_after_roundstart = FALSE
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 8bffc68da2..7f53a6c308 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -60,6 +60,48 @@
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/storage/box/syndie_kit/throwing_weapons = 3)
+/obj/effect/spawner/lootdrop/prison_contraband
+ name = "prison contraband loot spawner"
+ loot = list(/obj/item/clothing/mask/cigarette/space_cigarette = 4,
+ /obj/item/clothing/mask/cigarette/robust = 2,
+ /obj/item/clothing/mask/cigarette/carp = 3,
+ /obj/item/clothing/mask/cigarette/uplift = 2,
+ /obj/item/clothing/mask/cigarette/dromedary = 3,
+ /obj/item/clothing/mask/cigarette/robustgold = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+ /obj/item/storage/fancy/cigarettes = 3,
+ /obj/item/clothing/mask/cigarette/rollie/cannabis = 4,
+ /obj/item/toy/crayon/spraycan = 2,
+ /obj/item/crowbar = 1,
+ /obj/item/assembly/flash/handheld = 1,
+ /obj/item/restraints/handcuffs/cable/zipties = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/radio/off = 1,
+ /obj/item/lighter = 3,
+ /obj/item/storage/box/matches = 3,
+ /obj/item/reagent_containers/syringe/contraband/space_drugs = 1,
+ /obj/item/reagent_containers/syringe/contraband/krokodil = 1,
+ /obj/item/reagent_containers/syringe/contraband/crank = 1,
+ /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
+ /obj/item/reagent_containers/syringe/contraband/bath_salts = 1,
+ /obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
+ /obj/item/reagent_containers/syringe/contraband/morphine = 1,
+ /obj/item/storage/pill_bottle/happy = 1,
+ /obj/item/storage/pill_bottle/lsd = 1,
+ /obj/item/storage/pill_bottle/psicodine = 1,
+ /obj/item/reagent_containers/food/drinks/beer = 4,
+ /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
+ /obj/item/paper/fluff/jobs/prisoner/letter = 1,
+ /obj/item/grenade/smokebomb = 1,
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/tailclub = 1, //want to buy makeshift wooden club sprite
+ /obj/item/kitchen/knife/shiv = 4,
+ /obj/item/kitchen/knife/shiv/carrot = 1,
+ /obj/item/kitchen/knife = 1,
+ /obj/item/storage/wallet/random = 1,
+ /obj/item/pda = 1
+ )
+
/obj/effect/spawner/lootdrop/gambling
name = "gambling valuables spawner"
loot = list(
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 6fff680ef6..5b546cbecb 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -109,6 +109,12 @@ GLOBAL_LIST_INIT(channel_tokens, list(
keyslot = new /obj/item/encryptionkey/binary
recalculateChannels()
+/obj/item/radio/headset/headset_prisoner
+ name = "prison radio headset"
+ desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast."
+ icon_state = "prisoner_headset"
+ prison_radio = TRUE
+
/obj/item/radio/headset/headset_sec
name = "security radio headset"
desc = "This is used by your elite security force."
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 2e7cef2c9f..5a16c24b8e 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -255,18 +255,31 @@
icon_state = "knife"
desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
-/obj/item/kitchen/knife/carrotshiv
+/obj/item/kitchen/knife/shiv
+ name = "glass shiv"
+ icon = 'icons/obj/shards.dmi'
+ icon_state = "shiv"
+ item_state = "shiv"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ desc = "A makeshift glass shiv."
+ force = 8
+ throwforce = 12//fuck git
+ attack_verb = list("shanked", "shivved")
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ custom_materials = list(/datum/material/glass=400)
+
+/obj/item/kitchen/knife/shiv/carrot
name = "carrot shiv"
icon_state = "carrotshiv"
item_state = "carrotshiv"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ icon = 'icons/obj/kitchen.dmi'
desc = "Unlike other carrots, you should probably keep this far away from your eyes."
- force = 8
- throwforce = 12//fuck git
custom_materials = null
- attack_verb = list("shanked", "shivved")
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
+/obj/item/kitchen/knife/shiv/carrot/suicide_act(mob/living/carbon/user)
+ user.visible_message("[user] forcefully drives \the [src] into [user.p_their()] eye! It looks like [user.p_theyre()] trying to commit suicide!")
+ return BRUTELOSS
/obj/item/kitchen/rollingpin
name = "rolling pin"
diff --git a/code/game/objects/items/stacks/license_plates.dm b/code/game/objects/items/stacks/license_plates.dm
new file mode 100644
index 0000000000..06dc86ee61
--- /dev/null
+++ b/code/game/objects/items/stacks/license_plates.dm
@@ -0,0 +1,30 @@
+/obj/item/stack/license_plates
+ name = "invalid plate"
+ desc = "someone fucked up"
+ icon = 'icons/obj/machines/prison.dmi'
+ icon_state = "empty_plate"
+ novariants = FALSE
+ max_amount = 50
+
+/obj/item/stack/license_plates/empty
+ name = "empty license plate"
+ desc = "Instead of a license plate number, this could contain a quote like \"Live laugh love\"."
+
+/obj/item/stack/license_plates/empty/fifty
+ amount = 50
+
+/obj/item/stack/license_plates/filled
+ name = "license plate"
+ desc = "Prison labor paying off."
+ icon_state = "filled_plate_1_1"
+
+///Override to allow for variations
+/obj/item/stack/license_plates/filled/update_icon_state()
+ if(novariants)
+ return
+ if(amount <= (max_amount * (1/3)))
+ icon_state = "filled_plate_[rand(1,6)]_1"
+ else if (amount <= (max_amount * (2/3)))
+ icon_state = "filled_plate_[rand(1,6)]_2"
+ else
+ icon_state = "filled_plate_[rand(1,6)]_3"
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 6b1220743f..e62b5421d4 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -355,7 +355,19 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
/obj/item/shard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/lightreplacer))
- I.attackby(src, user)
+ var/obj/item/lightreplacer/L = I
+ L.attackby(src, user)
+ else if(istype(I, /obj/item/stack/sheet/cloth))
+ var/obj/item/stack/sheet/cloth/C = I
+ to_chat(user, "You begin to wrap the [C] around the [src]...")
+ if(do_after(user, 35, target = src))
+ var/obj/item/kitchen/knife/shiv/S = new /obj/item/kitchen/knife/shiv
+ C.use(1)
+ to_chat(user, "You wrap the [C] around the [src] forming a makeshift weapon.")
+ remove_item_from_storage(src)
+ qdel(src)
+ user.put_in_hands(S)
+
else
return ..()
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index cb619a711b..6bb501807d 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -317,7 +317,7 @@
* Trays - Agouri
*/
/obj/item/storage/bag/tray
- name = "tray"
+ name = "serving tray"
icon = 'icons/obj/food/containers.dmi'
icon_state = "tray"
desc = "A metal tray to lay food on."
@@ -377,6 +377,12 @@
. = ..()
update_icon()
+/obj/item/storage/bag/tray/cafeteria
+ name = "cafeteria tray"
+ icon = 'icons/obj/food/containers.dmi'
+ icon_state = "foodtray"
+ desc = "A cheap metal tray to pile today's meal onto."
+
//bluespace tray, holds more items
/obj/item/storage/bag/tray/bluespace
name = "bluespace tray"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index cd10f9209c..02ee466376 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -192,6 +192,7 @@
new /obj/item/clothing/under/rank/prisoner( src )
new /obj/item/clothing/under/rank/prisoner/skirt( src )
new /obj/item/clothing/shoes/sneakers/orange( src )
+ new /obj/item/radio/headset/headset_prisoner( src )
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 030f7f4edf..f6153330e4 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -106,6 +106,16 @@
name = "trash cart"
icon_state = "trashcart"
+/obj/structure/closet/crate/trashcart/Moved()
+ . = ..()
+ if(has_gravity())
+ playsound(src, 'sound/effects/roll.ogg', 100, TRUE)
+
+/obj/structure/closet/crate/trashcart/laundry
+ name = "laundry cart"
+ desc = "A large cart for hauling around large amounts of laundry."
+ icon_state = "laundry"
+
/obj/structure/closet/crate/medical
desc = "A medical crate."
name = "medical crate"
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index 242a7cc7fd..7648196f3e 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -2,7 +2,7 @@
name = "Prison Escapee"
uniform = /obj/item/clothing/under/rank/prisoner
shoes = /obj/item/clothing/shoes/sneakers/orange
- r_pocket = /obj/item/kitchen/knife
+ r_pocket = /obj/item/kitchen/knife/shiv
/datum/outfit/prisoner/post_equip(mob/living/carbon/human/H, visualsOnly=FALSE)
if(visualsOnly)
diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm
index b0676fbde2..058e0cc892 100644
--- a/code/modules/cargo/exports/sheets.dm
+++ b/code/modules/cargo/exports/sheets.dm
@@ -59,6 +59,11 @@
unit_name = "alien hide"
export_types = list(/obj/item/stack/sheet/animalhide/xeno)
+/datum/export/stack/licenseplate
+ cost = 25
+ unit_name = "license plate"
+ export_types = list(/obj/item/stack/license_plates/filled)
+
// Common materials.
// For base materials, see materials.dm
diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm
index 90629706b5..8b74b0fbe9 100644
--- a/code/modules/cargo/packs/materials.dm
+++ b/code/modules/cargo/packs/materials.dm
@@ -20,6 +20,13 @@
cost = 300 //thrice their export value
contains = list(/obj/item/stack/sheet/cardboard/fifty)
+/datum/supply_pack/materials/license50
+ name = "50 Empty License Plates"
+ desc = "Create a bunch of boxes."
+ cost = 1000 // 50 * 25 + 700 - 1000 = 950 credits profit
+ contains = list(/obj/item/stack/license_plates/empty/fifty)
+ crate_name = "empty license plate crate"
+
/datum/supply_pack/materials/glass50
crate_type = /obj/structure/closet/secure_closet/cargo
name = "50 Glass Sheets"
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index bd2c2b612d..5809cb8f50 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -71,6 +71,12 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/security/hos
uniform = /obj/item/clothing/under/plasmaman/security/hos
+/datum/outfit/plasmaman/prisoner
+ name = "Prisoner Plasmaman"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/prisoner
+ uniform = /obj/item/clothing/under/plasmaman/prisoner
+
/datum/outfit/plasmaman/cargo
name = "Cargo Plasmaman"
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index b50c2b45db..25ad19eee4 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -169,6 +169,10 @@
icon_state = "hos_envirohelm"
item_state = "hos_envirohelm"
+/obj/item/clothing/head/helmet/space/plasmaman/prisoner
+ name = "prisoner's plasma envirosuit helmet"
+ desc = "A plasmaman containment helmet for prisoners."
+
/obj/item/clothing/head/helmet/space/plasmaman/medical
name = "medical's plasma envirosuit helmet"
desc = "An envriohelmet designed for plasmaman medical doctors, having two stripes down it's length to denote as much."
diff --git a/code/modules/clothing/under/jobs/Plasmaman/security.dm b/code/modules/clothing/under/jobs/Plasmaman/security.dm
index c9b7b494a3..262b336011 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/security.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/security.dm
@@ -18,3 +18,9 @@
desc = "A slick black and red plasmaman containment suit designed for the head of security, also called the LAW."
icon_state = "hos_envirosuit"
item_state = "hos_envirosuit"
+
+/obj/item/clothing/under/plasmaman/prisoner
+ name = "prisoner envirosuit"
+ desc = "An orange envirosuit identifying and protecting a criminal plasmaman."
+ icon_state = "prisoner_envirosuit"
+ item_state = "prisoner_envirosuit"
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index f30d955b00..b11d2b83b9 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -19,7 +19,7 @@
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/sandwich
filling_color = "#FFA500"
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- slot_flags = ITEM_SLOT_HEAD
+ slot_flags = ITEM_SLOT_MASK
customfoodfilling = 0 //to avoid infinite bread-ception
foodtype = GRAIN
dunkable = TRUE
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 5f9b55b881..843688b5a0 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -29,7 +29,7 @@
/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.get_sharpness())
to_chat(user, "You sharpen the carrot into a shiv with [I].")
- var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv
+ var/obj/item/kitchen/knife/shiv/carrot/Shiv = new /obj/item/kitchen/knife/shiv/carrot
remove_item_from_storage(user)
qdel(src)
user.put_in_hands(Shiv)
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 06e1863bc9..35a89b46db 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -355,7 +355,7 @@
return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic",
- "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
+ "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Prisoner")
/proc/get_all_job_icons() //For all existing HUD icons
return get_all_jobs() + list("Prisoner")
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
new file mode 100644
index 0000000000..13c18c21ca
--- /dev/null
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -0,0 +1,24 @@
+datum/job/prisoner
+ title = "Prisoner"
+ flag = PRISONER
+ department_head = list("The Security Team")
+ department_flag = CIVILIAN
+ faction = "Station"
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "the security team"
+
+ outfit = /datum/outfit/job/prisoner
+ plasma_outfit = /datum/outfit/plasmaman/prisoner
+
+ display_order = JOB_DISPLAY_ORDER_PRISONER
+
+/datum/outfit/job/prisoner
+ name = "Prisoner"
+ jobtype = /datum/job/prisoner
+
+ uniform = /obj/item/clothing/under/rank/prisoner
+ shoes = /obj/item/clothing/shoes/sneakers/orange
+ id = /obj/item/card/id/prisoner
+ ears = /obj/item/radio/headset/headset_prisoner
+ belt = null
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 78b7dd3964..d91b102599 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(civilian_positions, list(
"Chaplain",
"Clown",
"Mime",
+ "Prisoner",
"Assistant"))
GLOBAL_LIST_INIT(security_positions, list(
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 2888507baa..7423a164a4 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -118,7 +118,7 @@
throwpower = I.throwforce
var/impacting_zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
var/list/block_return = list()
- var/total_damage = I.throwforce
+ var/total_damage = AM.throwforce
if(mob_run_block(AM, throwpower, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum?.thrower, impacting_zone, block_return) & BLOCK_SUCCESS)
hitpush = FALSE
skipcatch = TRUE
diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm
index 74eedc16c9..5fc415b2b6 100644
--- a/code/modules/movespeed/_movespeed_modifier.dm
+++ b/code/modules/movespeed/_movespeed_modifier.dm
@@ -41,9 +41,9 @@ Key procs
/// Next two variables depend on this: Should we do advanced calculations?
var/complex_calculation = FALSE
/// Absolute max tiles we can boost to
- var/absolute_max_tiles_per_second
+ var/absolute_max_tiles_per_second = INFINITY
/// Max tiles per second we can boost
- var/max_tiles_per_second_boost
+ var/max_tiles_per_second_boost = INFINITY
/// Movetypes this applies to
var/movetypes = ALL
@@ -54,6 +54,8 @@ Key procs
/// Other modification datums this conflicts with.
var/conflicts_with
+
+
/datum/movespeed_modifier/New()
. = ..()
if(!id)
diff --git a/code/modules/movespeed/modifiers/reagents.dm b/code/modules/movespeed/modifiers/reagents.dm
index 96b7be3a69..a6c3133c8b 100644
--- a/code/modules/movespeed/modifiers/reagents.dm
+++ b/code/modules/movespeed/modifiers/reagents.dm
@@ -23,7 +23,7 @@
multiplicative_slowdown = -4
priority = 500
complex_calculation = TRUE
- absolute_max_tiles_per_second = 8
+ absolute_max_tiles_per_second = 10
/datum/movespeed_modifier/reagent/methamphetamine
// very strong painkiller effect that caps out at slightly above runspeed
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 148535af76..d7c918007e 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -41,8 +41,9 @@
#define THERMAL_RELEASE_MODIFIER 350 //Higher == more heat released during reaction, not to be confused with the above values
#define THERMAL_RELEASE_CAP_MODIFIER 250 //Higher == lower cap on how much heat can be released per tick--currently 1.3x old value
-#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction
-#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power
+#define GAS_RELEASE_MODIFIER 800 //Higher == less gas released by reaction
+#define MAX_OXY_MULT 2 //The ratio between oxygen and plasma will approach this as temperature increases
+#define OXY_POINT 80 // the temperature above which oxygen output > plasma output
#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power
@@ -538,14 +539,19 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
//Power * 0.55 * a value between 1 and 0.8
var/device_energy = power * REACTION_POWER_MODIFIER
- var/effective_temperature = min(removed.return_temperature(), 2500 * dynamic_heat_modifier)
+ var/cur_temp = removed.return_temperature() // more readable, better-performing anyway
- var/max_temp_increase = effective_temperature + ((device_energy * dynamic_heat_modifier) / THERMAL_RELEASE_CAP_MODIFIER)
- //Calculate how much gas to release
- //Varies based on power and gas content
- removed.adjust_moles(GAS_PLASMA, max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0))
- //Varies based on power, gas content, and heat
- removed.adjust_moles(GAS_O2, max(((device_energy + effective_temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0))
+ // we don't want to cap the temperature like the old supermatter but we do want to stop adding more when it's too hot
+ var/max_temp_increase = min(cur_temp, 2500 * dynamic_heat_modifier) + ((device_energy * dynamic_heat_modifier) / THERMAL_RELEASE_CAP_MODIFIER)
+
+ // oxygen ratio increases as temperature does
+ var/oxy_ratio = HYPERBOLIC_GROWTH(MAX_OXY_MULT, 1 / OXY_POINT, cur_temp, (-OXY_POINT / 2))
+ // total moles also increases as temperature does
+ var/released_plasma = min(max((device_energy * dynamic_heat_modifier) / GAS_RELEASE_MODIFIER, 0) / (1+oxy_ratio), 2)
+
+ removed.adjust_moles(GAS_PLASMA, released_plasma)
+
+ removed.adjust_moles(GAS_O2, released_plasma * oxy_ratio)
if(removed.return_temperature() < max_temp_increase)
removed.adjust_heat(device_energy * dynamic_heat_modifier * THERMAL_RELEASE_MODIFIER)
@@ -599,13 +605,13 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
zap_icon = SLIGHTLY_CHARGED_ZAP_ICON_STATE
//Uncaps the zap damage, it's maxed by the input power
//Objects take damage now
- flags |= (ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE)
+ flags |= (ZAP_MOB_DAMAGE)
zap_count = 3
if(CRITICAL_POWER_PENALTY_THRESHOLD to INFINITY)
zap_icon = OVER_9000_ZAP_ICON_STATE
//It'll stun more now, and damage will hit harder, gloves are no garentee.
//Machines go boom
- flags |= (ZAP_MOB_STUN | ZAP_MACHINE_EXPLOSIVE | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE)
+ flags |= (ZAP_MOB_STUN | ZAP_MOB_DAMAGE)
zap_count = 4
//Now we deal with damage shit
if (damage > damage_penalty_point && prob(20))
@@ -1058,9 +1064,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(zapdir)
. = zapdir
- //Going boom should be rareish
- if(prob(80))
- zap_flags &= ~ZAP_MACHINE_EXPLOSIVE
if(target_type == COIL)
//In the best situation we can expect this to grow up to 2120kw before a delam/IT'S GONE TOO FAR FRED SHUT IT DOWN
//The formula for power gen is zap_str * zap_mod / 2 * capacitor rating, between 1 and 4
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index a9bdff64b2..02b19909b0 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -554,6 +554,13 @@
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles"
+/datum/reagent/consumable/nutraslop
+ name = "Nutraslop"
+ description = "Mixture of leftover prison foods served on previous days."
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#3E4A00" // rgb: 62, 74, 0
+ taste_description = "your imprisonment"
+
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 6614a0f795..b2a77efaa9 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1454,7 +1454,7 @@
/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired)
..()
metabolizer.AdjustAllImmobility(-20 * REM * delta_time)
- metabolizer.adjustStaminaLoss(-10 * REM * delta_time, 0)
+ metabolizer.adjustStaminaLoss(-30 * REM * delta_time, 0)
metabolizer.Jitter(10 * REM * delta_time)
metabolizer.Dizzy(10 * REM * delta_time)
return TRUE
@@ -1480,7 +1480,7 @@
/datum/reagent/medicine/changelinghaste
name = "Changeling Haste"
- description = "Drastically increases movement speed, but deals toxin damage."
+ description = "Drastically increases movement speed."
color = "#AE151D"
metabolization_rate = 2.5 * REAGENTS_METABOLISM
@@ -1492,12 +1492,6 @@
L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
..()
-/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired)
- metabolizer.adjustToxLoss(2 * REM * delta_time, 0)
- ..()
- return TRUE
-
-
/datum/reagent/medicine/corazone
// Heart attack code will not do damage if corazone is present
// because it's SPACE MAGIC ASPIRIN
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 93a07b1a6e..c2f80de761 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -218,6 +218,31 @@
volume = 50
list_reagents = list(/datum/reagent/medicine/stimulants = 50)
+/obj/item/reagent_containers/syringe/contraband
+ name = "unlabeled syringe"
+ desc = "A syringe containing some sort of unknown chemical cocktail."
+
+/obj/item/reagent_containers/syringe/contraband/space_drugs
+ list_reagents = list(/datum/reagent/drug/space_drugs = 15)
+
+/obj/item/reagent_containers/syringe/contraband/krokodil
+ list_reagents = list(/datum/reagent/drug/krokodil = 15)
+
+/obj/item/reagent_containers/syringe/contraband/crank
+ list_reagents = list(/datum/reagent/drug/crank = 15)
+
+/obj/item/reagent_containers/syringe/contraband/methamphetamine
+ list_reagents = list(/datum/reagent/drug/methamphetamine = 15)
+
+/obj/item/reagent_containers/syringe/contraband/bath_salts
+ list_reagents = list(/datum/reagent/drug/bath_salts = 15)
+
+/obj/item/reagent_containers/syringe/contraband/fentanyl
+ list_reagents = list(/datum/reagent/toxin/fentanyl = 15)
+
+/obj/item/reagent_containers/syringe/contraband/morphine
+ list_reagents = list(/datum/reagent/medicine/morphine = 15)
+
/obj/item/reagent_containers/syringe/calomel
name = "syringe (calomel)"
desc = "Contains calomel."
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 26f0ca66ee..db82e5cdb2 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -233,6 +233,14 @@
anchored = TRUE
reagent_id = /datum/reagent/consumable/cooking_oil
+/obj/structure/reagent_dispensers/servingdish
+ name = "serving dish"
+ desc = "A dish full of food slop for your bowl."
+ icon = 'icons/obj/kitchen.dmi'
+ icon_state = "serving"
+ anchored = TRUE
+ reagent_id = /datum/reagent/consumable/nutraslop
+
////////
//Kegs//
////////
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
index 67890838db..fe9ffe2035 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
@@ -30,13 +30,21 @@
category = list("initial","Dinnerware")
/datum/design/tray
- name = "Tray"
- id = "tray"
+ name = "Serving Tray"
+ id = "servingtray"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 3000)
build_path = /obj/item/storage/bag/tray
category = list("initial","Dinnerware")
+/datum/design/tray
+ name = "Cafeteria Tray"
+ id = "foodtray"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 3000)
+ build_path = /obj/item/storage/bag/tray/cafeteria
+ category = list("initial","Dinnerware")
+
/datum/design/bowl
name = "Bowl"
id = "bowl"
diff --git a/config/jobs.txt b/config/jobs.txt
index 1bf271763b..fab38e70f6 100644
--- a/config/jobs.txt
+++ b/config/jobs.txt
@@ -11,6 +11,8 @@ Chief Medical Officer=1,1
Assistant=-1,-1
+Prisoner=0,2
+
Quartermaster=1,1
Cargo Technician=3,2
Shaft Miner=3,3
diff --git a/html/changelogs/AutoChangeLog-pr-15062.yml b/html/changelogs/AutoChangeLog-pr-15062.yml
new file mode 100644
index 0000000000..7d5a10a30f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15062.yml
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - bugfix: "bread goes in mouth and not on head"
diff --git a/html/changelogs/AutoChangeLog-pr-15070.yml b/html/changelogs/AutoChangeLog-pr-15070.yml
new file mode 100644
index 0000000000..4a9be50457
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15070.yml
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - rscadd: "the permabrig erp role"
diff --git a/html/changelogs/AutoChangeLog-pr-15113.yml b/html/changelogs/AutoChangeLog-pr-15113.yml
new file mode 100644
index 0000000000..ceb2596395
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15113.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - balance: "Removes zap obj damage and machinery explosion from the SM arcs"
diff --git a/html/changelogs/AutoChangeLog-pr-15123.yml b/html/changelogs/AutoChangeLog-pr-15123.yml
new file mode 100644
index 0000000000..bfc6ae0e6b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15123.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - bugfix: "Fixes hitby runtime."
diff --git a/html/changelogs/AutoChangeLog-pr-15124.yml b/html/changelogs/AutoChangeLog-pr-15124.yml
new file mode 100644
index 0000000000..3a0c6b0f37
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15124.yml
@@ -0,0 +1,5 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - balance: "changeling adrenals buff"
+ - bugfix: "speedups"
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 215730c7ee..1596672ac3 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index fd4ded6ad8..d4b1428f3e 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi
index 284809da70..0e2ae605f6 100644
Binary files a/icons/mob/landmarks.dmi and b/icons/mob/landmarks.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d465470cd7..7d4ae79957 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 2bbe93a410..e7467d6352 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index a6c554f7da..9af0a6ba3a 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi
index 1fda3933bd..c6574ca86b 100644
Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index 40e00b431e..78ee67c45a 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 36efd97189..84b4f47e1a 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/machines/prison.dmi b/icons/obj/machines/prison.dmi
new file mode 100644
index 0000000000..7ce58e93a2
Binary files /dev/null and b/icons/obj/machines/prison.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index dbfc7b1f93..7e9a976624 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
index e7875efa26..6e5f5821ce 100644
Binary files a/icons/obj/shards.dmi and b/icons/obj/shards.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index a1a6180068..3224e875b2 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 8bbc7c80f2..9dd77df524 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -886,6 +886,7 @@
#include "code\game\machinery\mass_driver.dm"
#include "code\game\machinery\navbeacon.dm"
#include "code\game\machinery\PDApainter.dm"
+#include "code\game\machinery\prisonlabor.dm"
#include "code\game\machinery\quantum_pad.dm"
#include "code\game\machinery\recharger.dm"
#include "code\game\machinery\rechargestation.dm"
@@ -1247,6 +1248,7 @@
#include "code\game\objects\items\robot\robot_upgrades.dm"
#include "code\game\objects\items\stacks\bscrystal.dm"
#include "code\game\objects\items\stacks\cash.dm"
+#include "code\game\objects\items\stacks\license_plates.dm"
#include "code\game\objects\items\stacks\medical.dm"
#include "code\game\objects\items\stacks\rods.dm"
#include "code\game\objects\items\stacks\stack.dm"
@@ -2379,6 +2381,7 @@
#include "code\modules\jobs\job_types\medical_doctor.dm"
#include "code\modules\jobs\job_types\mime.dm"
#include "code\modules\jobs\job_types\paramedic.dm"
+#include "code\modules\jobs\job_types\prisoner.dm"
#include "code\modules\jobs\job_types\quartermaster.dm"
#include "code\modules\jobs\job_types\research_director.dm"
#include "code\modules\jobs\job_types\roboticist.dm"