From a7aa71e7ad7b7aa228c2f8133ef25e6ae9e0e361 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Sun, 29 Mar 2020 16:15:49 -0400
Subject: [PATCH] Fix matches and SSobj/SSprocessing

---
 code/game/objects/items/weapons/cigs_lighters.dm |  9 +++++++++
 code/game/objects/items/weapons/storage/boxes.dm | 10 +++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 70a9110215..f3df3c914b 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -60,6 +60,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			burn_out()
 	return ..()
 
+/obj/item/weapon/flame/match/proc/light(var/mob/user)
+	playsound(src, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
+	lit = 1
+	damtype = "burn"
+	icon_state = "match_lit"
+	name = "burning match"
+	desc = "A match. This one is presently on fire."
+	START_PROCESSING(SSobj, src)
+
 /obj/item/weapon/flame/match/proc/burn_out()
 	lit = 0
 	burnt = 1
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 447678a2c9..346f8baa65 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -408,17 +408,13 @@
 	can_hold = list(/obj/item/weapon/flame/match)
 	starts_with = list(/obj/item/weapon/flame/match = 10)
 
-/obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
+/obj/item/weapon/storage/box/matches/attackby(var/obj/item/weapon/flame/match/W, var/mob/user)
 	if(istype(W) && !W.lit && !W.burnt)
 		if(prob(25))
-			playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
+			W.light(user)
 			user.visible_message("<span class='notice'>[user] manages to light the match on the matchbox.</span>")
-			W.lit = 1
-			W.damtype = "burn"
-			W.icon_state = "match_lit"
-			START_PROCESSING(SSprocessing, W)
 		else
-			playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
+			playsound(src, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
 	W.update_icon()
 	return