From 5acffc2e01b333f203794f98c5f961f759d9c643 Mon Sep 17 00:00:00 2001
From: alsoandanswer <wowzewow@gmail.com>
Date: Thu, 14 Nov 2019 13:04:17 +0800
Subject: [PATCH] span

---
 code/game/objects/items/weapons/candle.dm  |  10 +++++-----
 code/modules/clothing/head/misc_special.dm |   9 +++++----
 icons/obj/candle.dmi                       | Bin 1288 -> 849 bytes
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index 768444f4884..586012aaf1d 100644
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -28,22 +28,22 @@
 	if(W.iswelder())
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
-			light(span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
+			light()
+			to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
 	else if(isflamesource(W))
 		light()
+		to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 	else if(istype(W, /obj/item/weapon/flame/candle))
 		var/obj/item/weapon/flame/candle/C = W
 		if(C.lit)
 			light()
+			to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 
-
-/obj/item/weapon/flame/candle/proc/light(var/flavor_text = span("notice", "\The [usr] lights \the [name].</span>"))
+/obj/item/weapon/flame/candle/proc/light()
 	if(!src.lit)
 		src.lit = 1
 		playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
 		//src.damtype = "fire"
-		for(var/mob/O in viewers(usr, null))
-			O.show_message(flavor_text, 1)
 		set_light(CANDLE_LUM)
 		update_icon()
 		START_PROCESSING(SSprocessing, src)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 154b29de0c6..3de579c1f3e 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -187,21 +187,22 @@
 	if(W.iswelder())
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
-			light(span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
+			light()
+			to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
 	else if(isflamesource(W))
 		light()
+		to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 	else if(istype(W, /obj/item/weapon/flame/candle))
 		var/obj/item/weapon/flame/candle/C = W
 		if(C.lit)
 			light()
+			to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 
-/obj/item/clothing/head/pumpkin/lantern/proc/light(var/flavor_text = span("notice", "\The [usr] lights \the [name].</span>"))
+/obj/item/clothing/head/pumpkin/lantern/proc/light()
 	if(!src.lit)
 		src.lit = 1
 		playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
 		//src.damtype = "fire"
-		for(var/mob/O in viewers(usr, null))
-			O.show_message(flavor_text, 1)
 		set_light(CANDLE_LUM)
 		update_icon()
 		START_PROCESSING(SSprocessing, src)
diff --git a/icons/obj/candle.dmi b/icons/obj/candle.dmi
index 8206cc7312f7e853713bbe10650638a7cea97c69..817d4b9af8cf56ba36a215e1f528ac1361d9d9a1 100644
GIT binary patch
delta 728
zcmV;}0w?{53eg6TBS!!*P)t-s0001RO(mCaGcX(w$Fx|uk3By>KY$PbwE!+a00320
zRq9v(|Ah<xxIq8;%Jcvq8N1UD00001bW%=J06^y0W|QdwRsmF#KmrwiAzrC5@k)(|
zS87PSQUfBD5~++>n+@Z0GE1<l1;#{5YEEJ$NLU9$Be9`iM6LzI#)vVw7T`=B$_lQ2
zF5pB80L!Mrdg8S3Pyhe|8c9S!RCt{2n}KcuArM5p>m3}Z_5c62%Tc4I$Bq&Az-C@z
zYVznZ7;4PK9u9;MvJ=C9Jw5vI>&EzZMQi_ffQ=)x_J?7*XJbHPe;8)TJ<anx$<KLX
zKw~cp=6RGQ!!XLTtpWDlDSkb{BqPRjgu)41`n15OC8B*{z}34JJ}p>+EE#-Q3Indb
zv_baHz3yGv=LIrC9_4`9mp4d0M$J2?`RI!NI$!|-7Z7j(0b^8u1ID8Nh=Be#K=F?R
z1oR-F2LU|_IIK6!hvM77Q$9w`rvPQ20~X$9#`HeAZl9i6`Lw;_W6{e32`&%O^4J>C
z)~6LWdh`z;c)Ik25JCtc9dLa8S3$Y-CQiVY4*>hQw{SY^36G~@LfFr}h4c6MRS)~Q
zi~|Xf*Yjx}_H!$L-g$Mtp-25)CR~ELfuV=}TpqB14eY#xa%w-<LqMnXb3Fu%T0hrE
zK&4$`z<&^Mh+03_JRs`l@&FGuu=BW|%M;Z3rXKfmtzkb$2qA<JLLe0l={~&PknTf8
zL%I(Y4e4{h^Vv0|&w;Lxb%TmPSIE3UMZha!U2RlfA?tvD)mOy49ICw{4cn`yy!8g5
z(#w3WzQ&b4efzM+uk~C|1JwCY=?Ni(5JCtcgnT-!D_lhL3Kvmb;hNKXzS;`c99-d|
ziqsff;kJE+VL#_DP1`5f-(65aXbkA*g7@kFpTSoE2_b}#uJ{2wcq0g=aXJV90000<
KMNUMnLSTaJQBVf}

delta 1169
zcmV;C1aAA$28arfBYy$BP)t-s0000bB_%&UKUGy#YHDhKe}9yel&`O^+1c6u|Np#r
zcq<hZ|6pK1006&{ivO94U??Df5CF@lo^V)D|H!qENHD)J0H$d~FdPu-SO7jWEl@KX
zs(@Ahg$q|pK5$JXc4$<WZ!@r%Z~wSJxQ{)Kf@c5Xib^;DNq<5tYE=MUS2xGBSa@tF
zigp0p)0qGH%Bq<Fhk!Vej!w$J0JXJssi|TA{|k|pNzUH@b$~URwE$9AKETPKbd>;K
za3$*hsy<5}N@@VK|22uHSSUaMYm!B9-vC6l08xN7H*q8-l>jVSB@Su;6)P1SIUE2=
z0LuT^wAQ|Tw||pW|CLjsdH~;W0JU+I|KullWB`?LOKD;NYF+^J)&NRM0Lsds#mTkx
z|2Tbz0G_ouOHp>Ev})S_B3EbtaFt$;tRFf{E3f|mNp%$<D@1js04r4hfd5!#d^KL5
z08rHcC6xdPKqMeQJT+=-Vu)BeuYOs(Z598IYPFRs|4F+_|J`-}FaSU$7AZ+5PG$gg
z^Pm5DCV8I#pO-$2)d0GxRh9n>!n1dr|5d-rpS4~>Q2&a>|G(IeFi5okF0DsY^Z+03
zegdJ9YE}VIk--&zB3`L6@k&jIS87VUQUfBD66<}#_?*lV>}r8QoRXT8SP2r=!O%!-
zpc#>C0kJ`COs)mQMi4G#$_lQ2F5pB80JN6EdeK?pW&i*H0d!JMQvg8b*k%9#00Cl4
zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*HrMF-#t2^S&=T_~OI0006I
zNkl<Zc-rloL5spL5QR&6p2OVMgM?ylJ?w7{{$VFoQNhd<lQdD@2eQH!rY{D&<*_>q
z006KP{+S;A^!H%$-TBuIyxBr)KltSt-<==)EV-9?o)`H!`|i9fm}e(Tyr1Nqf9t1)
ze%-+$OQyJgg~Se9`nZ7O645R(U@y<9fPv(Uy>qDnfw+KYvV2Gf9A)}ArU%Ft49{fw
zK$h16u4n@+AIS20!0^=p*$Bu+KsExh5%BJlUlM-{n7j?pbqku00d>#xk(XcA@jkg;
zKE6wMvV0t0#mfQ-E-%sY^4<Bk;z5u8<$<S54*&pv008jY{opnZ_3~N$+%}HYHemL1
z+wz_CgooqD3C(_P6Q}=Eme&GW{oEC2CCv0%K%<{qVaMu}TyK1WYCpF^XHuu+dgX*9
zl+*gV+XaFVAk!<Ka17{_esG_F$|oEHj!HkcQ@~&ZOt)JI_zMC3sPu!k0c>0#&r{&!
zx5Vmy2k#?{+i9Mc{FDx8^>fXi2hD!2qbF88z5@UN004kaIrJXz*!c!3Hl$@XSg|23
zbVBtS(lRGhu^}yULKPd*GAC5AAuV%46&unrC)BWB+vIZxP-U<7a~pj8>%W>_@8>pn
zs_X#(00000003m-I?tEeZdJ$ZPMQY{2>A6l0bS<-jc;l5fP5zEIH24_tb&kR1|;VA
j|Ho<uw08gi0KSY127d!B2^vyp00000NkvXXu0mjfEOQ6~