diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index e14a7c0b16e..d69ca891c0f 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -41,6 +41,7 @@
name = "prototype energy gun"
desc = "NT-P:01 Prototype Energy Gun. Early stage development of a unique laser rifle that has multifaceted energy lens allowing the gun to alter the form of projectile it fires on command."
icon_state = "protolaser"
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
ammo_x_offset = 2
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/electrode/old)
@@ -54,6 +55,7 @@
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
w_class = WEIGHT_CLASS_NORMAL
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos)
@@ -67,6 +69,7 @@
inhand_icon_state = "dragnet"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
w_class = WEIGHT_CLASS_NORMAL
can_flashlight = FALSE
@@ -83,6 +86,7 @@
icon_state = "turretlaser"
inhand_icon_state = "turretlaser"
slot_flags = null
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
w_class = WEIGHT_CLASS_HUGE
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
weapon_weight = WEAPON_HEAVY
@@ -95,6 +99,7 @@
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
icon_state = "nucgun"
inhand_icon_state = "nucgun"
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
charge_delay = 10
pin = null
can_charge = FALSE
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index a289db27773..7c546153219 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -12,6 +12,7 @@
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
clumsy_check = FALSE
item_flags = NONE
@@ -20,6 +21,7 @@
name ="retro laser gun"
icon_state = "retro"
desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
ammo_x_offset = 3
/obj/item/gun/energy/laser/retro/old
@@ -27,6 +29,7 @@
icon_state = "retro"
desc = "First generation lasergun, developed by Nanotrasen. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate. You really hope someone has developed a better lasergun while you were in cryo."
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old)
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
ammo_x_offset = 3
/obj/item/gun/energy/laser/hellgun
@@ -45,6 +48,7 @@
ammo_x_offset = 3
selfcharge = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
/obj/item/gun/energy/laser/captain/scattershot
name = "scatter shot laser rifle"
@@ -66,6 +70,7 @@
name = "scatter laser gun"
desc = "A laser gun equipped with a refraction kit that spreads bolts."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
/obj/item/gun/energy/laser/scatter/shotty
name = "energy shotgun"
@@ -76,6 +81,7 @@
shaded_charge = 0
pin = /obj/item/firing_pin/implant/mindshield
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter/disabler, /obj/item/ammo_casing/energy/electrode)
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
///Laser Cannon
@@ -118,7 +124,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/xray)
pin = null
ammo_x_offset = 3
-
+ cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
////////Laser Tag////////////////////
/obj/item/gun/energy/laser/bluetag
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/energy.dm b/modular_skyrat/modules/gunsgalore/code/guns/energy.dm
new file mode 100644
index 00000000000..94111da9a35
--- /dev/null
+++ b/modular_skyrat/modules/gunsgalore/code/guns/energy.dm
@@ -0,0 +1,20 @@
+/obj/item/gun/energy/laser
+ name = "laser carbine"
+ desc = "An energy-based laser carbine that fires concentrated beams of light which pass through glass and thin metal."
+ cell_type = /obj/item/stock_parts/cell/upgraded //2500 now.
+
+/obj/item/gun/energy/e_gun
+ name = "energy carbine"
+ desc = "A basic hybrid energy carbine with two settings: disable and kill."
+ cell_type = /obj/item/stock_parts/cell/upgraded //2500 now.
+
+/obj/projectile/beam/laser/accelerator
+ damage = 30
+
+/obj/item/gun/energy/lasercannon/afterattack(atom/target, mob/living/user, flag, params)
+ playsound(src, 'modular_skyrat/modules/gunsgalore/sound/guns/fire/laser_cannon_charge.ogg', fire_sound_volume)
+ to_chat(user, "You begin charging up a shot!")
+ if(!do_after(user, 6))
+ to_chat(user, "You fail to fire the shot!")
+ return
+ . = ..()
diff --git a/modular_skyrat/modules/gunsgalore/sound/guns/fire/laser_cannon_charge.ogg b/modular_skyrat/modules/gunsgalore/sound/guns/fire/laser_cannon_charge.ogg
new file mode 100644
index 00000000000..0b9abaa90e4
Binary files /dev/null and b/modular_skyrat/modules/gunsgalore/sound/guns/fire/laser_cannon_charge.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 7944a0ca787..3b44df48d16 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3492,6 +3492,7 @@
#include "modular_skyrat\modules\gunpoint\code\datum\gunpoint\gunpoint_radial.dm"
#include "modular_skyrat\modules\gunsafety\code\gun_safety.dm"
#include "modular_skyrat\modules\gunsgalore\code\ammo\ammo.dm"
+#include "modular_skyrat\modules\gunsgalore\code\guns\energy.dm"
#include "modular_skyrat\modules\gunsgalore\code\guns\master.dm"
#include "modular_skyrat\modules\gunsgalore\code\guns\akm\akm.dm"
#include "modular_skyrat\modules\gunsgalore\code\guns\fg42\fg42.dm"