From 4e69dda3dd85032ea3fdfb5fd0f1c209bca33e4b Mon Sep 17 00:00:00 2001
From: XeonMations <62395746+XeonMations@users.noreply.github.com>
Date: Fri, 28 Jun 2024 16:22:02 +0300
Subject: [PATCH] bug fix done (#11124)

---
 code/game/objects/items/devices/explosive_flashbulb.dm | 3 +++
 code/modules/assembly/flash.dm                         | 2 +-
 code/modules/uplink/uplink_items.dm                    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/devices/explosive_flashbulb.dm b/code/game/objects/items/devices/explosive_flashbulb.dm
index 9a3831c52f28c..1997206bad683 100644
--- a/code/game/objects/items/devices/explosive_flashbulb.dm
+++ b/code/game/objects/items/devices/explosive_flashbulb.dm
@@ -1,3 +1,6 @@
+/obj/item/assembly/flash/bomb
+	bulb = /obj/item/flashbulb/bomb
+
 /obj/item/flashbulb/bomb
 	name = "suspicious flashbulb"
 	desc = "A powerful flashbulb that looks slightly off, with strange wires running out the back."
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index aad68a0de592c..804c52dda0ec4 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -105,7 +105,7 @@
 
 /obj/item/assembly/flash/Initialize(mapload)
 	. = ..()
-	bulb = new bulb
+	bulb = new bulb(src)
 
 /obj/item/assembly/flash/examine(mob/user)
 	. = ..()
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 06040890222fe..1135654c072ca 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1393,9 +1393,9 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
 	purchasable_from = (UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
 
 /datum/uplink_item/explosives/explosive_flashbulbs
-	name = "Explosive Flashbulb"
-	desc = "A flashbulb stuffed with explosives that when used by an oblivious security officers, will cause a violent explosion."
-	item = /obj/item/flashbulb/bomb
+	name = "Explosive Flash"
+	desc = "A flash with a bulb stuffed with explosives that when used by an oblivious security officers, will cause a violent explosion."
+	item = /obj/item/assembly/flash/bomb
 	cost = 1
 	surplus = 8