here we go again (#2456)

code/modules/telesci/telepad.dm

@@ -12,23 +12,23 @@
 
 /obj/machinery/telepad/Initialize()
 	. = ..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/telesci_pad(null)
+	var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/telesci_pad(null)
 	B.apply_default_parts(src)
 
-/obj/item/weapon/circuitboard/machine/telesci_pad
+/obj/item/circuitboard/machine/telesci_pad
 	name = "Telepad (Machine Board)"
 	build_path = /obj/machinery/telepad
 	origin_tech = "programming=4;engineering=3;plasmatech=4;bluespace=4"
 	req_components = list(
-							/obj/item/weapon/ore/bluespace_crystal = 2,
-							/obj/item/weapon/stock_parts/capacitor = 1,
+							/obj/item/ore/bluespace_crystal = 2,
+							/obj/item/stock_parts/capacitor = 1,
 							/obj/item/stack/cable_coil = 1,
-							/obj/item/weapon/stock_parts/console_screen = 1)
-	def_components = list(/obj/item/weapon/ore/bluespace_crystal = /obj/item/weapon/ore/bluespace_crystal/artificial)
+							/obj/item/stock_parts/console_screen = 1)
+	def_components = list(/obj/item/ore/bluespace_crystal = /obj/item/ore/bluespace_crystal/artificial)
 
 /obj/machinery/telepad/RefreshParts()
 	var/E
-	for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)
+	for(var/obj/item/stock_parts/capacitor/C in component_parts)
 		E += C.rating
 	efficiency = E
 
@@ -63,8 +63,8 @@
 	idle_power_usage = 20
 	active_power_usage = 500
 	var/stage = 0
-/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/wrench))
+/obj/machinery/telepad_cargo/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/wrench))
 		anchored = 0
 		playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
 		if(anchored)
@@ -73,7 +73,7 @@
 		else if(!anchored)
 			anchored = 1
 			to_chat(user, "<span class='caution'>\The [src] is now secured.</span>")
-	else if(istype(W, /obj/item/weapon/screwdriver))
+	else if(istype(W, /obj/item/screwdriver))
 		if(stage == 0)
 			playsound(src, W.usesound, 50, 1)
 			to_chat(user, "<span class='caution'>You unscrew the telepad's tracking beacon.</span>")
@@ -82,8 +82,8 @@
 			playsound(src, W.usesound, 50, 1)
 			to_chat(user, "<span class='caution'>You screw in the telepad's tracking beacon.</span>")
 			stage = 0
-	else if(istype(W, /obj/item/weapon/weldingtool) && stage == 1)
-		var/obj/item/weapon/weldingtool/WT = W
+	else if(istype(W, /obj/item/weldingtool) && stage == 1)
+		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0,user))
 			playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
 			to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
@@ -115,7 +115,7 @@
 	return
 
 ///HANDHELD TELEPAD USER///
-/obj/item/weapon/rcs
+/obj/item/rcs
 	name = "rapid-crate-sender (RCS)"
 	desc = "Use this to send crates and closets to cargo telepads."
 	icon = 'icons/obj/telescience.dmi'
@@ -134,18 +134,18 @@
 	var/emagged = 0
 	var/teleporting = 0
 
-/obj/item/weapon/rcs/New()
+/obj/item/rcs/New()
 	..()
 	START_PROCESSING(SSobj, src)
 
-/obj/item/weapon/rcs/examine(mob/user)
+/obj/item/rcs/examine(mob/user)
 	..()
 	to_chat(user, "There are [rcharges] charge\s left.")
 
-/obj/item/weapon/rcs/Destroy()
+/obj/item/rcs/Destroy()
 	STOP_PROCESSING(SSobj, src)
 	return ..()
-/obj/item/weapon/rcs/process()
+/obj/item/rcs/process()
 	if(rcharges > 10)
 		rcharges = 10
 	if(last_charge == 0)
@@ -154,7 +154,7 @@
 	else
 		last_charge--
 
-/obj/item/weapon/rcs/attack_self(mob/user)
+/obj/item/rcs/attack_self(mob/user)
 	if(emagged)
 		if(mode == 0)
 			mode = 1
@@ -165,7 +165,7 @@
 			playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
 			to_chat(user, "<span class='caution'>You calibrate the telepad locator.</span>")
 
-/obj/item/weapon/rcs/emag_act(mob/user)
+/obj/item/rcs/emag_act(mob/user)
 	if(!emagged)
 		emagged = TRUE
 		do_sparks(5, TRUE, src)

code/modules/telesci/telesci_computer.dm

@@ -3,7 +3,7 @@
 	desc = "Used to teleport objects to and from the telescience telepad."
 	icon_screen = "teleport"
 	icon_keyboard = "teleport_key"
-	circuit = /obj/item/weapon/circuitboard/computer/telesci_console
+	circuit = /obj/item/circuitboard/computer/telesci_console
 	var/sending = 1
 	var/obj/machinery/telepad/telepad = null
 	var/temp_msg = "Telescience control console initialized.<BR>Welcome."
@@ -49,14 +49,14 @@
 	. = ..()
 	if(mapload)
 		for(var/i = 1; i <= starting_crystals; i++)
-			crystals += new /obj/item/weapon/ore/bluespace_crystal/artificial(null) // starting crystals
+			crystals += new /obj/item/ore/bluespace_crystal/artificial(null) // starting crystals
 
 /obj/machinery/computer/telescience/attack_paw(mob/user)
 	to_chat(user, "<span class='warning'>You are too primitive to use this computer!</span>")
 	return
 
 /obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/ore/bluespace_crystal))
+	if(istype(W, /obj/item/ore/bluespace_crystal))
 		if(crystals.len >= max_crystals)
 			to_chat(user, "<span class='warning'>There are not enough crystal slots.</span>")
 			return