diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index d2c414b131c..e495a7398ed 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -172,11 +172,11 @@ obj/item/ammo_casing/energy/net
 /obj/item/ammo_casing/energy/instakill/red
 	projectile_type = /obj/item/projectile/beam/instakill/red
 
-/obj/item/ammo_casing/energy/shock_revolver
+/obj/item/ammo_casing/energy/tesla_revolver
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	e_cost = 200
 	select_name = "stun"
-	projectile_type = /obj/item/projectile/energy/shock_revolver
+	projectile_type = /obj/item/projectile/energy/tesla_revolver
 
 /obj/item/ammo_casing/energy/gravityrepulse
 	projectile_type = /obj/item/projectile/gravityrepulse
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index be0ba75daaf..e80ea7e574f 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -7,12 +7,12 @@
 	origin_tech = "combat=3"
 	ammo_x_offset = 3
 
-/obj/item/weapon/gun/energy/shock_revolver
+/obj/item/weapon/gun/energy/tesla_revolver
 	name = "tesla gun"
 	desc = "An experimental gun based on an experimental engine, it's about as likely to kill it's operator as it is the target."
 	icon_state = "tesla"
 	item_state = "tesla"
-	ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
+	ammo_type = list(/obj/item/ammo_casing/energy/tesla_revolver)
 	origin_tech = "combat=4;materials=4;powerstorage=4"
 	can_flashlight = 0
 	pin = null
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index a4830b7c28d..2cb6f9312e8 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -165,22 +165,23 @@
 /obj/item/projectile/energy/bolt/large
 	damage = 20
 
-/obj/item/projectile/energy/shock_revolver
-	name = "shock bolt"
-	icon_state = "purple_laser"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/purple_laser
+/obj/item/projectile/energy/tesla_revolver
+	name = "tesla bolt"
+	icon_state = "tesla_projectile"
+	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
 	var/chain
 
-/obj/item/projectile/energy/shock_revolver/fire(setAngle)
+/obj/item/projectile/energy/tesla_revolver/fire(setAngle)
 	if(firer)
 		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
 	..()
 
-/obj/item/projectile/energy/shock_revolver/on_hit(atom/target)
+/obj/item/projectile/energy/tesla_revolver/on_hit(atom/target)
 	. = ..()
 	if(isliving(target))
 		tesla_zap(src, 3, 10000)
+	qdel(src)
 
-/obj/item/projectile/energy/shock_revolver/Destroy()
+/obj/item/projectile/energy/tesla_revolver/Destroy()
 	qdel(chain)
 	return ..()
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 05fcc6cde92..23fb9ac565f 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -29,7 +29,7 @@
 	req_tech = list("combat" = 4, "materials" = 4, "powerstorage" = 5)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 10000, MAT_GLASS = 10000, MAT_SILVER = 10000)
-	build_path = /obj/item/weapon/gun/energy/shock_revolver
+	build_path = /obj/item/weapon/gun/energy/tesla_revolver
 	category = list("Weapons")
 
 /datum/design/nuclear_gun
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 74660a09e4a..bdefb354d77 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ