cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-12 03:52:07 -05:00
committed by GitHub
parent 9163ddb85b
commit 165b5681d7
1 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+7 -31
View File
@@ -138,56 +138,32 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, brown"
path = /obj/item/clothing/accessory/storage/brown_vest
<<<<<<< HEAD
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black"
path = /obj/item/clothing/accessory/storage/black_vest
<<<<<<< HEAD
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white"
path = /obj/item/clothing/accessory/storage/white_vest
<<<<<<< HEAD
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown"
path = /obj/item/clothing/accessory/storage/brown_drop_pouches
<<<<<<< HEAD
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black"
path = /obj/item/clothing/accessory/storage/black_drop_pouches
<<<<<<< HEAD
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white"
path = /obj/item/clothing/accessory/storage/white_drop_pouches
<<<<<<< HEAD
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/fannypack
display_name = "fannypack selection"
@@ -330,4 +306,4 @@
"Brown Vest" = /obj/item/clothing/accessory/cowboy_vest/brown,
"Grey Vest" = /obj/item/clothing/accessory/cowboy_vest/grey
)
gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)
gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)