cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update loadout_accessories_vr.dm

Browse Source
This commit is contained in:
Razgriz
2021-05-18 21:05:00 -07:00
committed by GitHub
parent 3c3f14185d
commit cda655fffd
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -50,13 +50,7 @@
/datum/gear/accessory/holster /datum/gear/accessory/holster
display_name = "holster selection (Security, SM, HoP, Exploration)" display_name = "holster selection (Security, SM, HoP, Exploration)"
<<<<<<< HEAD
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder", "Blueshield Guard","Security Pilot") //YW ADDITIONS
||||||| parent of 55dc4f8a77... Merge pull request #10343 from KillianKirilenko/kk-misc
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder","Talon Guard")
=======
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard") allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard")
>>>>>>> 55dc4f8a77... Merge pull request #10343 from KillianKirilenko/kk-misc
/datum/gear/accessory/brown_vest /datum/gear/accessory/brown_vest
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"