Merge pull request #7956 from FlattestGuitar/more-fluff

Fluffs for Desolate, Hylocereus, Shazbot

code/modules/customitems/item_defines.dm

@@ -276,7 +276,39 @@
 		to_chat(target, "<span class='notice'>You comb your tail with the [src].</span>")
 		used = 1
 
-/obj/item/device/fluff/desolate_baton_kit //DesolateG: Michael steampunk_witch
+/obj/item/device/fluff/desolate_coat_kit //DesolateG: Michael Smith
+	name = "armored jacket conversion kit"
+	desc = "Flaps of dark fabric, probably used to somehow modify some sort of an armored garment. Won't help with protection, though."
+	icon_state = "modkit"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/device/fluff/desolate_coat_kit/afterattack(atom/target, mob/user, proximity)
+	if(!proximity || !ishuman(user) || user.incapacitated())
+		return
+
+	if(!istype(target, /obj/item/clothing/suit/armor/hos))
+		to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
+		return
+
+	to_chat(user, "<span class='notice'>You modify the appearance of [target].</span>")
+	var/obj/item/clothing/suit/armor/jacket = target
+	jacket.icon_state = "desolate_coat_open"
+	jacket.icon = 'icons/obj/custom_items.dmi'
+	jacket.ignore_suitadjust = 0
+	jacket.suit_adjusted = 1
+	var/has_action = FALSE
+	for(var/datum/action/A in jacket.actions)
+		if(istype(A, /datum/action/item_action/openclose))
+			has_action = TRUE
+	if(!has_action)
+		new /datum/action/item_action/openclose(jacket)//this actually works
+	jacket.adjust_flavour = "unbutton"
+	jacket.species_fit = null
+	jacket.sprite_sheets = null
+	user.update_inv_wear_suit()
+	qdel(src)
+
+/obj/item/device/fluff/desolate_baton_kit //DesolateG: Michael Smith
 	name = "stun baton converstion kit"
 	desc = "Some sci-fi looking parts for a stun baton."
 	icon = 'icons/obj/custom_items.dmi'
@@ -647,6 +679,43 @@
 	species_fit = null
 	sprite_sheets = null
 
+/obj/item/clothing/suit/jacket/miljacket/patch // sniper_fairy : P.A.T.C.H.
+	name = "custom purple military jacket"
+	desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one has a medical patch on it."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "shazjacket_purple_open"
+	ignore_suitadjust = 0
+	suit_adjusted = 1
+	actions_types = list(/datum/action/item_action/openclose)
+	adjust_flavour = "unbutton"
+
+/obj/item/clothing/suit/jacket/miljacket/patch/attack_self(mob/user)
+	var/list/options = list()
+	options["purple"] = "shazjacket_purple"
+	options["yellow"] = "shazjacket_yellow"
+	options["blue"] = "shazjacket_blue"
+	options["brown"] = "shazjacket_brown"
+	options["orange"] = "shazjacket_orange"
+	options["grey"] = "shazjacket_grey"
+	options["black"] ="shazjacket_black"
+	options["red"] ="shazjacket_red"
+	options["navy"] ="shazjacket_navy"
+	options["white"] ="shazjacket_white"
+
+	var/choice = input(user, "What color do you wish your jacket to be?", "Change color") as null|anything in options
+
+	if(choice && !user.stat && in_range(user, src))
+		if(suit_adjusted)
+			icon_state = "[options[choice]]_open"
+		else
+			icon_state = options[choice]
+		to_chat(user, "You turn your coat inside out and now it's [choice]!")
+		name = "custom [choice] military jacket"
+		user.update_inv_wear_suit()
+		return 1
+
+	. = ..()
+
 /obj/item/clothing/suit/fluff/dusty_jacket //ComputerlessCitizen: Screech
 	name = "Dusty Jacket"
 	desc = "A worn leather jacket. Some burn holes have been patched."
@@ -730,6 +799,17 @@
 /obj/item/clothing/head/hood/fluff/linda //Epic_Charger: Linda Clark
 	icon_state = "greenhood"
 
+/obj/item/clothing/suit/hooded/hoodie/hylo //Hylocereus: Sam Aria
+	name = "worn assymetrical hoodie"
+	desc = "A soft, cozy longline hoodie. It looks old and worn, but well cared for. There's no label, but a series of dates and names is penned on a scrap of fabric sewn on the inside of the left side of the chest - 'Sam Aria' is scrawled atop them all, next to the words 'Please Remember'."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "sam_hoodie"
+	hoodtype = /obj/item/clothing/head/hood/hylo
+
+/obj/item/clothing/head/hood/hylo
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "sam_hood"
+
 /obj/item/clothing/suit/hooded/fluff/bone //Doru7: Jack Bone
 	name = "skeleton suit"
 	desc = "A spooky full-body suit! This one doesn't glow in the dark."