Merge pull request #6975 from Citadel-Station-13/upstream-merge-38161

[MIRROR] Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo

code/game/objects/items/cigs_lighters.dm

@@ -492,11 +492,24 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	slot_flags = ITEM_SLOT_BELT
 	var/lit = 0
 	var/fancy = TRUE
+	var/overlay_state
+	var/overlay_list = list(
+		"plain",
+		"dame",
+		"thirteen",
+		"snake"
+		)
 	heat = 1500
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
 	grind_results = list("iron" = 1, "welding_fuel" = 5, "oil" = 5)
 
+/obj/item/lighter/Initialize()
+	. = ..()
+	if(!overlay_state)
+		overlay_state = pick(overlay_list)
+	update_icon()
+
 /obj/item/lighter/suicide_act(mob/living/carbon/user)
 	if (lit)
 		user.visible_message("<span class='suicide'>[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -507,10 +520,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		return BRUTELOSS
 
 /obj/item/lighter/update_icon()
-	if(lit)
-		icon_state = "[initial(icon_state)]_on"
-	else
-		icon_state = "[initial(icon_state)]"
+	cut_overlays()
+	var/mutable_appearance/lighter_overlay = mutable_appearance(icon,"lighter_overlay_[overlay_state][lit ? "-on" : ""]")
+	icon_state = "[initial(icon_state)][lit ? "-on" : ""]"
+	add_overlay(lighter_overlay)
 
 /obj/item/lighter/ignition_effect(atom/A, mob/user)
 	if(is_hot())
@@ -597,19 +610,44 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	desc = "A cheap-as-free lighter."
 	icon_state = "lighter"
 	fancy = FALSE
+	overlay_list = list(
+		"transp",
+		"tall",
+		"matte",
+		"zoppo" //u cant stoppo th zoppo
+		)
+	var/lighter_color
+	var/list/color_list = list( //Same 16 color selection as electronic assemblies
+		COLOR_ASSEMBLY_BLACK,
+		COLOR_FLOORTILE_GRAY,
+		COLOR_ASSEMBLY_BGRAY,
+		COLOR_ASSEMBLY_WHITE,
+		COLOR_ASSEMBLY_RED,
+		COLOR_ASSEMBLY_ORANGE,
+		COLOR_ASSEMBLY_BEIGE,
+		COLOR_ASSEMBLY_BROWN,
+		COLOR_ASSEMBLY_GOLD,
+		COLOR_ASSEMBLY_YELLOW,
+		COLOR_ASSEMBLY_GURKHA,
+		COLOR_ASSEMBLY_LGREEN,
+		COLOR_ASSEMBLY_GREEN,
+		COLOR_ASSEMBLY_LBLUE,
+		COLOR_ASSEMBLY_BLUE,
+		COLOR_ASSEMBLY_PURPLE
+		)
 
 /obj/item/lighter/greyscale/Initialize()
 	. = ..()
-	add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
+	if(!lighter_color)
+		lighter_color = pick(color_list)
 	update_icon()
 
 /obj/item/lighter/greyscale/update_icon()
 	cut_overlays()
-	var/mutable_appearance/base_overlay = mutable_appearance(icon,"[initial(icon_state)]_base")
-	base_overlay.appearance_flags = RESET_COLOR //the edging doesn't change color
-	if(lit)
-		base_overlay.icon_state = "[initial(icon_state)]_on"
-	add_overlay(base_overlay)
+	var/mutable_appearance/lighter_overlay = mutable_appearance(icon,"lighter_overlay_[overlay_state][lit ? "-on" : ""]")
+	icon_state = "[initial(icon_state)][lit ? "-on" : ""]"
+	lighter_overlay.color = lighter_color
+	add_overlay(lighter_overlay)
 
 /obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user)
 	if(is_hot())
@@ -619,9 +657,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/lighter/slime
 	name = "slime zippo"
 	desc = "A specialty zippo made from slimes and industry. Has a much hotter flame than normal."
-	icon_state = "slimezippo"
+	icon_state = "slighter"
 	heat = 3000 //Blue flame!
 	light_color = LIGHT_COLOR_CYAN
+	overlay_state = "slime"
 	grind_results = list("iron" = 1, "welding_fuel" = 5, "pyroxadone" = 5)
 
 

code/game/objects/items/storage/fancy.dm

@@ -293,22 +293,24 @@
 /obj/item/storage/fancy/cigarettes/cigars/update_icon()
 	cut_overlays()
 	if(fancy_open)
-		add_overlay("[icon_state]_open")
+		icon_state = "[initial(icon_state)]_open"
 		var/mutable_appearance/cigar_overlay = mutable_appearance(icon, icon_type)
 		for(var/c = contents.len, c >= 1, c--)
-			cigar_overlay.pixel_x = 4 * (c - 1)
+			cigar_overlay.pixel_x = 3 * (c - 1)
 			add_overlay(cigar_overlay)
 	else
-		icon_state = "cigarcase"
+		icon_state = "[initial(icon_state)]"
 
 /obj/item/storage/fancy/cigarettes/cigars/cohiba
 	name = "\improper cohiba robusto cigar case"
 	desc = "A case of imported Cohiba cigars, renowned for their strong flavor."
+	icon_state = "cohibacase"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar/cohiba
 
 /obj/item/storage/fancy/cigarettes/cigars/havana
 	name = "\improper premium havanian cigar case"
 	desc = "A case of classy Havanian cigars."
+	icon_state = "cohibacase"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar/havana
 
 /*