diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 26253018ff..ea760cd55a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -94,6 +94,13 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_x = -27; + pixel_y = -27; + prison_radio = 1 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "aao" = ( @@ -105,6 +112,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aap" = ( @@ -123,6 +131,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "aau" = ( @@ -154,6 +167,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aay" = ( @@ -206,6 +220,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aaC" = ( @@ -220,6 +235,8 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aaD" = ( @@ -340,7 +357,7 @@ /turf/open/floor/plating, /area/command/heads_quarters/hos) "aaN" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/security/prison/upper) "aaO" = ( @@ -394,6 +411,9 @@ name = "Permabrig Transfer"; req_access_txt = "2" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/security/prison) "aaV" = ( @@ -478,9 +498,6 @@ /turf/closed/wall, /area/security/execution/transfer) "abf" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Laundry" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -492,29 +509,21 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Prison Laundry"; + wiretypepath = /datum/wires/airlock/security + }, /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" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "abh" = ( @@ -532,6 +541,10 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "abi" = ( @@ -603,13 +616,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) -"abs" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solars/port/fore) "abt" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -669,6 +675,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison) "abE" = ( @@ -684,6 +694,7 @@ /area/security/prison/upper) "abF" = ( /obj/structure/table, +/obj/item/flashlight/lamp, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "abG" = ( @@ -728,13 +739,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "abL" = ( /obj/structure/chair/stool, @@ -836,13 +841,6 @@ /obj/structure/grille, /turf/open/space, /area/space/nearstation) -"abZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "aca" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -873,6 +871,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "acg" = ( @@ -1125,9 +1129,10 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" +/obj/machinery/button/door{ + id = "permacells1"; + name = "Privacy Shutters"; + pixel_x = 25 }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) @@ -1140,6 +1145,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "acD" = ( @@ -1151,6 +1162,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "acE" = ( @@ -1161,11 +1176,7 @@ dir = 4; light_color = "#c1caff" }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "acF" = ( /obj/machinery/light_switch{ @@ -1318,16 +1329,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"acV" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "acW" = ( /obj/structure/cable{ icon_state = "0-2" @@ -1343,13 +1344,7 @@ dir = 8 }, /obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "ada" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -1358,6 +1353,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "adb" = ( @@ -1369,11 +1370,32 @@ /area/security/prison/upper) "add" = ( /obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = 10 }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/machinery/camera{ + c_tag = "Permabrig Processing"; + dir = 8; + network = list("ss13","prison") + }, +/turf/open/floor/plasteel, /area/security/prison) "adf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -1523,24 +1545,6 @@ /obj/effect/landmark/barthpot, /turf/open/floor/wood, /area/service/library) -"adw" = ( -/obj/structure/cable, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) -"adx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "ady" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -1616,6 +1620,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "adI" = ( @@ -1807,13 +1812,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solars/starboard/fore) -"adZ" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "aeb" = ( /obj/structure/table, /obj/item/storage/box/handcuffs{ @@ -1839,8 +1837,12 @@ /area/security/prison) "aed" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/computer/prisoner/management, /obj/effect/turf_decal/delivery, +/obj/machinery/disposal/deliveryChute, +/obj/structure/plasticflaps/opaque{ + name = "Prisoner Transfer" + }, +/obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/dark, /area/security/prison) "aef" = ( @@ -1848,15 +1850,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -1866,7 +1859,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/security/prison) "aeh" = ( /obj/effect/turf_decal/tile/red{ @@ -1879,9 +1881,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /turf/open/floor/plasteel, /area/security/prison) "aei" = ( @@ -1889,6 +1888,10 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison) "aej" = ( @@ -1901,6 +1904,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plasteel, /area/security/prison) "aek" = ( @@ -1919,11 +1925,6 @@ /turf/open/floor/plasteel, /area/security/prison) "ael" = ( -/obj/machinery/button/flasher{ - id = "PCell 2"; - pixel_x = 6; - pixel_y = 24 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -1937,9 +1938,7 @@ /area/security/prison) "aem" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison) "aen" = ( @@ -1977,15 +1976,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/prison) "aeq" = ( -/obj/machinery/button/flasher{ - id = "PCell 1"; - pixel_x = 6; - pixel_y = 24 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -2221,21 +2214,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison) "aeO" = ( @@ -2297,10 +2284,12 @@ /obj/structure/cable{ icon_state = "1-4" }, -/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) "aeU" = ( @@ -2612,6 +2601,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/brig) "afr" = ( @@ -2665,6 +2658,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "afy" = ( @@ -2677,32 +2673,18 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"afz" = ( +"afA" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, /area/security/prison) -"afA" = ( -/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; @@ -2809,9 +2791,6 @@ pixel_y = -27 }, /obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, /turf/open/floor/plasteel, /area/security/prison) "afK" = ( @@ -3424,7 +3403,11 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/brig) "agP" = ( /obj/structure/cable{ @@ -3776,6 +3759,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/brig) "ahw" = ( @@ -3787,6 +3774,10 @@ icon_state = "1-4" }, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/brig) "ahx" = ( @@ -4324,9 +4315,6 @@ /turf/open/floor/plating, /area/security/brig) "aik" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -4981,9 +4969,6 @@ /turf/open/floor/plasteel, /area/commons/vacant_room/office/b) "aju" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "2-4" }, @@ -5303,13 +5288,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"ajW" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "ajX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -6531,19 +6509,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"amv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "amw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8392,16 +8357,6 @@ }, /turf/open/floor/plasteel, /area/security/processing) -"aqJ" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "aqN" = ( /obj/structure/closet/secure_closet/warden, /obj/structure/sign/poster/official/ion_rifle{ @@ -41408,10 +41363,6 @@ "bXs" = ( /turf/open/floor/plasteel/white, /area/science/circuit) -"bXv" = ( -/obj/item/stack/rods, -/turf/open/space, -/area/space) "bXw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, @@ -42061,7 +42012,8 @@ /area/maintenance/port/aft) "bZm" = ( /obj/structure/disposaloutlet{ - dir = 8 + dir = 8; + name = "Prisoner Outlet" }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -51822,6 +51774,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "cNE" = ( @@ -51984,13 +51940,13 @@ /obj/structure/sign/warning/securearea{ pixel_x = -32 }, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "prison blast door" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/prison) "cPb" = ( /turf/open/floor/wood/wood_diagonal, @@ -52896,11 +52852,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/button/door{ + id = "permacells3"; + name = "Privacy Shutters"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "dJL" = ( @@ -52933,6 +52891,10 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"dLl" = ( +/obj/item/stack/rods, +/turf/open/space, +/area/space) "dLZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -53009,6 +52971,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "dQD" = ( @@ -53076,6 +53042,11 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/button/electrochromatic{ + id = "!permabrigshowers"; + pixel_x = -25 + }, /turf/open/floor/plasteel/freezer, /area/security/prison/cells) "dYZ" = ( @@ -53189,9 +53160,6 @@ /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 @@ -53205,6 +53173,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 4"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "eky" = ( @@ -53262,9 +53234,6 @@ /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 @@ -53278,6 +53247,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 5"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "eoR" = ( @@ -53412,6 +53385,9 @@ amount = 14 }, /obj/item/stack/packageWrap, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "evR" = ( @@ -53428,6 +53404,17 @@ }, /turf/open/floor/plating, /area/commons/fitness) +"ewG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells5"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "ewN" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -53536,6 +53523,16 @@ /obj/item/clothing/under/rank/civilian/lawyer/red, /turf/open/floor/plasteel, /area/commons/fitness) +"eCB" = ( +/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/upper) "eCR" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -53587,6 +53584,12 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "eFx" = ( @@ -53731,6 +53734,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) +"eTt" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "eTA" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -53787,13 +53800,13 @@ /area/cargo/miningdock) "eWL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "prison blast door" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/prison) "eXz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -53833,10 +53846,6 @@ /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, @@ -53891,8 +53900,9 @@ /area/maintenance/port/fore) "fcj" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/starboard) "fcn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -54036,6 +54046,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "fjS" = ( @@ -54444,11 +54457,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "fGf" = ( /obj/machinery/smartfridge/disks{ @@ -54516,9 +54525,6 @@ /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 @@ -54530,6 +54536,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Prison Laundry"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "fMY" = ( @@ -54546,13 +54556,15 @@ /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" }, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "fNN" = ( @@ -54745,6 +54757,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "gcX" = ( @@ -54838,12 +54853,14 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/button/door{ + id = "permacells4"; + name = "Privacy Shutters"; + pixel_y = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "giT" = ( @@ -54959,7 +54976,12 @@ /area/engineering/atmos) "gxK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells3"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, /area/security/prison/cells) "gyr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -55161,9 +55183,6 @@ /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 @@ -55177,6 +55196,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 6"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "gMD" = ( @@ -55245,9 +55268,6 @@ /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 @@ -55259,6 +55279,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 3"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "gTx" = ( @@ -55412,6 +55436,19 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel, /area/commons/fitness) +"hcT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "hgG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/extinguisher_cabinet{ @@ -55449,7 +55486,24 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "hkA" = ( -/turf/open/floor/plasteel/dark, +/obj/structure/table, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = -13; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/machinery/flasher{ + id = "waitingflash"; + pixel_y = -28 + }, +/turf/open/floor/plasteel, /area/security/prison) "hlS" = ( /obj/structure/cable{ @@ -55488,6 +55542,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "hnU" = ( @@ -55673,10 +55730,12 @@ /turf/open/floor/plating, /area/security/prison/upper) "hKo" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "hMs" = ( @@ -55714,7 +55773,7 @@ /obj/item/assembly/signaler, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/port) "hQX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -55751,6 +55810,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plating, /area/service/abandoned_gambling_den) +"hSf" = ( +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "hSl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55888,6 +55952,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"ikv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/security/prison) "iky" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/dirt, @@ -55907,6 +55983,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "imk" = ( @@ -56065,7 +56144,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/grille, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/starboard) "iBq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, @@ -56094,6 +56173,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "iDo" = ( @@ -56618,9 +56700,6 @@ /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, @@ -56639,6 +56718,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Yard" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "jxF" = ( @@ -56749,10 +56831,6 @@ dir = 1 }, /area/commons/fitness) -"jFd" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/maintenance/port/fore) "jFB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -56811,6 +56889,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "jHt" = ( @@ -56856,6 +56937,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "jIW" = ( @@ -56960,12 +57044,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /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 @@ -56979,6 +57060,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Prison Forestry" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "jRw" = ( @@ -56999,6 +57083,9 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"jRV" = ( +/turf/open/floor/plasteel, +/area/security/prison) "jRW" = ( /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/tile/green{ @@ -57092,8 +57179,10 @@ /area/security/prison/upper) "jVV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 5 + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plasteel, /area/security/prison/upper) @@ -57182,13 +57271,14 @@ /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 }, +/obj/machinery/button/door{ + id = "permacells4"; + name = "Privacy Shutters"; + pixel_y = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "kdF" = ( @@ -57236,6 +57326,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "kfv" = ( @@ -57683,6 +57777,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "kGv" = ( @@ -57761,19 +57858,19 @@ 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, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Prisoner Delivery" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced, +/turf/open/floor/plasteel/dark, /area/security/prison/upper) "kMt" = ( /obj/machinery/computer/prisoner/gulag_teleporter_computer, @@ -57799,6 +57896,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, /area/security/prison/upper) "kOL" = ( @@ -58058,6 +58156,9 @@ }, /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/upper) "lip" = ( @@ -58273,6 +58374,17 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"lvw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells6"; + name = "Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/prison/cells) "lwN" = ( /obj/structure/cable{ icon_state = "1-8" @@ -58337,9 +58449,6 @@ }, /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{ @@ -58354,6 +58463,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Yard" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "lBz" = ( @@ -58394,12 +58506,23 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/prison/cells) +"lEf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells4"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "lGm" = ( /obj/machinery/shower{ dir = 4 @@ -58421,6 +58544,20 @@ }, /turf/open/floor/plating, /area/service/abandoned_gambling_den) +"lHK" = ( +/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" + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel, +/area/security/prison/cells) "lJA" = ( /turf/closed/wall, /area/security/prison/cells) @@ -59105,6 +59242,18 @@ /obj/item/clothing/under/rank/prisoner/skirt, /obj/item/clothing/under/rank/prisoner/skirt, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, /turf/open/floor/plasteel/cafeteria, /area/security/prison/upper) "myh" = ( @@ -59240,22 +59389,10 @@ /area/maintenance/starboard/fore) "mIZ" = ( /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 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "mJf" = ( @@ -59279,11 +59416,16 @@ "mJy" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/restraints/handcuffs, +/obj/item/taperecorder, +/obj/item/folder/red, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "mJH" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "mLS" = ( @@ -59533,6 +59675,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "ngs" = ( @@ -59577,11 +59720,12 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/button/door{ + id = "permacells2"; + name = "Privacy Shutters"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "nkP" = ( @@ -59911,9 +60055,6 @@ /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 @@ -59925,6 +60066,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 2"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "nSt" = ( @@ -59941,6 +60086,7 @@ /area/commons/dorms) "nSI" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/white, /area/security/prison/upper) "nTG" = ( @@ -60045,11 +60191,11 @@ /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" }, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/security/prison/upper) "obs" = ( @@ -60057,6 +60203,7 @@ dir = 1; light_color = "#ffc1c1" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/padded, /area/security/execution/transfer) "oby" = ( @@ -60361,18 +60508,18 @@ "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 + name = "Holding Cell"; + req_access_txt = "2" }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/button/flasher{ + id = "waitingflash"; + pixel_x = 6; + pixel_y = 24 + }, +/turf/open/floor/plasteel, /area/security/prison) "oAB" = ( /obj/structure/fireplace{ @@ -60509,6 +60656,15 @@ }, /turf/closed/wall, /area/medical/medbay/central) +"oTx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells2"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "oTH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/shower, @@ -60643,6 +60799,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "peE" = ( @@ -60812,6 +60971,19 @@ }, /turf/open/floor/wood/wood_diagonal, /area/maintenance/port/fore) +"pry" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "psf" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/sign/poster/official/the_owl{ @@ -60990,6 +61162,10 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"pGs" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/prison/starboard) "pGA" = ( /obj/machinery/hydroponics/soil, /obj/effect/turf_decal/tile/green{ @@ -61117,6 +61293,14 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"pPE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells1"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "pPI" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -61197,6 +61381,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "pUf" = ( @@ -61216,6 +61401,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "pUy" = ( @@ -61260,9 +61448,6 @@ /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 @@ -61274,6 +61459,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 1"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "qae" = ( @@ -61302,6 +61491,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "qeb" = ( @@ -61372,6 +61564,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison/cells) +"qhA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "qje" = ( /obj/structure/sign/mining{ pixel_y = 7 @@ -61636,13 +61835,15 @@ /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" }, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "qLy" = ( @@ -61753,6 +61954,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, /area/security/prison/upper) "qSf" = ( @@ -61828,10 +62030,6 @@ /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, @@ -61941,6 +62139,11 @@ /area/service/hydroponics) "ref" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "reA" = ( @@ -62164,6 +62367,7 @@ name = "Permabrig Transfer"; req_access_txt = "2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "rvr" = ( @@ -62198,6 +62402,13 @@ icon_state = "platingdmg2" }, /area/maintenance/port/fore) +"rwA" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "rxD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -62241,6 +62452,27 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"ryN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "rAR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -62279,6 +62511,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/light/small, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "rBY" = ( @@ -62318,6 +62551,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "rDh" = ( @@ -62364,6 +62600,16 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"rGZ" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "rIA" = ( /obj/machinery/light{ dir = 8 @@ -62418,6 +62664,11 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/ai_monitored/command/storage/eva) +"rQy" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space) "rQJ" = ( /obj/machinery/light/small{ dir = 8 @@ -62527,6 +62778,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) +"rYM" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/tracker, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/port/fore) "rZE" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -62634,6 +62892,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "ske" = ( @@ -62856,6 +63115,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "sBM" = ( @@ -62868,6 +63130,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "sCa" = ( @@ -62943,6 +63208,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/maintenance/prison/starboard) "sJw" = ( @@ -63273,6 +63539,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "tif" = ( @@ -63575,6 +63844,29 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) +"tCs" = ( +/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 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel/dark, +/area/security/prison/cells) "tEK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -63837,6 +64129,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "tWj" = ( @@ -64375,6 +64668,20 @@ }, /turf/open/floor/plating, /area/security/prison/upper) +"uLB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison/upper) "uOd" = ( /turf/open/floor/plasteel/white/side{ dir = 4 @@ -64386,6 +64693,7 @@ light_color = "#ffc1c1" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /mob/living/simple_animal/mouse/brown/Tom, /turf/open/floor/plating, /area/security/prison/upper) @@ -64612,6 +64920,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison/upper) +"vhC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, /area/security/prison/upper) "vim" = ( @@ -64649,6 +64968,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "vjm" = ( @@ -64659,12 +64981,6 @@ }, /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 @@ -65191,6 +65507,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "vYY" = ( @@ -65373,15 +65693,6 @@ /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{ @@ -65590,6 +65901,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "wBd" = ( @@ -65606,6 +65920,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"wDq" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"wGc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison) "wHk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -65634,8 +65964,9 @@ /obj/structure/bed, /obj/effect/spawner/lootdrop/bedsheet, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/port) "wII" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/maintenance, @@ -65730,6 +66061,9 @@ /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) "wVt" = ( @@ -65943,6 +66277,10 @@ name = "prison blast door" }, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "xiw" = ( @@ -65983,6 +66321,22 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"xkk" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/sign/warning/securearea{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, +/area/security/range) "xlX" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -66076,6 +66430,17 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"xuu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plating, +/area/security/brig) "xwB" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -66346,6 +66711,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/cafeteria, /area/security/prison/upper) "xNV" = ( @@ -66370,6 +66736,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/flasher{ + id = "visitorflash"; + pixel_x = 16; + pixel_y = 24 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "xPk" = ( @@ -66483,6 +66854,13 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"xVZ" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solars/port/fore) "xWq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ @@ -66615,6 +66993,28 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/hallway/primary/central) +"yeU" = ( +/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/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "permacells5"; + name = "Privacy Shutters"; + pixel_y = 25 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison/cells) "yeZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -80858,12 +81258,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaS aaS @@ -80879,9 +81273,15 @@ aaS aba aaS aaS +gXs +gXs +gXs +eRz +eRz +eRz aaf aaf -aaf +aaT aaf aaf alU @@ -81115,12 +81515,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa abY aaa aaf @@ -81133,7 +81527,7 @@ acy aaa aaf aaa -bXv +dLl aaa aaS aaa @@ -81141,6 +81535,12 @@ aaa aaa aaa aaa +gXs +aaa +aaa +aaa +aaa +aaa alU ash atU @@ -81372,31 +81772,31 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa abY aaa acW -acV +eTt adA aaa acW -acV +eTt adA aaa acW -acV +eTt adA aaa aaS +gXs +gXs +gXs +gXs +eRz +eRz aaf aaf -aaf -aaf +aaT +aaT aaf alU atn @@ -81626,34 +82026,34 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aae aaa aaa abY aaf acW -adx +hcT adA aaa acW -adx +hcT adA aaa acW -adx +hcT adA aaf aaf aaa aaa +gXs aaa aaa +ktS +aaa +aaa +gXs +aaa aaa alU alU @@ -81886,31 +82286,31 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa abY aaa acW -adx +hcT adA aaf acW -adx +hcT adA aaf acW -adx +hcT adA aaa aaf aaa aaa +gXs aaa aaa +ktS +aaa +aaa +gXs +aaa aaa gXs ali @@ -82143,27 +82543,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaf aaf acW -adx +hcT adA aaa acW -adx +hcT adA aaa acW -adx +hcT adA aaf aaf +gXs +gXs +gXs +gXs +gXs +gXs aaf aaf aaf @@ -82397,32 +82797,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaS aaS aaf aaa acW -adx +hcT adA aaa acW -adx +hcT adA aaa acW -adx +hcT adA aaa aaf aaa aaa +aaa +gXs +aaa +ktS +aaa +aaa ajV alR alR @@ -82654,29 +83054,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaa aaf aaa aaa aaa -adZ +rwA aaa aaa aaa -adZ +rwA aaa aaa aaa -adZ +rwA aaa aaa +aaf +aaa +aaa +aaa +gXs +aaa ajV ajV ajV @@ -82911,18 +83311,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaf -abs -abZ -abZ -adw +rYM +qhA +qhA +hSf ady ady ady @@ -82934,6 +83328,12 @@ ady ady cfK uDO +uDO +uDO +uDO +uDO +uDO +uDO ajq akB akB @@ -83168,29 +83568,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaa aaf aaa aaa aaa -ajW +xVZ aaa aaa aaa -ajW +xVZ aaa aaa aaa -ajW +xVZ aaa aaa +aaf +aaa +aaa +aaa +gXs +aaa ajV ajV ajV @@ -83425,32 +83825,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aba aaS aaf aaa acW -amv +pry adA aaa acW -amv +pry adA aaa acW -amv +pry adA aaa aaf aaa aaa +aaa +gXs +aaa +ktS +aaa +aaa ajV alR alR @@ -83685,30 +84085,30 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaf aaf acW -amv +pry adA aaa acW -amv +pry adA aaa acW -amv +pry adA aaf aaf aaa aaa aaa +gXs +aaa +ktS +aaa +aaa +aaa alU amF alF @@ -83942,27 +84342,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaa acW -amv +pry adA aaf acW -amv +pry adA aaf acW -amv +pry adA aaa aaf +gXs +gXs +gXs +gXs +gXs +gXs aaf aaf aaf @@ -84199,30 +84599,30 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaf acW -amv +pry adA aaa acW -amv +pry adA aaa acW -amv +pry adA aaf aaf aaa aaa aaa +aaa +aaa +ktS +wDq +aaa +aaa alU alU alU @@ -84456,30 +84856,30 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaa acW -aqJ +rGZ adA aaa acW -aqJ +rGZ adA aaa acW -aqJ +rGZ adA aaa aaS aaa aaa aaa +aaa +aaa +ktS +rQy +aaa +aaa alU lLA mzT @@ -84713,12 +85113,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aaS aaa aaf @@ -84734,7 +85128,13 @@ aaa aaf aaa aaS -aaf +gXs +gXs +gXs +gXs +gXs +eRz +aaT aaf aaf alU @@ -84965,12 +85365,6 @@ cNd cNd aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa gXs gXs gXs @@ -84994,6 +85388,12 @@ aaS aaa aaa aaa +gXs +aaa +ktS +aaa +aaa +aaa alU enJ enJ @@ -85245,7 +85645,7 @@ gXs aaa aaa aaa -aaa +gXs aaa aaa aaa @@ -85502,13 +85902,13 @@ gXs aaa aaa aaa +gXs aaa aaa aaa aaa aaa -aaa -jFd +ali fDn gFs aKY @@ -85759,7 +86159,7 @@ gXs aaa aaa aaa -aaa +gXs aaa aaa aaa @@ -86003,15 +86403,19 @@ gXs aaa aaa aaa -gXs -gXs -gXs +eRz +eRz +eRz gXs gXs aaa aaa aaa aaa +eRz +aaa +aaa +aaa gXs aaa aaa @@ -86019,10 +86423,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa ali aok qZD @@ -86260,7 +86660,7 @@ gXs aaa aaa aaa -gXs +eRz aaa aaa aaa @@ -86269,6 +86669,10 @@ aaa aaa aaa aaa +eRz +aaa +aaa +aaa gXs aaa aaa @@ -86276,10 +86680,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa ali aok amC @@ -86517,7 +86917,7 @@ gXs aaa aaa aaa -gXs +eRz aaa aaa aaa @@ -86526,7 +86926,7 @@ gXs gXs gXs gXs -gXs +eRz gXs gXs gXs @@ -86783,7 +87183,7 @@ aaa aaa aaa aaa -gXs +eRz aaa aaa aaa @@ -87040,7 +87440,7 @@ aaa aae aaa aaa -gXs +eRz aaa aaa aaa @@ -87805,7 +88205,7 @@ mvV tso abc dIZ -wll +dIZ mbC abc abc @@ -88055,7 +88455,7 @@ wnX mAT mAT lJA -giE +yeU rBK lJA giE @@ -88312,10 +88712,10 @@ iCN lJA lJA lJA -czP +ewG eoJ lJA -czP +lEf ejr abc tJE @@ -88811,7 +89211,7 @@ aaa eRz eRz eRz -sMu +eRz eRz eRz gXs @@ -89074,8 +89474,8 @@ aaa aaa aaa adI -adI -adI +oUF +eCB adI qCc qCc @@ -89083,7 +89483,7 @@ wgu qCc qCc qCc -czP +lvw gMB lJA tnH @@ -89858,7 +90258,7 @@ acG acG lJA maP -wVt +lHK nRO vYF txs @@ -90116,7 +90516,7 @@ acG mnu xGm xNV -gxK +oTx nko vFZ szn @@ -90614,10 +91014,10 @@ adI mwN kfG uJY -kkb +vhC tLC aaN -peD +uLB kGj acG lux @@ -90632,7 +91032,7 @@ nFA wVt pZD vYF -txs +tCs szn pIR aeL @@ -90877,7 +91277,7 @@ pgq peD sBM acG -acG +aaN jOB acG acG @@ -90887,12 +91287,12 @@ acG aay oss abv -lJA +pPE acA acI adD aed -uql +wGc afv agg acd @@ -91149,7 +91549,7 @@ lJA lJA szn aeg -uql +ryN afA acd acd @@ -91407,9 +91807,9 @@ ada adF aef aeM -afz +aav ldY -lRb +xkk lRb vIi fsj @@ -91663,7 +92063,7 @@ ref aat adH aem -aeO +ikv afJ sXV sXV @@ -92173,7 +92573,7 @@ oKB vhy abA jNN -hkA +jRV hkA aai aek @@ -92693,7 +93093,7 @@ adI xKl omX afG -aim +xuu afL ahu aie @@ -93721,7 +94121,7 @@ adJ aep aeT afG -aim +xuu ajL akj afM @@ -93959,7 +94359,7 @@ jnk sIn eZS iBj -fcj +pGs iBq vHK dCd @@ -96016,15 +96416,15 @@ eRz eRz eRz eRz -vli +eRz eRz eRz eRz eRz aaT eRz -aaT -aaT +aaf +aaf aaT gXs abG