diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index cad329bb618..7db6f5999c9 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -325,3 +325,30 @@
 		return
 
 	..()
+
+
+/obj/item/weapons/fluff/moon_baton //Tiger Claw - Zander Moon - omnivac - DONE
+	name = "tiger claw"
+	desc = "A small energy dagger given to Golden Tigers."
+	icon = 'icons/obj/custom_items/moon_baton.dmi'
+	icon_state = "tigerclaw"
+	slot_flags = SLOT_BELT
+	force = 2
+	w_class = 2
+	contained_sprite = 1
+	var/active = 0
+
+/obj/item/weapons/fluff/moon_baton/attack_self(mob/user)
+	active= !active
+	if(active)
+		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+		user << "\blue \The [src] is now energised."
+		icon_state = "tigerclaw_active"
+		slot_flags = null
+		attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	else
+		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+		user << "\blue \The [src] is de-energised."
+		icon_state = initial(icon_state)
+		slot_flags = initial(slot_flags)
+		attack_verb = list()
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 60143e55511..48e39d42c55 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -80,7 +80,7 @@
 			var/obj/item/device/kit/suit/kit = item
 			kit.new_light_overlay = additional_data
 			kit.new_mob_icon_file = CUSTOM_ITEM_MOB
-			
+	
 	// for snowflake implants
 	else if(istype(item, /obj/item/weapon/implanter/fluff))
 		var/obj/item/weapon/implanter/fluff/L = item
diff --git a/icons/obj/custom_items/moon_baton.dmi b/icons/obj/custom_items/moon_baton.dmi
new file mode 100644
index 00000000000..f2f2a2a60b6
Binary files /dev/null and b/icons/obj/custom_items/moon_baton.dmi differ
diff --git a/icons/obj/custom_items_obj.dmi b/icons/obj/custom_items_obj.dmi
index e69de29bb2d..5d7dcd67939 100644
Binary files a/icons/obj/custom_items_obj.dmi and b/icons/obj/custom_items_obj.dmi differ