diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm
index 2393323a439..d7c97b31925 100644
--- a/code/game/objects/items/devices/lighting/flashlight.dm
+++ b/code/game/objects/items/devices/lighting/flashlight.dm
@@ -38,8 +38,6 @@
 	var/always_on = FALSE
 	/// How efficient the flashlight is at producing light compared to baseline
 	var/efficiency_modifier = 1.0
-	/// A way for mappers to force which way a flashlight faces upon spawning
-	var/spawn_dir
 
 /obj/item/flashlight/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
@@ -82,6 +80,11 @@
 	QDEL_NULL(cell)
 	return ..()
 
+/obj/item/flashlight/dropped(mob/user)
+	. = ..()
+	if(user?.dir)
+		set_dir(user.dir)
+
 /obj/item/flashlight/get_cell()
 	return cell
 
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 01b1732eedd..c0cd8b186a3 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -24,6 +24,11 @@
 	drop_sound = 'sound/items/drop/helm.ogg'
 	pickup_sound = 'sound/items/pickup/helm.ogg'
 
+/obj/item/clothing/head/hardhat/dropped(mob/user)
+	. = ..()
+	if(user?.dir)
+		set_dir(user.dir)
+
 /obj/item/clothing/head/hardhat/orange
 	icon_state = "hardhat_orange"
 	item_state = "hardhat_orange"
diff --git a/html/changelogs/kano-dot-light-directions.yml b/html/changelogs/kano-dot-light-directions.yml
new file mode 100644
index 00000000000..3dcb9232aee
--- /dev/null
+++ b/html/changelogs/kano-dot-light-directions.yml
@@ -0,0 +1,6 @@
+author: Kano
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed flashlights not lighting the direction they're supposed to when dropped."