cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01: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:41:37 -04:00
committed by GitHub
parent 6f129e8dc2
commit 0f7bde4780
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
@@ -615,15 +615,9 @@
/datum/gear/suit/miscellaneous/cardigan/New()
..()
<<<<<<< HEAD
gear_tweaks += gear_tweak_free_color_choice
||||||| parent of e5bcc628fd... Merge pull request #11469 from PastelPrinceDan/clothingwooyeah
gear_tweaks += gear_tweak_free_color_choice
=======
gear_tweaks += gear_tweak_free_color_choice
/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")
>>>>>>> e5bcc628fd... Merge pull request #11469 from PastelPrinceDan/clothingwooyeah