diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f5a8dbbd3530..675155b7a37d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -68910,16 +68910,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 +72854,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{ @@ -88561,6 +88538,15 @@ /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel, /area/engine/engineering) +"fTJ" = ( +/obj/machinery/turnstile/brig{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "fTT" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -100835,6 +100821,17 @@ icon_state = "panelscorched" }, /area/maintenance/disposal/incinerator) +"ujk" = ( +/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) "ukm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -126388,7 +126385,7 @@ agE ahq cjO crC -cpR +ujk cxM bHT cjM @@ -126904,7 +126901,7 @@ bWL apq aef aGE -cjb +fTJ cjP aaj bpE @@ -127675,7 +127672,7 @@ ain apr agX aHp -cjb +fTJ cjT aaf awk diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 7361a31b1c8c..871273303b71 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -4417,29 +4417,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{ @@ -5100,31 +5077,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, @@ -32751,6 +32703,18 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"cRY" = ( +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 2"; + name = "Cell 2 Locker" + }, +/turf/open/floor/plasteel, +/area/security/brig) "cRZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -33294,6 +33258,21 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) +"djf" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/flasher{ + id = "Cell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 1"; + name = "Cell 2 Locker" + }, +/turf/open/floor/plasteel, +/area/security/brig) "djy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -38669,6 +38648,26 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/library) +"gTB" = ( +/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) "gTO" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/structure/window/reinforced, @@ -46794,6 +46793,18 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/medical/virology) +"miY" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 3"; + name = "Cell 3 Locker" + }, +/turf/open/floor/plasteel, +/area/security/brig) "mjb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -51065,15 +51076,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 @@ -51914,15 +51916,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) "pmR" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -57838,18 +57831,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{ @@ -62708,11 +62689,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"wiv" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "wiA" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/loading_area{ @@ -77915,22 +77891,22 @@ aaa aaa aaa aaa -wiv -wiv +tnK +tnK gcm sHq -wiv -wiv -wiv +tnK +tnK +tnK aSD -wiv -wiv -wiv +tnK +tnK +tnK sHq eRz -wiv +tnK quT -wiv +tnK apJ kmy iGX @@ -78172,7 +78148,7 @@ aaa aaa aaa aaa -wiv +tnK oCs ldm cLi @@ -78429,7 +78405,7 @@ aaa aaa aaa aaa -wiv +tnK oCs aaa aaa @@ -79711,8 +79687,8 @@ aaa aaa aaa aaa -wiv -wiv +tnK +tnK aaa aaa oCs @@ -79971,7 +79947,7 @@ aaS aaS aaf aaf -wiv +tnK eNl aaa aaa @@ -80228,7 +80204,7 @@ aaS aaa aoV aaa -wiv +tnK sHq aaa aaa @@ -80742,7 +80718,7 @@ aaS aaa aoV aaa -wiv +tnK sHq aaa aaa @@ -80999,7 +80975,7 @@ aaS aba aaf aaf -wiv +tnK rTw aaa aaa @@ -81254,7 +81230,7 @@ aaa aaa aaa gcm -wiv +tnK aaa aaa oCs @@ -82541,7 +82517,7 @@ aaa aaa aaa aaa -wiv +tnK oCs aaa aaa @@ -82812,7 +82788,7 @@ gYj lPs qup sYk -wiv +tnK ali ali ali @@ -83055,21 +83031,21 @@ aaa aaa aaa aaa -wiv -wiv -wiv +tnK +tnK +tnK sHq quT -wiv -wiv +tnK +tnK sHq -wiv -wiv -wiv +tnK +tnK +tnK sHq eRz quT -wiv +tnK aaa aaa ali @@ -93866,7 +93842,7 @@ ajy aki akM aor -tbD +djf amQ anw anz @@ -94894,7 +94870,7 @@ ajA akm akV aqa -pmh +cRY amR anw anz @@ -95922,7 +95898,7 @@ ajB akm akV aqa -oGb +miY amR anw anz @@ -97976,10 +97952,10 @@ agn anS akc aiG -akW +gTB aiG amo -amJ +gTB anz anv aoz diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index d1ab69163a90..bd50a547618a 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -68092,23 +68092,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 +68099,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 +109076,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 +109472,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" @@ -124712,6 +124621,16 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"fWK" = ( +/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) "fXG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -124782,6 +124701,12 @@ "gnJ" = ( /turf/open/floor/plasteel/dark/corner, /area/maintenance/disposal/incinerator) +"gye" = ( +/obj/machinery/turnstile/brig{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "gCK" = ( /turf/closed/wall, /area/maintenance/department/science) @@ -125565,6 +125490,24 @@ heat_capacity = 1e+006 }, /area/crew_quarters/locker) +"kMO" = ( +/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) "kNc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -126689,6 +126632,29 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) +"pqy" = ( +/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) "prJ" = ( /obj/structure/sign/poster/official/science{ pixel_x = -32 @@ -126737,6 +126703,22 @@ dir = 1 }, /area/maintenance/disposal/incinerator) +"pGo" = ( +/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) "pHD" = ( /obj/structure/particle_accelerator/end_cap{ dir = 8 @@ -128174,6 +128156,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"wUl" = ( +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "Brig Blast door" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/brig) "wWE" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -178452,7 +178444,7 @@ bJs bLk bgZ dkn -bZK +pGo bnf bgZ bgZ @@ -178708,8 +178700,8 @@ bPo bXo bjy bNj -dkp -dkP +kMO +fWK bni bNj cfe @@ -178965,8 +178957,8 @@ bJt bXt dns bNj -dkq -bZM +pqy +wUl bno bNj ceI @@ -179223,7 +179215,7 @@ bXw bmc bNj dks -bZN +gye bnp bNj biy diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 518c71b9e0ad..d36396e81535 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -9272,31 +9272,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 +9872,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; @@ -13060,21 +13002,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" @@ -72012,6 +71939,28 @@ /obj/item/lighter, /turf/open/floor/plasteel, /area/quartermaster/qm) +"fDj" = ( +/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) "fDm" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -74677,6 +74626,20 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"jEL" = ( +/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) "jER" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -74831,6 +74794,12 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"jMC" = ( +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "jNW" = ( /obj/structure/closet, /obj/item/flashlight, @@ -82679,6 +82648,36 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"vXN" = ( +/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) "vXP" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 @@ -112103,10 +112102,10 @@ awQ ayA aAL aiv -aiq +jMC azJ aBd -aCo +jEL aDC azG axV @@ -112360,10 +112359,10 @@ atT alW arD atB -auK +fDj avC awh -awk +vXN axj azU aGo diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a20f491636ad..62ce9b7944d5 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -2,7 +2,7 @@ #define FONT_SIZE "5pt" #define FONT_COLOR "#09f" #define FONT_STYLE "Small Fonts" -#define MAX_TIMER 12000 //yogs - changed 9000 to 12000 +#define MAX_TIMER 15000 //yogs - changed 9000 to 15000 #define PRESET_SHORT 1800 //yogs - changed 1200 to 1800 #define PRESET_MEDIUM 3000 //yogs - changed 1800 to 3000 @@ -26,7 +26,8 @@ req_access = list(ACCESS_SECURITY) density = FALSE var/id = null // id of linked machinery/lockers - + var/desired_name = null + var/desired_crime = null var/activation_time = 0 var/timer_duration = 0 @@ -34,6 +35,46 @@ var/list/obj/machinery/targets = list() var/obj/item/radio/Radio //needed to send messages to sec radio + 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="600"), + list(name="Vandalism (Cosmetic)", tooltip="To deliberately vandalize the station.", colour="good",icon="spray-can",sentence="600"), + list(name="Resisting Arrest", tooltip="To not cooperate with an officer who attempts a proper arrest.", colour="good",icon="running",sentence="600"), + list(name="Drug Possession", tooltip="To possess space drugs or other narcotics by unauthorized personnel.", colour="good",icon="joint",sentence="600"), + list(name="Indecent Exposure", tooltip="To be intentionally and publicly unclothed.", colour="good",icon="flushed",sentence="600"), + 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="600") + ) + var/static/list/crimesminor = list( + list(name="Vandalism (Destructive)", tooltip="To deliberately damage the station without malicious intent.", colour="average",icon="car-crash",sentence="1800"), + list(name="Narcotics Distribution", tooltip="To distribute narcotics and other controlled substances.", colour="average",icon="tablets",sentence="1800"), + 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="1800"), + list(name="Possession, Contraband", tooltip="To be in possession of illegal or prohibited goods.", colour="average",icon="syringe",sentence="1800"), + list(name="Assault", tooltip="To use physical force against someone without the apparent intent to kill them.", colour="average",icon="fist-raised",sentence="1800") + ) + var/static/list/crimesmoderate = list( + list(name="Theft", tooltip="To steal restricted or dangerous items",colour="average",icon="people-carry",sentence="3000"), + list(name="Rioting", tooltip="To partake in an unauthorized and disruptive assembly of crewmen that refuse to disperse.",colour="average",icon="users",sentence="3000"), + 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="3000"), + 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="3000"), + list(name="Insubordination", tooltip="To disobey a lawful direct order from one's superior officer.",colour="average",icon="user-minus",sentence="3000"), + 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="3000") + ) + 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="4200"), + 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="4200"), + list(name="Possession, Explosives", tooltip="To be in possession of an explosive device.",colour="bad",icon="bomb",sentence="4200"), + list(name="Inciting a Riot", tooltip="To attempt to stir the crew into a riot",colour="bad",icon="bullhorn",sentence="4200"), + list(name="Sabotage", tooltip="To hinder the work of the crew or station through malicious actions.",colour="bad",icon="fire",sentence="4200"), + 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="4200") + ) + 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="6000"), + list(name="Manslaughter", tooltip="To unintentionally kill someone through negligent, but not malicious, actions.",colour="bad",icon="skull-crossbones",sentence="6000"), + list(name="Possession, Syndicate Contraband", tooltip="To be in unauthorized possession of syndicate or other PTE technology.",colour="bad",icon="bomb",sentence="6000"), + list(name="Embezzlement", tooltip="To misuse a security or command position to steal money from the crew.",colour="bad",icon="dollar-sign",sentence="6000"), + 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="6000"), + 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="6000") + ) + maptext_height = 26 maptext_width = 32 maptext_y = -1 @@ -63,6 +104,13 @@ obj_break() update_icon() +/obj/machinery/door_timer/attackby(obj/item/W, mob/user, params) + var/obj/item/card/id/card = W.GetID() + if (card) + say("Prisoner name set.") + desired_name = card.registered_name + else + return FALSE //Main door timer loop, if it's timing and time is >0 reduce time by 1. // if it's less than 0, open door, reset timer @@ -78,7 +126,7 @@ // open/closedoor checks if door_timer has power, if so it checks if the // linked door is open/closed (by density) then opens it/closes it. -/obj/machinery/door_timer/proc/timer_start() +/obj/machinery/door_timer/proc/timer_start(mob/user) if(stat & (NOPOWER|BROKEN)) return 0 @@ -97,6 +145,19 @@ continue C.locked = TRUE C.update_icon() + + 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) + else if(!desired_name) + say("No prisoner name inputted, security record not updated.") + return 1 @@ -113,6 +174,11 @@ activation_time = null set_timer(0) update_icon() + var/datum/data/record/R = find_record("name", desired_name, GLOB.data_core.security) + if(R) + R.fields["criminal"] = "Discharged" + for(var/mob/living/carbon/human/H in GLOB.carbon_list) + H.sec_hud_set_security_status() for(var/obj/machinery/door/window/brigdoor/door in targets) if(!door.density) @@ -127,6 +193,9 @@ C.locked = FALSE C.update_icon() + desired_crime = null + desired_name = null + return 1 @@ -196,6 +265,13 @@ data["minutes"] = round((time_left - data["seconds"]) / 60) data["timing"] = timing data["flash_charging"] = FALSE + data["desired_name"] = desired_name + data["desired_crime"] = desired_crime + data["pettyCrimes"] = crimespetty + data["minorCrimes"] = crimesminor + data["moderateCrimes"] = crimesmoderate + data["majorCrimes"] = crimesmajor + data["severeCrimes"] = crimessevere for(var/obj/machinery/flasher/F in targets) if(F.last_flash && (F.last_flash + 150) > world.time) data["flash_charging"] = TRUE @@ -218,9 +294,13 @@ if(value) . = set_timer(time_left()+value) if("start") - timer_start() + timer_start(usr) + for(var/mob/living/carbon/human/H in GLOB.carbon_list) + H.sec_hud_set_security_status() if("stop") timer_end(forced = TRUE) + for(var/mob/living/carbon/human/H in GLOB.carbon_list) + H.sec_hud_set_security_status() if("flash") for(var/obj/machinery/flasher/F in targets) F.flash() @@ -237,6 +317,21 @@ . = set_timer(preset_time) if(timing) activation_time = world.time + if("prisoner_name") + var/prisoner_name = stripped_input(usr, "Input prisoner's name...", "Crimes", desired_name) + if(!prisoner_name || !Adjacent(usr)) + return FALSE + desired_name = prisoner_name + if("presetCrime") + var/value = text2num(params["preset"]) + var/preset_crime = "N/A" + for(var/allcrimes in crimespetty + crimesminor + crimesmoderate + crimesmajor + crimessevere) + if(params["crime"] == allcrimes["name"]) + preset_crime = params["crime"] + break + desired_crime += preset_crime + ", " + if(value) + . = set_timer(time_left()+value) else . = FALSE diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index db44bd4a1ca2..fa4f420fd733 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -18,7 +18,7 @@ /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/Initialize() . = ..() diff --git a/tgui/packages/tgui/interfaces/BrigTimer.js b/tgui/packages/tgui/interfaces/BrigTimer.js index ee00abf1794d..3d51313697a9 100644 --- a/tgui/packages/tgui/interfaces/BrigTimer.js +++ b/tgui/packages/tgui/interfaces/BrigTimer.js @@ -1,14 +1,14 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; -import { Button, Section } from '../components'; +import { Button, Section, Flex } from '../components'; import { Window } from '../layouts'; export const BrigTimer = (props, context) => { const { act, data } = useBackend(context); return (
{ content={data.flash_charging ? 'Recharging' : 'Flash'} disabled={data.flash_charging} onClick={() => act('flash')} /> +
+
+ + + {Object.keys(data.pettyCrimes).map(petty => { + let value = data.pettyCrimes[petty]; + return ( +