cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

mostly [modular] renames brig off to correction officer, on request of gandalf (#5453)

Browse Source 
* [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 <bonniefluff>
This commit is contained in:
death and coding
2021-05-05 00:34:40 +01:00
committed by GitHub
co-authored by louiseedwardstuart <bonniefluff>
parent 0f459a310f
commit 2ae15d08d3
27 changed files with 202 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
+110 -67
View File
@@ -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
_maps/map_files/NSSJourney/NSSJourney.dmm
+29 -4
View File
@@ -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
code/controllers/subsystem/job.dm
+1 -1
View File
@@ -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")
code/game/gamemodes/changeling/changeling.dm
+1 -1
View File
@@ -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
code/game/gamemodes/cult/cult.dm
+1 -1
View File
@@ -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
code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+2 -2
View File
@@ -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
code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+2 -2
View File
@@ -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
code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+7 -7
View File
@@ -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
code/game/gamemodes/eldritch_cult/eldritch_cult.dm
+1 -1
View File
@@ -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
code/game/gamemodes/gang/gang.dm
+1 -1
View File
@@ -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..
code/game/gamemodes/revolution/revolution.dm
+1 -1
View File
@@ -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
code/game/gamemodes/traitor/traitor.dm
+1 -1
View File
@@ -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
code/modules/jobs/jobs.dm
+2 -1
View File
@@ -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(
config/jobs.txt
+1 -1
View File
@@ -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
modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+1 -1
View File
@@ -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,
modular_skyrat/modules/antagonists/code/gamemodes.dm
+12 -12
View File
@@ -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")
modular_skyrat/modules/brigoff/code/game/area/Space_Station_13_areas.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/area/brigofficer
name = "Brig Officer Lounge"
name = "Corrections Officer Lounge"
icon_state = "brig"
modular_skyrat/modules/brigoff/code/game/objects/effects/landmarks.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/obj/effect/landmark/start/brigoff
name = "Brig Officer"
name = "Corrections Officer"
icon_state = "Security Officer"
modular_skyrat/modules/brigoff/code/game/objects/items/devices/radio/headset.dm
+1 -1
View File
@@ -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
modular_skyrat/modules/brigoff/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -3
View File
@@ -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)
modular_skyrat/modules/brigoff/code/modules/clothing/head/jobs.dm
+1 -1
View File
@@ -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'
modular_skyrat/modules/brigoff/code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -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'
modular_skyrat/modules/brigoff/code/modules/clothing/under/jobs/security.dm
+4 -4
View File
@@ -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"
modular_skyrat/modules/brigoff/code/modules/jobs/job_types/brigoff.dm
+2 -2
View File
@@ -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
modular_skyrat/modules/brigoff/icons/lockers/closet.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

modular_skyrat/modules/customization/modules/client/loadout/uniform.dm
+15
View File
@@ -615,6 +615,21 @@
path = /obj/item/clothing/under/rank/security/warden/peacekeeper/sol
restricted_roles = list("Warden")
/datum/loadout_item/uniform/job/coroffw
name = "Corrections Officer Sweater (skirt)"
path = /obj/item/clothing/under/rank/security/brigguard/sweater/women
restricted_roles = list("Corrections Officer","Warden")
/datum/loadout_item/uniform/job/coroffshir
name = "Corrections Officer Shirt"
path = /obj/item/clothing/under/rank/security/brigguard
restricted_roles = list("Corrections Officer","Warden")
/datum/loadout_item/uniform/job/coroffshir
name = "Corrections Officer Skirt"
path = /obj/item/clothing/under/rank/security/brigguard/women
restricted_roles = list("Corrections Officer","Warden")
/datum/loadout_item/uniform/job/secskirt
name = "Security skirt"
path = /obj/item/clothing/under/rank/security/officer/skirt
tgstation.dme
+1 -1
View File
@@ -3574,10 +3574,10 @@
#include "modular_skyrat\master_files\code\game\objects\items\hhmirror.dm"
#include "modular_skyrat\master_files\code\game\objects\items\holy_weapons.dm"
#include "modular_skyrat\master_files\code\game\objects\items\oxygen_candle.dm"
#include "modular_skyrat\master_files\code\game\objects\items\religion.dm"
#include "modular_skyrat\master_files\code\game\objects\items\devices\radio\encryption_key.dm"
#include "modular_skyrat\master_files\code\game\objects\items\devices\radio\headset.dm"
#include "modular_skyrat\master_files\code\game\objects\items\storage\boxes.dm"
#include "modular_skyrat\master_files\code\game\objects\items\religion.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\sauna_oven.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\shower.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\tables_racks.dm"