Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape

# Conflicts: # modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:45:52 -05:00
parent 637c64f55b 5924595c8d
commit 5cacbfbe2e
1 changed files with 4 additions and 0 deletions
@@ -371,7 +371,11 @@
 	icon_state = "leechjar"
 	item_state = "leechjar"

+<<<<<<< HEAD
 	path = /obj/item/bedsheet/custom/flagcape
+=======
+/obj/item/bedsheet/custom/flagcape
+>>>>>>> 5924595c8d02754cc68433771a8bedbfafdd26dd
 	name = "Flag Cape"
 	desc = "A truly patriotic form of heroic attire."
 	icon = 'icons/obj/custom.dmi'