Removes All Weapons

code/modules/events/holidays/Christmas.dm

@@ -3,7 +3,7 @@
 		if(!is_station_level(xmas.z))	continue
 		for(var/turf/simulated/floor/T in orange(1,xmas))
 			for(var/i=1,i<=rand(1,5),i++)
-				new /obj/item/weapon/a_gift(T)
+				new /obj/item/a_gift(T)
 	for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list)
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
 
@@ -16,20 +16,20 @@
 		evil_tree.icon_gib = evil_tree.icon_state
 		qdel(xmas)
 
-/obj/item/weapon/toy/xmas_cracker
+/obj/item/toy/xmas_cracker
 	name = "xmas cracker"
 	icon = 'icons/obj/christmas.dmi'
 	icon_state = "cracker"
 	desc = "Directions for use: Requires two people, one to pull each end."
 	var/cracked = 0
 
-/obj/item/weapon/toy/xmas_cracker/New()
+/obj/item/toy/xmas_cracker/New()
 	..()
 
-/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user)
+/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
 	if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
 		target.visible_message("<span class='notice'>[user] and [target] pop \an [src]! *pop*</span>", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='notice'>You hear a *pop*.</span>")
-		var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc)
+		var/obj/item/paper/Joke = new /obj/item/paper(user.loc)
 		Joke.name = "[pick("awful","terrible","unfunny")] joke"
 		Joke.info = pick("What did one snowman say to the other?\n\n<i>'Is it me or can you smell carrots?'</i>",
 			"Why couldn't the snowman get laid?\n\n<i>He was frigid!</i>",
@@ -45,7 +45,7 @@
 		user.update_icons()
 		cracked = 1
 		icon_state = "cracker1"
-		var/obj/item/weapon/toy/xmas_cracker/other_half = new /obj/item/weapon/toy/xmas_cracker(target)
+		var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target)
 		other_half.cracked = 1
 		other_half.icon_state = "cracker2"
 		target.put_in_active_hand(other_half)

code/modules/events/holidays/Holidays.dm

@@ -165,12 +165,12 @@ var/global/Holiday = null
 			var/turf/simulated/floor/F = Floorlist[rand(1,Floorlist.len)]
 			Floorlist = null
 			var/obj/structure/closet/C = locate(/obj/structure/closet) in F
-			var/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/wrapped/Egg
+			var/obj/item/reagent_containers/food/snacks/chocolateegg/wrapped/Egg
 			if( C )			Egg = new(C)
 			else			Egg = new(F)
 */
 /*			var/list/obj/containers = list()
-			for(var/obj/item/weapon/storage/S in world)
+			for(var/obj/item/storage/S in world)
 				if(!is_station_level(S.z))	continue
 				containers += S
 

code/modules/events/meaty_ores.dm

@@ -44,7 +44,7 @@
 			if(prob(80))
 				gibs(loc)
 				if(prob(45))
-					new /obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+					new /obj/item/reagent_containers/food/snacks/meat(loc)
 				else if(prob(10))
 					explosion(get_turf(loc), 0, pick(0,1), pick(2,3), 0)
 			else

code/modules/events/spacevine.dm

@@ -482,8 +482,8 @@
 
 /obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user)
 	var/damage_dealt = I.force
-	if(istype(I, /obj/item/weapon/scythe))
-		var/obj/item/weapon/scythe/S = I
+	if(istype(I, /obj/item/scythe))
+		var/obj/item/scythe/S = I
 		if(S.extend)	//so folded telescythes won't get damage boosts / insta-clears (they instead will instead be treated like non-scythes)
 			damage_dealt *= 4
 			for(var/obj/structure/spacevine/B in range(1,src))

code/modules/events/traders.dm

@@ -53,8 +53,8 @@ var/global/list/unused_trade_stations = list("sol")
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(M), slot_back)
-			var/obj/item/weapon/card/id/supply/W = new(M)
+			M.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(M), slot_back)
+			var/obj/item/card/id/supply/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Sol Trader)"
 			W.assignment = "Sol Trader"
 			W.registered_name = M.real_name