diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm
index bae6b7e1f9e..6be52895139 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm
@@ -18820,11 +18820,11 @@
 "fAo" = (
 /obj/structure/table/wood,
 /obj/item/clothing/under/suit/red,
-/obj/item/candle{
+/obj/item/flashlight/flare/candle{
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/obj/item/candle{
+/obj/item/flashlight/flare/candle{
 	pixel_x = 8;
 	pixel_y = 4
 	},
@@ -30685,7 +30685,7 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos/mix)
 "jew" = (
-/obj/item/candle{
+/obj/item/flashlight/flare/candle{
 	pixel_x = -7;
 	pixel_y = 3
 	},
@@ -37010,7 +37010,7 @@
 /area/mine/living_quarters)
 "kYE" = (
 /obj/structure/table,
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "kYF" = (
@@ -42739,7 +42739,7 @@
 	pixel_x = -1;
 	pixel_y = 6
 	},
-/obj/item/candle/infinite{
+/obj/item/flashlight/flare/candle/infinite{
 	pixel_x = -11;
 	pixel_y = 11
 	},
diff --git a/_maps/map_files/MetaStation/MetaStation_bubber.dmm b/_maps/map_files/MetaStation/MetaStation_bubber.dmm
index 5d7bc529e5d..abeae3d810d 100644
--- a/_maps/map_files/MetaStation/MetaStation_bubber.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_bubber.dmm
@@ -7916,7 +7916,7 @@
 "cUp" = (
 /obj/structure/table,
 /obj/item/plate,
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/radio{
 	desc = "An old handheld radio. You could use it, if you really wanted to.";
@@ -43332,7 +43332,7 @@
 /area/station/command/gateway)
 "pig" = (
 /obj/structure/table,
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
@@ -47453,7 +47453,7 @@
 /turf/open/floor/plating,
 /area/station/maintenance/aft/greater)
 "qER" = (
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /obj/machinery/light_switch/directional/west,
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/table/wood,
@@ -60915,7 +60915,7 @@
 /turf/open/floor/iron/dark,
 /area/station/security/evidence)
 "vhE" = (
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /obj/machinery/light_switch/directional/north,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/table/wood,
@@ -67472,7 +67472,7 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/box/lights/mixed,
 /obj/item/cigbutt/cigarbutt,
-/obj/item/candle{
+/obj/item/flashlight/flare/candle{
 	pixel_x = -5
 	},
 /obj/item/storage/box/matches{
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
index 3b266a869f7..185179e79d5 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
@@ -33093,11 +33093,11 @@
 /area/station/cargo/storage)
 "jxh" = (
 /obj/structure/table/wood/fancy,
-/obj/item/candle{
+/obj/item/flashlight/flare/candle{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/candle{
+/obj/item/flashlight/flare/candle{
 	pixel_x = -8;
 	pixel_y = 6
 	},
@@ -33105,7 +33105,7 @@
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /turf/open/floor/carpet/stellar,
 /area/station/service/chapel/funeral)
 "jxp" = (
@@ -51089,7 +51089,7 @@
 "omw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/crew_quarters/bar)
 "omB" = (
@@ -83808,7 +83808,7 @@
 "xnZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/random/structure/table,
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /obj/effect/spawner/random/entertainment/lighter{
 	pixel_x = 9
 	},
diff --git a/_maps/map_files/tramstation/tramstation_bubber.dmm b/_maps/map_files/tramstation/tramstation_bubber.dmm
index c5f89761ab5..3b9713115fe 100644
--- a/_maps/map_files/tramstation/tramstation_bubber.dmm
+++ b/_maps/map_files/tramstation/tramstation_bubber.dmm
@@ -6909,7 +6909,7 @@
 /area/station/commons/lounge)
 "cxd" = (
 /obj/structure/table/wood,
-/obj/item/candle,
+/obj/item/flashlight/flare/candle,
 /turf/open/floor/iron/chapel{
 	dir = 4
 	},