here we go again (#2456)

code/game/machinery/computer/Operating.dm

@@ -3,7 +3,7 @@
 	desc = "Used to monitor the vitals of a patient during surgery."
 	icon_screen = "crew"
 	icon_keyboard = "med_key"
-	circuit = /obj/item/weapon/circuitboard/computer/operating
+	circuit = /obj/item/circuitboard/computer/operating
 	var/mob/living/carbon/human/patient
 	var/obj/structure/table/optable/table
 

code/game/machinery/computer/_computer.dm

@@ -16,7 +16,7 @@
 	var/icon_screen = "generic"
 	var/clockwork = FALSE
 
-/obj/machinery/computer/Initialize(mapload, obj/item/weapon/circuitboard/C)
+/obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
 	. = ..()
 	power_change()
 
@@ -66,7 +66,7 @@
 	return
 
 /obj/machinery/computer/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags_1&NODECONSTRUCT_1))
+	if(istype(I, /obj/item/screwdriver) && circuit && !(flags_1&NODECONSTRUCT_1))
 		playsound(src.loc, I.usesound, 50, 1)
 		to_chat(user, "<span class='notice'> You start to disconnect the monitor...</span>")
 		if(do_after(user, 20*I.toolspeed, target = src))
@@ -113,8 +113,8 @@
 					to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
 				else
 					playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-				new /obj/item/weapon/shard(src.loc)
-				new /obj/item/weapon/shard(src.loc)
+				new /obj/item/shard(src.loc)
+				new /obj/item/shard(src.loc)
 				A.state = 3
 				A.icon_state = "3"
 			else

code/game/machinery/computer/aifixer.dm

@@ -4,13 +4,13 @@
 	req_access = list(ACCESS_CAPTAIN, ACCESS_ROBOTICS, ACCESS_HEADS)
 	var/mob/living/silicon/ai/occupier = null
 	var/active = 0
-	circuit = /obj/item/weapon/circuitboard/computer/aifixer
+	circuit = /obj/item/circuitboard/computer/aifixer
 	icon_keyboard = "tech_key"
 	icon_screen = "ai-fixer"
 	light_color = LIGHT_COLOR_PINK
 
 /obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params)
-	if(occupier && istype(I, /obj/item/weapon/screwdriver))
+	if(occupier && istype(I, /obj/item/screwdriver))
 		if(stat & (NOPOWER|BROKEN))
 			to_chat(user, "<span class='warning'>The screws on [name]'s screen won't budge.</span>")
 		else

code/game/machinery/computer/apc_control.dm

@@ -4,7 +4,7 @@
 	icon_screen = "solar"
 	icon_keyboard = "power_key"
 	req_access = list(ACCESS_ENGINE)
-	circuit = /obj/item/weapon/circuitboard/computer/apc_control
+	circuit = /obj/item/circuitboard/computer/apc_control
 	light_color = LIGHT_COLOR_YELLOW
 	var/list/apcs //APCs the computer has access to
 	var/mob/living/operator //Who's operating the computer right now
@@ -97,7 +97,7 @@
 	if(!usr || !usr.canUseTopic(src) || usr.incapacitated() || stat || QDELETED(src))
 		return
 	if(href_list["authenticate"])
-		var/obj/item/weapon/card/id/ID = usr.get_active_held_item()
+		var/obj/item/card/id/ID = usr.get_active_held_item()
 		if(!istype(ID))
 			ID = usr.get_idcard()
 		if(ID && istype(ID))
@@ -106,7 +106,7 @@
 				auth_id = "[ID.registered_name] ([ID.assignment])"
 				log_activity("logged in")
 		if(!authenticated) //Check for emags
-			var/obj/item/weapon/card/emag/E = usr.get_active_held_item()
+			var/obj/item/card/emag/E = usr.get_active_held_item()
 			if(E && istype(E) && usr.Adjacent(src))
 				to_chat(usr, "<span class='warning'>You bypass [src]'s access requirements using your emag.</span>")
 				authenticated = TRUE

code/game/machinery/computer/arcade.dm

@@ -6,15 +6,15 @@
 	icon_screen = "invaders"
 	clockwork = TRUE //it'd look weird
 	var/list/prizes = list(
-		/obj/item/weapon/storage/box/snappops					= 2,
+		/obj/item/storage/box/snappops					= 2,
 		/obj/item/toy/talking/AI								= 2,
 		/obj/item/toy/talking/codex_gigas						= 2,
 		/obj/item/clothing/under/syndicate/tacticool			= 2,
 		/obj/item/toy/sword										= 2,
 		/obj/item/toy/gun										= 2,
-		/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow	= 2,
-		/obj/item/weapon/storage/box/fakesyndiesuit				= 2,
-		/obj/item/weapon/storage/crayons						= 2,
+		/obj/item/gun/ballistic/shotgun/toy/crossbow	= 2,
+		/obj/item/storage/box/fakesyndiesuit				= 2,
+		/obj/item/storage/crayons						= 2,
 		/obj/item/toy/spinningtoy								= 2,
 		/obj/item/toy/prize/ripley								= 1,
 		/obj/item/toy/prize/fireripley							= 1,
@@ -34,15 +34,15 @@
 		/obj/item/toy/redbutton									= 2,
 		/obj/item/toy/talking/owl								= 2,
 		/obj/item/toy/talking/griffin							= 2,
-		/obj/item/weapon/coin/antagtoken						= 2,
+		/obj/item/coin/antagtoken						= 2,
 		/obj/item/stack/tile/fakespace/loaded					= 2,
 		/obj/item/stack/tile/fakepit/loaded						= 2,
 		/obj/item/toy/toy_xeno									= 2,
-		/obj/item/weapon/storage/box/actionfigure				= 1,
-		/obj/item/weapon/restraints/handcuffs/fake              = 2,
-		/obj/item/weapon/grenade/chem_grenade/glitter/pink		= 1,
-		/obj/item/weapon/grenade/chem_grenade/glitter/blue		= 1,
-		/obj/item/weapon/grenade/chem_grenade/glitter/white		= 1,
+		/obj/item/storage/box/actionfigure				= 1,
+		/obj/item/restraints/handcuffs/fake              = 2,
+		/obj/item/grenade/chem_grenade/glitter/pink		= 1,
+		/obj/item/grenade/chem_grenade/glitter/blue		= 1,
+		/obj/item/grenade/chem_grenade/glitter/white		= 1,
 		/obj/item/toy/eightball									= 2,
 		/obj/item/toy/windupToolbox								= 2)
 
@@ -56,8 +56,8 @@
 	// If it's a generic arcade machine, pick a random arcade
 	// circuit board for it and make the new machine
 	if(!circuit)
-		var/choice = pick(subtypesof(/obj/item/weapon/circuitboard/computer/arcade))
-		var/obj/item/weapon/circuitboard/CB = new choice()
+		var/choice = pick(subtypesof(/obj/item/circuitboard/computer/arcade))
+		var/obj/item/circuitboard/CB = new choice()
 		new CB.build_path(loc, CB)
 		return INITIALIZE_HINT_QDEL
 	Reset()
@@ -66,7 +66,7 @@
 
 /obj/machinery/computer/arcade/proc/prizevend()
 	if(prob(0.0001)) //1 in a million
-		new /obj/item/weapon/gun/energy/pulse/prize(src)
+		new /obj/item/gun/energy/pulse/prize(src)
 		UnlockMedal(PULSE_MEDAL,usr.client)
 
 	if(!contents.len)
@@ -105,7 +105,7 @@
 	name = "arcade machine"
 	desc = "Does not support Pinball."
 	icon_state = "arcade"
-	circuit = /obj/item/weapon/circuitboard/computer/arcade/battle
+	circuit = /obj/item/circuitboard/computer/arcade/battle
 	var/enemy_name = "Space Villian"
 	var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc
 	var/player_hp = 30 //Player health/attack points
@@ -335,7 +335,7 @@
 	name = "The Orion Trail"
 	desc = "Learn how our ancestors got to Orion, and have fun in the process!"
 	icon_state = "arcade"
-	circuit = /obj/item/weapon/circuitboard/computer/arcade/orion_trail
+	circuit = /obj/item/circuitboard/computer/arcade/orion_trail
 	var/busy = FALSE //prevent clickspam that allowed people to ~speedrun~ the game.
 	var/engine = 0
 	var/hull = 0
@@ -1025,7 +1025,7 @@
 	gameStatus = ORION_STATUS_START
 	say("Congratulations, you made it to Orion!")
 	if(emagged)
-		new /obj/item/weapon/orion_ship(loc)
+		new /obj/item/orion_ship(loc)
 		message_admins("[key_name_admin(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
 		log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
 	else
@@ -1050,7 +1050,7 @@
 	loot = list()
 	del_on_death = TRUE
 
-/obj/item/weapon/orion_ship
+/obj/item/orion_ship
 	name = "model settler ship"
 	desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..."
 	icon = 'icons/obj/toy.dmi'
@@ -1058,7 +1058,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	var/active = 0 //if the ship is on
 
-/obj/item/weapon/orion_ship/examine(mob/user)
+/obj/item/orion_ship/examine(mob/user)
 	..()
 	if(!(in_range(user, src)))
 		return
@@ -1067,7 +1067,7 @@
 	else
 		to_chat(user, "<span class='notice'>There's a little switch on the bottom. It's flipped up.</span>")
 
-/obj/item/weapon/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse
+/obj/item/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse
 	if(active)
 		return
 

code/game/machinery/computer/atmos_alert.dm

@@ -1,7 +1,7 @@
 /obj/machinery/computer/atmos_alert
 	name = "atmospheric alert console"
 	desc = "Used to monitor the station's air alarms."
-	circuit = /obj/item/weapon/circuitboard/computer/atmos_alert
+	circuit = /obj/item/circuitboard/computer/atmos_alert
 	icon_screen = "alert:0"
 	icon_keyboard = "atmos_key"
 	var/list/priority_alarms = list()

code/game/machinery/computer/atmos_control.dm

@@ -64,7 +64,7 @@
 	desc = "Used to monitor the station's atmospherics sensors."
 	icon_screen = "tank"
 	icon_keyboard = "atmos_key"
-	circuit = /obj/item/weapon/circuitboard/computer/atmos_control
+	circuit = /obj/item/circuitboard/computer/atmos_control
 
 	var/frequency = 1441
 	var/list/sensors = list(
@@ -139,7 +139,7 @@
 	var/input_tag
 	var/output_tag
 	frequency = 1441
-	circuit = /obj/item/weapon/circuitboard/computer/atmos_control/tank
+	circuit = /obj/item/circuitboard/computer/atmos_control/tank
 
 	var/list/input_info
 	var/list/output_info

code/game/machinery/computer/buildandrepair.dm

@@ -7,7 +7,7 @@
 	add_fingerprint(user)
 	switch(state)
 		if(0)
-			if(istype(P, /obj/item/weapon/wrench))
+			if(istype(P, /obj/item/wrench))
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You start wrenching the frame into place...</span>")
 				if(do_after(user, 20*P.toolspeed, target = src))
@@ -15,8 +15,8 @@
 					anchored = TRUE
 					state = 1
 				return
-			if(istype(P, /obj/item/weapon/weldingtool))
-				var/obj/item/weapon/weldingtool/WT = P
+			if(istype(P, /obj/item/weldingtool))
+				var/obj/item/weldingtool/WT = P
 				if(!WT.remove_fuel(0, user))
 					if(!WT.isOn())
 						to_chat(user, "<span class='warning'>The welding tool must be on to complete this task!</span>")
@@ -31,7 +31,7 @@
 					qdel(src)
 				return
 		if(1)
-			if(istype(P, /obj/item/weapon/wrench))
+			if(istype(P, /obj/item/wrench))
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You start to unfasten the frame...</span>")
 				if(do_after(user, 20*P.toolspeed, target = src))
@@ -39,7 +39,7 @@
 					anchored = FALSE
 					state = 0
 				return
-			if(istype(P, /obj/item/weapon/circuitboard/computer) && !circuit)
+			if(istype(P, /obj/item/circuitboard/computer) && !circuit)
 				if(!user.drop_item())
 					return
 				playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
@@ -50,16 +50,16 @@
 				P.loc = null
 				return
 
-			else if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
+			else if(istype(P, /obj/item/circuitboard) && !circuit)
 				to_chat(user, "<span class='warning'>This frame does not accept circuit boards of this type!</span>")
 				return
-			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
+			if(istype(P, /obj/item/screwdriver) && circuit)
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You screw the circuit board into place.</span>")
 				state = 2
 				icon_state = "2"
 				return
-			if(istype(P, /obj/item/weapon/crowbar) && circuit)
+			if(istype(P, /obj/item/crowbar) && circuit)
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
 				state = 1
@@ -69,7 +69,7 @@
 				circuit = null
 				return
 		if(2)
-			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
+			if(istype(P, /obj/item/screwdriver) && circuit)
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You unfasten the circuit board.</span>")
 				state = 1
@@ -90,7 +90,7 @@
 					to_chat(user, "<span class='warning'>You need five lengths of cable to wire the frame!</span>")
 				return
 		if(3)
-			if(istype(P, /obj/item/weapon/wirecutters))
+			if(istype(P, /obj/item/wirecutters))
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the cables.</span>")
 				state = 2
@@ -116,7 +116,7 @@
 							src.icon_state = "4"
 				return
 		if(4)
-			if(istype(P, /obj/item/weapon/crowbar))
+			if(istype(P, /obj/item/crowbar))
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
 				state = 3
@@ -124,7 +124,7 @@
 				var/obj/item/stack/sheet/glass/G = new (loc, 2)
 				G.add_fingerprint(user)
 				return
-			if(istype(P, /obj/item/weapon/screwdriver))
+			if(istype(P, /obj/item/screwdriver))
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You connect the monitor.</span>")
 				var/obj/B = new src.circuit.build_path (src.loc, circuit)
@@ -138,8 +138,8 @@
 /obj/structure/frame/computer/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(state == 4)
-			new /obj/item/weapon/shard(loc)
-			new /obj/item/weapon/shard(loc)
+			new /obj/item/shard(loc)
+			new /obj/item/shard(loc)
 		if(state >= 3)
 			new /obj/item/stack/cable_coil(loc , 5)
 	..()

code/game/machinery/computer/camera.dm

@@ -3,7 +3,7 @@
 	desc = "Used to access the various cameras on the station."
 	icon_screen = "cameras"
 	icon_keyboard = "security_key"
-	circuit = /obj/item/weapon/circuitboard/computer/security
+	circuit = /obj/item/circuitboard/computer/security
 	var/last_pic = 1
 	var/list/network = list("SS13")
 	var/mapping = 0//For the overview file, interesting bit of code.
@@ -186,4 +186,4 @@
 	icon_screen = "mining"
 	icon_keyboard = "mining_key"
 	network = list("MINE")
-	circuit = /obj/item/weapon/circuitboard/computer/mining
+	circuit = /obj/item/circuitboard/computer/mining

code/game/machinery/computer/card.dm

@@ -10,9 +10,9 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	icon_screen = "id"
 	icon_keyboard = "id_key"
 	req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS)
-	circuit = /obj/item/weapon/circuitboard/computer/card
-	var/obj/item/weapon/card/id/scan = null
-	var/obj/item/weapon/card/id/modify = null
+	circuit = /obj/item/circuitboard/computer/card
+	var/obj/item/card/id/scan = null
+	var/obj/item/card/id/modify = null
 	var/authenticated = 0
 	var/mode = 0
 	var/printing = null
@@ -51,8 +51,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	change_position_cooldown = config.id_console_jobslot_delay
 
 /obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY
-	if(istype(O, /obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/idcard = O
+	if(istype(O, /obj/item/card/id))
+		var/obj/item/card/id/idcard = O
 		if(check_access(idcard))
 			if(!scan)
 				if(!usr.drop_item())
@@ -364,7 +364,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				head_subordinates = null
 			else
 				var/obj/item/I = usr.get_active_held_item()
-				if (istype(I, /obj/item/weapon/card/id))
+				if (istype(I, /obj/item/card/id))
 					if(!usr.drop_item())
 						return
 					playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
@@ -380,7 +380,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				scan = null
 			else
 				var/obj/item/I = usr.get_active_held_item()
-				if (istype(I, /obj/item/weapon/card/id))
+				if (istype(I, /obj/item/card/id))
 					if(!usr.drop_item())
 						return
 					playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
@@ -542,7 +542,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 			if (!( printing ))
 				printing = 1
 				sleep(50)
-				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc )
+				var/obj/item/paper/P = new /obj/item/paper( loc )
 				var/t1 = "<B>Crew Manifest:</B><BR>"
 				for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
 					t1 += t.fields["name"] + " - " + t.fields["rank"] + "<br>"
@@ -562,18 +562,18 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 
 /obj/machinery/computer/card/centcom
 	name = "\improper CentCom identification console"
-	circuit = /obj/item/weapon/circuitboard/computer/card/centcom
+	circuit = /obj/item/circuitboard/computer/card/centcom
 	req_access = list(ACCESS_CENT_CAPTAIN)
 
 /obj/machinery/computer/card/minor
 	name = "department management console"
 	desc = "You can use this to change ID's for specific departments."
 	icon_screen = "idminor"
-	circuit = /obj/item/weapon/circuitboard/computer/card/minor
+	circuit = /obj/item/circuitboard/computer/card/minor
 
 /obj/machinery/computer/card/minor/Initialize()
 	. = ..()
-	var/obj/item/weapon/circuitboard/computer/card/minor/typed_circuit = circuit
+	var/obj/item/circuitboard/computer/card/minor/typed_circuit = circuit
 	if(target_dept)
 		typed_circuit.target_dept = target_dept
 	else

code/game/machinery/computer/cloning.dm

@@ -3,7 +3,7 @@
 	desc = "Used to clone people and manage DNA."
 	icon_screen = "dna"
 	icon_keyboard = "med_key"
-	circuit = /obj/item/weapon/circuitboard/computer/cloning
+	circuit = /obj/item/circuitboard/computer/cloning
 	req_access = list(ACCESS_HEADS) //ONLY USED FOR RECORD DELETION RIGHT NOW.
 	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
 	var/list/pods //Linked cloning pods
@@ -13,7 +13,7 @@
 	var/menu = 1 //Which menu screen to display
 	var/list/records = list()
 	var/datum/data/record/active_record = null
-	var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything.
+	var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
 	var/loading = 0 // Nice loading text
 	var/autoprocess = 0
 
@@ -115,7 +115,7 @@
 	LAZYREMOVE(pods, pod)
 
 /obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
+	if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES
 		if (!src.diskette)
 			if(!user.drop_item())
 				return
@@ -232,7 +232,7 @@
 				dat += "<h4>[src.active_record.fields["name"]]</h4>"
 				dat += "Scan ID [src.active_record.fields["id"]] <a href='byond://?src=\ref[src];clone=[active_record.fields["id"]]'>Clone</a><br>"
 
-				var/obj/item/weapon/implant/health/H = locate(src.active_record.fields["imp"])
+				var/obj/item/implant/health/H = locate(src.active_record.fields["imp"])
 
 				if ((H) && (istype(H)))
 					dat += "<b>Health Implant Data:</b><br />[H.sensehealth()]<br><br />"
@@ -339,7 +339,7 @@
 			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
 
 		else if (src.menu == 4)
-			var/obj/item/weapon/card/id/C = usr.get_active_held_item()
+			var/obj/item/card/id/C = usr.get_active_held_item()
 			if (istype(C)||istype(C, /obj/item/device/pda))
 				if(src.check_access(C))
 					src.temp = "[src.active_record.fields["name"]] => Record deleted."
@@ -488,12 +488,12 @@
 		R.fields["mind"] = "\ref[mob_occupant.mind]"
 
    //Add an implant if needed
-	var/obj/item/weapon/implant/health/imp
-	for(var/obj/item/weapon/implant/health/HI in mob_occupant.implants)
+	var/obj/item/implant/health/imp
+	for(var/obj/item/implant/health/HI in mob_occupant.implants)
 		imp = HI
 		break
 	if(!imp)
-		imp = new /obj/item/weapon/implant/health(mob_occupant)
+		imp = new /obj/item/implant/health(mob_occupant)
 		imp.implant(mob_occupant)
 	R.fields["imp"] = "\ref[imp]"
 

code/game/machinery/computer/communications.dm

@@ -5,7 +5,7 @@
 	icon_screen = "comm"
 	icon_keyboard = "tech_key"
 	req_access = list(ACCESS_HEADS)
-	circuit = /obj/item/weapon/circuitboard/computer/communications
+	circuit = /obj/item/circuitboard/computer/communications
 	var/authenticated = 0
 	var/auth_id = "Unknown" //Who is currently logged in?
 	var/list/messagetitle = list()
@@ -36,7 +36,7 @@
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/communications/proc/checkCCcooldown()
-	var/obj/item/weapon/circuitboard/computer/communications/CM = circuit
+	var/obj/item/circuitboard/computer/communications/CM = circuit
 	if(CM.lastTimeUsed + 600 > world.time)
 		return FALSE
 	return TRUE
@@ -61,7 +61,7 @@
 
 	if(!href_list["operation"])
 		return
-	var/obj/item/weapon/circuitboard/computer/communications/CM = circuit
+	var/obj/item/circuitboard/computer/communications/CM = circuit
 	switch(href_list["operation"])
 		// main interface
 		if("main")
@@ -70,7 +70,7 @@
 		if("login")
 			var/mob/M = usr
 
-			var/obj/item/weapon/card/id/I = M.get_active_held_item()
+			var/obj/item/card/id/I = M.get_active_held_item()
 			if(!istype(I))
 				I = M.get_idcard()
 
@@ -96,7 +96,7 @@
 
 		if("swipeidseclevel")
 			var/mob/M = usr
-			var/obj/item/weapon/card/id/I = M.get_active_held_item()
+			var/obj/item/card/id/I = M.get_active_held_item()
 			if (istype(I, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = I
 				I = pda.id
@@ -392,7 +392,7 @@
 	src.updateUsrDialog()
 
 /obj/machinery/computer/communications/attackby(obj/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/card/id))
 		attack_hand(user)
 	else
 		return ..()
@@ -692,5 +692,5 @@
 	return ..()
 
 /obj/machinery/computer/communications/proc/overrideCooldown()
-	var/obj/item/weapon/circuitboard/computer/communications/CM = circuit
+	var/obj/item/circuitboard/computer/communications/CM = circuit
 	CM.lastTimeUsed = 0

code/game/machinery/computer/crew.dm

@@ -6,7 +6,7 @@
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 250
 	active_power_usage = 500
-	circuit = /obj/item/weapon/circuitboard/computer/crew
+	circuit = /obj/item/circuitboard/computer/crew
 
 	light_color = LIGHT_COLOR_BLUE
 
@@ -135,7 +135,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		if (ignore_unused || hi.isUsed())
 			var/list/results = list()
 			var/obj/item/clothing/under/U
-			var/obj/item/weapon/card/id/I
+			var/obj/item/card/id/I
 			var/turf/pos
 			var/ijob
 			var/name

code/game/machinery/computer/dna_console.dm

@@ -22,7 +22,7 @@
 	icon_screen = "dna"
 	icon_keyboard = "med_key"
 	density = TRUE
-	circuit = /obj/item/weapon/circuitboard/computer/scan_consolenew
+	circuit = /obj/item/circuitboard/computer/scan_consolenew
 	var/radduration = 2
 	var/radstrength = 1
 
@@ -31,7 +31,7 @@
 	var/injectorready = 0	//world timer cooldown var
 	var/current_screen = "mainmenu"
 	var/obj/machinery/dna_scannernew/connected = null
-	var/obj/item/weapon/disk/data/diskette = null
+	var/obj/item/disk/data/diskette = null
 	var/list/delayed_action = null
 	anchored = TRUE
 	use_power = IDLE_POWER_USE
@@ -41,7 +41,7 @@
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params)
-	if (istype(I, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
+	if (istype(I, /obj/item/disk/data)) //INSERT SOME DISKETTES
 		if (!src.diskette)
 			if(!user.drop_item())
 				return
@@ -390,11 +390,11 @@
 				num = Clamp(num, 1, NUMBER_OF_BUFFERS)
 				var/list/buffer_slot = buffer[num]
 				if(istype(buffer_slot))
-					var/obj/item/weapon/dnainjector/timed/I
+					var/obj/item/dnainjector/timed/I
 					switch(href_list["text"])
 						if("se")
 							if(buffer_slot["SE"])
-								I = new /obj/item/weapon/dnainjector/timed(loc)
+								I = new /obj/item/dnainjector/timed(loc)
 								var/powers = 0
 								for(var/datum/mutation/human/HM in GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations)
 									if(HM.check_block_string(buffer_slot["SE"]))
@@ -417,19 +417,19 @@
 									I.damage_coeff  = connected.damage_coeff
 						if("ui")
 							if(buffer_slot["UI"])
-								I = new /obj/item/weapon/dnainjector/timed(loc)
+								I = new /obj/item/dnainjector/timed(loc)
 								I.fields = list("UI"=buffer_slot["UI"])
 								if(connected)
 									I.damage_coeff = connected.damage_coeff
 						if("ue")
 							if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
-								I = new /obj/item/weapon/dnainjector/timed(loc)
+								I = new /obj/item/dnainjector/timed(loc)
 								I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
 								if(connected)
 									I.damage_coeff  = connected.damage_coeff
 						if("mixed")
 							if(buffer_slot["UI"] && buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
-								I = new /obj/item/weapon/dnainjector/timed(loc)
+								I = new /obj/item/dnainjector/timed(loc)
 								I.fields = list("UI"=buffer_slot["UI"],"name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
 								if(connected)
 									I.damage_coeff = connected.damage_coeff

code/game/machinery/computer/gulag_teleporter.dm

@@ -5,9 +5,9 @@
 	icon_screen = "explosive"
 	icon_keyboard = "security_key"
 	req_access = list(ACCESS_ARMORY)
-	circuit = /obj/item/weapon/circuitboard/computer/gulag_teleporter_console
+	circuit = /obj/item/circuitboard/computer/gulag_teleporter_console
 	var/default_goal = 200
-	var/obj/item/weapon/card/id/prisoner/id = null
+	var/obj/item/card/id/prisoner/id = null
 	var/obj/machinery/gulag_teleporter/teleporter = null
 	var/obj/structure/gulag_beacon/beacon = null
 	var/mob/living/carbon/human/prisoner = null
@@ -25,7 +25,7 @@
 	return ..()
 
 /obj/machinery/computer/gulag_teleporter_computer/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/weapon/card/id/prisoner))
+	if(istype(W, /obj/item/card/id/prisoner))
 		if(!id)
 			if(!user.drop_item())
 				return
@@ -101,7 +101,7 @@
 					id = null
 			else
 				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/weapon/card/id/prisoner))
+				if(istype(I, /obj/item/card/id/prisoner))
 					if(!usr.drop_item())
 						return
 					I.forceMove(src)

code/game/machinery/computer/launchpad_control.dm

@@ -3,7 +3,7 @@
 	desc = "Used to teleport objects to and from a launchpad."
 	icon_screen = "teleport"
 	icon_keyboard = "teleport_key"
-	circuit = /obj/item/weapon/circuitboard/computer/launchpad_console
+	circuit = /obj/item/circuitboard/computer/launchpad_console
 	var/sending = TRUE
 	var/current_pad //current pad viewed on the screen
 	var/list/obj/machinery/launchpad/launchpads

code/game/machinery/computer/law.dm

@@ -5,8 +5,8 @@
 	icon_screen = "command"
 
 /obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/weapon/aiModule))
-		var/obj/item/weapon/aiModule/M = O
+	if(istype(O, /obj/item/aiModule))
+		var/obj/item/aiModule/M = O
 		if(src.stat & (NOPOWER|BROKEN|MAINT))
 			return
 		if(!current)
@@ -33,7 +33,7 @@
 /obj/machinery/computer/upload/ai
 	name = "\improper AI upload console"
 	desc = "Used to upload laws to the AI."
-	circuit = /obj/item/weapon/circuitboard/computer/aiupload
+	circuit = /obj/item/circuitboard/computer/aiupload
 
 /obj/machinery/computer/upload/ai/attack_hand(mob/user)
 	if(..())
@@ -57,7 +57,7 @@
 /obj/machinery/computer/upload/borg
 	name = "cyborg upload console"
 	desc = "Used to upload laws to Cyborgs."
-	circuit = /obj/item/weapon/circuitboard/computer/borgupload
+	circuit = /obj/item/circuitboard/computer/borgupload
 
 /obj/machinery/computer/upload/borg/attack_hand(mob/user)
 	if(..())

code/game/machinery/computer/medical.dm

@@ -6,8 +6,8 @@
 	icon_screen = "medcomp"
 	icon_keyboard = "med_key"
 	req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS)
-	circuit = /obj/item/weapon/circuitboard/computer/med_data
-	var/obj/item/weapon/card/id/scan = null
+	circuit = /obj/item/circuitboard/computer/med_data
+	var/obj/item/card/id/scan = null
 	var/authenticated = null
 	var/rank = null
 	var/screen = null
@@ -26,7 +26,7 @@
 	icon_keyboard = "syndie_key"
 
 /obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/weapon/card/id) && !scan)
+	if(istype(O, /obj/item/card/id) && !scan)
 		if(!user.drop_item())
 			return
 		O.loc = src
@@ -112,11 +112,11 @@
 
 					dat += "<table><tr><td><b><font size='4'>Medical Record</font></b></td></tr>"
 					if(active1 in GLOB.data_core.general)
-						if(istype(active1.fields["photo_front"], /obj/item/weapon/photo))
-							var/obj/item/weapon/photo/P1 = active1.fields["photo_front"]
+						if(istype(active1.fields["photo_front"], /obj/item/photo))
+							var/obj/item/photo/P1 = active1.fields["photo_front"]
 							user << browse_rsc(P1.img, "photo_front")
-						if(istype(active1.fields["photo_side"], /obj/item/weapon/photo))
-							var/obj/item/weapon/photo/P2 = active1.fields["photo_side"]
+						if(istype(active1.fields["photo_side"], /obj/item/photo))
+							var/obj/item/photo/P2 = active1.fields["photo_side"]
 							user << browse_rsc(P2.img, "photo_side")
 						dat += "<tr><td>Name:</td><td>[active1.fields["name"]]</td>"
 						dat += "<td><a href='?src=\ref[src];field=show_photo_front'><img src=photo_front height=80 width=80 border=4></a></td>"
@@ -222,7 +222,7 @@
 				src.scan = null
 			else
 				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/weapon/card/id))
+				if(istype(I, /obj/item/card/id))
 					if(!usr.drop_item())
 						return
 					I.loc = src
@@ -258,7 +258,7 @@
 				src.authenticated = 1
 				src.rank = "Central Command"
 				src.screen = 1
-			else if(istype(src.scan, /obj/item/weapon/card/id))
+			else if(istype(src.scan, /obj/item/card/id))
 				src.active1 = null
 				src.active2 = null
 				if(src.check_access(src.scan))
@@ -399,14 +399,14 @@
 					if("show_photo_front")
 						if(active1)
 							if(active1.fields["photo_front"])
-								if(istype(active1.fields["photo_front"], /obj/item/weapon/photo))
-									var/obj/item/weapon/photo/P = active1.fields["photo_front"]
+								if(istype(active1.fields["photo_front"], /obj/item/photo))
+									var/obj/item/photo/P = active1.fields["photo_front"]
 									P.show(usr)
 					if("show_photo_side")
 						if(active1)
 							if(active1.fields["photo_side"])
-								if(istype(active1.fields["photo_side"], /obj/item/weapon/photo))
-									var/obj/item/weapon/photo/P = active1.fields["photo_side"]
+								if(istype(active1.fields["photo_side"], /obj/item/photo))
+									var/obj/item/photo/P = active1.fields["photo_side"]
 									P.show(usr)
 					else
 
@@ -539,7 +539,7 @@
 					GLOB.data_core.medicalPrintCount++
 					playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1)
 					sleep(30)
-					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
+					var/obj/item/paper/P = new /obj/item/paper( src.loc )
 					P.info = "<CENTER><B>Medical Record - (MR-[GLOB.data_core.medicalPrintCount])</B></CENTER><BR>"
 					if(active1 in GLOB.data_core.general)
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"])

code/game/machinery/computer/message.dm

@@ -8,7 +8,7 @@
 	name = "message monitor console"
 	desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages."
 	icon_screen = "comm_logs"
-	circuit = /obj/item/weapon/circuitboard/computer/message_monitor
+	circuit = /obj/item/circuitboard/computer/message_monitor
 	//Server linked to.
 	var/obj/machinery/message_server/linkedServer = null
 	//Sparks effect - For emag
@@ -32,8 +32,8 @@
 
 	light_color = LIGHT_COLOR_GREEN
 
-/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O, mob/living/user, params)
-	if(istype(O, /obj/item/weapon/screwdriver) && emagged)
+/obj/machinery/computer/message_monitor/attackby(obj/item/O, mob/living/user, params)
+	if(istype(O, /obj/item/screwdriver) && emagged)
 		//Stops people from just unscrewing the monitor and putting it back to get the console working again.
 		to_chat(user, "<span class='warning'>It is too hot to mess with!</span>")
 	else
@@ -47,7 +47,7 @@
 		screen = 2
 		spark_system.set_up(5, 0, src)
 		src.spark_system.start()
-		var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey
+		var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey
 		MK.loc = src.loc
 		// Will help make emagging the console not so easy to get away with.
 		MK.info += "<br><br><font color='red'>�%@%(*$%&(�&?*(%&�/{}</font>"
@@ -451,16 +451,16 @@
 	return src.attack_hand(usr)
 
 
-/obj/item/weapon/paper/monitorkey
+/obj/item/paper/monitorkey
 	//..()
 	name = "monitor decryption key"
 	var/obj/machinery/message_server/server = null
 
-/obj/item/weapon/paper/monitorkey/Initialize()
+/obj/item/paper/monitorkey/Initialize()
 	..()
 	return INITIALIZE_HINT_LATELOAD
 
-/obj/item/weapon/paper/monitorkey/LateInitialize()
+/obj/item/paper/monitorkey/LateInitialize()
 	if(GLOB.message_servers)
 		for(var/obj/machinery/message_server/server in GLOB.message_servers)
 			if(!isnull(server))

code/game/machinery/computer/monastery_shuttle.dm

@@ -1,7 +1,7 @@
 /obj/machinery/computer/shuttle/monastery_shuttle
 	name = "monastery shuttle console"
 	desc = "Used to control the monastery shuttle."
-	circuit = /obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle
+	circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle
 	shuttleId = "pod1"
 	possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
 	no_destination_swap = TRUE

code/game/machinery/computer/prisoner.dm

@@ -10,8 +10,8 @@
 	var/timeleft = 60
 	var/stop = 0
 	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
-	var/obj/item/weapon/card/id/prisoner/inserted_id
-	circuit = /obj/item/weapon/circuitboard/computer/prisoner
+	var/obj/item/card/id/prisoner/inserted_id
+	circuit = /obj/item/circuitboard/computer/prisoner
 
 	light_color = LIGHT_COLOR_RED
 
@@ -34,7 +34,7 @@
 		dat += "<H3>Prisoner Implant Management</H3>"
 		dat += "<HR>Chemical Implants<BR>"
 		var/turf/Tr = null
-		for(var/obj/item/weapon/implant/chem/C in GLOB.tracked_chem_implants)
+		for(var/obj/item/implant/chem/C in GLOB.tracked_chem_implants)
 			Tr = get_turf(C)
 			if((Tr) && (Tr.z != src.z))
 				continue//Out of range
@@ -47,7 +47,7 @@
 			dat += "<A href='?src=\ref[src];inject10=\ref[C]'>(<font class='bad'>(10)</font>)</A><BR>"
 			dat += "********************************<BR>"
 		dat += "<HR>Tracking Implants<BR>"
-		for(var/obj/item/weapon/implant/tracking/T in GLOB.tracked_implants)
+		for(var/obj/item/implant/tracking/T in GLOB.tracked_implants)
 			if(!isliving(T.imp_in))
 				continue
 			Tr = get_turf(T)
@@ -71,7 +71,7 @@
 	return
 
 /obj/machinery/computer/prisoner/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/card/id))
 		return attack_hand(user)
 	else
 		return ..()
@@ -90,7 +90,7 @@
 
 		if(href_list["id"])
 			if(href_list["id"] =="insert" && !inserted_id)
-				var/obj/item/weapon/card/id/prisoner/I = usr.get_active_held_item()
+				var/obj/item/card/id/prisoner/I = usr.get_active_held_item()
 				if(istype(I))
 					if(!usr.drop_item())
 						return
@@ -111,16 +111,16 @@
 							num = min(num,1000) //Cap the quota to the equivilent of 10 minutes.
 							inserted_id.goal = num
 		else if(href_list["inject1"])
-			var/obj/item/weapon/implant/I = locate(href_list["inject1"]) in GLOB.tracked_chem_implants
+			var/obj/item/implant/I = locate(href_list["inject1"]) in GLOB.tracked_chem_implants
 			if(I && istype(I))
 				I.activate(1)
 		else if(href_list["inject5"])
-			var/obj/item/weapon/implant/I = locate(href_list["inject5"]) in GLOB.tracked_chem_implants
+			var/obj/item/implant/I = locate(href_list["inject5"]) in GLOB.tracked_chem_implants
 			if(I && istype(I))
 				I.activate(5)
 
 		else if(href_list["inject10"])
-			var/obj/item/weapon/implant/I = locate(href_list["inject10"]) in GLOB.tracked_chem_implants
+			var/obj/item/implant/I = locate(href_list["inject10"]) in GLOB.tracked_chem_implants
 			if(I && istype(I))
 				I.activate(10)
 
@@ -134,7 +134,7 @@
 			var/warning = copytext(sanitize(input(usr,"Message:","Enter your message here!","")),1,MAX_MESSAGE_LEN)
 			if(!warning)
 				return
-			var/obj/item/weapon/implant/I = locate(href_list["warn"]) in GLOB.tracked_implants
+			var/obj/item/implant/I = locate(href_list["warn"]) in GLOB.tracked_implants
 			if(I && istype(I) && I.imp_in)
 				var/mob/living/R = I.imp_in
 				to_chat(R, "<span class='italics'>You hear a voice in your head saying: '[warning]'</span>")

code/game/machinery/computer/robot.dm

@@ -7,7 +7,7 @@
 	icon_screen = "robot"
 	icon_keyboard = "rd_key"
 	req_access = list(ACCESS_ROBOTICS)
-	circuit = /obj/item/weapon/circuitboard/computer/robotics
+	circuit = /obj/item/circuitboard/computer/robotics
 	var/temp = null
 
 	light_color = LIGHT_COLOR_PINK

code/game/machinery/computer/security.dm

@@ -4,8 +4,8 @@
 	icon_screen = "security"
 	icon_keyboard = "security_key"
 	req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
-	circuit = /obj/item/weapon/circuitboard/computer/secure_data
-	var/obj/item/weapon/card/id/scan = null
+	circuit = /obj/item/circuitboard/computer/secure_data
+	var/obj/item/card/id/scan = null
 	var/authenticated = null
 	var/rank = null
 	var/screen = null
@@ -35,7 +35,7 @@
 	clockwork = TRUE //it'd look weird
 
 /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/weapon/card/id))
+	if(istype(O, /obj/item/card/id))
 		if(!scan)
 			if(!user.drop_item())
 				return
@@ -175,11 +175,11 @@
 				if(3)
 					dat += "<font size='4'><b>Security Record</b></font><br>"
 					if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1))
-						if(istype(active1.fields["photo_front"], /obj/item/weapon/photo))
-							var/obj/item/weapon/photo/P1 = active1.fields["photo_front"]
+						if(istype(active1.fields["photo_front"], /obj/item/photo))
+							var/obj/item/photo/P1 = active1.fields["photo_front"]
 							user << browse_rsc(P1.img, "photo_front")
-						if(istype(active1.fields["photo_side"], /obj/item/weapon/photo))
-							var/obj/item/weapon/photo/P2 = active1.fields["photo_side"]
+						if(istype(active1.fields["photo_side"], /obj/item/photo))
+							var/obj/item/photo/P2 = active1.fields["photo_side"]
 							user << browse_rsc(P2.img, "photo_side")
 						dat += {"<table><tr><td><table>
 						<tr><td>Name:</td><td><A href='?src=\ref[src];choice=Edit Field;field=name'>&nbsp;[active1.fields["name"]]&nbsp;</A></td></tr>
@@ -310,7 +310,7 @@ What a mess.*/
 					scan = null
 				else
 					var/obj/item/I = usr.get_active_held_item()
-					if(istype(I, /obj/item/weapon/card/id))
+					if(istype(I, /obj/item/card/id))
 						if(!usr.drop_item())
 							return
 						I.loc = src
@@ -336,7 +336,7 @@ What a mess.*/
 					authenticated = usr.client.holder.admin_signature
 					rank = "Central Command"
 					screen = 1
-				else if(istype(scan, /obj/item/weapon/card/id))
+				else if(istype(scan, /obj/item/card/id))
 					active1 = null
 					active2 = null
 					if(check_access(scan))
@@ -369,7 +369,7 @@ What a mess.*/
 					GLOB.data_core.securityPrintCount++
 					playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1)
 					sleep(30)
-					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc )
+					var/obj/item/paper/P = new /obj/item/paper( loc )
 					P.info = "<CENTER><B>Security Record - (SR-[GLOB.data_core.securityPrintCount])</B></CENTER><BR>"
 					if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))
 						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"])
@@ -451,8 +451,8 @@ What a mess.*/
 							printing = 1
 							sleep(30)
 							if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists.
-								var/obj/item/weapon/photo/photo = active1.fields["photo_front"]
-								new /obj/item/weapon/poster/wanted(src.loc, photo.img, wanted_name, info)
+								var/obj/item/photo/photo = active1.fields["photo_front"]
+								new /obj/item/poster/wanted(src.loc, photo.img, wanted_name, info)
 							printing = 0
 
 //RECORD DELETE
@@ -610,8 +610,8 @@ What a mess.*/
 							active1.fields["species"] = t1
 					if("show_photo_front")
 						if(active1.fields["photo_front"])
-							if(istype(active1.fields["photo_front"], /obj/item/weapon/photo))
-								var/obj/item/weapon/photo/P = active1.fields["photo_front"]
+							if(istype(active1.fields["photo_front"], /obj/item/photo))
+								var/obj/item/photo/P = active1.fields["photo_front"]
 								P.show(usr)
 					if("upd_photo_front")
 						var/icon/photo = get_photo(usr)
@@ -620,8 +620,8 @@ What a mess.*/
 							active1.fields["photo_front"] = photo
 					if("show_photo_side")
 						if(active1.fields["photo_side"])
-							if(istype(active1.fields["photo_side"], /obj/item/weapon/photo))
-								var/obj/item/weapon/photo/P = active1.fields["photo_side"]
+							if(istype(active1.fields["photo_side"], /obj/item/photo))
+								var/obj/item/photo/P = active1.fields["photo_side"]
 								P.show(usr)
 					if("upd_photo_side")
 						var/icon/photo = get_photo(usr)
@@ -737,14 +737,14 @@ What a mess.*/
 	return
 
 /obj/machinery/computer/secure_data/proc/get_photo(mob/user)
-	var/obj/item/weapon/photo/P = null
+	var/obj/item/photo/P = null
 	if(issilicon(user))
 		var/mob/living/silicon/tempAI = user
 		var/datum/picture/selection = tempAI.GetPhoto()
 		if(selection)
 			P = new()
 			P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
-	else if(istype(user.get_active_held_item(), /obj/item/weapon/photo))
+	else if(istype(user.get_active_held_item(), /obj/item/photo))
 		P = user.get_active_held_item()
 	return P
 

code/game/machinery/computer/station_alert.dm

@@ -3,7 +3,7 @@
 	desc = "Used to access the station's automated alert system."
 	icon_screen = "alert:0"
 	icon_keyboard = "atmos_key"
-	circuit = /obj/item/weapon/circuitboard/computer/stationalert
+	circuit = /obj/item/circuitboard/computer/stationalert
 	var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list())
 
 	light_color = LIGHT_COLOR_CYAN

code/game/machinery/computer/teleporter.dm

@@ -4,7 +4,7 @@
 	icon_screen = "teleport"
 	icon_keyboard = "teleport_key"
 	light_color = LIGHT_COLOR_BLUE
-	circuit = /obj/item/weapon/circuitboard/computer/teleporter
+	circuit = /obj/item/circuitboard/computer/teleporter
 	var/obj/item/device/gps/locked
 	var/regime_set = "Teleporter"
 	var/id
@@ -168,7 +168,7 @@
 				continue
 			L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R
 
-		for(var/obj/item/weapon/implant/tracking/I in GLOB.tracked_implants)
+		for(var/obj/item/implant/tracking/I in GLOB.tracked_implants)
 			if(!I.imp_in || !ismob(I.loc))
 				continue
 			else