From 682a00b768e59b03c43789abc94f6fc12878323e Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sun, 23 Apr 2017 01:35:43 -0500
Subject: [PATCH] Greyscale lighters no longer color the flame (#517)

---
 .../objects/items/weapons/cigs_lighters.dm    |  31 +++++++++++-------
 icons/obj/cigarettes.dmi                      | Bin 7830 -> 7829 bytes
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 68d4b985c3..d7ba81590e 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -475,27 +475,36 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 1500
 	resistance_flags = FIRE_PROOF
 
+/obj/item/weapon/lighter/update_icon()
+	if(lit)
+		icon_state = "[initial(icon_state)]_on"
+	else
+		icon_state = "[initial(icon_state)]"
+
+/obj/item/weapon/lighter/ignition_effect(atom/A, mob/user)
+	. = "<span class='rose'>With a single flick of their wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.</span>"
+
 /obj/item/weapon/lighter/greyscale
 	name = "cheap lighter"
 	desc = "A cheap-as-free lighter."
 	icon_state = "lighter"
 
-/obj/item/weapon/lighter/greyscale/New()
-	..()
-	var/image/I = image(icon,"lighter-overlay")
-	var/newcolor = color2hex(randomColor(1))
-	add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
+/obj/item/weapon/lighter/greyscale/Initialize()
+	. = ..()
+	add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
+	update_icon()
+
+/obj/item/weapon/lighter/greyscale/update_icon()
+	cut_overlays()
+	var/image/I = image(icon,"[initial(icon_state)]_base")
+	I.appearance_flags = RESET_COLOR //the edging doesn't change color
+	if(lit)
+		I.icon_state = "[initial(icon_state)]_on"
 	add_overlay(I)
 
 /obj/item/weapon/lighter/greyscale/ignition_effect(atom/A, mob/user)
 	. = "<span class='notice'>After some fiddling, [user] manages to light [A] with [src].</span>"
 
-/obj/item/weapon/lighter/ignition_effect(atom/A, mob/user)
-	. = "<span class='rose'>With a single flick of their wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.</span>"
-
-/obj/item/weapon/lighter/update_icon()
-	icon_state = lit ? "[icon_state]_on" : "[initial(icon_state)]"
-
 /obj/item/weapon/lighter/attack_self(mob/living/user)
 	if(user.is_holding(src))
 		if(!lit)
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 6a6c59da390d03ff2035c87b9f38d83218187fbe..76ac7bd0a8e40288d1a940d156fb0ab408a29dd2 100644
GIT binary patch
delta 400
zcmV;B0dM}6J(WF>Bms?)B_V&KsnBXWahY08J+!ZY0!hJJLZT#WV^6;WbnUvKxHphK
z<Db~Dgy-GM{s`N{K7E(Yqv@c4&BH29K2U@f3Rvf9(n@UFFy8pUgM<PWH8$MI5ac3F
z1Ue4|WNC78T+8wLT2f4Dtn5foY8!^A6wYWVxVuBrB3w8vNN*LM0+D~wB21Rnzvj-)
zp`<mzTN9vw70VylO&M_}+*x84XR6-Mp2by~Czkz6GZxbFOqQ0&51qjH5|515f3mdx
z8ijF4WVHU1CBA>l#qf%n42frO*7xj1{68_dd-j0(zo@a{uI8RN<R2cD)=7=Mh8i30
zXwQw0n1{M870!H0>ok86Qt<%_$XU+v+rqw^E&bD^>Rm^)mH8yYk}GX|IQ2@=YvPA}
z^LX;;OUtb!O=py)<@FnVv#yFr{DdkH;wWs|AYEBe_VA2Ne7PqYbzf+$p{d!no6D|d
uEMpn_Co;w(k4@&`5_ZQeY!CbN8}qfMk3-G{X8-^k!%0LzRCu$*0n!{!3(JrI

delta 400
zcmV;B0dM}5J(fL?Bms_*B_V&asnBUVahY08J+!ZYQj&tVghWZ`#-4r$*xGeNF*lGt
z<Db~Dgy-$c?f{$pE<H=<(X>#&!~H5v-cf`G3Rvf9(nzeEFx>dSgM<PW71rFz5ac3F
z1Ue4|WNC78T+8A5T2f4DtZYe8Y8(2f6wYWVxSJtq5iXn-q_YZ7fyjSo5k^bvUvX!r
zP|}#-tqD-Tisg^&ri?ff?kq8jGsn(Pp2by~Czkz6GZfPDjFy(j_pQMA5)X{lf3&pz
z8ijF4WVHUHCBA>dMgNML42fs(t>^4T{68_eIeS3;UsPCgS8-1q@(+(n>!ij`LxnYW
zwCBc0%tO_b3MW3Lb(((&sdx_s<Sb|TZDH3=mi}pS>|9H<NAp33C0E+`aO#wz*TfI|
z=JDjwmzG;en$93g%d0o~W?dDL_z6`Y#8Fr`GhAundp*)SbCyo=_{)8wwT7l9+do{^
uHDeje*gw%R9(`ys4VSPzY+$qBrC$z`r^K`^LY)8r9K%UOK~%HC0n;3eY{zH-