here we go again (#2456)

code/modules/events/wizard/curseditems.dm

@@ -22,7 +22,7 @@
 			loadout = list(/obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal/magic, /obj/item/clothing/head/wizard)
 			ruins_spaceworthiness = 1
 		if("swords")
-			loadout[5] = /obj/item/weapon/katana/cursed
+			loadout[5] = /obj/item/katana/cursed
 		if("bigfatdoobie")
 			loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy
 			ruins_spaceworthiness = 1

code/modules/events/wizard/greentext.dm

@@ -15,11 +15,11 @@
 		return 0
 
 	var/mob/living/carbon/human/H = pick(holder_canadates)
-	new /obj/item/weapon/greentext(H.loc)
+	new /obj/item/greentext(H.loc)
 	to_chat(H, "<font color='green'>The mythical greentext appear at your feet! Pick it up if you dare...</font>")
 
 
-/obj/item/weapon/greentext
+/obj/item/greentext
 	name = "greentext"
 	desc = "No one knows what this massive tome does, but it feels <i><font color='green'>desirable</font></i> all the same..."
 	w_class = WEIGHT_CLASS_BULKY
@@ -31,11 +31,11 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/quiet = FALSE
 
-/obj/item/weapon/greentext/New()
+/obj/item/greentext/New()
 	..()
 	GLOB.poi_list |= src
 
-/obj/item/weapon/greentext/equipped(mob/living/user as mob)
+/obj/item/greentext/equipped(mob/living/user as mob)
 	to_chat(user, "<font color='green'>So long as you leave this place with greentext in hand you know will be happy...</font>")
 	if(user.mind && user.mind.objectives.len > 0)
 		to_chat(user, "<span class='warning'>... so long as you still perform your other objectives that is!</span>")
@@ -48,7 +48,7 @@
 	START_PROCESSING(SSobj, src)
 	..()
 
-/obj/item/weapon/greentext/dropped(mob/living/user as mob)
+/obj/item/greentext/dropped(mob/living/user as mob)
 	if(user in color_altered_mobs)
 		to_chat(user, "<span class='warning'>A sudden wave of failure washes over you...</span>")
 		user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it
@@ -57,7 +57,7 @@
 	STOP_PROCESSING(SSobj, src)
 	..()
 
-/obj/item/weapon/greentext/process()
+/obj/item/greentext/process()
 	if(new_holder && new_holder.z == ZLEVEL_CENTCOM)//you're winner!
 		to_chat(new_holder, "<font color='green'>At last it feels like victory is assured!</font>")
 		if(!(new_holder in SSticker.mode.traitors))
@@ -77,7 +77,7 @@
 		last_holder.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
 		last_holder = new_holder //long live the king
 
-/obj/item/weapon/greentext/Destroy(force)
+/obj/item/greentext/Destroy(force)
 	if(!(resistance_flags & ON_FIRE) && !force)
 		return QDEL_HINT_LETMELIVE
 
@@ -94,5 +94,5 @@
 		if(!quiet)
 			to_chat(M, message)
 
-/obj/item/weapon/greentext/quiet
+/obj/item/greentext/quiet
 	quiet = TRUE

code/modules/events/wizard/rpgloot.dm

@@ -11,8 +11,8 @@
 		if(!istype(I.rpg_loot))
 			I.rpg_loot = new(I)
 
-		if(istype(I, /obj/item/weapon/storage))
-			var/obj/item/weapon/storage/S = I
+		if(istype(I, /obj/item/storage))
+			var/obj/item/storage/S = I
 			if(prob(upgrade_scroll_chance) && S.contents.len < S.storage_slots && !S.invisibility)
 				var/obj/item/upgradescroll/scroll = new
 				S.handle_item_insertion(scroll,1)