Removes All Weapons

code/modules/mining/lavaland/ash_flora.dm

@@ -7,7 +7,7 @@
 	var/harvested_name = "shortened mushrooms"
 	var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large."
 	var/needs_sharp_harvest = TRUE
-	var/harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings
+	var/harvest = /obj/item/reagent_containers/food/snacks/ash_flora/shavings
 	var/harvest_amount_low = 1
 	var/harvest_amount_high = 3
 	var/harvest_time = 60
@@ -54,7 +54,7 @@
 	desc = initial(desc)
 	harvested = FALSE
 
-/obj/structure/flora/ash/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/flora/ash/attackby(obj/item/W, mob/user, params)
 	if(!harvested && needs_sharp_harvest && W.sharp)
 		user.visible_message("<span class='notice'>[user] starts to harvest from [src] with [W].</span>","<span class='notice'>You begin to harvest from [src] with [W].</span>")
 		if(do_after(user, harvest_time, target = src))
@@ -79,7 +79,7 @@
 	desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
 	harvested_name = "leafless mushrooms"
 	harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
-	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf
+	harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_leaf
 	needs_sharp_harvest = FALSE
 	harvest_amount_high = 4
 	harvest_time = 20
@@ -95,7 +95,7 @@
 	desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
 	harvested_name = "small mushrooms"
 	harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
-	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap
+	harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_cap
 	harvest_amount_high = 4
 	harvest_time = 50
 	harvest_message_low = "You slice the cap off of a mushroom."
@@ -111,7 +111,7 @@
 	luminosity = 1
 	harvested_name = "tiny mushrooms"
 	harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
-	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
+	harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_stem
 	harvest_amount_high = 4
 	harvest_time = 40
 	harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem."
@@ -126,7 +126,7 @@
 	desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
 	harvested_name = "cacti"
 	harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
-	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit
+	harvest = /obj/item/reagent_containers/food/snacks/ash_flora/cactus_fruit
 	needs_sharp_harvest = FALSE
 	harvest_amount_high = 2
 	harvest_time = 10
@@ -149,7 +149,7 @@
 			H.visible_message("<span class='danger'>[H] steps on a cactus!</span>", \
 				"<span class='userdanger'>You step on a cactus!</span>")
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora
+/obj/item/reagent_containers/food/snacks/ash_flora
 	name = "mushroom shavings"
 	desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
 	icon = 'icons/obj/lavaland/ash_flora.dmi'
@@ -157,33 +157,33 @@
 	list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
 	w_class = WEIGHT_CLASS_TINY
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/New()
+/obj/item/reagent_containers/food/snacks/ash_flora/New()
 	..()
 	pixel_x = rand(-4, 4)
 	pixel_y = rand(-4, 4)
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting
+/obj/item/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf
+/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_leaf
 	name = "mushroom leaf"
 	desc = "A leaf, from a mushroom."
 	list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
 	icon_state = "mushroom_leaf"
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap
+/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_cap
 	name = "mushroom cap"
 	desc = "The cap of a large mushroom."
 	list_reagents = list("lsd" = 2, "entpoly" = 4, "psilocybin" = 2)
 	icon_state = "mushroom_cap"
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
+/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_stem
 	name = "mushroom stem"
 	desc = "A long mushroom stem. It's slightly glowing."
 	list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
 	icon_state = "mushroom_stem"
 	luminosity = 1
 
-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit
+/obj/item/reagent_containers/food/snacks/ash_flora/cactus_fruit
 	name = "cactus fruit"
 	list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 4)
 	desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
@@ -199,7 +199,7 @@
 //what you can craft with these things
 /datum/crafting_recipe/mushroom_bowl
 	name = "Mushroom Bowl"
-	result = /obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl
-	reqs = list(/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings = 5)
+	result = /obj/item/reagent_containers/food/drinks/mushroom_bowl
+	reqs = list(/obj/item/reagent_containers/food/snacks/ash_flora/shavings = 5)
 	time = 30
 	category = CAT_PRIMAL

code/modules/mining/lavaland/loot/ashdragon_loot.dm

@@ -6,18 +6,18 @@
 	var/loot = rand(1,4)
 	switch(loot)
 		if(1)
-			new /obj/item/weapon/melee/ghost_sword(src)
+			new /obj/item/melee/ghost_sword(src)
 		if(2)
-			new /obj/item/weapon/lava_staff(src)
+			new /obj/item/lava_staff(src)
 		if(3)
-			new /obj/item/weapon/spellbook/oneuse/sacredflame(src)
-			new /obj/item/weapon/gun/magic/wand/fireball(src)
+			new /obj/item/spellbook/oneuse/sacredflame(src)
+			new /obj/item/gun/magic/wand/fireball(src)
 		if(4)
-			new /obj/item/weapon/dragons_blood(src)
+			new /obj/item/dragons_blood(src)
 
 // Spectral Blade
 
-/obj/item/weapon/melee/ghost_sword
+/obj/item/melee/ghost_sword
 	name = "spectral blade"
 	desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
 	icon_state = "spectral"
@@ -32,13 +32,13 @@
 	var/summon_cooldown = 0
 	var/list/mob/dead/observer/spirits
 
-/obj/item/weapon/melee/ghost_sword/New()
+/obj/item/melee/ghost_sword/New()
 	..()
 	spirits = list()
 	processing_objects.Add(src)
 	poi_list |= src
 
-/obj/item/weapon/melee/ghost_sword/Destroy()
+/obj/item/melee/ghost_sword/Destroy()
 	for(var/mob/dead/observer/G in spirits)
 		G.invisibility = initial(G.invisibility)
 	spirits.Cut()
@@ -46,7 +46,7 @@
 	poi_list -= src
 	. = ..()
 
-/obj/item/weapon/melee/ghost_sword/attack_self(mob/user)
+/obj/item/melee/ghost_sword/attack_self(mob/user)
 	if(summon_cooldown > world.time)
 		to_chat(user, "You just recently called out for aid. You don't want to annoy the spirits.")
 		return
@@ -56,16 +56,16 @@
 
 	summon_cooldown = world.time + 600
 
-/obj/item/weapon/melee/ghost_sword/Topic(href, href_list)
+/obj/item/melee/ghost_sword/Topic(href, href_list)
 	if(href_list["follow"])
 		var/mob/dead/observer/ghost = usr
 		if(istype(ghost))
 			ghost.ManualFollow(src)
 
-/obj/item/weapon/melee/ghost_sword/process()
+/obj/item/melee/ghost_sword/process()
 	ghost_check()
 
-/obj/item/weapon/melee/ghost_sword/proc/ghost_check()
+/obj/item/melee/ghost_sword/proc/ghost_check()
 	var/ghost_counter = 0
 	var/turf/T = get_turf(src)
 	var/list/contents = T.GetAllContents()
@@ -84,7 +84,7 @@
 
 	return ghost_counter
 
-/obj/item/weapon/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
 	force = 0
 	var/ghost_counter = ghost_check()
 
@@ -92,7 +92,7 @@
 	user.visible_message("<span class='danger'>[user] strikes with the force of [ghost_counter] vengeful spirits!</span>")
 	..()
 
-/obj/item/weapon/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
 	var/ghost_counter = ghost_check()
 	final_block_chance += Clamp((ghost_counter * 5), 0, 75)
 	owner.visible_message("<span class='danger'>[owner] is protected by a ring of [ghost_counter] ghosts!</span>")
@@ -100,13 +100,13 @@
 
 // Blood
 
-/obj/item/weapon/dragons_blood
+/obj/item/dragons_blood
 	name = "bottle of dragons blood"
 	desc = "You're not actually going to drink this, are you?"
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "vial"
 
-/obj/item/weapon/dragons_blood/attack_self(mob/living/carbon/human/user)
+/obj/item/dragons_blood/attack_self(mob/living/carbon/human/user)
 	if(!istype(user))
 		return
 
@@ -147,7 +147,7 @@
 
 //Lava Staff
 
-/obj/item/weapon/lava_staff
+/obj/item/lava_staff
 	name = "staff of lava"
 	desc = "The ability to fill the emergency shuttle with lava. What more could you want out of life?"
 	icon_state = "staffofstorms"
@@ -171,11 +171,11 @@
 	var/timer = 0
 	var/banned_turfs
 
-/obj/item/weapon/lava_staff/New()
+/obj/item/lava_staff/New()
 	. = ..()
 	banned_turfs = typecacheof(list(/turf/space/transit, /turf/unsimulated))
 
-/obj/item/weapon/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
 	if(timer > world.time)
 		return

code/modules/mining/lavaland/loot/bubblegum_loot.dm

@@ -10,7 +10,7 @@
 		if(2)
 			new /obj/item/blood_contract(src)
 		if(3)
-			new /obj/item/weapon/gun/magic/staff/spellblade(src)
+			new /obj/item/gun/magic/staff/spellblade(src)
 		
 // Mayhem
 		
@@ -76,6 +76,6 @@
 			if(H == L)
 				continue
 			to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. They have been marked red! Go kill them!</span>")
-			H.put_in_hands(new /obj/item/weapon/kitchen/knife/butcher(H))
+			H.put_in_hands(new /obj/item/kitchen/knife/butcher(H))
 
 	qdel(src)

code/modules/mining/lavaland/loot/colossus_loot.dm

@@ -15,7 +15,7 @@
 	use_power = 0
 	var/memory_saved = FALSE
 	var/list/stored_items = list()
-	var/static/list/blacklist = typecacheof(list(/obj/item/weapon/spellbook))
+	var/static/list/blacklist = typecacheof(list(/obj/item/spellbook))
 
 /obj/machinery/smartfridge/black_box/update_icon()
 	return
@@ -206,7 +206,7 @@
 			NewTerrainTables = /obj/structure/table/wood
 			NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush,
 							/obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/monkey,
-							/obj/item/weapon/gun/projectile/bow, /obj/item/weapon/storage/backpack/quiver/full)
+							/obj/item/gun/projectile/bow, /obj/item/storage/backpack/quiver/full)
 			florachance = 20
 		if("alien") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos.
 			NewTerrainFloors = /turf/simulated/floor/mineral/abductor
@@ -378,7 +378,7 @@
 	activation_method = "touch"
 	cooldown_add = 50
 	activation_sound = 'sound/magic/TIMEPARADOX2.ogg'
-	var/list/banned_items_typecache = list(/obj/item/weapon/storage, /obj/item/weapon/implant, /obj/item/weapon/implanter, /obj/item/weapon/disk/nuclear, /obj/item/projectile, /obj/item/weapon/spellbook)
+	var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook)
 
 /obj/machinery/anomalous_crystal/refresher/New()
 	..()

code/modules/mining/lavaland/loot/hierophant_loot.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/hierophant_staff
+/obj/item/hierophant_staff
 	name = "Hierophant's staff"
 	desc = "A large club with intense magic power infused into it."
 	icon_state = "hierophant_staff"
@@ -19,7 +19,7 @@
 	var/teleporting = FALSE //if we ARE teleporting
 	var/friendly_fire_check = FALSE //if the blasts we make will consider our faction against the faction of hit targets
 
-/obj/item/weapon/hierophant_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/hierophant_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
 	var/turf/T = get_turf(target)
 	if(!T || timer > world.time)
@@ -47,7 +47,7 @@
 		else
 			to_chat(user, "<span class='warning'>That target is out of range!</span>") //too far away
 
-/obj/item/weapon/hierophant_staff/ui_action_click(mob/user, actiontype)
+/obj/item/hierophant_staff/ui_action_click(mob/user, actiontype)
 	if(actiontype == /datum/action/item_action/toggle_unfriendly_fire) //toggle friendly fire...
 		friendly_fire_check = !friendly_fire_check
 		to_chat(user, "<span class='warning'>You toggle friendly fire [friendly_fire_check ? "off":"on"]!</span>")
@@ -128,7 +128,7 @@
 	if(user)
 		user.update_action_buttons_icon()
 
-/obj/item/weapon/hierophant_staff/proc/teleport_mob(turf/source, mob/M, turf/target, mob/user)
+/obj/item/hierophant_staff/proc/teleport_mob(turf/source, mob/M, turf/target, mob/user)
 	var/turf/turf_to_teleport_to = get_step(target, get_dir(source, M)) //get position relative to caster
 	if(!turf_to_teleport_to || is_blocked_turf(turf_to_teleport_to))
 		return
@@ -152,7 +152,7 @@
 	if(user != M)
 		add_logs(user, M, "teleported", null, "from ([source.x],[source.y],[source.z])")
 
-/obj/item/weapon/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
+/obj/item/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
 	if(!T)
 		return
 	new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, user)
@@ -164,7 +164,7 @@
 		spawn(0)
 			blast_wall(T, d, user)
 
-/obj/item/weapon/hierophant_staff/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
+/obj/item/hierophant_staff/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
 	if(!T)
 		return
 	var/range = blast_range
@@ -177,7 +177,7 @@
 		previousturf = J
 		J = get_step(previousturf, dir)
 
-/obj/item/weapon/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
+/obj/item/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
 	if(!T)
 		return
 	new /obj/effect/temp_visual/hierophant/telegraph(T, user)

code/modules/mining/lavaland/loot/legion_loot.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/staff/storm
+/obj/item/staff/storm
 	name = "staff of storms"
 	desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it."
 	icon_state = "staffofstorms"
@@ -13,7 +13,7 @@
 	var/storm_type = /datum/weather/ash_storm
 	var/storm_cooldown = 0
 
-/obj/item/weapon/staff/storm/attack_self(mob/user)
+/obj/item/staff/storm/attack_self(mob/user)
 	if(storm_cooldown > world.time)
 		to_chat(user, "<span class='warning'>The staff is still recharging!</span>")
 		return

code/modules/mining/lavaland/loot/tendril_loot.dm

@@ -1,7 +1,7 @@
 //Shared Bag
 
 //Internal
-/obj/item/weapon/storage/backpack/shared
+/obj/item/storage/backpack/shared
 	name = "paradox bag"
 	desc = "Somehow, it's in two places at once."
 	max_combined_w_class = 60
@@ -14,7 +14,7 @@
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "cultpack"
 	slot_flags = SLOT_BACK
-	var/obj/item/weapon/storage/backpack/shared/bag
+	var/obj/item/storage/backpack/shared/bag
 
 /obj/item/device/shared_storage/red
 	name = "paradox bag"
@@ -23,7 +23,7 @@
 /obj/item/device/shared_storage/red/New()
 	..()
 	if(!bag)
-		var/obj/item/weapon/storage/backpack/shared/S = new(src)
+		var/obj/item/storage/backpack/shared/S = new(src)
 		var/obj/item/device/shared_storage/blue = new(loc)
 
 		bag = S
@@ -79,16 +79,16 @@
 
 //Potion of Flight: as we do not have the "Angel" species this currently does not work.
 
-/obj/item/weapon/reagent_containers/glass/bottle/potion
+/obj/item/reagent_containers/glass/bottle/potion
 	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "potionflask"
 
-/obj/item/weapon/reagent_containers/glass/bottle/potion/flight
+/obj/item/reagent_containers/glass/bottle/potion/flight
 	name = "strange elixir"
 	desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
 	list_reagents = list("flightpotion" = 5)
 
-/obj/item/weapon/reagent_containers/glass/bottle/potion/update_icon()
+/obj/item/reagent_containers/glass/bottle/potion/update_icon()
 	if(reagents.total_volume)
 		icon_state = "potionflask"
 	else
@@ -124,7 +124,7 @@
 	desc = "A boat used for traversing lava."
 	icon_state = "goliath_boat"
 	icon = 'icons/obj/lavaland/dragonboat.dmi'
-	keytype = /obj/item/weapon/oar
+	keytype = /obj/item/oar
 	burn_state = LAVA_PROOF | FIRE_PROOF
 
 /obj/vehicle/lavaboat/relaymove(mob/user, direction)
@@ -137,7 +137,7 @@
 		to_chat(user, "<span class='warning'>Boats don't go on land!</span>")
 		return 0
 
-/obj/item/weapon/oar
+/obj/item/oar
 	name = "oar"
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "oar"
@@ -149,7 +149,7 @@
 
 /datum/crafting_recipe/oar
 	name = "goliath bone oar"
-	result = /obj/item/weapon/oar
+	result = /obj/item/oar
 	reqs = list(/obj/item/stack/sheet/bone = 2)
 	time = 15
 	category = CAT_PRIMAL
@@ -284,7 +284,7 @@
 
 //Meat Hook
 
-/obj/item/weapon/gun/magic/hook
+/obj/item/gun/magic/hook
 	name = "meat hook"
 	desc = "Mid or feed."
 	ammo_type = /obj/item/ammo_casing/magic/hook

code/modules/mining/lavaland/necropolis_chests.dm

@@ -24,15 +24,15 @@
 		if(3)
 			new /obj/item/device/soulstone/anybody(src)
 		if(4)
-			new /obj/item/weapon/katana/cursed(src)
+			new /obj/item/katana/cursed(src)
 		if(5)
 			new /obj/item/clothing/glasses/godeye(src)
 		if(6)
-			new /obj/item/weapon/pickaxe/diamond(src)
+			new /obj/item/pickaxe/diamond(src)
 		if(7)
 			new /obj/item/clothing/head/culthood(src)
 			new /obj/item/clothing/suit/hooded/cultrobes(src)
-			new /obj/item/weapon/bedsheet/cult(src)
+			new /obj/item/bedsheet/cult(src)
 		if(8)
 			new /obj/item/organ/internal/brain/xeno(src)
 		if(9)
@@ -43,13 +43,13 @@
 			new /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker(src)
 			new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/berserker(src)
 		if(12)
-			new /obj/item/weapon/sord(src)
+			new /obj/item/sord(src)
 		if(13)
-			new /obj/item/weapon/nullrod/scythe/talking(src)
+			new /obj/item/nullrod/scythe/talking(src)
 		if(14)
-			new /obj/item/weapon/nullrod/armblade(src)
+			new /obj/item/nullrod/armblade(src)
 		if(15)
-			new /obj/item/weapon/guardiancreator(src)
+			new /obj/item/guardiancreator(src)
 		if(16)
 			new /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs(src)
 		if(17)
@@ -59,14 +59,14 @@
 		if(19)
 			new /obj/item/device/immortality_talisman(src)
 		if(20)
-			new /obj/item/weapon/gun/magic/hook(src)
+			new /obj/item/gun/magic/hook(src)
 		if(21)
 			new /obj/item/voodoo(src)
 		if(22)
-			new /obj/item/weapon/grenade/clusterbuster/inferno(src)
+			new /obj/item/grenade/clusterbuster/inferno(src)
 		if(23)
-			new /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell(src)
+			new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
 			new /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor(src)
 			new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor(src)
 		if(24)
-			new /obj/item/weapon/spellbook/oneuse/summonitem(src)
+			new /obj/item/spellbook/oneuse/summonitem(src)