diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 95987ded83a..2399dc4aaba 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -128,7 +128,7 @@
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/ntcane(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded/ntcane(H.back), slot_in_backpack)
 		H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(H), slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 7bc59c018ae..06176ac83b8 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -1,5 +1,5 @@
 /obj/item/weapon/melee/baton
-	name = "stun baton"
+	name = "stunbaton"
 	desc = "A stun baton for incapacitating people with."
 	icon_state = "stunbaton"
 	item_state = "baton"
@@ -48,11 +48,11 @@
 
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
-		icon_state = "[initial(name)]_active"
+		icon_state = "[initial(icon_state)]_active"
 	else if(!bcell)
-		icon_state = "[initial(name)]_nocell"
+		icon_state = "[initial(icon_state)]_nocell"
 	else
-		icon_state = "[initial(name)]"
+		icon_state = "[initial(icon_state)]"
 
 /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user)
 	if(istype(W, /obj/item/weapon/cell))
@@ -78,6 +78,9 @@
 	return
 
 /obj/item/weapon/melee/baton/attack_self(mob/user as mob)
+	if(bcell.charge < hitcost)
+		status = 0
+		return
 	if(status && (CLUMSY in user.mutations) && prob(50))
 		user << "\red You grab the [src] on the wrong side."
 		user.Weaken(stunforce*3)
@@ -182,21 +185,12 @@
 	..()
 
 
-/obj/item/weapon/melee/baton/ntcane
+/obj/item/weapon/melee/baton/loaded/ntcane
 	name = "fancy cane"
 	desc = "A cane with special engraving on it. It has a strange button on the handle..."
 	icon_state = "cane_nt"
 	item_state = "cane_nt"
 
-
-/obj/item/weapon/melee/baton/ntcane/update_icon()
-	if(status)
-		icon_state = "cane_nt_active"
-		item_state = "cane_nt_active"
-	else
-		icon_state = "cane_nt"
-		item_state = "cane_nt"
-
 //Makeshift stun baton. Replacement for stun gloves.
 /obj/item/weapon/melee/baton/cattleprod
 	name = "stunprod"
@@ -208,3 +202,11 @@
 	stunforce = 5
 	hitcost = 2500
 	slot_flags = null
+
+/obj/item/weapon/melee/baton/cattleprod/update_icon()
+	if(status)
+		icon_state = "stunprod_active"
+	else if(!bcell)
+		icon_state = "stunprod_nocell"
+	else
+		icon_state = "stunprod"
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 c599f1c6990..487f3706663 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -214,7 +214,7 @@
 		new /obj/item/weapon/gun/projectile/revolver/detective(src)
 		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/clothing/tie/storage/black_vest(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 0be3d7fd70b..d7de8588418 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ