shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'flagcape'

Browse Source 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
This commit is contained in:
LetterJay
2018-07-06 00:51:42 -05:00
parent 65e2d7695b 3d7d862861
commit a64dba6270
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+8
View File
@@ -296,8 +296,16 @@ datum/gear/darksabresheath
path = /obj/item/clothing/suit/armor/vest/darkcarapace
ckeywhitelist = list("inferno707")
<<<<<<< HEAD
/datum/gear/devilwings
name = "Strange Wings"
category = SLOT_NECK
path = /obj/item/clothing/neck/devilwings
ckeywhitelist = list("kitsun")
=======
/datum/gear/flagcape
name = "US Flag Cape"
category = SLOT_IN_BACKPACK
path = /obj/item/bedsheet/custom/flagcape
ckeywhitelist = list("darnchacha")
>>>>>>> flagcape