cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 20:23:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update loadout_xeno.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-30 01:03:25 -04:00
committed by GitHub
parent a777f6993d
commit 7915a9c9a8
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+2 -18
View File
@@ -213,16 +213,8 @@
/datum/gear/uniform/dept/undercoat/security
display_name = "security undercoat (Teshari)"
<<<<<<< HEAD
path = /obj/item/clothing/under/seromi/undercoat/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
path = /obj/item/clothing/under/seromi/undercoat/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
=======
path = /obj/item/clothing/under/teshari/undercoat/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
>>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
/datum/gear/uniform/dept/undercoat/service
display_name = "service undercoat (Teshari)"
@@ -378,16 +370,8 @@
/datum/gear/suit/dept/cloak/security
display_name = "security cloak (Teshari)"
<<<<<<< HEAD
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer")
=======
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer")
>>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
/datum/gear/suit/dept/cloak/security/New()
..()