Merge branch 'master' into kitsundevilwings

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -290,6 +290,12 @@ datum/gear/darksabresheath
 	path = 	/obj/item/custom/leechjar
 	ckeywhitelist = list("sgtryder")
 
+/datum/gear/darkarmor
+	name = "Dark Armor"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/suit/armor/vest/darkcarapace
+	ckeywhitelist = list("inferno707")
+
 /datum/gear/devilwings
 	name = "Strange Wings"
 	category = SLOT_NECK

modular_citadel/code/modules/client/loadout/head.dm

@@ -48,6 +48,12 @@
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/that
 
+/datum/gear/flakhelm
+	name = "Flak Helmet"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/flakhelm
+	cost = 2
+
 //trek fancy Hats!
 /datum/gear/trekcap
 	name = "Federation Officer's Cap"

modular_citadel/code/modules/client/loadout/suit.dm

@@ -74,6 +74,12 @@
 	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/ianshirt
 
+/datum/gear/flakjack
+	name = "Flak Jacket"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/flakjack
+	cost = 2
+
 /datum/gear/trekds9_coat
 	name = "DS9 Overcoat (use uniform)"
 	category = SLOT_WEAR_SUIT

modular_citadel/code/modules/clothing/head/head.dm

@@ -0,0 +1,14 @@
+/*/////////////////////////////////////////////////////////////////////////////////
+///////																		///////
+///////			Cit's exclusive hats, helmets, etc. go here			///////
+///////																		///////
+*//////////////////////////////////////////////////////////////////////////////////
+
+/obj/item/clothing/head/flakhelm
+	name = "flak helmet"
+	icon = 'modular_citadel/icons/obj/clothing/space_nam.dmi'
+	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/space_nam.dmi'
+	icon_state = "m1helm"
+	item_state = "helmet"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0.1, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = -1)
+	desc = "A dilapidated helmet used in ancient wars. This one is brittle and essentially useless. An ace of spades is tucked into the band around the outer shell."

modular_citadel/code/modules/clothing/suits/suits.dm

@@ -11,7 +11,7 @@
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
 	icon_state = "hostrench"
 	item_state = "hostrench"
-	
+
 /obj/item/clothing/suit/hooded/cloak/david
 	name = "red cloak"
 	icon_state = "goliath_cloak"
@@ -24,3 +24,15 @@
 	icon_state = "golhood"
 	desc = "conceal your face in shame with this nanotrasen brand hood"
 	flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/suit/flakjack
+	name = "flak jacket"
+	desc = "A dilapidated jacket made of a supposedly bullet-proof material (Hint: It isn't.). Smells faintly of napalm."
+	icon = 'modular_citadel/icons/obj/clothing/space_nam.dmi'
+	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/space_nam.dmi'
+	icon_state = "flakjack"
+	item_state = "redtag"
+	blood_overlay_type = "armor"
+	body_parts_covered = CHEST
+	resistance_flags = NONE
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -328,6 +328,18 @@
 		/obj/item/toy/sword/darksabre
 		))
 
+/obj/item/clothing/suit/armor/vest/darkcarapace
+	name = "Dark Armor"
+	desc = "A dark, non-functional piece of armor sporting a red and black finish."
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "darkcarapace"
+	item_state = "darkcarapace"
+	blood_overlay_type = "armor"
+	dog_fashion = /datum/dog_fashion/back
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	
+
 /obj/item/clothing/neck/cloak/green
 	name = "Generic Green Cloak"
 	desc = "This cloak doesn't seem too special."