Merge branch 'flagcape'

# Conflicts: # icons/obj/custom.dmi # modular_citadel/code/modules/client/loadout/__donator.dm # modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:51:42 -05:00
parent 65e2d7695b 3d7d862861
commit a64dba6270
3 changed files with 18 additions and 0 deletions
@@ -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
@@ -371,6 +371,7 @@
 	icon_state = "leechjar"
 	item_state = "leechjar"

+<<<<<<< HEAD
 /obj/item/clothing/neck/devilwings
 	name = "Strange Wings"
 	desc = "These strange wings look like they once attached to something... or someone...? Whatever the case, their presence makes you feel uneasy.."
@@ -380,3 +381,12 @@
 	item_state = "devilwings"
 	worn_x_dimension = 64
 	worn_y_dimension = 34
+=======
+/obj/item/bedsheet/custom/flagcape
+	name = "Flag Cape"
+	desc = "A truly patriotic form of heroic attire."
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "flagcape"
+	item_state = "flagcape"
+>>>>>>> flagcape