From 9c7a528c5833e5306f98f2899255e08fd81970b0 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 22 Jul 2021 01:10:06 -0400 Subject: [PATCH 01/17] Update wheelchair.dm --- code/modules/vehicles/wheelchair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 922ba908f139..bb9d678bcd67 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -45,7 +45,7 @@ //1.5 (movespeed as of this change) multiplied by 4 gets 6, which gives you a delay of 3 assuming the user has two arms, //getting the speed of the wheelchair roughly equal to the speed of a scooter based on testing. //if that made no sense this simply makes the wheelchair speed change along with movement speed delay - D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2) + D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 3) / min(user.get_num_arms(), 2) return ..() /obj/vehicle/ridden/wheelchair/Moved() From b2467a965d7adb7ca1be900abe6a55abf790f20d Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 22 Jul 2021 01:10:22 -0400 Subject: [PATCH 02/17] Update wheelchair.dm --- code/modules/vehicles/wheelchair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index bb9d678bcd67..922ba908f139 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -45,7 +45,7 @@ //1.5 (movespeed as of this change) multiplied by 4 gets 6, which gives you a delay of 3 assuming the user has two arms, //getting the speed of the wheelchair roughly equal to the speed of a scooter based on testing. //if that made no sense this simply makes the wheelchair speed change along with movement speed delay - D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 3) / min(user.get_num_arms(), 2) + D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2) return ..() /obj/vehicle/ridden/wheelchair/Moved() From a263c14bd887d44b59b5d6b047cee6a26d709e7b Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 8 Oct 2021 16:15:46 -0400 Subject: [PATCH 03/17] removes random brig cell --- _maps/map_files/YogStation/YogStation.dmm | 84 +++++++++++++---------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index bb8be0b98e47..94de8059d544 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -49516,6 +49516,17 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"nWC" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig/cell{ + id = "Cell 3" + }, +/turf/open/floor/plasteel, +/area/security/brig) "nWK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -50769,15 +50780,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 @@ -51578,6 +51580,12 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) +"plo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed, +/obj/item/bedsheet/prisoner, +/turf/open/floor/plasteel, +/area/security/brig) "plx" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -51611,15 +51619,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 @@ -53632,6 +53631,20 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"qyZ" = ( +/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/cell{ + id = "Cell 1" + }, +/turf/open/floor/plasteel, +/area/security/brig) "qzJ" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, @@ -57323,18 +57336,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{ @@ -59448,6 +59449,17 @@ }, /turf/open/floor/engine/airless, /area/space) +"uxQ" = ( +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig/cell{ + id = "Cell 2" + }, +/turf/open/floor/plasteel, +/area/security/brig) "uxT" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -93120,7 +93132,7 @@ ajy aki akM aor -tbD +qyZ amQ anw anz @@ -93634,7 +93646,7 @@ auA akk akN aqn -alx +plo amR anw anc @@ -94148,7 +94160,7 @@ ajA akm akV aqa -pmh +uxQ amR anw anz @@ -94662,7 +94674,7 @@ ajH akk akN aqn -alx +plo amR anw anz @@ -95176,7 +95188,7 @@ ajB akm akV aqa -oGb +nWC amR anw anz @@ -95690,7 +95702,7 @@ ajH akk akV aqn -alx +plo amR anw anr From b55782c5c3c8f72bbea22cd30ff97b686ee90d42 Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Fri, 8 Oct 2021 17:31:11 -0400 Subject: [PATCH 04/17] adds list to thing --- code/game/machinery/doors/brigdoors.dm | 47 +++++++++++- code/game/machinery/doors/turnstile.dm | 2 +- tgui/packages/tgui/interfaces/BrigTimer.js | 84 +++++++++++++++++++++- 3 files changed, 128 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a20f491636ad..436652a7b4db 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 @@ -34,6 +34,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="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") + ) + maptext_height = 26 maptext_width = 32 maptext_y = -1 @@ -196,6 +236,11 @@ data["minutes"] = round((time_left - data["seconds"]) / 60) data["timing"] = timing data["flash_charging"] = FALSE + 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 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..475a08ee8c23 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="Long" onClick={() => act('preset', { preset: 'long' })} />
+
+ + + {Object.keys(data.pettyCrimes).map(petty => { + let value = data.pettyCrimes[petty]; + return ( +
); From 94a6e7e5eab0e1da055175aca32970a1a0c8b2e1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 8 Oct 2021 17:36:32 -0400 Subject: [PATCH 05/17] add brig turnstile --- _maps/map_files/KiloStation/KiloStation.dmm | 55 +++--- _maps/map_files/YogStation/YogStation.dmm | 92 +++++----- _maps/map_files/YogsDelta/YogsDelta.dmm | 182 +++++++++----------- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 157 ++++++++--------- 4 files changed, 236 insertions(+), 250 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f5a8dbbd3530..f151c29763dc 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{ @@ -92469,6 +92446,17 @@ initial_gas_mix = "plasma=1000;TEMP=293.15" }, /area/engine/atmos) +"kdi" = ( +/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) "kdl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -103730,6 +103718,21 @@ }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) +"xCz" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/turnstile/brig{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "xCH" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -126388,7 +126391,7 @@ agE ahq cjO crC -cpR +kdi cxM bHT cjM @@ -126904,7 +126907,7 @@ bWL apq aef aGE -cjb +xCz cjP aaj bpE @@ -127675,7 +127678,7 @@ ain apr agX aHp -cjb +xCz cjT aaf awk diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 94de8059d544..f830c34fcf45 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -4447,29 +4447,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 +5133,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, @@ -52211,6 +52163,26 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) +"pGd" = ( +/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, +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "pGm" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -59382,6 +59354,26 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"uvw" = ( +/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) "uvA" = ( /obj/item/cigbutt/roach, /turf/open/floor/plating, @@ -97242,10 +97234,10 @@ agn anS akc aiG -akW +uvw aiG amo -amJ +pGd anz anv aoz diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index d1ab69163a90..5df030ff8dfd 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" @@ -124739,6 +124648,18 @@ /obj/item/pen, /turf/open/floor/plasteel/white, /area/science/research) +"fYm" = ( +/obj/machinery/turnstile/brig{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/brig) "gbI" = ( /obj/structure/table/glass, /obj/structure/cable/white{ @@ -125130,6 +125051,29 @@ /obj/machinery/cryopod, /turf/open/floor/plasteel, /area/security/prison) +"ijA" = ( +/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) "iko" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -125803,6 +125747,16 @@ /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel, /area/science/xenobiology) +"lUK" = ( +/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) "lXl" = ( /obj/structure/cable/white{ icon_state = "0-2" @@ -127922,6 +127876,24 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) +"vVQ" = ( +/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) "vXg" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -128394,6 +128366,22 @@ /obj/structure/closet/wardrobe/black, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) +"ycb" = ( +/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) "ycn" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -178452,7 +178440,7 @@ bJs bLk bgZ dkn -bZK +ycb bnf bgZ bgZ @@ -178708,8 +178696,8 @@ bPo bXo bjy bNj -dkp -dkP +vVQ +lUK bni bNj cfe @@ -178965,8 +178953,8 @@ bJt bXt dns bNj -dkq -bZM +ijA +bno bno bNj ceI @@ -179223,7 +179211,7 @@ bXw bmc bNj dks -bZN +fYm bnp bNj biy diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index b8c6582b524e..4d343ad343bb 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" @@ -71968,6 +71895,16 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port) +"fxW" = ( +/obj/machinery/turnstile/brig{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "fyi" = ( /obj/structure/girder, /obj/structure/grille, @@ -74876,6 +74813,28 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) +"jOf" = ( +/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) "jPM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -81184,6 +81143,20 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"tUk" = ( +/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) "tUo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -81645,6 +81618,36 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"uvJ" = ( +/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) "uyj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -112073,10 +112076,10 @@ awQ ayA aAL aiv -aiq +fxW azJ aBd -aCo +tUk aDC azG axV @@ -112330,10 +112333,10 @@ atT alW arD atB -auK +jOf avC awh -awk +uvJ axj azU aGo From e05ed9381507db42bd33fddd948a4ded810143da Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Fri, 8 Oct 2021 21:41:26 -0400 Subject: [PATCH 06/17] u[pdate --- code/game/machinery/doors/brigdoors.dm | 102 ++++++++++++++------- tgui/packages/tgui/interfaces/BrigTimer.js | 23 ++++- 2 files changed, 89 insertions(+), 36 deletions(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 436652a7b4db..5b369f1a5d99 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -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 @@ -35,43 +36,43 @@ 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="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") + 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="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") + 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="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") + 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="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") + 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="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") + 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 @@ -103,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 //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 @@ -118,13 +126,27 @@ // 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 activation_time = world.time timing = TRUE + 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) + for(var/mob/living/carbon/human/H in GLOB.carbon_list) + H.sec_hud_set_security_status() + else if(desired_name == null) + say("No prisoner name inputted, security record not updated.") + for(var/obj/machinery/door/window/brigdoor/door in targets) if(door.density) continue @@ -153,6 +175,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" + desired_crime = null + desired_name = null for(var/obj/machinery/door/window/brigdoor/door in targets) if(!door.density) @@ -236,6 +263,8 @@ 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 @@ -282,6 +311,17 @@ . = 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 == null | !Adjacent(usr)) + return FALSE + desired_name = prisoner_name + if("presetCrime") + var/value = text2num(params["preset"]) + var/preset_crime = params["crime"] + desired_crime += preset_crime + ", " + if(value) + . = set_timer(time_left()+value) else . = FALSE diff --git a/tgui/packages/tgui/interfaces/BrigTimer.js b/tgui/packages/tgui/interfaces/BrigTimer.js index 475a08ee8c23..7b0cb240e00d 100644 --- a/tgui/packages/tgui/interfaces/BrigTimer.js +++ b/tgui/packages/tgui/interfaces/BrigTimer.js @@ -25,8 +25,14 @@ export const BrigTimer = (props, context) => { content={data.flash_charging ? 'Recharging' : 'Flash'} disabled={data.flash_charging} onClick={() => act('flash')} /> +