From f555d6b281b62b929b449a43affe60b7560d6974 Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Fri, 6 Feb 2026 21:41:57 +0100
Subject: [PATCH] Fixes several in-hand lights (#21811)

The in-hand sprites of a lot of handheld lights now exist again.
Torches, flares and marshal wands also now correctly give a light all
around, instead of directional.
---
 code/game/machinery/floodlight.dm                          | 2 +-
 code/game/objects/items/devices/lighting/flare.dm          | 1 +
 code/game/objects/items/devices/lighting/flashlight.dm     | 1 +
 .../objects/items/devices/lighting/marshalling_wand.dm     | 1 +
 html/changelogs/FixTheLights.yml                           | 7 +++++++
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/FixTheLights.yml

diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 9bc90e40e1c..d30535a9705 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -6,7 +6,7 @@
 	icon_state = "flood00"
 	density = TRUE
 	obj_flags = OBJ_FLAG_ROTATABLE
-	light_system = MOVABLE_LIGHT
+	light_system = DIRECTIONAL_LIGHT
 	light_range = 6
 	light_color = LIGHT_COLOR_TUNGSTEN
 
diff --git a/code/game/objects/items/devices/lighting/flare.dm b/code/game/objects/items/devices/lighting/flare.dm
index e687d3d83d3..1a1099e7052 100644
--- a/code/game/objects/items/devices/lighting/flare.dm
+++ b/code/game/objects/items/devices/lighting/flare.dm
@@ -16,6 +16,7 @@
 	toggle_sound = null
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
+	light_system = MOVABLE_LIGHT
 
 /obj/item/flashlight/flare/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm
index 0d9dface53c..27ac603d95f 100644
--- a/code/game/objects/items/devices/lighting/flashlight.dm
+++ b/code/game/objects/items/devices/lighting/flashlight.dm
@@ -7,6 +7,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
+	contained_sprite = TRUE
 	light_color = LIGHT_COLOR_HALOGEN
 	light_system = DIRECTIONAL_LIGHT
 	light_range = 4
diff --git a/code/game/objects/items/devices/lighting/marshalling_wand.dm b/code/game/objects/items/devices/lighting/marshalling_wand.dm
index 35df848e24b..b538b1ac48b 100644
--- a/code/game/objects/items/devices/lighting/marshalling_wand.dm
+++ b/code/game/objects/items/devices/lighting/marshalling_wand.dm
@@ -4,6 +4,7 @@
 	icon_state = "marshallingwand"
 	item_state = "marshallingwand"
 	w_class = WEIGHT_CLASS_SMALL
+	light_system = MOVABLE_LIGHT
 	light_color = LIGHT_COLOR_RED
 	light_range = 2
 	action_button_name = "Toggle Marshalling Wands"
diff --git a/html/changelogs/FixTheLights.yml b/html/changelogs/FixTheLights.yml
new file mode 100644
index 00000000000..8926aea80d0
--- /dev/null
+++ b/html/changelogs/FixTheLights.yml
@@ -0,0 +1,7 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes several light in-hand sprites."
+  - bugfix: "Fixes the directional glow to be a radius instead for the torch, flare and marshal wand."