diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index a4d771aa81e..487efefe076 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -12,6 +12,7 @@
 	w_class = 3
 	origin_tech = list(TECH_COMBAT = 2)
 	attack_verb = list("beaten")
+	var/lightcolor = "#FF6A00"
 	var/stunforce = 0
 	var/agonyforce = 60
 	var/status = 0		//whether the thing is on or not
@@ -52,7 +53,7 @@
 		icon_state = "[initial(name)]"
 
 	if(icon_state == "[initial(name)]_active")
-		set_light(1.5, 1, "#FF6A00")
+		set_light(1.5, 1, lightcolor)
 	else
 		set_light(0)
 
diff --git a/code/modules/xenobio2/tools/slime_handling_tools.dm b/code/modules/xenobio2/tools/slime_handling_tools.dm
index dcd8740e447..b8f37a106f0 100644
--- a/code/modules/xenobio2/tools/slime_handling_tools.dm
+++ b/code/modules/xenobio2/tools/slime_handling_tools.dm
@@ -8,31 +8,38 @@
 	
 */
 /obj/item/weapon/melee/baton/slime
-	name = "stunbaton (s)"
+	name = "slimebaton"
 	desc = "A modified stun baton designed to stun slimes for handling."
 	icon_state = "slimebaton"
 	item_state = "slimebaton"
 	slot_flags = SLOT_BELT
 	force = 9
+	lightcolor = "#33CCFF"
 	origin_tech = list(TECH_COMBAT = 2, TECH_BIO = 4)
 	agonyforce = 10	//It's not supposed to be great at stunning human beings.
-	var/stunforce = 60	//How much stasis it does to slimes, and 1/3rd to non-slimes.
+	var/stasisforce = 60	//How much stasis it does to slimes, and 1/3rd to non-slimes.
 
 /obj/item/weapon/melee/baton/slime/attack(mob/M, mob/user)
 	if(istype(M, /mob/living/simple_animal/xeno))
 		var/mob/living/simple_animal/xeno/X = M
 		if(istype(M, /mob/living/simple_animal/xeno/slime))
-			X.stasis += stunforce
+			X.stasis += stasisforce
 		else
-			X.stasis += (stunforce / 6)
+			X.stasis += (stasisforce / 6)
 	..()
 	
+/obj/item/weapon/melee/baton/slime/loaded/New()
+	..()
+	bcell = new/obj/item/weapon/cell/high(src)
+	update_icon()
+	return
+	
 	
 // Xeno stun gun + projectile
 /obj/item/weapon/gun/energy/taser/xeno
 	name = "xeno taser gun"
 	desc = "Straight out of NT's testing laboratories, this small gun is used to subdue non-humanoid xeno life forms. While marketed towards handling slimes, it may be useful for other creatures."
-	icon_state = taserold
+	icon_state = "taserold"
 	fire_sound = 'sound/weapons/taser2.ogg'
 	max_shots = 10
 	projectile_type = /obj/item/projectile/beam/stun/xeno
@@ -40,16 +47,18 @@
 /obj/item/projectile/beam/stun/xeno
 	icon_state = "omni"
 	agony = 4
-	var/stunforce = 40
+	var/stasisforce = 40
 	
 	muzzle_type = /obj/effect/projectile/laser_omni/muzzle
 	tracer_type = /obj/effect/projectile/laser_omni/tracer
 	impact_type = /obj/effect/projectile/laser_omni/impact
 	
 /obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0)
-	if(istype(M, /mob/living/simple_animal/xeno))
-		var/mob/living/simple_animal/xeno/X = M
-		if(istype(M, /mob/living/simple_animal/xeno/slime))
-			X.stasis += stunforce
+	if(istype(target, /mob/living/simple_animal/xeno))
+		var/mob/living/simple_animal/xeno/X = target
+		if(istype(target, /mob/living/simple_animal/xeno/slime))
+			X.stasis += stasisforce
 		else
-			X.stasis += (stunforce / 8)
\ No newline at end of file
+			X.stasis += (stasisforce / 8)
+	else
+		..()
\ No newline at end of file
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index bc2bfee340e..c428ddfc745 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ