diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3b766a1966a3..fa80a71cacdc 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -538,27 +538,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/courtroom) -"aaW" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/window/brigdoor/northright{ - id = "Cell 4"; - name = "Cell 4"; - req_access_txt = "1" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "aaX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -627,27 +606,6 @@ }, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/fore) -"abc" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/window/brigdoor/northright{ - id = "Cell 3"; - name = "Cell 3"; - req_access_txt = "1" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "abd" = ( /obj/machinery/light{ dir = 4 @@ -801,27 +759,6 @@ "abq" = ( /turf/closed/wall/rust, /area/quartermaster/warehouse) -"abr" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/window/brigdoor/northright{ - id = "Cell 1"; - name = "Cell 1"; - req_access_txt = "1" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "abs" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -3735,28 +3672,6 @@ "ago" = ( /turf/closed/wall, /area/hallway/primary/fore) -"agq" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/window/brigdoor/northright{ - id = "Cell 6"; - name = "Cell 6"; - req_access_txt = "1" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "agr" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -3773,28 +3688,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/warden) -"ags" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/window/brigdoor/northright{ - id = "Cell 5"; - name = "Cell 5"; - req_access_txt = "1" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "agt" = ( /turf/closed/wall/rust, /area/space/nearstation) @@ -5201,28 +5094,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"aiZ" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/window/brigdoor/northright{ - id = "Cell 2"; - name = "Cell 2"; - req_access_txt = "1" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "aja" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -61114,25 +60985,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/security/execution/education) -"bWp" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/door_timer{ - id = "Cell 6"; - name = "Cell 6"; - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 6"; - name = "Cell 6 Locker" - }, -/turf/open/floor/plasteel, -/area/security/warden) "bWq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -61170,44 +61022,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) -"bWu" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/door_timer{ - id = "Cell 5"; - name = "Cell 5"; - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 5"; - name = "Cell 5 Locker" - }, -/turf/open/floor/plasteel, -/area/security/warden) -"bWv" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/door_timer{ - id = "Cell 4"; - name = "Cell 4"; - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 4"; - name = "Cell 4 Locker" - }, -/turf/open/floor/plasteel, -/area/security/warden) "bWw" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -61280,28 +61094,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/warden) -"bWB" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/turf/open/floor/plasteel, -/area/security/warden) "bWC" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -61373,25 +61165,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bWG" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 2"; - name = "Cell 2 Locker" - }, -/turf/open/floor/plasteel, -/area/security/warden) "bWH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -61404,25 +61177,6 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/port/aft) -"bWI" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/turf/open/floor/plasteel, -/area/security/warden) "bWJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -68910,16 +68664,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"cjb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/security/brig) "cjd" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; @@ -72864,19 +72608,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) -"cpR" = ( -/obj/machinery/door/airlock/security/glass{ - id_tag = null; - name = "Brig"; - req_access_txt = "63" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/security/warden) "cpS" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -86591,6 +86322,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"dlv" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/turnstile/genpop, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "dne" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -89205,6 +88953,27 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/security/warden) +"gEt" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/genpop, +/obj/machinery/genpop_interface{ + pixel_x = -32; + pixel_y = 3 + }, +/obj/machinery/button/flasher{ + id = "Cell 6"; + name = "Cell Flasher"; + pixel_x = -32; + pixel_y = -11 + }, +/turf/open/floor/plasteel, +/area/security/warden) "gHd" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "0"; @@ -90246,6 +90015,24 @@ }, /turf/closed/wall/rust, /area/maintenance/disposal/incinerator) +"hXf" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/turnstile/genpop, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "hYN" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -94104,6 +93891,17 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/toilet/restrooms) +"lZh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/security/warden) "lZB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -98471,6 +98269,30 @@ icon_state = "platingdmg1" }, /area/maintenance/port/aft) +"rmt" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/closet/secure_closet/genpop, +/obj/machinery/genpop_interface{ + pixel_x = -32; + pixel_y = 3 + }, +/obj/machinery/button/flasher{ + id = "Cell 3"; + name = "Cell Flasher"; + pixel_x = -32; + pixel_y = -11 + }, +/turf/open/floor/plasteel, +/area/security/warden) "rnQ" = ( /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Airlock" @@ -99593,6 +99415,27 @@ "sxU" = ( /turf/open/floor/plasteel, /area/hallway/primary/fore) +"syH" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/genpop, +/obj/machinery/genpop_interface{ + pixel_x = -32; + pixel_y = 3 + }, +/obj/machinery/button/flasher{ + id = "Cell 1"; + name = "Cell Flasher"; + pixel_x = -32; + pixel_y = -11 + }, +/turf/open/floor/plasteel, +/area/security/warden) "szu" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped{ dir = 4 @@ -100424,6 +100267,15 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/security/warden) +"tDX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/turnstile/brig{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "tEz" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -102481,6 +102333,27 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"vUW" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/genpop, +/obj/machinery/genpop_interface{ + pixel_x = -32; + pixel_y = 3 + }, +/obj/machinery/button/flasher{ + id = "Cell 2"; + name = "Cell Flasher"; + pixel_x = -32; + pixel_y = -11 + }, +/turf/open/floor/plasteel, +/area/security/warden) "vVv" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, @@ -102885,6 +102758,27 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"wBP" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/genpop, +/obj/machinery/genpop_interface{ + pixel_x = -32; + pixel_y = 3 + }, +/obj/machinery/button/flasher{ + id = "Cell 5"; + name = "Cell Flasher"; + pixel_x = -32; + pixel_y = -11 + }, +/turf/open/floor/plasteel, +/area/security/warden) "wDp" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line{ @@ -122269,7 +122163,7 @@ tDS aai aeI aaT -bWp +gEt ajZ bTp bVY @@ -122525,7 +122419,7 @@ aer aef cwN aaA -agq +hXf bWs abO adn @@ -123040,7 +122934,7 @@ avb aal aeI aaT -bWu +wBP abY adp ael @@ -123296,7 +123190,7 @@ bPt avb cwR bkT -ags +hXf bWs abO ady @@ -123811,7 +123705,7 @@ avb aan aeI aaT -bWv +gEt abY aek aaT @@ -124067,7 +123961,7 @@ bPt avb cwR aaC -aaW +dlv bWA acb aes @@ -124582,7 +124476,7 @@ avb adS aaS aaT -bWB +rmt bSR byA gEa @@ -124838,7 +124732,7 @@ bPt avb cwX aaA -abc +dlv bWs abO bYz @@ -125353,7 +125247,7 @@ avb aas aaS aaT -bWG +vUW aft bYF cbv @@ -125609,7 +125503,7 @@ bPt avb cwX aff -aiZ +hXf bWs abO bYI @@ -126124,7 +126018,7 @@ avb adY aaS aaT -bWI +syH acf rZn cbw @@ -126380,7 +126274,7 @@ bPE avb cwR aff -abr +dlv bWN acp adF @@ -126389,7 +126283,7 @@ agE ahq cjO crC -cpR +lZh cxM bHT cjM @@ -126905,7 +126799,7 @@ bWL apq aef aGE -cjb +tDX cjP aaj bpE @@ -127676,7 +127570,7 @@ ain apr agX aHp -cjb +tDX cjT aaf awk diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 0f57bcece05a..3b509f5011f0 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -3820,19 +3820,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ajG" = ( -/obj/machinery/light, -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "ajH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -4107,10 +4094,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"akk" = ( -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/brig) "akl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -4131,18 +4114,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"ako" = ( -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "akp" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -4337,32 +4308,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) -"akN" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/security/brig) -"akO" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 1"; - name = "Cell 1" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/security/brig) "akP" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -4375,22 +4320,6 @@ }, /turf/closed/wall, /area/security/brig) -"akR" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 2"; - name = "Cell 2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/security/brig) "akS" = ( /obj/machinery/computer/security/telescreen{ dir = 8; @@ -4404,22 +4333,6 @@ /obj/item/hand_labeler, /turf/open/floor/plasteel, /area/science/misc_lab) -"akT" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 3"; - name = "Cell 3" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/security/brig) "akU" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Desk"; @@ -4447,29 +4360,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) -"akW" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, -/area/security/brig) "akX" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ @@ -5156,31 +5046,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/security/brig) -"amJ" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, -/area/security/brig) "amK" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -6484,16 +6349,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aqn" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aqo" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -22138,6 +21993,14 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/lab) +"bpw" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/open/floor/plasteel, +/area/security/brig) "bpz" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -27506,6 +27369,14 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"bKX" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/closet/secure_closet/genpop, +/turf/open/floor/plasteel, +/area/security/brig) "bKZ" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -31424,6 +31295,21 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"cqa" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/turnstile/genpop{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "cqc" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/structure/window/reinforced{ @@ -32359,6 +32245,22 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/quartermaster/storage) +"cGT" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/genpop_interface{ + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "Cell 1"; + name = "Cell 3 Flasher"; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/security/brig) "cHk" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -42233,6 +42135,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/engine, /area/science/xenobiology) +"jhM" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/plasteel, +/area/security/brig) "jhQ" = ( /obj/structure/table/glass, /obj/machinery/door/window/northleft{ @@ -49570,6 +49484,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) +"nYq" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "nYC" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -50769,15 +50694,6 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) -"oGb" = ( -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/variation/box/sec/brig_cell, -/turf/open/floor/plasteel, -/area/security/brig) "oGe" = ( /obj/structure/sign/warning/securearea{ pixel_y = -32 @@ -51611,15 +51527,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"pmh" = ( -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/variation/box/sec/brig_cell, -/turf/open/floor/plasteel, -/area/security/brig) "pmC" = ( /obj/docking_port/stationary/public_mining_dock{ dir = 8 @@ -54203,23 +54110,6 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) -"qUH" = ( -/obj/machinery/camera{ - c_tag = "Brig Central"; - dir = 1 - }, -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/security/brig) "qVe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -54458,6 +54348,17 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"rbc" = ( +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "rbs" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -57324,18 +57225,6 @@ /obj/effect/spawner/lootdrop/techstorage/RnD_secure, /turf/open/floor/plasteel/white, /area/storage/tech) -"tbD" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/flasher{ - id = "Cell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/variation/box/sec/brig_cell, -/turf/open/floor/plasteel, -/area/security/brig) "tbW" = ( /obj/machinery/blackbox_recorder, /obj/structure/cable/yellow{ @@ -57846,6 +57735,26 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) +"trQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "tsI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59000,6 +58909,26 @@ /obj/structure/bookcase/random/adult, /turf/open/floor/carpet, /area/library) +"uij" = ( +/obj/machinery/camera{ + c_tag = "Brig Central"; + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light, +/obj/machinery/genpop_interface{ + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "Cell 3"; + name = "Cell 3 Flasher"; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/security/brig) "uiz" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed, @@ -60773,6 +60702,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/hallway/secondary/entry) +"vrW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/flasher{ + id = "Cell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "vsP" = ( /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, @@ -61265,6 +61208,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"vKl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed, +/obj/item/bedsheet/prisoner, +/turf/open/floor/plasteel, +/area/security/brig) "vKp" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -61907,6 +61856,21 @@ "wec" = ( /turf/template_noop, /area/medical/morgue) +"wem" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/genpop_interface{ + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "Cell 2"; + name = "Cell 3 Flasher"; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/security/brig) "wex" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -93121,7 +93085,7 @@ ajy aki akM aor -tbD +vrW amQ anw anz @@ -93376,7 +93340,7 @@ aiD aaC ajg akl -akO +cqa amu alx amR @@ -93632,10 +93596,10 @@ wcw aid agj auA -akk -akN -aqn -alx +akp +bpw +jhM +vKl amR anw anc @@ -93889,7 +93853,7 @@ ewO rVu agj ajA -ajG +cGT akQ agj agj @@ -94149,7 +94113,7 @@ ajA akm akV aqa -pmh +rbc amR anw anz @@ -94404,7 +94368,7 @@ gmi tVV wEd akl -akR +cqa amu alx amR @@ -94660,10 +94624,10 @@ aiG aiG aiy ajH -akk -akN -aqn -alx +akp +bKX +jhM +vKl amR anw anz @@ -94917,7 +94881,7 @@ agR agn aiI ajH -ako +wem akQ agj agj @@ -95177,7 +95141,7 @@ ajB akm akV aqa -oGb +nYq amR anw anz @@ -95432,7 +95396,7 @@ aiK ajc apo akl -akT +cqa amZ alx amR @@ -95688,10 +95652,10 @@ anq aiJ ajc ajH -akk -akV -aqn -alx +akp +bKX +jhM +vKl amR anw anr @@ -95945,7 +95909,7 @@ ahX aiL ajc ajH -qUH +uij akQ agj agj @@ -97231,10 +97195,10 @@ agn anS akc aiG -akW +trQ aiG amo -amJ +trQ anz anv aoz diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index d1ab69163a90..bff98f4dde46 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -34072,28 +34072,6 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/quartermaster/qm) -"bcH" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/door_timer{ - id = "brig1"; - name = "Cell 1"; - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Security - Brig Center"; - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "bcI" = ( /obj/machinery/firealarm{ dir = 1; @@ -53494,34 +53472,6 @@ }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) -"bEF" = ( -/obj/structure/cable/white{ - icon_state = "1-4" - }, -/obj/structure/cable/white{ - icon_state = "2-4" - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/door/window/brigdoor/security/cell/westright{ - id = "brig1"; - name = "Cell 1" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "bEG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -55373,25 +55323,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"bHx" = ( -/obj/structure/closet/secure_closet/brig{ - id = "brig1"; - name = "Cell 1 Locker" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "bHy" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -60856,25 +60787,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bPo" = ( -/obj/structure/closet/secure_closet/brig{ - id = "brig2"; - name = "Cell 2 Locker" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "bPp" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ @@ -66464,34 +66376,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) -"bXw" = ( -/obj/structure/cable/white{ - icon_state = "1-4" - }, -/obj/structure/cable/white{ - icon_state = "2-4" - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/door/window/brigdoor/security/cell/westright{ - id = "brig2"; - name = "Cell 2" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "bXx" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -68092,23 +67976,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bZK" = ( -/obj/structure/cable/white{ - icon_state = "0-4" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "brigwindows"; - name = "Brig Front Blast door" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plating, -/area/security/brig) "bZL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -68116,20 +67983,6 @@ }, /turf/open/floor/plasteel/grimy, /area/library) -"bZM" = ( -/obj/structure/cable/white{ - icon_state = "1-4" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigfront"; - name = "Brig Blast door" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "bZN" = ( /obj/structure/cable/white{ icon_state = "0-8" @@ -109107,53 +108960,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"dkp" = ( -/obj/structure/cable/white{ - icon_state = "2-4" - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"dkq" = ( -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigfront"; - name = "Brig Blast door" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "dkr" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -109550,19 +109356,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"dkP" = ( -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/brig) "dkQ" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -121689,6 +121482,24 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"dWs" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "dWx" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/dirt, @@ -124712,6 +124523,23 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"fTV" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/plasteel, +/area/security/brig) "fXG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -124782,6 +124610,30 @@ "gnJ" = ( /turf/open/floor/plasteel/dark/corner, /area/maintenance/disposal/incinerator) +"gxg" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/turnstile/genpop{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "gCK" = ( /turf/closed/wall, /area/maintenance/department/science) @@ -124878,6 +124730,15 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) +"gWm" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "gXw" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -125185,6 +125046,39 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit, /turf/open/floor/plating, /area/maintenance/port) +"iyV" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Security - Brig Center"; + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/genpop_interface{ + pixel_x = -32; + pixel_y = 3 + }, +/obj/machinery/button/flasher{ + id = "brig1"; + name = "Top Cell Flash"; + pixel_x = -40; + pixel_y = -11 + }, +/obj/machinery/button/flasher{ + id = "brig2"; + name = "Bottom Cell Flash"; + pixel_x = -24; + pixel_y = -11 + }, +/turf/open/floor/plasteel, +/area/security/brig) "iBZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -125349,6 +125243,16 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) +"jsE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1; + icon_state = "vent_map_on-1" + }, +/turf/open/floor/plasteel, +/area/security/brig) "juf" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/effect/turf_decal/stripes/line{ @@ -126160,6 +126064,12 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"ncN" = ( +/obj/machinery/turnstile/brig{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ncP" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine, @@ -126403,6 +126313,29 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"ojz" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "Brig Blast door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/brig) "olS" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, @@ -127317,6 +127250,22 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/white, /area/medical/genetics) +"sak" = ( +/obj/machinery/door/poddoor/preopen{ + id = "brigwindows"; + name = "Brig Front Blast door" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/turnstile/brig{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "saw" = ( /turf/closed/wall/r_wall, /area/science/misc_lab/range) @@ -127403,6 +127352,16 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) +"sHG" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/closet/secure_closet/genpop, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "sIg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -127470,6 +127429,30 @@ /obj/structure/cable/white, /turf/open/floor/carpet, /area/medical/psych) +"tcv" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/turnstile/genpop{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "tdY" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/tile/blue, @@ -127605,6 +127588,14 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"ugj" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/open/floor/plasteel, +/area/security/brig) "ujV" = ( /obj/machinery/light/small{ dir = 1 @@ -178452,7 +178443,7 @@ bJs bLk bgZ dkn -bZK +sak bnf bgZ bgZ @@ -178700,16 +178691,16 @@ bBd bCa bEa bnG -bHx +fTV bia bjy bNj -bPo +fTV bXo bjy bNj -dkp -dkP +dWs +jsE bni bNj cfe @@ -178965,8 +178956,8 @@ bJt bXt dns bNj -dkq -bZM +ojz +bno bno bNj ceI @@ -179215,15 +179206,15 @@ bnG bnG mSY biy -bEF -bmc +gxg +sHG bNj -biy -bXw +ugj +tcv bmc bNj dks -bZN +ncN bnp bNj biy @@ -179473,9 +179464,9 @@ bNj aJz aYA bGN -baW -bcH -aYA +gWm +iyV +aJz bXy baW cJs diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 0bb88560c621..584c415084b5 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -8131,23 +8131,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"ash" = ( -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Brig - Hallway - Port"; - dir = 1 - }, -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "asi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -8181,19 +8164,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"asl" = ( -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_y = -32 - }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "asm" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, @@ -8234,18 +8204,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"asq" = ( -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "asr" = ( /obj/machinery/computer/crew{ dir = 8 @@ -9272,31 +9230,6 @@ /obj/structure/window/reinforced/tinted/fulltile, /turf/open/floor/plating, /area/maintenance/port/fore) -"auK" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, -/area/security/brig) "auL" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -9897,39 +9830,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"awk" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/flasher{ - id = "secentranceflasher"; - pixel_x = 25 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, -/area/security/brig) "awl" = ( /obj/machinery/airalarm{ dir = 1; @@ -12378,30 +12278,6 @@ /obj/item/bedsheet/prisoner, /turf/open/floor/plasteel, /area/security/brig) -"aAZ" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aBa" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 2"; - name = "Cell 2 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aBb" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) "aBc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13060,21 +12936,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics/garden) -"aCo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Secure Gate"; - name = "brig shutters" - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/security/brig) "aCp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39924,72 +39785,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"bCW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 1"; - name = "Cell 1" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/security/brig) -"bCX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 2"; - name = "Cell 2" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/security/brig) -"bDa" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 3"; - name = "Cell 3" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/security/brig) "bDb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -72053,6 +71848,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"fCR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "fCT" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -73317,6 +73116,22 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/secondary) +"htS" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/genpop_interface{ + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "Cell 2"; + name = "Cell 2 Flasher"; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/security/brig) "hua" = ( /obj/effect/landmark/stationroom/maint/threexfive, /turf/template_noop, @@ -74512,6 +74327,28 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"jfF" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel, +/area/security/brig) "jfY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -75476,6 +75313,21 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"kIt" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/genpop_interface{ + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "Cell 1"; + name = "Cell 3 Flasher"; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/security/brig) "kIz" = ( /obj/machinery/light/small{ dir = 4 @@ -75492,6 +75344,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) +"kIY" = ( +/obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Brig - Hallway - Port"; + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/genpop_interface{ + pixel_y = -35 + }, +/obj/machinery/button/flasher{ + id = "Cell 1"; + name = "Cell 1 Flasher"; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/security/brig) "kKf" = ( /obj/structure/window/reinforced, /obj/structure/lattice, @@ -77491,6 +77363,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"oeY" = ( +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ogP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -78272,6 +78150,14 @@ /obj/structure/cable/yellow, /turf/open/floor/plasteel, /area/janitor) +"pvl" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/open/floor/plasteel, +/area/security/brig) "pvm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -79038,6 +78924,36 @@ }, /turf/open/floor/plating, /area/crew_quarters/bar) +"qHX" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/flasher{ + id = "secentranceflasher"; + pixel_x = 25 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel, +/area/security/brig) "qHZ" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -79976,6 +79892,20 @@ }, /turf/open/floor/plasteel, /area/hydroponics) +"spo" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Secure Gate"; + name = "brig shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "spy" = ( /obj/structure/closet/secure_closet/medical3, /obj/machinery/light{ @@ -83184,6 +83114,24 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"wNu" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/turnstile/genpop{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "wOE" = ( /turf/open/floor/plating, /area/maintenance/aft) @@ -83955,6 +83903,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) +"ylm" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/turnstile/genpop{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ylB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -108990,7 +108956,7 @@ aqo ayx aAg atU -bCW +wNu bDD azE aCl @@ -109247,9 +109213,9 @@ alW alW asx asm -dBG +pvl axd -aAZ +fCR aCm aDw aCs @@ -109503,7 +109469,7 @@ apH atO alW asx -ash +kIY ahx ahx ahx @@ -110018,7 +109984,7 @@ aoT apG aAh bzs -bCX +ylm bDE azE aCl @@ -110275,9 +110241,9 @@ anr alW asx asm -dBG +pvl axd -aBa +fCR aCm aDw ayy @@ -110531,7 +110497,7 @@ asn adY alW asx -asl +htS ahx ahx ahx @@ -111046,7 +111012,7 @@ atQ apJ aAs bzs -bDa +ylm bDF azE aCl @@ -111303,9 +111269,9 @@ awL ayz aAH asm -dBG +pvl axd -aBb +fCR aCm aDw ayX @@ -111559,7 +111525,7 @@ asw anr alW asx -asq +kIt ahx ahx ahx @@ -112074,10 +112040,10 @@ awQ ayA aAL aiv -aiq +oeY azJ aBd -aCo +spo aDC azG axV @@ -112331,10 +112297,10 @@ atT alW arD atB -auK +jfF avC awh -awk +qHX axj azU aGo diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index b5b0815edbea..ee0d7c4a6740 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -148,3 +148,5 @@ #define ACCESS_MECH_SCIENCE 303 #define ACCESS_MECH_ENGINE 304 #define ACCESS_MECH_FREEMINER 310 +//Prisoner access for genpop system +#define ACCESS_PRISONER 311 diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index db44bd4a1ca2..c03313899d1c 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -18,7 +18,12 @@ /obj/machinery/turnstile/brig name = "Brig turnstile" //Seccies and brig phys may always pass, either way. - req_one_access = list(ACCESS_BRIG) + req_one_access = list(ACCESS_SEC_DOORS) + +/obj/machinery/turnstile/genpop + name = "Cell turnstile" + //used for the actually cells + req_one_access = list(ACCESS_BRIG, ACCESS_PRISONER) /obj/machinery/turnstile/Initialize() . = ..() diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index c7782039530e..1e7a45554bf3 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -615,6 +615,17 @@ update_label("John Doe", "Clowny") name = "mining ID" access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) +/obj/item/card/id/genpop + name = "Genpop Prisoner ID card" + desc = "You are a number, you are not a free man." + icon_state = "orange" + item_state = "orange-id" + lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' + assignment = "Prisoner" + registered_name = "Scum" + registered_age = null + /obj/item/card/id/away name = "a perfectly generic identification card" desc = "A perfectly generic identification card. Looks like it could use some flavor." diff --git a/code/modules/security/genpop.dm b/code/modules/security/genpop.dm new file mode 100644 index 000000000000..83c6e9739540 --- /dev/null +++ b/code/modules/security/genpop.dm @@ -0,0 +1,343 @@ +//Credit to oraclestation for the idea! This just a recode... +//Credit to NSV13 for the recoded code that has been recoded slightly ~ Yogstation + +#define MAX_TIMER 25 MINUTES //Maximum you can give without a permabrigging (Yogstation) +#define PRESET_SHORT 3 MINUTES +#define PRESET_MEDIUM 5 MINUTES +#define PRESET_LONG 10 MINUTES + +/obj/structure/closet/secure_closet/genpop + name = "genpop locker" + desc = "A locker to store a prisoner's valuables, that they can collect at a later date." + req_access = list(ACCESS_BRIG) + anchored = TRUE + var/registered_name = null + +/obj/structure/closet/secure_closet/genpop/Initialize(mapload) + . = ..() + //Show that it's available. + set_light(1,1,COLOR_GREEN) + +/obj/structure/closet/secure_closet/genpop/attackby(obj/item/W, mob/user, params) + var/obj/item/card/id/I = null + if(istype(W, /obj/item/card/id)) + I = W + else + I = W.GetID() + if(istype(I)) + if(broken) + to_chat(user, "It appears to be broken.") + return + if(!I || !I.registered_name) + return + //Sec officers can always open the lockers. Bypass the ID setting behaviour. + //Buuut, if they're holding a prisoner ID, that takes priority. + if(allowed(user) && !istype(I, /obj/item/card/id/genpop)) + locked = !locked + update_icon() + return TRUE + //Handle setting a new ID. + if(!registered_name) + if(istype(I, /obj/item/card/id/genpop)) //Don't claim the locker for a sec officer mind you... + var/obj/item/card/id/genpop/P = I + if(P.assigned_locker) + to_chat(user, "This ID card is already registered to a locker.") + return FALSE + P.assigned_locker = src + registered_name = I.registered_name + desc = "Assigned to: [I.registered_name]." + say("Locker sealed. Assignee: [I.registered_name]") + + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) + set_light(1,1,COLOR_RED) + locked = TRUE + update_icon() + else + to_chat(user, "Invalid ID. Only prisoners / officers may use these lockers.") + return FALSE + //It's an ID, and is the correct registered name. + if(istype(I) && (registered_name == I.registered_name)) + var/obj/item/card/id/genpop/ID = I + //Not a prisoner ID. + if(!istype(ID)) + return FALSE + if(ID.served_time < ID.sentence) + playsound(loc, 'sound/machines/buzz-sigh.ogg', 80) + say("DANGER: PRISONER HAS NOT COMPLETED SENTENCE. AWAIT SENTENCE COMPLETION. COMPLIANCE IS IN YOUR BEST INTEREST.") + return FALSE + visible_message("[user] slots [I] into [src]'s ID slot, freeing its contents!") + registered_name = null + desc = initial(desc) + locked = FALSE + update_icon() + set_light(1,1,COLOR_GREEN) + qdel(I) + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) + return + else + to_chat(user, "Access Denied.") + else + return ..() + +//Officer interface. +/obj/machinery/genpop_interface + name = "Prisoner Management Interface" + icon = 'icons/obj/status_display.dmi' + icon_state = "frame" + desc = "An all-in-one interface for officers to manage prisoners!" + req_access = list(ACCESS_SECURITY) + density = FALSE + maptext_height = 26 + maptext_width = 32 + maptext_y = -1 + circuit = /obj/item/circuitboard/machine/genpop_interface + var/next_print = 0 + var/desired_sentence = 0 //What sentence do you want to give them? + var/desired_crime = null //What is their crime? + var/desired_name = null + var/obj/item/radio/Radio //needed to send messages to sec radio + //Preset crimes that you can set, without having to remember times + var/static/list/crimespetty = list( + list(name="Petty Theft", tooltip="To take items from areas one does not have access to or to take items belonging to others or the station as a whole.", colour="good",icon="hand-holding",sentence="1"), + list(name="Vandalism (Cosmetic)", tooltip="To deliberately vandalize the station.", colour="good",icon="spray-can",sentence="1"), + list(name="Resisting Arrest", tooltip="To not cooperate with an officer who attempts a proper arrest.", colour="good",icon="running",sentence="1"), + list(name="Drug Possession", tooltip="To possess space drugs or other narcotics by unauthorized personnel.", colour="good",icon="joint",sentence="1"), + list(name="Indecent Exposure", tooltip="To be intentionally and publicly unclothed.", colour="good",icon="flushed",sentence="1"), + list(name="Trespass", tooltip="To be in an area which a person does not have access to. This counts for general areas of the ship, and trespass in restricted areas is a more serious crime.", colour="good",icon="door-open",sentence="1") + ) + var/static/list/crimesminor = list( + list(name="Vandalism (Destructive)", tooltip="To deliberately damage the station without malicious intent.", colour="average",icon="car-crash",sentence="3"), + list(name="Narcotics Distribution", tooltip="To distribute narcotics and other controlled substances.", colour="average",icon="tablets",sentence="3"), + list(name="Possession of a Weapon", tooltip="To be in possession of a dangerous item that is not part of their job role.", colour="average",icon="bolt",sentence="3"), + list(name="Possession, Contraband", tooltip="To be in possession of illegal or prohibited goods.", colour="average",icon="syringe",sentence="3"), + list(name="Assault", tooltip="To use physical force against someone without the apparent intent to kill them.", colour="average",icon="fist-raised",sentence="3") + ) + var/static/list/crimesmoderate = list( + list(name="Theft", tooltip="To steal restricted or dangerous items",colour="average",icon="people-carry",sentence="5"), + list(name="Rioting", tooltip="To partake in an unauthorized and disruptive assembly of crewmen that refuse to disperse.",colour="average",icon="users",sentence="5"), + list(name="Creating a workplace hazard", tooltip="To endanger the crew or station through negligent or irresponsible, but not deliberately malicious, actions.",colour="average",icon="bomb",sentence="5"), + list(name="Breaking and Entry", tooltip="Forced entry to areas where the subject does not have access to. This counts for general areas, and breaking into restricted areas is a more serious crime.",colour="average",icon="door-closed",sentence="5"), + list(name="Insubordination", tooltip="To disobey a lawful direct order from one's superior officer.",colour="average",icon="user-minus",sentence="5"), + list(name="Animal Cruelty", tooltip="To kill an animal for reasons other than research, food purposes, self-defense purposes, or as a resolution to animal overpopulation.",colour="average",icon="user-minus",sentence="5") + ) + var/static/list/crimesmajor = list( + list(name="Assault, Officer", tooltip="To use physical force against a Department Head or member of Security without the apparent intent to kill them.",colour="bad",icon="gavel",sentence="7"), + list(name="Possession, restricted weapon", tooltip="To be in possession of a restricted weapon without prior authorization, such as guns, batons, flashes, grenades, etc.",colour="bad",icon="exclamation",sentence="7"), + list(name="Possession, Explosives", tooltip="To be in possession of an explosive device.",colour="bad",icon="bomb",sentence="7"), + list(name="Inciting a Riot", tooltip="To attempt to stir the crew into a riot",colour="bad",icon="bullhorn",sentence="7"), + list(name="Sabotage", tooltip="To hinder the work of the crew or station through malicious actions.",colour="bad",icon="fire",sentence="7"), + list(name="Major Trespass", tooltip="Being in a restricted area without prior authorization. This includes any Security Area, Command area (including EVA), The Engine Room, Atmos, or Toxins Research.",colour="bad",icon="key",sentence="7") + ) + var/static/list/crimessevere = list( + list(name="Assault With a Deadly Weapon", tooltip=" To use physical force, through a deadly weapon, against someone without the apparent intent to kill them.",colour="bad",icon="user-injured",sentence="10"), + list(name="Manslaughter", tooltip="To unintentionally kill someone through negligent, but not malicious, actions.",colour="bad",icon="skull-crossbones",sentence="10"), + list(name="Possession, Syndicate Contraband", tooltip="To be in unauthorized possession of syndicate or other PTE technology.",colour="bad",icon="bomb",sentence="10"), + list(name="Embezzlement", tooltip="To misuse a security or command position to steal money from the crew.",colour="bad",icon="dollar-sign",sentence="10"), + list(name="B&E of a Restricted Area", tooltip="This is breaking into any Security area, Command area (Bridge, EVA, Captains Quarters, Teleporter, etc.), the Engine Room, Atmos, or Toxins research.",colour="bad",icon="id-card",sentence="10"), + list(name="Dereliction of Duty", tooltip="To willfully abandon an obligation that is critical to the station's continued operation.",colour="bad",icon="walking",sentence="10") + ) + +/obj/item/circuitboard/machine/genpop_interface + name = "Prisoner Management Interface (circuit)" + build_path = /obj/machinery/genpop_interface + +/obj/machinery/genpop_interface/Initialize() + . = ..() + update_icon() + + Radio = new/obj/item/radio(src) + Radio.listening = 0 + Radio.set_frequency(FREQ_SECURITY) + +/obj/machinery/genpop_interface/update_icon() + if(stat & (NOPOWER)) + icon_state = "frame" + return + + if(stat & (BROKEN)) + set_picture("ai_bsod") + return + set_picture("default") + + +/obj/machinery/genpop_interface/proc/set_picture(state) + if(maptext) + maptext = "" + cut_overlays() + add_overlay(mutable_appearance(icon, state)) + +/obj/machinery/genpop_interface/ui_state(mob/user) + return GLOB.default_state + +/obj/machinery/genpop_interface/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "GenPop") + ui.open() + +/obj/machinery/genpop_interface/ui_data(mob/user) + var/list/data = list() + data["allPrisoners"] = list() + data["desired_name"] = desired_name + data["desired_crime"] = desired_crime + data["sentence"] = desired_sentence + data["canPrint"] = world.time >= next_print + data["pettyCrimes"] = crimespetty + data["minorCrimes"] = crimesminor + data["moderateCrimes"] = crimesmoderate + data["majorCrimes"] = crimesmajor + data["severeCrimes"] = crimessevere + var/list/L = data["allPrisoners"] + for(var/obj/item/card/id/genpop/ID in GLOB.prisoner_ids) + var/list/id_info = list() + id_info["name"] = ID.registered_name + id_info["id"] = "\ref[ID]" + id_info["served_time"] = ID.served_time + id_info["sentence"] = ID.sentence + id_info["crime"] = ID.crime + data["allPrisoners"][++L.len] = id_info + return data + +/obj/machinery/genpop_interface/proc/print_id(mob/user) + + if(world.time < next_print) + to_chat(user, "[src]'s ID printer is on cooldown.") + return FALSE + investigate_log("[key_name(user)] created a prisoner ID with sentence: [desired_sentence] for [desired_sentence] min", INVESTIGATE_RECORDS) + user.log_message("[key_name(user)] created a prisoner ID with sentence: [desired_sentence] for [desired_sentence] min", LOG_ATTACK) + + if(desired_crime) + var/datum/data/record/R = find_record("name", desired_name, GLOB.data_core.security) + if(R) + R.fields["criminal"] = "Incarcerated" + var/crime = GLOB.data_core.createCrimeEntry(desired_crime, null, user.real_name, station_time_timestamp()) + GLOB.data_core.addCrime(R.fields["id"], crime) + investigate_log("New Crime: [desired_crime] | Added to [R.fields["name"]] by [key_name(user)]", INVESTIGATE_RECORDS) + say("Criminal record for [R.fields["name"]] successfully updated with inputted crime.") + playsound(loc, 'sound/machines/ping.ogg', 50, 1) + + var/obj/item/card/id/id = new /obj/item/card/id/genpop(get_turf(src), desired_sentence, desired_crime, desired_name) + Radio.talk_into(src, "Prisoner [id.registered_name] has been incarcerated for [desired_sentence / 60] minute(s).", FREQ_SECURITY) + var/obj/item/paper/paperwork = new /obj/item/paper(get_turf(src)) + paperwork.info = "

Record Of Incarceration:

Name:

[desired_name]

Crime:

[desired_crime]

Sentence (Min)

[desired_sentence/60]

Nanotrasen Security Forces

" + desired_sentence = 0 + desired_crime = null + desired_name = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) + next_print = world.time + 20 SECONDS + +/obj/machinery/genpop_interface/ui_act(action, params) + if(isliving(usr)) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + if(..()) + return + if(!allowed(usr)) + to_chat(usr, "Access denied.") + return + switch(action) + if("time") + var/value = text2num(params["adjust"]) + if(value && isnum(value)) + desired_sentence += value + desired_sentence = clamp(desired_sentence,0,MAX_TIMER) + if("crime") + var/crimes = stripped_input(usr, "Input prisoner's crimes...", "Crimes", desired_crime) + if(crimes == null | !Adjacent(usr)) + return FALSE + desired_crime = crimes + if("prisoner_name") + var/prisoner_name = stripped_input(usr, "Input prisoner's name...", "Crimes", desired_name) + if(prisoner_name == null | !Adjacent(usr)) + return FALSE + desired_name = prisoner_name + if("print") + print_id(usr) + + if("preset") + var/preset = params["preset"] + var/preset_time = 0 + switch(preset) + if("short") + preset_time = PRESET_SHORT + if("medium") + preset_time = PRESET_MEDIUM + if("long") + preset_time = PRESET_LONG + + desired_sentence = preset_time + desired_sentence /= 10 + if("presetCrime") + var/preset_time = text2num(params["preset"]) + var/preset_crime = params["crime"] + desired_sentence += preset_time*60 + desired_crime += preset_crime + ", " + desired_sentence = clamp(desired_sentence,0,MAX_TIMER) + + if("release") + var/obj/item/card/id/genpop/id = locate(params["id"]) + if(!istype(id)) + return + if(alert("Are you sure you want to release [id.registered_name]", "Prisoner Release", "Yes", "No") != "Yes") + return + Radio.talk_into(src, "Prisoner [id.registered_name] has been discharged.", FREQ_SECURITY) + investigate_log("[key_name(usr)] has early-released [id] ([id.loc])", INVESTIGATE_RECORDS) + usr.log_message("[key_name(usr)] has early-released [id] ([id.loc])", LOG_ATTACK) + id.served_time = id.sentence + +GLOBAL_LIST_EMPTY(prisoner_ids) + +/obj/item/card/id/genpop + var/served_time = 0 //Seconds. + var/sentence = 0 //'ard time innit. + var/crime = null //What you in for mate? + var/atom/assigned_locker = null //Where's our stuff then guv? + +/obj/item/card/id/genpop/Initialize(mapload, _sentence, _crime, _name) + . = ..() + LAZYADD(GLOB.prisoner_ids, src) + if(_crime) + crime = _crime + if(_sentence) + sentence = _sentence + if(!_name) + registered_name = "Prisoner WR-DELPHIC#[rand(0, 10000)]" + else + registered_name = _name + update_label(registered_name, "Convict") + START_PROCESSING(SSobj, src) + +/obj/item/card/id/genpop/Destroy() + GLOB.prisoner_ids -= src + . = ..() + +/obj/item/card/id/genpop/examine(mob/user) + . = ..() + if(sentence) + . += "The card indicates the holder has served [served_time] out of [sentence] seconds." + if(crime) + . += "It appears its holder was convicted of: [crime]" + +/obj/item/card/id/genpop/process() + served_time+=2 //set to 2 to offset lag, before each second was roughly one half real second + + if (served_time >= sentence) //FREEDOM! + assignment = "Ex-Convict" + access = list(ACCESS_PRISONER) + update_label(registered_name, assignment) + playsound(loc, 'sound/machines/ping.ogg', 50, 1) + + var/datum/data/record/R = find_record("name", registered_name, GLOB.data_core.security) + if(R) + R.fields["criminal"] = "Discharged" + + if(isliving(loc)) + to_chat(loc, "You have served your sentence! You may now exit prison through the turnstiles and collect your belongings by slotting the ID into your locker.") + return PROCESS_KILL + + + +#undef PRESET_SHORT +#undef PRESET_MEDIUM +#undef PRESET_LONG + +#undef MAX_TIMER diff --git a/tgui/packages/tgui/interfaces/GenPop.js b/tgui/packages/tgui/interfaces/GenPop.js new file mode 100644 index 000000000000..aeb1eecce8ab --- /dev/null +++ b/tgui/packages/tgui/interfaces/GenPop.js @@ -0,0 +1,179 @@ +import { Fragment } from 'inferno'; +import { useBackend } from '../backend'; +import { Button, Section, ProgressBar, Flex } from '../components'; +import { Window } from '../layouts'; +import { toFixed } from 'common/math'; + +export const GenPop = (props, context) => { + const { act, data } = useBackend(context); + return ( + + +
+
+
+ + + {Object.keys(data.pettyCrimes).map(petty => { + let value = data.pettyCrimes[petty]; + return ( +
+
+ {Object.keys(data.allPrisoners).map(key => { + let value = data.allPrisoners[key]; + return ( +
act('release', { id: value.id })} /> + }> + Incarcerated for: {value.crime}
+ + {toFixed(value.served_time / 60)} min / {toFixed(value.sentence / 60)} min + +
+ ); + })} +
+ + + ); +}; diff --git a/yogstation.dme b/yogstation.dme index b002e518256d..d3ff7658b2de 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2904,6 +2904,7 @@ #include "code\modules\ruins\spaceruin_code\spacehotel.dm" #include "code\modules\ruins\spaceruin_code\TheDerelict.dm" #include "code\modules\ruins\spaceruin_code\whiteshipruin_box.dm" +#include "code\modules\security\genpop.dm" #include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\security_levels.dm" #include "code\modules\shuttle\arrivals.dm"