diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index df00f0bd779..b2c96c0aa91 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -17,12 +17,6 @@ datum/objective_item/steal/caplaser
 	difficulty = 5
 	excludefromjob = list("Captain")
 
-datum/objective_item/steal/hospistol
-	name = "the head of security's stun pistol"
-	targetitem = /obj/item/weapon/gun/energy/hospistol
-	difficulty = 6
-	excludefromjob = list("Head of Security")
-
 datum/objective_item/steal/handtele
 	name = "a hand teleporter"
 	targetitem = /obj/item/weapon/hand_tele
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 81b6e80f16a..f353cc8d27c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -50,10 +50,10 @@
 	new /obj/item/weapon/storage/box/ids(src)
 	new /obj/item/device/megaphone/command(src)
 	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/weapon/gun/energy/gun(src)
 	new /obj/item/device/flash/handheld(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/weapon/mining_voucher(src)
+	new /obj/item/weapon/gun/energy/gun(src)
 	return
 
 
@@ -86,7 +86,7 @@
 	new /obj/item/clothing/mask/gas/sechailer/swat(src)
 	new /obj/item/weapon/shield/riot/tele(src)
 	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/gun/energy/hospistol(src)
+	new /obj/item/weapon/gun/energy/gun/advtaser(src)
 	new /obj/item/weapon/storage/belt/security/full(src)
 	return
 
@@ -117,8 +117,8 @@
 	new /obj/item/tapeproj/security(src)
 	new /obj/item/weapon/reagent_containers/spray/pepper(src)
 	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/gun/energy/gun/advtaser(src)
 	new /obj/item/weapon/storage/belt/security/full(src)
+	new /obj/item/weapon/gun/energy/gun/advtaser(src)
 	return
 
 
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index b389b18034f..902a3b81715 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -61,7 +61,6 @@
 /obj/item/ammo_casing/energy/electrode/gun
 	fire_sound = 'sound/weapons/gunshot.ogg'
 	e_cost = 100
-	delay = 0
 
 /obj/item/ammo_casing/energy/ion
 	projectile_type = /obj/item/projectile/ion
@@ -117,10 +116,6 @@
 	e_cost = 50
 	fire_sound = "sound/weapons/taser2.ogg"
 
-/obj/item/ammo_casing/energy/disabler/gun
-	e_cost = 40
-	fire_sound = 'sound/weapons/gunshot.ogg'
-
 /obj/item/ammo_casing/energy/wormhole
 	projectile_type = /obj/item/projectile/beam/wormhole
 	e_cost = 0
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index ada98ef6ec2..cb4b69fe95c 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -20,7 +20,6 @@
 	var/lightfail = 0
 	var/charge_tick = 0
 	modifystate = 0
-	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
 	can_flashlight = 0
 	pin = null
 
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 879a421cb09..413dff9ad14 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -6,19 +6,11 @@
 	item_state = null	//so the human update icon uses the icon_state instead.
 	ammo_type = list(/obj/item/ammo_casing/energy/electrode)
 
-/obj/item/weapon/gun/energy/hospistol
-	name = "stun pistol"
-	desc = "A high-tech handgun that fires reusable stun cartridges in an internal magazine. The prize of the Head of Security."
-	icon_state = "hospistol"
-	ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
-	can_flashlight = 0
-	pin = /obj/item/device/firing_pin/implant/loyalty
-
 /obj/item/weapon/gun/energy/stunrevolver
 	name = "stun revolver"
-	desc = "A high-tech revolver that fires internal, reusable disabler cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
+	desc = "A high-tech revolver that fires internal, reusable taser cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
 	icon_state = "stunrevolver"
-	ammo_type = list(/obj/item/ammo_casing/energy/disabler/gun)
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
 	can_flashlight = 0
 	pin = null
 
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 1035f081e09..62aca6fca2a 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -24,7 +24,7 @@
 
 /datum/design/stunrevolver
 	name = "Stun Revolver"
-	desc = "A high-tech revolver that fires internal, reusable disabler cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
+	desc = "A high-tech revolver that fires internal, reusable taser cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
 	id = "stunrevolver"
 	req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
 	build_type = PROTOLATHE
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 839f4471beb..cfd8d30c0d9 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ