Removes All Weapons

code/modules/assembly/assembly.dm

@@ -91,8 +91,8 @@
 //		if(radio && (wires & WIRE_RADIO_PULSE))
 			//Not sure what goes here quite yet send signal?
 
-		if(istype(loc,/obj/item/weapon/grenade)) // This is a hack.  Todo: Manage this better -Sayu
-			var/obj/item/weapon/grenade/G = loc
+		if(istype(loc,/obj/item/grenade)) // This is a hack.  Todo: Manage this better -Sayu
+			var/obj/item/grenade/G = loc
 			G.prime()                // Adios, muchachos
 
 
@@ -121,13 +121,13 @@
 		return 0
 
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+	attackby(obj/item/W as obj, mob/user as mob, params)
 		if(isassembly(W))
 			var/obj/item/device/assembly/A = W
 			if((!A.secured) && (!secured))
 				attach_assembly(A,user)
 				return
-		if(istype(W, /obj/item/weapon/screwdriver))
+		if(istype(W, /obj/item/screwdriver))
 			if(toggle_secure())
 				to_chat(user, "<span class='notice'>\The [src] is ready!</span>")
 			else

code/modules/assembly/bomb.dm

@@ -9,7 +9,7 @@
 	flags = CONDUCT //Copied this from old code, so this may or may not be necessary
 	var/status = 0   //0 - not readied //1 - bomb finished with welder
 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
-	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank
+	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
 	origin_tech = "materials=1;engineering=1"
 
 /obj/item/device/onetankbomb/examine(mob/user)
@@ -24,11 +24,11 @@
 		overlays += bombassembly.overlays
 		overlays += "bomb_assembly"
 
-/obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/device/onetankbomb/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/device/analyzer))
 		bombtank.attackby(W, user, params)
 		return
-	if(istype(W, /obj/item/weapon/wrench) && !status)	//This is basically bomb assembly code inverted. apparently it works.
+	if(istype(W, /obj/item/wrench) && !status)	//This is basically bomb assembly code inverted. apparently it works.
 
 		to_chat(user, "<span class='notice'>You disassemble [src].</span>")
 
@@ -42,7 +42,7 @@
 
 		qdel(src)
 		return
-	if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
+	if((istype(W, /obj/item/weldingtool) && W:welding))
 		if(!status)
 			status = 1
 			bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
@@ -92,7 +92,7 @@
 
 // ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
 
-/obj/item/weapon/tank/proc/bomb_assemble(W,user)	//Bomb assembly proc. This turns assembly+tank into a bomb
+/obj/item/tank/proc/bomb_assemble(W,user)	//Bomb assembly proc. This turns assembly+tank into a bomb
 	var/obj/item/device/assembly_holder/S = W
 	var/mob/M = user
 	if(!S.secured)										//Check if the assembly is secured
@@ -116,7 +116,7 @@
 	R.update_icon()
 	return
 
-/obj/item/weapon/tank/proc/detonate()	//This happens when a bomb is told to explode
+/obj/item/tank/proc/detonate()	//This happens when a bomb is told to explode
 	var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
 	var/strength = 1
 
@@ -165,7 +165,7 @@
 		qdel(master)
 	qdel(src)
 
-/obj/item/weapon/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
+/obj/item/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
 	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
 	var/turf/simulated/T = get_turf(src)
 	if(!T)

code/modules/assembly/health.dm

@@ -27,7 +27,7 @@
 	update_icon()
 	return secured
 
-/obj/item/device/assembly/health/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/assembly/health/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/device/multitool))
 		if(alarm_health == 0)
 			alarm_health = -90

code/modules/assembly/holder.dm

@@ -137,8 +137,8 @@
 		return
 
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-		if(istype(W, /obj/item/weapon/screwdriver))
+	attackby(obj/item/W as obj, mob/user as mob, params)
+		if(istype(W, /obj/item/screwdriver))
 			if(!a_left || !a_right)
 				to_chat(user, "<span class='warning'>BUG:Assembly part missing, please report this!</span>")
 				return

code/modules/assembly/igniter.dm

@@ -29,8 +29,8 @@
 			var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
 			if(tank)
 				tank.boom()
-		if(istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/))
-			var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
+		if(istype(src.loc.loc, /obj/item/reagent_containers/glass/beaker/))
+			var/obj/item/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
 			if(beakerbomb)
 				beakerbomb.heat_beaker()
 

code/modules/assembly/shock_kit.dm

@@ -14,8 +14,8 @@
 	QDEL_NULL(part2)
 	return ..()
 
-/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench) && !status)
+/obj/item/assembly/shock_kit/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/wrench) && !status)
 		var/turf/T = loc
 		if(ismob(T))
 			T = T.loc
@@ -27,7 +27,7 @@
 		part2 = null
 		qdel(src)
 		return
-	if(istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/screwdriver))
 		status = !status
 		to_chat(user, "<span class='notice'>[src] is now [status ? "secured" : "unsecured"]!</span>")
 	add_fingerprint(user)