diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 15d78f37276..a89cfaa3f2b 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -388,6 +388,15 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	containertype = /obj/structure/closet/crate/secure/plasma
 	containername = "energy gun crate"
 
+/datum/supply_packs/security/armory/epistol	// costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person
+	name = "Energy Pistol Crate"
+	contains = list(/obj/item/weapon/gun/energy/gun/pistol,
+					/obj/item/weapon/gun/energy/gun/pistol,
+					/obj/item/weapon/gun/energy/gun/pistol)
+	cost = 15
+	containertype = /obj/structure/closet/crate/secure/plasma
+	containername = "energy gun crate"
+
 /datum/supply_packs/security/armory/eweapons
 	name = "Incendiary Weapons Crate"
 	contains = list(/obj/item/weapon/flamethrower/full,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 36ff8dc2455..b31b3f78729 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -52,7 +52,7 @@
 	new /obj/item/weapon/storage/box/ids(src)
 	new /obj/item/weapon/storage/box/PDAs(src)
 	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/weapon/gun/energy/gun(src)
+	new /obj/item/weapon/gun/energy/gun/pistol(src)
 	new /obj/item/device/flash(src)
 	new /obj/item/clothing/accessory/petcollar(src)
 	new /obj/item/weapon/door_remote/civillian(src)
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 3e4838f7e20..2070512edc2 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -47,6 +47,21 @@
 	if(gun_light && gun_light.on)
 		overlays += "mini-light"
 
+/obj/item/weapon/gun/energy/gun/pistol
+	name = "energy pistol"
+	desc = "A small, pistol-sized energy gun made to be a side arm to it's larger carbine cousin. It has two settings: stun and kill."
+	icon_state = "epistol"
+	item_state = "gun"
+	w_class = WEIGHT_CLASS_SMALL
+	ammo_x_offset = 1
+	charge_sections = 4
+	can_flashlight = 0 // Can't attach or detach a flashlight
+
+/obj/item/weapon/gun/energy/gun/pistol/New()
+	..()
+	power_supply.maxcharge = 500
+	power_supply.charge = 500
+
 /obj/item/weapon/gun/energy/gun/hos
 	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."
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 03b8eba0f8c..d8611794a40 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ