From 46b5f36ec9170c709265feb58ab265a3997d521d Mon Sep 17 00:00:00 2001
From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:08:05 -0400
Subject: [PATCH] Shotgun change (#29670)

---
 .../mob/living/silicon/robot/robot_modules.dm       |  2 +-
 code/modules/projectiles/ammunition/energy_lens.dm  |  3 +++
 code/modules/projectiles/guns/energy/energy.dm      | 13 +++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 5f5d771303b..3a85d68884b 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -638,7 +638,7 @@
 	)
 	emag_override_modules = list(/obj/item/reagent_containers/drinks/bottle/beer/sleepy_beer)
 	emag_modules = list(/obj/item/restraints/handcuffs/cable/zipties/cyborg, /obj/item/instrument/guitar/cyborg)
-	malf_modules = list(/obj/item/gun/projectile/shotgun/automatic/combat/cyborg)
+	malf_modules = list(/obj/item/gun/energy/gun/shotgun/cyborg)
 	special_rechargables = list(
 		/obj/item/reagent_containers/condiment/enzyme,
 		/obj/item/reagent_containers/drinks/bottle/beer/sleepy_beer,
diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm
index 556d8eb9af7..5d6dbf81a75 100644
--- a/code/modules/projectiles/ammunition/energy_lens.dm
+++ b/code/modules/projectiles/ammunition/energy_lens.dm
@@ -51,6 +51,9 @@
 	select_name = "kill"
 	delay = 1 SECONDS
 
+/obj/item/ammo_casing/energy/laser/eshotgun/cyborg
+	e_cost = 500
+
 /obj/item/ammo_casing/energy/laser/heavy
 	projectile_type = /obj/item/projectile/beam/laser/heavylaser
 	select_name = "anti-vehicle"
diff --git a/code/modules/projectiles/guns/energy/energy.dm b/code/modules/projectiles/guns/energy/energy.dm
index 7a6253e50bc..3ef14b8ccd6 100644
--- a/code/modules/projectiles/guns/energy/energy.dm
+++ b/code/modules/projectiles/guns/energy/energy.dm
@@ -265,6 +265,19 @@
 	. += "This scatter-beam technology allows for more energy output per trigger pull, however the increased heat on the focusing lens has resulted in a decreased fire rate compared to the standard fare. \
 	It is a Nanotrasen officer's best friend, allowing them to stop crime one trigger pull at a time."
 
+/obj/item/gun/energy/gun/shotgun/cyborg
+	name = "Energy Scatterbeam"
+	desc = "An energy emitter that fires spread-fire laser shells."
+	icon_state = "eshotgun"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/eshotgun/cyborg)
+
+/obj/item/gun/energy/gun/shotgun/newshot()
+	..()
+	robocharge()
+
+/obj/item/gun/energy/emitter/gun/shotgun/emp_act()
+	return
+
 // MARK: FAKE ENERGY GUN
 /obj/item/gun/energy/gun/fake
 	name = "replica EG-7 energy gun"