From c402c6dc306fc44b32dfffcccdd0f05cbfa54306 Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Mon, 6 Apr 2020 13:24:52 +0300
Subject: [PATCH] Combinig
 https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/

---
 code/game/objects/items/cigs_lighters.dm   |  2 +-
 code/modules/clothing/head/misc_special.dm | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index f338c951e9..20ec57354c 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -706,7 +706,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	name = "\improper E-Cigarette"
 	desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that.
 	icon = 'icons/obj/clothing/masks.dmi'
-	icon_state = "blaVape" //We cant have a null icon state due to the vendor spritesheet
+	icon_state = "black_vape"
 	item_state = null
 	w_class = WEIGHT_CLASS_TINY
 	var/chem_volume = 100
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index d586811461..d5632a1e4c 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -187,11 +187,11 @@
 /obj/item/clothing/head/wig
 	name = "wig"
 	desc = "A bunch of hair without a head attached."
-	icon_state = "pwig"
-	item_state = "pwig"
+	icon = 'icons/mob/human_face.dmi'	  // default icon for all hairs
+	icon_state = "hair_vlong"
 	flags_inv = HIDEHAIR
+	color = "#000"
 	var/hair_style = "Very Long Hair"
-	var/hair_color = "#000"
 
 /obj/item/clothing/head/wig/Initialize(mapload)
 	. = ..()
@@ -203,14 +203,9 @@
 	if(!S)
 		icon = 'icons/obj/clothing/hats.dmi'
 		icon_state = "pwig"
-
-/obj/item/clothing/head/wig/update_overlays()
-	. = ..()
-	var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
-	if(S)
-		var/mutable_appearance/M = mutable_appearance(S.icon, S.icon_state, color = hair_color)
-		M.appearance_flags |= RESET_COLOR
-		. += M
+	else
+		icon = S.icon
+		icon_state = S.icon_state
 
 /obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
@@ -220,12 +215,12 @@
 			return
 		var/mutable_appearance/M = mutable_appearance(S.icon, S.icon_state,layer = -HAIR_LAYER)
 		M.appearance_flags |= RESET_COLOR
-		M.color = hair_color
+		M.color = color
 		. += M
 
 /obj/item/clothing/head/wig/random/Initialize(mapload)
 	hair_style = pick(GLOB.hair_styles_list - "Bald") //Don't want invisible wig
-	hair_color = "#[random_short_color()]"
+	color = "#[random_short_color()]"
 	. = ..()
 
 /obj/item/clothing/head/bronze