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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-09-27 17:59:35 -04:00
committed by GitHub
parent ad57dfbb92
commit 842c76a9c1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_suit.dm
-6
View File
@@ -617,11 +617,6 @@
/datum/gear/suit/cmddressjacket
display_name = "command dress jacket"
path = /obj/item/clothing/suit/storage/cmddressjacket
<<<<<<< HEAD
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
=======
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
/datum/gear/suit/miscellaneous/kimono
@@ -658,4 +653,3 @@
"Earth kimono" = /obj/item/clothing/suit/kimono/earth
)
gear_tweaks += new/datum/gear_tweak/path(kimonos)
>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)