diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 85b483b8363..9ef7de7f369 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -1,21 +1,22 @@
-obj/item/weapon/gun/magic/staff/
+/obj/item/weapon/gun/magic/staff
 	slot_flags = SLOT_BACK
+	ammo_type = /obj/item/ammo_casing/magic
 
-obj/item/weapon/gun/magic/staff/change
+/obj/item/weapon/gun/magic/staff/change
 	name = "staff of change"
 	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
 	ammo_type = /obj/item/ammo_casing/magic/change
 	icon_state = "staffofchange"
 	item_state = "staffofchange"
 
-obj/item/weapon/gun/magic/staff/animate
+/obj/item/weapon/gun/magic/staff/animate
 	name = "staff of animation"
 	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
 	ammo_type = /obj/item/ammo_casing/magic/animate
 	icon_state = "staffofanimation"
 	item_state = "staffofanimation"
 
-obj/item/weapon/gun/magic/staff/healing
+/obj/item/weapon/gun/magic/staff/healing
 	name = "staff of healing"
 	desc = "An artefact that spits bolts of restoring magic which can remove ailments of all kinds and even raise the dead."
 	ammo_type = /obj/item/ammo_casing/magic/heal
@@ -25,7 +26,7 @@ obj/item/weapon/gun/magic/staff/healing
 /obj/item/weapon/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves
 	return
 
-obj/item/weapon/gun/magic/staff/chaos
+/obj/item/weapon/gun/magic/staff/chaos
 	name = "staff of chaos"
 	desc = "An artefact that spits bolts of chaotic magic that can potentially do anything."
 	ammo_type = /obj/item/ammo_casing/magic/chaos
@@ -35,7 +36,7 @@ obj/item/weapon/gun/magic/staff/chaos
 	recharge_rate = 2
 	no_den_usage = 1
 
-obj/item/weapon/gun/magic/staff/door
+/obj/item/weapon/gun/magic/staff/door
 	name = "staff of door creation"
 	desc = "An artefact that spits bolts of transformative magic that can create doors in walls."
 	ammo_type = /obj/item/ammo_casing/magic/door
@@ -55,7 +56,7 @@ obj/item/weapon/gun/magic/staff/door
 	max_charges = 4
 	recharge_rate = 8
 
-obj/item/weapon/gun/magic/staff/focus
+/obj/item/weapon/gun/magic/staff/focus
 	name = "mental focus"
 	desc = "An artefact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out."
 	icon = 'icons/obj/wizard.dmi'