From 2ae15d08d39f680d5e2fc08967a3d4cf8b04fdac Mon Sep 17 00:00:00 2001 From: death and coding <58394696+thestubborn@users.noreply.github.com> Date: Wed, 5 May 2021 00:34:40 +0100 Subject: [PATCH] mostly [modular] renames brig off to correction officer, on request of gandalf (#5453) * [semi-modular] Renames Brig Officer to Correction Officer on request of Gandalf * Update jobs.dm * my name i * s Patrick, I'm 31, and I'm not here to cause harm. Please do not contact the police , please don't alert the authorities, please don't freak out. I'm not going to kill myself or hurt anyone or anything like that, but please don't freak out. My name is Patr * go on * ??? * Update security.dm * more, more * Dear top I'm writing you this tomato I'm writing this email to make sure you know that I tried to make a fund video unfortunately, unfortunately that didn't turn out so well my hypothesis in my experience Haitians were not happening as well as I plant and I'm really sorry you'll never happen again, please don't fire me I hope we can still be best friends your if if fewer from your best friend sure not now if if if if if, Thank you again,. Sharma 908 auburn 500 Joe favor employee Co-authored-by: louiseedwardstuart --- .../IceBoxStation/IceBoxStation_skyrat.dmm | 177 +++++++++++------- _maps/map_files/NSSJourney/NSSJourney.dmm | 33 +++- code/controllers/subsystem/job.dm | 2 +- code/game/gamemodes/changeling/changeling.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- .../dynamic/dynamic_rulesets_latejoin.dm | 4 +- .../dynamic/dynamic_rulesets_midround.dm | 4 +- .../dynamic/dynamic_rulesets_roundstart.dm | 14 +- .../gamemodes/eldritch_cult/eldritch_cult.dm | 2 +- code/game/gamemodes/gang/gang.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/modules/jobs/jobs.dm | 3 +- config/jobs.txt | 2 +- .../master_files/code/datums/id_trim/jobs.dm | 2 +- .../modules/antagonists/code/gamemodes.dm | 24 +-- .../code/game/area/Space_Station_13_areas.dm | 2 +- .../code/game/objects/effects/landmarks.dm | 2 +- .../objects/items/devices/radio/headset.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 5 +- .../code/modules/clothing/head/jobs.dm | 2 +- .../code/modules/clothing/suits/armor.dm | 2 +- .../modules/clothing/under/jobs/security.dm | 8 +- .../code/modules/jobs/job_types/brigoff.dm | 4 +- .../modules/brigoff/icons/lockers/closet.dmi | Bin 1773 -> 1891 bytes .../modules/client/loadout/uniform.dm | 15 ++ tgstation.dme | 2 +- 27 files changed, 202 insertions(+), 119 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm index c9124e8f009..742f24d0aa6 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm @@ -601,18 +601,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "amY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/paper_bin/carbon{ - pixel_x = -5; - pixel_y = 3 +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/flashlight/lamp/green{ - on = 0; - pixel_x = -4; - pixel_y = 10 - }, -/turf/open/floor/plating, +/obj/structure/loom, +/turf/open/floor/vault/rock, /area/security/prison) "amZ" = ( /obj/structure/chair, @@ -956,12 +949,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "atG" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/item/soap/nanotrasen, -/turf/open/floor/iron/freezer, -/area/security/prison/safe) +/obj/structure/table, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/turf/open/floor/vault/rock, +/area/security/prison) "atN" = ( /obj/structure/rack, /obj/item/wrench, @@ -1211,6 +1203,11 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"ayD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/fedora, +/turf/open/floor/plating, +/area/security/prison) "ayL" = ( /obj/machinery/camera{ c_tag = "Bar South"; @@ -6533,6 +6530,11 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"cDA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/food/egg, +/turf/open/floor/plating, +/area/security/prison) "cDT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /turf/closed/wall/r_wall, @@ -8375,9 +8377,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dqN" = ( -/obj/structure/curtain/cloth, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/security/old{ + name = "Workshop" + }, /turf/open/floor/iron/dark, /area/security/prison/safe) "dqQ" = ( @@ -13800,15 +13804,16 @@ /turf/open/floor/iron, /area/command/heads_quarters/ce) "fvl" = ( -/obj/machinery/shower{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, /obj/machinery/light/small, -/turf/open/floor/iron/freezer, -/area/security/prison/safe) +/obj/machinery/plate_press{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/vault/rock, +/area/security/prison) "fvn" = ( /obj/item/stack/sheet/glass, /obj/structure/table/glass, @@ -15421,6 +15426,14 @@ dir = 4 }, /area/security/prison) +"gff" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/food/burger, +/turf/open/floor/plating, +/area/security/prison) "gfg" = ( /turf/closed/wall, /area/science/lab) @@ -19515,6 +19528,13 @@ /obj/item/wirecutters, /turf/open/floor/plating, /area/engineering/storage/tech) +"hMk" = ( +/obj/machinery/light/small, +/obj/machinery/plate_press{ + pixel_y = -3 + }, +/turf/open/floor/vault/rock, +/area/security/prison) "hMm" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" @@ -26719,11 +26739,8 @@ /turf/open/floor/plating, /area/engineering/storage/tech) "kHX" = ( -/obj/machinery/shower{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/security/prison/safe) +/turf/open/floor/vault/rock, +/area/security/prison) "kIa" = ( /obj/machinery/airalarm{ dir = 4; @@ -27311,9 +27328,19 @@ }, /area/security/prison/safe) "kSP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/open/floor/plating, +/obj/item/chair/plastic{ + pixel_y = 10 + }, +/obj/item/chair/plastic{ + pixel_y = 10 + }, +/obj/item/chair/plastic{ + pixel_y = 10 + }, +/obj/item/chair/plastic{ + pixel_y = 10 + }, +/turf/open/floor/vault/rock, /area/security/prison) "kSZ" = ( /obj/structure/table, @@ -38569,14 +38596,14 @@ /turf/open/floor/iron, /area/hallway/primary/central) "pst" = ( -/obj/machinery/shower{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron/freezer, -/area/security/prison/safe) +/obj/structure/table, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/turf/open/floor/vault/rock, +/area/security/prison) "psy" = ( /obj/structure/mirror{ pixel_y = 32 @@ -42749,6 +42776,15 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) +"rep" = ( +/obj/machinery/light/small/broken{ + dir = 1 + }, +/obj/machinery/plate_press{ + pixel_y = 4 + }, +/turf/open/floor/vault/rock, +/area/security/prison) "rew" = ( /obj/machinery/power/smes, /obj/structure/cable, @@ -44474,11 +44510,11 @@ /turf/open/floor/iron/white, /area/medical/storage) "rOC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plating, +/obj/structure/table, +/obj/machinery/camera/autoname, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/turf/open/floor/vault/rock, /area/security/prison) "rOH" = ( /obj/effect/turf_decal/bot, @@ -45826,6 +45862,9 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"sqN" = ( +/turf/open/floor/vault/rock, +/area/icemoon/surface/outdoors) "sqQ" = ( /obj/structure/closet/secure_closet/chief_medical, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -46353,12 +46392,9 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "sCQ" = ( -/obj/machinery/shower{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/freezer, -/area/security/prison/safe) +/turf/open/floor/vault/rock, +/area/security/prison) "sCV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 10 @@ -56985,6 +57021,11 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"xlf" = ( +/obj/structure/cable, +/obj/structure/grille, +/turf/open/floor/vault/rock, +/area/icemoon/surface/outdoors) "xlv" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Dorm"; @@ -58179,13 +58220,10 @@ /turf/open/floor/iron, /area/cargo/office) "xJA" = ( -/obj/machinery/shower{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/freezer, -/area/security/prison/safe) +/turf/open/floor/vault/rock, +/area/security/prison) "xJC" = ( /obj/machinery/door/airlock/maintenance{ name = "Mech Bay Maintenance"; @@ -58308,13 +58346,12 @@ /turf/open/floor/iron/dark, /area/security/processing) "xMk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, /obj/item/stack/sheet/cardboard{ amount = 10 }, -/obj/item/stack/sheet/cloth/ten, -/turf/open/floor/plating, +/obj/structure/loom, +/obj/machinery/light/small, +/turf/open/floor/vault/rock, /area/security/prison) "xMm" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -59387,6 +59424,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/science/mixing) +"yjw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/under/rank/prisoner/classic, +/obj/item/clothing/suit/jacket/leather/overcoat, +/turf/open/floor/plating, +/area/security/prison) "yjy" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -79138,7 +79181,7 @@ atl mBk mBk uCh -uCh +sqN coW rdn atl @@ -79910,7 +79953,7 @@ atl uCh uCh wiZ -coW +xlf uCh uCh rdn @@ -80426,7 +80469,7 @@ vhs uaM uaM uaM -uaM +cdw cdw cdw cdw @@ -80942,8 +80985,8 @@ cdr bzR wBC rOC -fnr -fnr +kHX +atG cdw cdw dWG @@ -81198,9 +81241,9 @@ wBC rfj eRG wBC -wBC -wBC -wBC +rep +kHX +hMk cdw pHr snt @@ -82719,7 +82762,7 @@ uCh uCh cdw fnr -fnr +cDA fnr aQQ eHQ @@ -84518,8 +84561,8 @@ uCh uCh cdw rEW -fnr -ylb +yjw +gff eHQ mTE aTe @@ -84775,7 +84818,7 @@ uCh uCh cdw pZF -fnr +ayD eqQ eHQ aNQ diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 96201d0a2ef..5559cbdab77 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -39000,6 +39000,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/central) +"dMD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/under/rank/prisoner/classic, +/turf/open/floor/plating, +/area/security/prison) "dMS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -53357,6 +53362,13 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"sMd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/food/burger/bigbite, +/turf/open/floor/plating, +/area/security/prison) "sMi" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -54666,6 +54678,11 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"ubn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/jacket/leather/overcoat, +/turf/open/floor/plating, +/area/security/prison) "ubw" = ( /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ @@ -57574,6 +57591,14 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"wOq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/clothing/head/fedora, +/turf/open/floor/plating, +/area/security/prison) "wPd" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light, @@ -84126,8 +84151,8 @@ xzh xzh aai lJN -xZn -wxl +dMD +wOq acd vOR oBk @@ -84383,8 +84408,8 @@ xzh xzh aai fNM -xZn -uAQ +ubn +sMd acd wIo oBk diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 61223361de9..56043b44fc2 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -842,7 +842,7 @@ SUBSYSTEM_DEF(job) station_jobs = list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", \ "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", \ "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", "Psychologist", \ - "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Officer", "Prisoner") + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Corrections Officer", "Prisoner") head_of_staff_jobs = list("Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security", "Captain") diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 2aac7e8bfaf..ca2149ac824 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w antag_flag = ROLE_CHANGELING false_report_weight = 10 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Prisoner", "Security Officer", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Brig Officer", "Blueshield", "Warden", "Detective", "Head of Security", "Captain") //SKYRAT EDIT ADDITION - SEC_HAUL + protected_jobs = list("Prisoner", "Security Officer", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Corrections Officer", "Blueshield", "Warden", "Detective", "Head of Security", "Captain") //SKYRAT EDIT ADDITION - SEC_HAUL required_players = 15 required_enemies = 1 recommended_enemies = 3 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 8c22a6edb88..5b5da397fea 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -36,7 +36,7 @@ report_type = "cult" antag_flag = ROLE_CULTIST false_report_weight = 10 - restricted_jobs = list("Prisoner","Chaplain","AI", "Cyborg", "Security Officer", "Blueshield", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Brig Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") //SKYRAT EDIT ADDITION - SEC_HAUL + restricted_jobs = list("Prisoner","Chaplain","AI", "Cyborg", "Security Officer", "Blueshield", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Corrections Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") //SKYRAT EDIT ADDITION - SEC_HAUL protected_jobs = list() required_players = 29 required_enemies = 4 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 9b6ecdc6394..1a83fb158f8 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -53,7 +53,7 @@ name = "Syndicate Infiltrator" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_TRAITOR - protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain") + protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain", "Corrections Officer") restricted_roles = list("AI","Cyborg") required_candidates = 1 weight = 7 @@ -73,7 +73,7 @@ antag_datum = /datum/antagonist/rev/head antag_flag = ROLE_REV_HEAD antag_flag_override = ROLE_REV - restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") + restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Corrections Officer", "Chief Medical Officer", "Research Director") enemy_roles = list("AI", "Cyborg", "Security Officer","Detective","Head of Security", "Captain", "Warden") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 772310cb295..133d1b88b20 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -164,7 +164,7 @@ name = "Syndicate Sleeper Agent" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_TRAITOR - protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 1 weight = 7 @@ -225,7 +225,7 @@ persistent = TRUE antag_flag = ROLE_FAMILIES protected_roles = list("Prisoner", "Head of Personnel") - restricted_roles = list("Cyborg", "AI", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") + restricted_roles = list("Cyborg", "AI", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") required_candidates = 6 // gotta have 'em ALL weight = 1 cost = 25 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 4528c7b34b5..ff850a66d1f 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -11,7 +11,7 @@ antag_flag = ROLE_TRAITOR antag_datum = /datum/antagonist/traitor minimum_required_age = 0 - protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") + protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") restricted_roles = list("Cyborg") required_candidates = 1 weight = 5 @@ -50,7 +50,7 @@ name = "Blood Brothers" antag_flag = ROLE_BROTHER antag_datum = /datum/antagonist/brother/ - protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") + protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") restricted_roles = list("Cyborg", "AI") required_candidates = 2 weight = 4 @@ -99,7 +99,7 @@ name = "Changelings" antag_flag = ROLE_CHANGELING antag_datum = /datum/antagonist/changeling - protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") + protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") restricted_roles = list("AI", "Cyborg") required_candidates = 1 weight = 3 @@ -136,7 +136,7 @@ name = "Heretics" antag_flag = ROLE_HERETIC antag_datum = /datum/antagonist/heretic - protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") + protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") restricted_roles = list("AI", "Cyborg") required_candidates = 1 weight = 3 @@ -225,7 +225,7 @@ antag_flag = ROLE_CULTIST antag_datum = /datum/antagonist/cult minimum_required_age = 14 - restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel") + restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Corrections Officer") required_candidates = 2 weight = 3 cost = 20 @@ -368,7 +368,7 @@ antag_flag_override = ROLE_REV antag_datum = /datum/antagonist/rev/head minimum_required_age = 14 - restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") + restricted_roles = list("AI", "Corrections Officer", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") required_candidates = 3 weight = 3 delay = 7 MINUTES @@ -451,7 +451,7 @@ persistent = TRUE antag_flag = ROLE_FAMILIES protected_roles = list("Prisoner", "Head of Personnel") - restricted_roles = list("Cyborg", "AI", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") + restricted_roles = list("Cyborg", "AI", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Corrections Officer") required_candidates = 6 // gotta have 'em ALL weight = 2 cost = 30 diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm index a510701c4b8..66cefd06208 100644 --- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm +++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm @@ -4,7 +4,7 @@ report_type = "heresy" antag_flag = ROLE_HERETIC false_report_weight = 5 - protected_jobs = list("Prisoner", "Security Officer", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Brig Officer", "Warden", "Blueshield", "Detective", "Head of Security", "Captain") //SKYRAT EDIT ADDITION - SEC_HAUL + protected_jobs = list("Prisoner", "Security Officer", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Corrections Officer", "Warden", "Blueshield", "Detective", "Head of Security", "Captain") //SKYRAT EDIT ADDITION - SEC_HAUL restricted_jobs = list("AI", "Cyborg") required_players = 0 required_enemies = 1 diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 40402876deb..4e4b12f440c 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -9,7 +9,7 @@ announce_span = "danger" announce_text = "Grove For Lyfe!" reroll_friendly = FALSE - restricted_jobs = list("Cyborg", "AI", "Prisoner","Security Officer", "Security Medic", "Securty Sergeant", "Brig Officer", "Warden", "Blueshield", "Detective", "Head of Security", "Captain", "Head of Personnel") //SKYRAT EDIT ADDITION - SEC_HAUL + restricted_jobs = list("Cyborg", "AI", "Prisoner","Security Officer", "Security Medic", "Securty Sergeant", "Corrections Officer", "Warden", "Blueshield", "Detective", "Head of Security", "Captain", "Head of Personnel") //SKYRAT EDIT ADDITION - SEC_HAUL protected_jobs = list() /// A reference to the handler that is used to run pre_setup(), post_setup(), etc.. diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index cb91b0a7535..5d6d6557ae0 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -13,7 +13,7 @@ report_type = "revolution" antag_flag = ROLE_REV false_report_weight = 10 - restricted_jobs = list("Prisoner", "Security Officer", "Security Medic", "Security Sergeant", "Brig Officer", "Civil Disputes Officer", "Warden", "Detective", "Blueshield", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") //SKYRAT EDIT ADDITION - SEC_HAUL + restricted_jobs = list("Prisoner", "Security Officer", "Security Medic", "Security Sergeant", "Corrections Officer", "Civil Disputes Officer", "Warden", "Detective", "Blueshield", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") //SKYRAT EDIT ADDITION - SEC_HAUL required_jobs = list(list("Captain"=1),list("Head of Personnel"=1),list("Head of Security"=1),list("Chief Engineer"=1),list("Research Director"=1),list("Chief Medical Officer"=1)) //Any head present required_players = 30 required_enemies = 2 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 36053da10f5..e0a0804ab53 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -9,7 +9,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Prisoner","Security Officer", "Brig Officer", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Warden", "Blueshield", "Detective", "Head of Security", "Captain") //SKYRAT EDIT CHANGE - SEC_HAUL + protected_jobs = list("Prisoner","Security Officer", "Corrections Officer", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Warden", "Blueshield", "Detective", "Head of Security", "Captain") //SKYRAT EDIT CHANGE - SEC_HAUL required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 67793f16436..ba93915d004 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -66,7 +66,8 @@ GLOBAL_LIST_INIT(security_positions, list( "Security Medic", "Security Sergeant", "Civil Disputes Officer", - "Blueshield")) //SKYRAT EDIT - LIST AMENDED + "Blueshield", + "Corrections Officer")) //SKYRAT EDIT - LIST AMENDED /// These aren't defacto jobs, but are the special departmental variants for sec officers. GLOBAL_LIST_INIT(security_sub_positions, list( diff --git a/config/jobs.txt b/config/jobs.txt index 9c9f52b7fb0..440776a6eea 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -48,7 +48,7 @@ Security Officer=4,4 Civil Disputes Officer=4,4 Security Sergeant=2,2 Security Medic=1,1 -Brig Officer 1,1 +Corrections Officer 1,1 AI=1,1 Cyborg=3,3 diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index fdaab8885a9..026030145f6 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -134,7 +134,7 @@ /datum/id_trim/job/brigoff - assignment = "Brig Officer" + assignment = "Corrections Officer" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_brigoff" full_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, diff --git a/modular_skyrat/modules/antagonists/code/gamemodes.dm b/modular_skyrat/modules/antagonists/code/gamemodes.dm index 119dd9bd9cc..be297870cfb 100644 --- a/modular_skyrat/modules/antagonists/code/gamemodes.dm +++ b/modular_skyrat/modules/antagonists/code/gamemodes.dm @@ -1,35 +1,35 @@ /datum/game_mode/traitor - protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/game_mode/traitor/changeling - protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/game_mode/changeling - protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/game_mode/traitor/bros - protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/game_mode/heretics - protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/game_mode/gang - protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //i hate whoever just copy pasted this a bunch of times + protected_jobs = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //i hate whoever just copy pasted this a bunch of times /datum/dynamic_ruleset/roundstart/traitor - protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/dynamic_ruleset/roundstart/traitorbro - protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/dynamic_ruleset/roundstart/changeling - protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/dynamic_ruleset/roundstart/heretics - protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/dynamic_ruleset/midround/autotraitor - protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") /datum/dynamic_ruleset/latejoin/infiltrator - protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Prisoner", "Blueshield", "Corrections Officer", "Security Officer", "Warden", "Detective", "Security Medic", "Security Sergeant", "Civil Disputes Officer", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") diff --git a/modular_skyrat/modules/brigoff/code/game/area/Space_Station_13_areas.dm b/modular_skyrat/modules/brigoff/code/game/area/Space_Station_13_areas.dm index 2e3fdd8b1f3..c1d5c22114d 100644 --- a/modular_skyrat/modules/brigoff/code/game/area/Space_Station_13_areas.dm +++ b/modular_skyrat/modules/brigoff/code/game/area/Space_Station_13_areas.dm @@ -1,3 +1,3 @@ /area/brigofficer - name = "Brig Officer Lounge" + name = "Corrections Officer Lounge" icon_state = "brig" diff --git a/modular_skyrat/modules/brigoff/code/game/objects/effects/landmarks.dm b/modular_skyrat/modules/brigoff/code/game/objects/effects/landmarks.dm index a485864befc..4bd638a8e00 100644 --- a/modular_skyrat/modules/brigoff/code/game/objects/effects/landmarks.dm +++ b/modular_skyrat/modules/brigoff/code/game/objects/effects/landmarks.dm @@ -1,3 +1,3 @@ /obj/effect/landmark/start/brigoff - name = "Brig Officer" + name = "Corrections Officer" icon_state = "Security Officer" diff --git a/modular_skyrat/modules/brigoff/code/game/objects/items/devices/radio/headset.dm b/modular_skyrat/modules/brigoff/code/game/objects/items/devices/radio/headset.dm index 79907c12971..e247ed1d4c9 100644 --- a/modular_skyrat/modules/brigoff/code/game/objects/items/devices/radio/headset.dm +++ b/modular_skyrat/modules/brigoff/code/game/objects/items/devices/radio/headset.dm @@ -1,5 +1,5 @@ /obj/item/radio/headset/brigoff - name = "\proper brig officer's headset" + name = "\proper corrections officer's headset" icon_state = "sec_headset" keyslot = new /obj/item/encryptionkey/headset_sec diff --git a/modular_skyrat/modules/brigoff/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/modular_skyrat/modules/brigoff/code/game/objects/structures/crates_lockers/closets/secure/security.dm index b83e1b3487f..f6eb4b00fc2 100644 --- a/modular_skyrat/modules/brigoff/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/modular_skyrat/modules/brigoff/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -1,12 +1,11 @@ /obj/structure/closet/secure_closet/brigoff icon = 'modular_skyrat/modules/brigoff/icons/lockers/closet.dmi' - name = "brig officer riot gear" + name = "corrections officer riot gear" icon_state = "riot" /obj/structure/closet/secure_closet/warden/brigoff/PopulateContents() - . = ..() + ..() new /obj/item/clothing/suit/armor/riot(src) - new /obj/item/storage/belt/security/full(src) new /obj/item/grenade/flashbang(src) new /obj/item/assembly/flash/handheld(src) new /obj/item/restraints/handcuffs(src) diff --git a/modular_skyrat/modules/brigoff/code/modules/clothing/head/jobs.dm b/modular_skyrat/modules/brigoff/code/modules/clothing/head/jobs.dm index 5f7c90ba8ba..6534299706c 100644 --- a/modular_skyrat/modules/brigoff/code/modules/clothing/head/jobs.dm +++ b/modular_skyrat/modules/brigoff/code/modules/clothing/head/jobs.dm @@ -1,5 +1,5 @@ /obj/item/clothing/head/brigoff - name = "brig officer's cap" + name = "corrections officer's cap" desc = "A black visor cap with a round Nanotrasen logo made out of silver in the center, the most it'll do is protect you from some light rain...Or a prisoner slopping out." icon = 'modular_skyrat/modules/brigoff/icons/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/modules/brigoff/icons/mob/head.dmi' diff --git a/modular_skyrat/modules/brigoff/code/modules/clothing/suits/armor.dm b/modular_skyrat/modules/brigoff/code/modules/clothing/suits/armor.dm index 9cf676f24d3..c9e2608fdb8 100644 --- a/modular_skyrat/modules/brigoff/code/modules/clothing/suits/armor.dm +++ b/modular_skyrat/modules/brigoff/code/modules/clothing/suits/armor.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit/toggle/jacket/brigoff - name = "brig officer's suit jacket" + name = "corrections officer's suit jacket" desc = "A pressed and ironed suit jacket, it has light armor against stabbings. There's some rank badges on the right breast." icon = 'modular_skyrat/modules/brigoff/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/modules/brigoff/icons/mob/suit.dmi' diff --git a/modular_skyrat/modules/brigoff/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/modules/brigoff/code/modules/clothing/under/jobs/security.dm index 74e0c06ae23..2f42da4c83d 100644 --- a/modular_skyrat/modules/brigoff/code/modules/clothing/under/jobs/security.dm +++ b/modular_skyrat/modules/brigoff/code/modules/clothing/under/jobs/security.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/rank/security/brigguard desc = "A white satin shirt with some bronze rank pins at the neck." - name = "brig officer's suit" + name = "corrections officer's suit" icon = 'modular_skyrat/modules/brigoff/icons/obj/clothing/uniform.dmi' worn_icon = 'modular_skyrat/modules/brigoff/icons/mob/uniform.dmi' icon_state = "brigguard" @@ -9,16 +9,16 @@ sensor_mode = SENSOR_COORDS random_sensor = FALSE -/obj/item/clothing/under/rank/security/brigguardw +/obj/item/clothing/under/rank/security/brigguard/women desc = "A white satin shirt with some bronze rank pins at the neck." - name = "brig officer's skirt" + name = "corrections officer's skirt" icon = 'modular_skyrat/modules/brigoff/icons/obj/clothing/uniform.dmi' worn_icon = 'modular_skyrat/modules/brigoff/icons/mob/uniform.dmi' icon_state = "brigguardw" /obj/item/clothing/under/rank/security/brigguard/sweater desc = "A black combat sweater thrown over the standard issue shirt, perfect for wake up calls." - name = "brig officer's sweater" + name = "corrections officer's sweater" icon = 'modular_skyrat/modules/brigoff/icons/obj/clothing/uniform.dmi' worn_icon = 'modular_skyrat/modules/brigoff/icons/mob/uniform.dmi' icon_state = "brigguardsweat" diff --git a/modular_skyrat/modules/brigoff/code/modules/jobs/job_types/brigoff.dm b/modular_skyrat/modules/brigoff/code/modules/jobs/job_types/brigoff.dm index 8d3826675b6..555c697eb14 100644 --- a/modular_skyrat/modules/brigoff/code/modules/jobs/job_types/brigoff.dm +++ b/modular_skyrat/modules/brigoff/code/modules/jobs/job_types/brigoff.dm @@ -1,5 +1,5 @@ /datum/job/brigoff - title = "Brig Officer" + title = "Corrections Officer" auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY department_head = list("The Warden and Head of Security") faction = "Station" @@ -31,7 +31,7 @@ /datum/outfit/job/brigoff - name = "Brig Officer" + name = "Corrections Officer" jobtype = /datum/job/brigoff uniform = /obj/item/clothing/under/rank/security/brigguard/sweater suit = /obj/item/clothing/suit/toggle/jacket/brigoff diff --git a/modular_skyrat/modules/brigoff/icons/lockers/closet.dmi b/modular_skyrat/modules/brigoff/icons/lockers/closet.dmi index 5b274a078810335cddf81cca8dfc31bcc7a407d1..35e2cdb3f572280ddb20fda5fa4de3c184e54eb0 100644 GIT binary patch delta 1787 zcmVfFDZ*Bkpc$}q?IVFEXpxYgM$K|-x*QP_& zHvCCG7-u0-9*&%CM#m8n=M!fmnPH532~kCYME0<=yG^7s&b09X5`we4R}1a=0~1+T zm7k0qe#4S8O|yDILKLD9#n*D9StlHL<6^I!^Xam8E7>Ie|9g(Qt5CHKe*V{lu7rleX)2=^Lo!Jt{sr^@$306z!gU-J^97rHP=_yc)e#8JI7^G z1ISG2$*)BxAOX}kGzB9F01xZep(%hULl=WtS734%K!|~r>42tyI>O2w2~7c#Lk^Q( z0Tz=x0t%BV0tPk;g7{%->ZQjg0SL@|K8v?c z3?dv3SH17z;v#iyn1`JSooQ4Qb# z=}ZPKt*uOAwY0PV01m(LCK?+3rnaT~Z3hX!L7o%}%wm7tzCDM&zFt$?Y9IkPK)~n2 zThS=)-oMW~m2DvbFy`Fos0IM(bQ%Glk6B!^qrb1Ox2m`#00&skWB>qphEsr3kN_N@ zy|opgP>5+vssXBiXRDUZ#Lb&b;^cBUOZ#2<>~mA!vn7CH@tUTe?9$I}Qt7ySyL5}j z6i{4Ww-tY@I}kKJTd4s`_kR(#1fZYjYWvYxvb7tA_vp`Lvq&r~U~P33nUxi8d2}3n z-PHGNPXS)Cz=;xe5IoK)(>B?a6;`kIb!Zz{?qihljPLpUjl}jn%jt&HaL1eR8rcVNE?m2+d7eG|&|LW>hrT4%A1cO1jp9G3h zoVlHc{w{zuLe~J5;B{9ZLLNFSrhvkKE;2jw2cA4$Gqo+SjgpY zHy+1bCebQG0&sxh#s-r(KP3{5PhWNUHc$lY+P_;+4Inw>0FonQ4baoQUju-)_72;z zR+g6l0DsOe2x-ZR!Z$4;1poji+jgPf>$QI!XS{6}Zmc|HkWqa?Q-I`<03@eu3h3?a z)c|0}jvbhup5{6^O(_a)+`nf#4vRXXp7H1x9RLOg2LS*#8LeowLsZkyzvngEamLrz zaf3lV^@<1h|H7wIDeT?5muEf({Y_2ydUX|c`{U0vH(M5f8~ypbF{Xf2Duq}qrig#C zie-F#9rO7ta;yJXjxi5lys^>x{x0 zTJ`>l`pR>0tl)HiK5tZDbMc~n@kMcft+ci8gra&(ZCT=Ue?D(iU~}=J?f@)Tva%$d z&L9+OHMMmDr`F{0<~au#85t4M0SJF*Pyt|MWW;cQv9U2B9l-494~5wLG|N_;T9d~c z6#&M@#>fFArDhzUmTG`Qo(8;{&Ek-!!I4~8LJqJER{QhM%*-&(#2JKjfc(ZrS%15g z8lXE6MBc{wJgfcrNdiCXh{65Yk-d<`+28e3Kf3<9z1wZ z_9T#ZQkAHs8sL_%3GJueMZ)iQBo~&b0MOalNe&<>h5$r&0D2DK3@T9mB4}V>fE+*~ zQ~($l7%=QVE@(qTE!6t)&Xv9d4RLB z{C8E`7saWT(*FEvwr2bDdEO0DwRsAcP1~k00a1-Meka`SH;s%lo>~ zpU<1J#*n3@%|^<(xjC-?@qNz}6mmIyYw=CobMa93*U>UcPfw3A@AD(R@G`=?JD7eT df-}4Y@Gr`gd0jNUG$H^1002ovPDHLkV1i--QAGd% delta 1673 zcmV;426p-54($z)Bo(H5R9JLGWpiV4X>fFDZ*Bkpc$|%qIVFFEY-55%X%e$K$(-?= z#{~+@oQi+lpA<1 zfWM&eaR5azTnHMc9Lf-u4#3xXsnbh>i37+?CNrryox@7G-k-h(S|q#iGnvUtf0~@m zVa3XQ$pI{q-T39`1SlkcGKYo$0pMZ%Iy3|jIp|_A>k1V!6-<;i9MBL@L6q{1goXgg zAqSH%0veMq0uXl+)qQ@Icl0AucsjA#H5kH_J0xtPT@`}FtpbQcwu1YiR@i39*3&2R{?3le}0 zG}P6>=kqa*Ni{$b@Z74UGqefhn9b0b$YzUc_}qO_Vq8qk^uCEE_Oc}OY(Qa@P7Ie$s{6cYuMl0Lt=NATOLi< zUpMtR%R_+EIjrz};`AIu$z^(aT4`!%fV-v!{?=Azaf_`11_o}Kip#79;L-3RJn`j@ zWdZ1&kX;K{PsLDAgc9${_vsFeeD{&Ua#CUfua;= zmz{_HTL5c>t^o?c>sx^cdFZeh0uG+L$ntN$;@Q!@sblta7eQ|bv4OiIBU<$FWBd>f zTM~cYoj^cq?Cpi$?}yLlgWK)K{{BAV@p#VP`Trk}$Fa4wg(u6)v?h=TtY!cYQYoy5 z!&qk$tuQ128^|0VGl}zkBx3vURgu32ihx!7zbvQ*kQ{OV$q}*!=<0k;1AzL5Cd;vQ zceVilf2^(*v}8po3#YaXAq4;cx9c0x=X8Hsjx$@|h?(6d3^J-rXb6xT5`g673<2HU z-5LN?S65?cX^HFLxTq+Y+4$3P92Rv%CF9UL9RLOf1^@sHj8?Q-A)smKYkkFXoY})e z%rMBOQgHzPcYG`sLwkEW&wLE}s;cnC-X5&(kN>cyh6Hd9#t;yT#SjXG6j4^O%pQLp zVl|yaYVV(tW2^$0y>f+JQWc0%1cpK(B^V59EZ4DFp|7gSIM+`8E&5-fIK)|0;B@g~ zFc{QCa)5m58?Hi89j1PVR9i~|e}4GHN0ggvMLFf=q| zIKb4@l#mW!_UZTe*u0uW7E}P3nwozi2auGqaR90T?13CWa)fn&^zm`d{`OL8fKHDW zX-4bwDisv~B9RDm2M7j(I|xrZE#33WbDlfPAP1um=?YT3TAj0VKr`fanfD z^8ogs0?6t7{{DV)0EtimpufN0u>Y{28yctvum=YKgu`K_qoYHMMx*2al3{;1Kr|W^ z+5xBrum@os;P<=