cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-08-24 20:34:13 -04:00
committed by GitHub
parent 50cec12f3f
commit f326dceba1
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -616,17 +616,8 @@
/datum/gear/suit/miscellaneous/cardigan/New()
..()
gear_tweaks += gear_tweak_free_color_choice
<<<<<<< HEAD
||||||| parent of 8848775cef... Merge pull request #11479 from PastelPrinceDan/aueugh
/datum/gear/suit/cmddressjacket
display_name = "command dress jacket"
path = /obj/item/clothing/suit/storage/cmddressjacket
allowed_roles = list("Facility Director", "Head of Personnel", "Command Secretary")
=======
/datum/gear/suit/cmddressjacket
display_name = "command dress jacket"
path = /obj/item/clothing/suit/storage/cmddressjacket
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
>>>>>>> 8848775cef... Merge pull request #11479 from PastelPrinceDan/aueugh