From f5dc81d2476bb8bf5cac28e132b6ae3333931513 Mon Sep 17 00:00:00 2001
From: Casper3667 <CasperMC@hotmail.dk>
Date: Wed, 7 Jul 2021 03:30:21 +0200
Subject: [PATCH] Minor torch upgrade (#12134)

---
 .../objects/items/devices/lighting/flare.dm   | 21 +++++++++++++++++++
 html/changelogs/TorchLight.yml                |  6 ++++++
 2 files changed, 27 insertions(+)
 create mode 100644 html/changelogs/TorchLight.yml

diff --git a/code/game/objects/items/devices/lighting/flare.dm b/code/game/objects/items/devices/lighting/flare.dm
index e4cdb850f1e..21d9a6db841 100644
--- a/code/game/objects/items/devices/lighting/flare.dm
+++ b/code/game/objects/items/devices/lighting/flare.dm
@@ -74,6 +74,9 @@
 	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 
 /obj/item/device/flashlight/flare/torch/attack_self(mob/user)
+	if (on)
+		turn_off()
+		user.visible_message("<b>[user]</b> extinguishes \the [src].", SPAN_NOTICE("You extinguish \the [src]."))
 	return
 
 /obj/item/device/flashlight/flare/torch/update_icon()
@@ -99,6 +102,24 @@
 	else
 		..()
 
+/obj/item/device/flashlight/flare/torch/isFlameSource()
+	return on
+
+/obj/item/device/flashlight/flare/torch/process()
+	var/turf/pos = get_turf(src)
+	if(pos)
+		pos.hotspot_expose(produce_heat, 5)
+	fuel = max(fuel - 1, 0)
+	if(!fuel || !on)
+		turn_off()
+		STOP_PROCESSING(SSprocessing, src)
+		if(!fuel)
+			var/obj/item/torch/T = new(pos)
+			if(ismob(src.loc))
+				var/mob/H = src.loc
+				H.put_in_hands(T)
+			qdel(src)
+
 /obj/item/torch
 	name = "torch handle"
 	desc = "A torch handle without its head."
diff --git a/html/changelogs/TorchLight.yml b/html/changelogs/TorchLight.yml
new file mode 100644
index 00000000000..a3f39ceda07
--- /dev/null
+++ b/html/changelogs/TorchLight.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - rscadd: "Lit torches can now be used to ignite stuff, be extinguished by using it in hand and reused."