merge conflict fix

code/game/objects/structures/aliens.dm

@@ -0,0 +1,428 @@
+/* Alien shit!
+ * Contains:
+ *		structure/alien
+ *		Resin
+ *		Weeds
+ *		Egg
+ */
+
+#define WEED_NORTH_EDGING "north"
+#define WEED_SOUTH_EDGING "south"
+#define WEED_EAST_EDGING "east"
+#define WEED_WEST_EDGING "west"
+
+/obj/structure/alien
+	icon = 'icons/mob/alien.dmi'
+
+/*
+ * Resin
+ */
+/obj/structure/alien/resin
+	name = "resin"
+	desc = "Looks like some kind of thick resin."
+	icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
+	icon_state = "resin"
+	density = 1
+	opacity = 1
+	anchored = 1
+	canSmoothWith = list(/obj/structure/alien/resin)
+	var/health = 200
+	var/resintype = null
+	smooth = SMOOTH_TRUE
+
+/obj/structure/alien/resin/initialize()
+	air_update_turf(1)
+	..()
+
+/obj/structure/alien/resin/Destroy()
+	air_update_turf(1)
+	return ..()
+
+/obj/structure/alien/resin/Move()
+	var/turf/T = loc
+	..()
+	move_update_air(T)
+
+/obj/structure/alien/resin/CanAtmosPass()
+	return !density
+
+/obj/structure/alien/resin/wall
+	name = "resin wall"
+	desc = "Thick resin solidified into a wall."
+	icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
+	icon_state = "wall0"	//same as resin, but consistency ho!
+	resintype = "wall"
+	canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
+
+/obj/structure/alien/resin/wall/BlockSuperconductivity()
+	return 1
+
+/obj/structure/alien/resin/wall/shadowling //For chrysalis
+	name = "chrysalis wall"
+	desc = "Some sort of purple substance in an egglike shape. It pulses and throbs from within and seems impenetrable."
+	health = INFINITY
+
+/obj/structure/alien/resin/membrane
+	name = "resin membrane"
+	desc = "Resin just thin enough to let light pass through."
+	icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi'
+	icon_state = "membrane0"
+	opacity = 0
+	health = 120
+	resintype = "membrane"
+	canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
+
+/obj/structure/alien/resin/proc/healthcheck()
+	if(health <=0)
+		qdel(src)
+
+
+/obj/structure/alien/resin/bullet_act(obj/item/projectile/Proj)
+	if(Proj.damage_type == BRUTE || Proj.damage_type == BURN)
+		health -= Proj.damage
+	..()
+	healthcheck()
+
+
+/obj/structure/alien/resin/ex_act(severity)
+	switch(severity)
+		if(1)
+			health -= 150
+		if(2)
+			health -= 100
+		if(3)
+			health -= 50
+	healthcheck()
+
+
+/obj/structure/alien/resin/blob_act()
+	health -= 50
+	healthcheck()
+
+
+/obj/structure/alien/resin/hitby(atom/movable/AM)
+	..()
+	var/tforce = 0
+	if(ismob(AM))
+		tforce = 10
+	else if(isobj(AM))
+		var/obj/O = AM
+		tforce = O.throwforce
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	health -= tforce
+	healthcheck()
+
+/obj/structure/alien/resin/attack_hand(mob/living/user)
+	if(HULK in user.mutations)
+		user.do_attack_animation(src)
+		user.visible_message("<span class='danger'>[user] destroys [src]!</span>")
+		health = 0
+		healthcheck()
+
+
+/obj/structure/alien/resin/attack_alien(mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
+	if(islarva(user))
+		return
+	user.visible_message("<span class='danger'>[user] claws at the resin!</span>")
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	health -= 50
+	if(health <= 0)
+		user.visible_message("<span class='danger'>[user] slices the [name] apart!</span>")
+	healthcheck()
+
+
+/obj/structure/alien/resin/attackby(obj/item/I, mob/living/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
+	health -= I.force
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	healthcheck()
+	..()
+
+
+/obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target, height=0)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return !opacity
+	return !density
+
+
+/*
+ * Weeds
+ */
+
+#define NODERANGE 3
+
+/obj/structure/alien/weeds
+	gender = PLURAL
+	name = "resin floor"
+	desc = "A thick resin surface covers the floor."
+	icon_state = "weeds"
+	anchored = 1
+	density = 0
+	layer = 2
+	var/health = 15
+	var/obj/structure/alien/weeds/node/linked_node = null
+	var/static/list/weedImageCache
+
+
+/obj/structure/alien/weeds/New(pos, node)
+	..()
+	linked_node = node
+	if(istype(loc, /turf/space))
+		qdel(src)
+		return
+	if(icon_state == "weeds")
+		icon_state = pick("weeds", "weeds1", "weeds2")
+	fullUpdateWeedOverlays()
+	spawn(rand(150, 200))
+		if(src)
+			Life()
+
+/obj/structure/alien/weeds/Destroy()
+	var/turf/T = loc
+	for(var/obj/structure/alien/weeds/W in range(1,T))
+		W.updateWeedOverlays()
+	linked_node = null
+	return ..()
+
+/obj/structure/alien/weeds/proc/Life()
+	set background = BACKGROUND_ENABLED
+	var/turf/U = get_turf(src)
+
+	if(istype(U, /turf/space))
+		qdel(src)
+		return
+
+	if(!linked_node || get_dist(linked_node, src) > linked_node.node_range)
+		return
+
+	for(var/turf/T in U.GetAtmosAdjacentTurfs())
+
+		if(locate(/obj/structure/alien/weeds) in T || istype(T, /turf/space))
+			continue
+
+		new /obj/structure/alien/weeds(T, linked_node)
+
+
+/obj/structure/alien/weeds/ex_act(severity)
+	qdel(src)
+
+
+/obj/structure/alien/weeds/attackby(obj/item/I, mob/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(I.attack_verb.len)
+		visible_message("<span class='danger'>[user] has [pick(I.attack_verb)] [src] with [I]!</span>")
+	else
+		visible_message("<span class='danger'>[user] has attacked [src] with [I]!</span>")
+
+	var/damage = I.force / 4
+	if(istype(I, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = I
+		if(WT.remove_fuel(0, user))
+			damage = 15
+			playsound(loc, WT.usesound, 100, 1)
+
+	health -= damage
+	healthcheck()
+
+
+/obj/structure/alien/weeds/proc/healthcheck()
+	if(health <= 0)
+		qdel(src)
+
+
+/obj/structure/alien/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 300)
+		health -= 5
+		healthcheck()
+
+
+/obj/structure/alien/weeds/proc/updateWeedOverlays()
+
+	overlays.Cut()
+
+	if(!weedImageCache || !weedImageCache.len)
+		weedImageCache = list()
+		weedImageCache.len = 4
+		weedImageCache[WEED_NORTH_EDGING] = image('icons/mob/alien.dmi', "weeds_side_n", layer=2.11, pixel_y = -32)
+		weedImageCache[WEED_SOUTH_EDGING] = image('icons/mob/alien.dmi', "weeds_side_s", layer=2.11, pixel_y = 32)
+		weedImageCache[WEED_EAST_EDGING] = image('icons/mob/alien.dmi', "weeds_side_e", layer=2.11, pixel_x = -32)
+		weedImageCache[WEED_WEST_EDGING] = image('icons/mob/alien.dmi', "weeds_side_w", layer=2.11, pixel_x = 32)
+
+	var/turf/N = get_step(src, NORTH)
+	var/turf/S = get_step(src, SOUTH)
+	var/turf/E = get_step(src, EAST)
+	var/turf/W = get_step(src, WEST)
+	if(!locate(/obj/structure/alien) in N.contents)
+		if(istype(N, /turf/simulated/floor))
+			overlays += weedImageCache[WEED_SOUTH_EDGING]
+	if(!locate(/obj/structure/alien) in S.contents)
+		if(istype(S, /turf/simulated/floor))
+			overlays += weedImageCache[WEED_NORTH_EDGING]
+	if(!locate(/obj/structure/alien) in E.contents)
+		if(istype(E, /turf/simulated/floor))
+			overlays += weedImageCache[WEED_WEST_EDGING]
+	if(!locate(/obj/structure/alien) in W.contents)
+		if(istype(W, /turf/simulated/floor))
+			overlays += weedImageCache[WEED_EAST_EDGING]
+
+
+/obj/structure/alien/weeds/proc/fullUpdateWeedOverlays()
+	for(var/obj/structure/alien/weeds/W in range(1,src))
+		W.updateWeedOverlays()
+
+//Weed nodes
+/obj/structure/alien/weeds/node
+	name = "glowing resin"
+	desc = "Blue bioluminescence shines from beneath the surface."
+	icon_state = "weednode"
+	light_range = 1
+	var/node_range = NODERANGE
+
+
+/obj/structure/alien/weeds/node/New()
+	..(loc, src)
+
+#undef NODERANGE
+
+
+/*
+ * Egg
+ */
+
+//for the status var
+#define BURST 0
+#define BURSTING 1
+#define GROWING 2
+#define GROWN 3
+#define MIN_GROWTH_TIME 1800	//time it takes to grow a hugger
+#define MAX_GROWTH_TIME 3000
+
+/obj/structure/alien/egg
+	name = "egg"
+	desc = "A large mottled egg."
+	icon_state = "egg_growing"
+	density = 0
+	anchored = 1
+	var/health = 100
+	var/status = GROWING	//can be GROWING, GROWN or BURST; all mutually exclusive
+	layer = MOB_LAYER
+
+
+/obj/structure/alien/egg/New()
+	new /obj/item/clothing/mask/facehugger(src)
+	..()
+	spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
+		Grow()
+
+/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
+	return attack_hand(user)
+
+/obj/structure/alien/egg/attack_hand(mob/living/user)
+	if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel))
+		switch(status)
+			if(BURST)
+				to_chat(user, "<span class='notice'>You clear the hatched egg.</span>")
+				playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+				qdel(src)
+				return
+			if(GROWING)
+				to_chat(user, "<span class='notice'>The child is not developed yet.</span>")
+				return
+			if(GROWN)
+				to_chat(user, "<span class='notice'>You retrieve the child.</span>")
+				Burst(0)
+				return
+	else
+		to_chat(user, "<span class='notice'>It feels slimy.</span>")
+		user.changeNext_move(CLICK_CD_MELEE)
+
+
+/obj/structure/alien/egg/proc/GetFacehugger()
+	return locate(/obj/item/clothing/mask/facehugger) in contents
+
+/obj/structure/alien/egg/proc/Grow()
+	icon_state = "egg"
+	status = GROWN
+
+/obj/structure/alien/egg/proc/Burst(kill = 1)	//drops and kills the hugger if any is remaining
+	if(status == GROWN || status == GROWING)
+		icon_state = "egg_hatched"
+		flick("egg_opening", src)
+		status = BURSTING
+		spawn(15)
+			status = BURST
+			var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
+			if(child)
+				child.loc = get_turf(src)
+				if(kill && istype(child))
+					child.Die()
+				else
+					for(var/mob/M in range(1,src))
+						if(CanHug(M))
+							child.Attach(M)
+							break
+
+/obj/structure/alien/egg/bullet_act(obj/item/projectile/Proj)
+	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		health -= Proj.damage
+	..()
+	healthcheck()
+
+
+/obj/structure/alien/egg/attackby(obj/item/I, mob/user, params)
+	if(I.attack_verb.len)
+		visible_message("<span class='danger'>[user] has [pick(I.attack_verb)] [src] with [I]!</span>")
+	else
+		visible_message("<span class='danger'>[user] has attacked [src] with [I]!</span>")
+
+	var/damage = I.force / 4
+	if(istype(I, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = I
+
+		if(WT.remove_fuel(0, user))
+			damage = 15
+			playsound(loc, WT.usesound, 100, 1)
+
+	health -= damage
+	user.changeNext_move(CLICK_CD_MELEE)
+	healthcheck()
+
+
+/obj/structure/alien/egg/proc/healthcheck()
+	if(health <= 0)
+		if(status != BURST && status != BURSTING)
+			Burst()
+		else if(status == BURST && prob(50))
+			qdel(src)	//Remove the egg after it has been hit after bursting.
+
+
+/obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 500)
+		health -= 5
+		healthcheck()
+
+
+/obj/structure/alien/egg/HasProximity(atom/movable/AM)
+	if(status == GROWN)
+		if(!CanHug(AM))
+			return
+
+		var/mob/living/carbon/C = AM
+		if(C.stat == CONSCIOUS && C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo))
+			return
+
+		Burst(0)
+
+#undef BURST
+#undef BURSTING
+#undef GROWING
+#undef GROWN
+#undef MIN_GROWTH_TIME
+#undef MAX_GROWTH_TIME
+
+#undef WEED_NORTH_EDGING
+#undef WEED_SOUTH_EDGING
+#undef WEED_EAST_EDGING
+#undef WEED_WEST_EDGING

code/game/objects/structures/artstuff.dm

@@ -10,7 +10,7 @@
 	density = 1
 	burn_state = FLAMMABLE
 	burntime = 15
-	var/obj/item/weapon/canvas/painting = null
+	var/obj/item/canvas/painting = null
 
 /obj/structure/easel/Destroy()
 	QDEL_NULL(painting)
@@ -18,8 +18,8 @@
 
 //Adding canvases
 /obj/structure/easel/attackby(var/obj/item/I, var/mob/user, params)
-	if(istype(I, /obj/item/weapon/canvas))
-		var/obj/item/weapon/canvas/C = I
+	if(istype(I, /obj/item/canvas))
+		var/obj/item/canvas/C = I
 		user.unEquip(C)
 		painting = C
 		C.loc = get_turf(src)
@@ -49,7 +49,7 @@
 //To safe memory on making /icons we cache the blanks..
 var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 
-/obj/item/weapon/canvas
+/obj/item/canvas
 	name = "11px by 11px canvas"
 	desc = "Draw out your soul on this canvas! Only crayons can draw on it. Examine it to focus on the canvas."
 	icon = 'icons/obj/artstuff.dmi'
@@ -57,24 +57,24 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 	burn_state = FLAMMABLE
 	var/whichGlobalBackup = 1 //List index
 
-/obj/item/weapon/canvas/nineteenXnineteen
+/obj/item/canvas/nineteenXnineteen
 	name = "19px by 19px canvas"
 	icon_state = "19x19"
 	whichGlobalBackup = 2
 
-/obj/item/weapon/canvas/twentythreeXnineteen
+/obj/item/canvas/twentythreeXnineteen
 	name = "23px by 19px canvas"
 	icon_state = "23x19"
 	whichGlobalBackup = 3
 
-/obj/item/weapon/canvas/twentythreeXtwentythree
+/obj/item/canvas/twentythreeXtwentythree
 	name = "23px by 23px canvas"
 	icon_state = "23x23"
 	whichGlobalBackup = 4
 
 
 //Find the right size blank canvas
-/obj/item/weapon/canvas/proc/getGlobalBackup()
+/obj/item/canvas/proc/getGlobalBackup()
 	. = null
 	if(globalBlankCanvases[whichGlobalBackup])
 		. = globalBlankCanvases[whichGlobalBackup]
@@ -86,7 +86,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 
 
 //One pixel increments
-/obj/item/weapon/canvas/attackby(var/obj/item/I, var/mob/user, params)
+/obj/item/canvas/attackby(var/obj/item/I, var/mob/user, params)
 	//Click info
 	var/list/click_params = params2list(params)
 	var/pixX = text2num(click_params["icon-x"])
@@ -98,7 +98,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 
 	var/icon/masterpiece = icon(icon,icon_state)
 	//Cleaning one pixel with a soap or rag
-	if(istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag))
+	if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
 		//Pixel info created only when needed
 		var/thePix = masterpiece.GetPixel(pixX,pixY)
 		var/icon/Ico = getGlobalBackup()
@@ -124,7 +124,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 	..()
 
 //Clean the whole canvas
-/obj/item/weapon/canvas/attack_self(var/mob/user)
+/obj/item/canvas/attack_self(var/mob/user)
 	if(!user)
 		return
 	var/icon/blank = getGlobalBackup()

code/game/objects/structures/barsign.dm

@@ -61,7 +61,7 @@
 	if(!allowed(user))
 		to_chat(user, "<span class = 'info'>Access denied.</span>")
 		return
-	if( istype(I, /obj/item/weapon/screwdriver))
+	if( istype(I, /obj/item/screwdriver))
 		if(!panel_open)
 			to_chat(user, "<span class='notice'>You open the maintenance panel.</span>")
 			set_sign(new /datum/barsign/hiddensigns/signoff)

code/game/objects/structures/bedsheet_bin.dm

@@ -4,7 +4,7 @@ BEDSHEETS
 LINEN BINS
 */
 
-/obj/item/weapon/bedsheet
+/obj/item/bedsheet
 	name = "bedsheet"
 	desc = "A surprisingly soft linen bedsheet."
 	icon = 'icons/obj/items.dmi'
@@ -25,7 +25,7 @@ LINEN BINS
 
 
 
-/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
+/obj/item/bedsheet/attack_self(mob/user as mob)
 	user.drop_item()
 	if(layer == initial(layer))
 		layer = 5
@@ -35,31 +35,31 @@ LINEN BINS
 	return
 
 
-/obj/item/weapon/bedsheet/blue
+/obj/item/bedsheet/blue
 	icon_state = "sheetblue"
 	item_color = "blue"
 	dream_messages = list("blue")
 	nightmare_messages = list("vox blood")
 
-/obj/item/weapon/bedsheet/green
+/obj/item/bedsheet/green
 	icon_state = "sheetgreen"
 	item_color = "green"
 	dream_messages = list("green")
 	nightmare_messages = list("unathi flesh")
 
-/obj/item/weapon/bedsheet/orange
+/obj/item/bedsheet/orange
 	icon_state = "sheetorange"
 	item_color = "orange"
 	dream_messages = list("orange")
 	nightmare_messages = list("exploding fruit")
 
-/obj/item/weapon/bedsheet/purple
+/obj/item/bedsheet/purple
 	icon_state = "sheetpurple"
 	item_color = "purple"
 	dream_messages = list("purple")
 	nightmare_messages = list("Grey blood")
 
-/obj/item/weapon/bedsheet/patriot
+/obj/item/bedsheet/patriot
 	name = "patriotic bedsheet"
 	desc = "You've never felt more free than when sleeping on this."
 	icon_state = "sheetUSA"
@@ -67,7 +67,7 @@ LINEN BINS
 	dream_messages = list("America", "freedom", "fireworks", "bald eagles")
 	nightmare_messages = list("communism")
 
-/obj/item/weapon/bedsheet/rainbow
+/obj/item/bedsheet/rainbow
 	name = "rainbow bedsheet"
 	desc = "A multi_colored blanket.  It's actually several different sheets cut up and sewn together."
 	icon_state = "sheetrainbow"
@@ -75,19 +75,19 @@ LINEN BINS
 	dream_messages = list("red", "orange", "yellow", "green", "blue", "purple", "a rainbow")
 	nightmare_messages = list("green", "a cluwne", "fLoOr ClUwNe")
 
-/obj/item/weapon/bedsheet/red
+/obj/item/bedsheet/red
 	icon_state = "sheetred"
 	item_color = "red"
 	dream_messages = list("red")
 	nightmare_messages = list("gibs")
 
-/obj/item/weapon/bedsheet/yellow
+/obj/item/bedsheet/yellow
 	icon_state = "sheetyellow"
 	item_color = "yellow"
 	dream_messages = list("yellow")
 	nightmare_messages = list("locker full of banana peels")
 
-/obj/item/weapon/bedsheet/mime
+/obj/item/bedsheet/mime
 	name = "mime's blanket"
 	desc = "A very soothing striped blanket.  All the noise just seems to fade out when you're under the covers in this."
 	icon_state = "sheetmime"
@@ -95,7 +95,7 @@ LINEN BINS
 	dream_messages = list("silence", "gestures", "a pale face", "a gaping mouth", "the mime")
 	nightmare_messages = list("honk", "laughter", "a prank", "a joke", "a smiling face", "the clown")
 
-/obj/item/weapon/bedsheet/clown
+/obj/item/bedsheet/clown
 	name = "clown's blanket"
 	desc = "A rainbow blanket with a clown mask woven in.  It smells faintly of bananas."
 	icon_state = "sheetclown"
@@ -103,7 +103,7 @@ LINEN BINS
 	dream_messages = list("honk", "laughter", "a prank", "a joke", "a smiling face", "the clown")
 	nightmare_messages = list("silence", "gestures", "a pale face", "a gaping mouth", "the mime")
 
-/obj/item/weapon/bedsheet/captain
+/obj/item/bedsheet/captain
 	name = "captain's bedsheet."
 	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
 	icon_state = "sheetcaptain"
@@ -111,7 +111,7 @@ LINEN BINS
 	dream_messages = list("authority", "a golden ID", "sunglasses", "a green disc", "an antique gun", "the captain")
 	nightmare_messages = list("comdom", "clown with all access", "the syndicate")
 
-/obj/item/weapon/bedsheet/rd
+/obj/item/bedsheet/rd
 	name = "research director's bedsheet"
 	desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
 	icon_state = "sheetrd"
@@ -119,7 +119,7 @@ LINEN BINS
 	dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
 	nightmare_messages = list("toxins full of plasma", "UPGRADE THE SLEEPERS", "rogue ai")
 
-/obj/item/weapon/bedsheet/medical
+/obj/item/bedsheet/medical
 	name = "medical blanket"
 	desc = "It's a sterilized* blanket commonly used in the Medbay.  *Sterilization is voided if a virologist is present onboard the station."
 	icon_state = "sheetmedical"
@@ -127,7 +127,7 @@ LINEN BINS
 	dream_messages = list("healing", "life", "surgery", "a doctor")
 	nightmare_messages = list("death", "no cryox", "cryo is off")
 
-/obj/item/weapon/bedsheet/cmo
+/obj/item/bedsheet/cmo
 	name = "chief medical officer's bedsheet"
 	desc = "It's a sterilized blanket that has a cross emblem.  There's some cat fur on it, likely from Runtime."
 	icon_state = "sheetcmo"
@@ -135,7 +135,7 @@ LINEN BINS
 	dream_messages = list("authority", "a silvery ID", "healing", "life", "surgery", "a cat", "the chief medical officer")
 	nightmare_messages = list("chemists making meth", "cryo it off", "where is the defib", "no biomass")
 
-/obj/item/weapon/bedsheet/hos
+/obj/item/bedsheet/hos
 	name = "head of security's bedsheet"
 	desc = "It is decorated with a shield emblem.  While crime doesn't sleep, you do, but you are still THE LAW!"
 	icon_state = "sheethos"
@@ -144,7 +144,7 @@ LINEN BINS
 	nightmare_messages = list("the clown", "a toolbox", "sHiTcUrItY", "why did you put them in for 50 minutes")
 
 
-/obj/item/weapon/bedsheet/hop
+/obj/item/bedsheet/hop
 	name = "head of personnel's bedsheet"
 	desc = "It is decorated with a key emblem.  For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
 	icon_state = "sheethop"
@@ -152,7 +152,7 @@ LINEN BINS
 	dream_messages = list("authority", "a silvery ID", "obligation", "a computer", "an ID", "a corgi", "the head of personnel")
 	nightmare_messages = list("improper paperwork", "all access clown", "50 open clown slots", "dead ian")
 
-/obj/item/weapon/bedsheet/ce
+/obj/item/bedsheet/ce
 	name = "chief engineer's bedsheet"
 	desc = "It is decorated with a wrench emblem.  It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
 	icon_state = "sheetce"
@@ -160,7 +160,7 @@ LINEN BINS
 	dream_messages = list("authority", "a silvery ID", "the engine", "power tools", "an APC", "a parrot", "the chief engineer")
 	nightmare_messages = list("forced airlock", "syndicate bomb", "explosion in research chem", "iT's LoOsE")
 
-/obj/item/weapon/bedsheet/qm
+/obj/item/bedsheet/qm
 	name = "quartermaster's bedsheet"
 	desc = "It is decorated with a crate emblem in silver lining.  It's rather tough, and just the thing to lie on after a hard day of pushing paper."
 	icon_state = "sheetqm"
@@ -168,13 +168,13 @@ LINEN BINS
 	dream_messages = list("a grey ID", "a shuttle", "a crate", "a sloth", "the quartermaster")
 	nightmare_messages = list("a bald person", "no points", "wheres the ore", "space carp")
 
-/obj/item/weapon/bedsheet/brown
+/obj/item/bedsheet/brown
 	icon_state = "sheetbrown"
 	item_color = "cargo"
 	dream_messages = list("brown")
 	nightmare_messages = list("dead monkey")
 
-/obj/item/weapon/bedsheet/centcom
+/obj/item/bedsheet/centcom
 	name = "centcom bedsheet"
 	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
 	icon_state = "sheetcentcom"
@@ -182,7 +182,7 @@ LINEN BINS
 	dream_messages = list("a unique ID", "authority", "artillery", "an ending")
 	nightmare_messages = list("a butt fax")
 
-/obj/item/weapon/bedsheet/syndie
+/obj/item/bedsheet/syndie
 	name = "syndicate bedsheet"
 	desc = "It has a syndicate emblem and it has an aura of evil."
 	icon_state = "sheetsyndie"
@@ -190,7 +190,7 @@ LINEN BINS
 	dream_messages = list("a green disc", "a red crystal", "a glowing blade", "a wire-covered ID")
 	nightmare_messages = list("stunbaton", "taser", "lasers", "a toolbox")
 
-/obj/item/weapon/bedsheet/cult
+/obj/item/bedsheet/cult
 	name = "cultist's bedsheet"
 	desc = "You might dream of Nar'Sie if you sleep with this.  It seems rather tattered and glows of an eldritch presence."
 	icon_state = "sheetcult"
@@ -199,7 +199,7 @@ LINEN BINS
 	nightmare_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
 
 
-/obj/item/weapon/bedsheet/wiz
+/obj/item/bedsheet/wiz
 	name = "wizard's bedsheet"
 	desc = "A special fabric enchanted with magic so you can have an enchanted night.  It even glows!"
 	icon_state = "sheetwiz"
@@ -251,7 +251,7 @@ LINEN BINS
 	update_icon()
 
 /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(istype(I, /obj/item/weapon/bedsheet))
+	if(istype(I, /obj/item/bedsheet))
 		user.drop_item()
 		I.loc = src
 		sheets.Add(I)
@@ -269,13 +269,13 @@ LINEN BINS
 	if(amount >= 1)
 		amount--
 
-		var/obj/item/weapon/bedsheet/B
+		var/obj/item/bedsheet/B
 		if(sheets.len > 0)
 			B = sheets[sheets.len]
 			sheets.Remove(B)
 
 		else
-			B = new /obj/item/weapon/bedsheet(loc)
+			B = new /obj/item/bedsheet(loc)
 
 		B.loc = user.loc
 		user.put_in_hands(B)
@@ -294,13 +294,13 @@ LINEN BINS
 	if(amount >= 1)
 		amount--
 
-		var/obj/item/weapon/bedsheet/B
+		var/obj/item/bedsheet/B
 		if(sheets.len > 0)
 			B = sheets[sheets.len]
 			sheets.Remove(B)
 
 		else
-			B = new /obj/item/weapon/bedsheet(loc)
+			B = new /obj/item/bedsheet(loc)
 
 		B.loc = loc
 		to_chat(user, "<span class='notice'>You telekinetically remove [B] from [src].</span>")

code/game/objects/structures/coathanger.dm

@@ -13,7 +13,7 @@
 	coat = null
 	update_icon()
 
-/obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/coatrack/attackby(obj/item/W as obj, mob/user as mob, params)
 	var/can_hang = 0
 	for(var/T in allowed)
 		if(istype(W,T))

code/game/objects/structures/crates_lockers/closets.dm

@@ -13,7 +13,7 @@
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
 	var/lastbang
-	var/cutting_tool = /obj/item/weapon/weldingtool
+	var/cutting_tool = /obj/item/weldingtool
 	var/sound = 'sound/machines/click.ogg'
 	var/cutting_sound
 	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
@@ -164,11 +164,11 @@
 		dump_contents()
 		qdel(src)
 
-/obj/structure/closet/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/rcs) && !opened)
+/obj/structure/closet/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/rcs) && !opened)
 		if(user in contents) //to prevent self-teleporting.
 			return
-		var/obj/item/weapon/rcs/E = W
+		var/obj/item/rcs/E = W
 		if(E.rcell && (E.rcell.charge >= E.chargecost))
 			if(!is_level_reachable(z))
 				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
@@ -243,13 +243,13 @@
 			return
 
 	if(opened)
-		if(istype(W, /obj/item/weapon/grab))
+		if(istype(W, /obj/item/grab))
 			MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 		if(istype(W,/obj/item/tk_grab))
 			return 0
 		if(istype(W, cutting_tool))
-			if(istype(W, /obj/item/weapon/weldingtool))
-				var/obj/item/weapon/weldingtool/WT = W
+			if(istype(W, /obj/item/weldingtool))
+				var/obj/item/weldingtool/WT = W
 				if(!WT.remove_fuel(0, user))
 					return
 				to_chat(user, "<span class='notice'>You begin cutting \the [src] apart...</span>")
@@ -274,8 +274,8 @@
 			W.forceMove(loc)
 	else if(istype(W, /obj/item/stack/packageWrap))
 		return
-	else if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
+	else if(istype(W, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = W
 		if(src == user.loc)
 			to_chat(user, "<span class='notice'>You can not [welded?"unweld":"weld"] the locker from inside.</span>")
 			return

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -54,18 +54,18 @@
 	animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
 
 
-/obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/closet/cardboard/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(src.opened)
-		if(istype(W, /obj/item/weapon/weldingtool))
+		if(istype(W, /obj/item/weldingtool))
 			return
-		if(istype(W, /obj/item/weapon/wirecutters))
-			var/obj/item/weapon/wirecutters/WC = W
+		if(istype(W, /obj/item/wirecutters))
+			var/obj/item/wirecutters/WC = W
 			new /obj/item/stack/sheet/cardboard(src.loc)
 			for(var/mob/M in viewers(src))
 				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WC].</span>", 3, "You hear cutting.", 2)
 			qdel(src)
 			return
-		if(istype(W, /obj/item/weapon/pen))
+		if(istype(W, /obj/item/pen))
 			var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield",	"Brig Physician", "Captain",
 			"Cargo", "Chief Engineer",	"Chaplain",	"Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP",
 			"HOS", "Hydroponics", "Internal Affairs Agent", "Janitor",	"Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot",

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -2,7 +2,7 @@
 /obj/structure/closet/fireaxecabinet
 	name = "fire axe cabinet"
 	desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
-	var/obj/item/weapon/twohanded/fireaxe/fireaxe = new/obj/item/weapon/twohanded/fireaxe
+	var/obj/item/twohanded/fireaxe/fireaxe = new/obj/item/twohanded/fireaxe
 	icon_state = "fireaxe1000"
 	icon_closed = "fireaxe1000"
 	icon_opened = "fireaxe1100"
@@ -23,7 +23,7 @@
 			hasaxe = 1
 
 		if(isrobot(user) || src.locked)
-			if(istype(O, /obj/item/device/multitool))
+			if(istype(O, /obj/item/multitool))
 				to_chat(user, "<span class='warning'>Resetting circuitry...</span>")
 				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
 				if(do_after(user, 20 * O.toolspeed, target = src))
@@ -31,9 +31,9 @@
 					to_chat(user, "<span class = 'caution'> You disable the locking modules.</span>")
 					update_icon()
 				return
-			else if(istype(O, /obj/item/weapon))
+			else if(istype(O, /obj/item))
 				user.changeNext_move(CLICK_CD_MELEE)
-				var/obj/item/weapon/W = O
+				var/obj/item/W = O
 				if(src.smashed || src.localopened)
 					if(localopened)
 						localopened = 0
@@ -54,7 +54,7 @@
 						src.localopened = 1
 				update_icon()
 			return
-		if(istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened)
+		if(istype(O, /obj/item/twohanded/fireaxe) && src.localopened)
 			if(!fireaxe)
 				if(O:wielded)
 					to_chat(user, "<span class='warning'>Unwield the axe first.</span>")
@@ -78,7 +78,7 @@
 		else
 			if(src.smashed)
 				return
-			if(istype(O, /obj/item/device/multitool))
+			if(istype(O, /obj/item/multitool))
 				if(localopened)
 					localopened = 0
 					icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -49,9 +49,9 @@
 
 /obj/structure/closet/lasertag/red/New()
 	..()
-	new /obj/item/weapon/gun/energy/laser/redtag(src)
-	new /obj/item/weapon/gun/energy/laser/redtag(src)
-	new /obj/item/weapon/gun/energy/laser/redtag(src)
+	new /obj/item/gun/energy/laser/redtag(src)
+	new /obj/item/gun/energy/laser/redtag(src)
+	new /obj/item/gun/energy/laser/redtag(src)
 	new /obj/item/clothing/suit/redtag(src)
 	new /obj/item/clothing/suit/redtag(src)
 	new /obj/item/clothing/suit/redtag(src)
@@ -65,9 +65,9 @@
 
 /obj/structure/closet/lasertag/blue/New()
 	..()
-	new /obj/item/weapon/gun/energy/laser/bluetag(src)
-	new /obj/item/weapon/gun/energy/laser/bluetag(src)
-	new /obj/item/weapon/gun/energy/laser/bluetag(src)
+	new /obj/item/gun/energy/laser/bluetag(src)
+	new /obj/item/gun/energy/laser/bluetag(src)
+	new /obj/item/gun/energy/laser/bluetag(src)
 	new /obj/item/clothing/suit/bluetag(src)
 	new /obj/item/clothing/suit/bluetag(src)
 	new /obj/item/clothing/suit/bluetag(src)

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -91,18 +91,18 @@
 	new /obj/item/clothing/suit/armor/tdome/red(src)
 	new /obj/item/clothing/suit/armor/tdome/red(src)
 	new /obj/item/clothing/suit/armor/tdome/red(src)
-	new /obj/item/weapon/melee/energy/sword/saber(src)
-	new /obj/item/weapon/melee/energy/sword/saber(src)
-	new /obj/item/weapon/melee/energy/sword/saber(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/melee/energy/sword/saber(src)
+	new /obj/item/melee/energy/sword/saber(src)
+	new /obj/item/melee/energy/sword/saber(src)
+	new /obj/item/gun/energy/laser(src)
+	new /obj/item/gun/energy/laser(src)
+	new /obj/item/gun/energy/laser(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/storage/box/flashbangs(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
@@ -118,18 +118,18 @@
 	new /obj/item/clothing/suit/armor/tdome/green(src)
 	new /obj/item/clothing/suit/armor/tdome/green(src)
 	new /obj/item/clothing/suit/armor/tdome/green(src)
-	new /obj/item/weapon/melee/energy/sword/saber(src)
-	new /obj/item/weapon/melee/energy/sword/saber(src)
-	new /obj/item/weapon/melee/energy/sword/saber(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/melee/energy/sword/saber(src)
+	new /obj/item/melee/energy/sword/saber(src)
+	new /obj/item/melee/energy/sword/saber(src)
+	new /obj/item/gun/energy/laser(src)
+	new /obj/item/gun/energy/laser(src)
+	new /obj/item/gun/energy/laser(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/storage/box/flashbangs(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -18,8 +18,8 @@
 	..()
 	new /obj/item/clothing/head/that(src)
 	new /obj/item/clothing/head/that(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/clothing/head/hairflower
 	new /obj/item/clothing/under/sl_suit(src)
 	new /obj/item/clothing/under/sl_suit(src)
@@ -46,8 +46,8 @@
 	..()
 	new /obj/item/clothing/under/waiter(src)
 	new /obj/item/clothing/under/waiter(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/suit/chef/classic(src)
@@ -55,11 +55,11 @@
 	new /obj/item/clothing/suit/chef/classic(src)
 	new /obj/item/clothing/head/soft/mime(src)
 	new /obj/item/clothing/head/soft/mime(src)
-	new /obj/item/weapon/storage/box/mousetraps(src)
-	new /obj/item/weapon/storage/box/mousetraps(src)
+	new /obj/item/storage/box/mousetraps(src)
+	new /obj/item/storage/box/mousetraps(src)
 	new /obj/item/clothing/under/rank/chef(src)
 	new /obj/item/clothing/head/chefhat(src)
-	new /obj/item/weapon/reagent_containers/glass/rag(src)
+	new /obj/item/reagent_containers/glass/rag(src)
 
 /*
  * Janitor
@@ -73,22 +73,22 @@
 /obj/structure/closet/jcloset/New()
 	..()
 	new /obj/item/clothing/under/rank/janitor(src)
-	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/weapon/cartridge/janitor(src)
-	new /obj/item/device/flashlight(src)
+	new /obj/item/radio/headset/headset_service(src)
+	new /obj/item/cartridge/janitor(src)
+	new /obj/item/flashlight(src)
 	new /obj/item/clothing/shoes/galoshes(src)
-	new /obj/item/weapon/soap(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/storage/bag/trash(src)
-	new /obj/item/device/lightreplacer(src)
-	new /obj/item/weapon/holosign_creator(src)
+	new /obj/item/soap(src)
+	new /obj/item/caution(src)
+	new /obj/item/caution(src)
+	new /obj/item/caution(src)
+	new /obj/item/caution(src)
+	new /obj/item/storage/bag/trash(src)
+	new /obj/item/lightreplacer(src)
+	new /obj/item/holosign_creator(src)
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
-	new /obj/item/weapon/watertank/janitor(src)
-	new /obj/item/weapon/storage/belt/janitor(src)
+	new /obj/item/watertank/janitor(src)
+	new /obj/item/storage/belt/janitor(src)
 
 /*
  * Lawyer
@@ -101,8 +101,8 @@
 
 /obj/structure/closet/lawcloset/New()
 	..()
-	new /obj/item/weapon/storage/box/tapes(src)
-	new /obj/item/weapon/book/manual/faxes(src)
+	new /obj/item/storage/box/tapes(src)
+	new /obj/item/book/manual/faxes(src)
 	new /obj/item/clothing/under/lawyer/female(src)
 	new /obj/item/clothing/under/lawyer/black(src)
 	new /obj/item/clothing/under/lawyer/red(src)
@@ -127,8 +127,8 @@
 /obj/structure/closet/paramedic/New()
 	new /obj/item/clothing/under/rank/medical/paramedic(src)
 	new /obj/item/clothing/under/rank/medical/paramedic(src)
-	new /obj/item/device/radio/headset/headset_med(src)
-	new /obj/item/device/radio/headset/headset_med(src)
+	new /obj/item/radio/headset/headset_med(src)
+	new /obj/item/radio/headset/headset_med(src)
 	new /obj/item/clothing/head/soft/blue(src)
 	new /obj/item/clothing/head/soft/blue(src)
 	new /obj/item/clothing/gloves/color/latex(src)
@@ -139,5 +139,5 @@
 	new /obj/item/clothing/head/soft/blue(src)
 	new /obj/item/clothing/suit/storage/paramedic(src)
 	new /obj/item/clothing/suit/storage/paramedic(src)
-	new /obj/item/weapon/tank/emergency_oxygen/engi(src)
-	new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/tank/emergency_oxygen/engi(src)

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -7,7 +7,7 @@
 
 /obj/structure/closet/l3closet/New()
 	..()
-	new /obj/item/weapon/storage/bag/bio( src )
+	new /obj/item/storage/bag/bio( src )
 	new /obj/item/clothing/suit/bio_suit/general( src )
 	new /obj/item/clothing/head/bio_hood/general( src )
 
@@ -32,11 +32,11 @@
 /obj/structure/closet/l3closet/virology/New()
 	..()
 	contents = list()
-	new /obj/item/weapon/storage/bag/bio( src )
+	new /obj/item/storage/bag/bio( src )
 	new /obj/item/clothing/suit/bio_suit/virology( src )
 	new /obj/item/clothing/head/bio_hood/virology( src )
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/weapon/tank/oxygen(src)
+	new /obj/item/tank/oxygen(src)
 
 
 /obj/structure/closet/l3closet/security
@@ -71,6 +71,6 @@
 /obj/structure/closet/l3closet/scientist/New()
 	..()
 	contents = list()
-	new /obj/item/weapon/storage/bag/bio( src )
+	new /obj/item/storage/bag/bio( src )
 	new /obj/item/clothing/suit/bio_suit/scientist( src )
 	new /obj/item/clothing/head/bio_hood/scientist( src )

code/game/objects/structures/crates_lockers/closets/malfunction.dm

@@ -7,10 +7,9 @@
 
 /obj/structure/closet/malf/suits/New()
 	..()
-	new /obj/item/weapon/tank/jetpack/void(src)
+	new /obj/item/tank/jetpack/void(src)
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/clothing/head/helmet/space/nasavoid(src)
-	new /obj/item/clothing/suit/space/nasavoid(src)
-	new /obj/item/weapon/crowbar(src)
-	new /obj/item/weapon/stock_parts/cell(src)
-	new /obj/item/device/multitool(src)
+	new /obj/effect/nasavoidsuitspawner(src)
+	new /obj/item/crowbar(src)
+	new /obj/item/stock_parts/cell(src)
+	new /obj/item/multitool(src)

code/game/objects/structures/crates_lockers/closets/secure/bar.dm

@@ -12,16 +12,16 @@
 
 /obj/structure/closet/secure_closet/bar/New()
 	..()
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
+	new /obj/item/reagent_containers/food/drinks/cans/beer( src )
 
 /obj/structure/closet/secure_closet/bar/update_icon()
 	if(broken)

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -13,10 +13,10 @@
 	new /obj/item/clothing/under/rank/cargotech(src)
 	new /obj/item/clothing/under/rank/cargotech/skirt(src)
 	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
+	new /obj/item/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/clothing/head/soft(src)
-//		new /obj/item/weapon/cartridge/quartermaster(src)
+//		new /obj/item/cartridge/quartermaster(src)
 
 
 /obj/structure/closet/secure_closet/quartermaster
@@ -34,11 +34,11 @@
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/under/rank/cargo/skirt(src)
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
+	new /obj/item/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/weapon/tank/emergency_oxygen(src)
+	new /obj/item/tank/emergency_oxygen(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/clothing/head/soft(src)
-	new /obj/item/weapon/door_remote/quartermaster(src)
+	new /obj/item/door_remote/quartermaster(src)

code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm

@@ -20,12 +20,12 @@
 	new /obj/item/clothing/head/witchhunter_hat(src)
 	new /obj/item/clothing/suit/holidaypriest(src)
 	new /obj/item/clothing/under/wedding/bride_white(src)
-	new /obj/item/weapon/storage/backpack/cultpack (src)
+	new /obj/item/storage/backpack/cultpack (src)
 	new /obj/item/clothing/head/helmet/riot/knight/templar(src)
 	new /obj/item/clothing/suit/armor/riot/knight/templar(src)
-	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
-	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
-	new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
+	new /obj/item/storage/fancy/candle_box/eternal(src)
+	new /obj/item/storage/fancy/candle_box/eternal(src)
+	new /obj/item/storage/fancy/candle_box/eternal(src)
 	new /obj/item/clothing/gloves/ring/silver(src)
 	new /obj/item/clothing/gloves/ring/silver(src)
 	new /obj/item/clothing/gloves/ring/gold(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -11,31 +11,31 @@
 /obj/structure/closet/secure_closet/engineering_chief/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/industrial(src)
+		new /obj/item/storage/backpack/industrial(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_eng(src)
-	new /obj/item/weapon/storage/backpack/duffel/engineering(src)
+		new /obj/item/storage/backpack/satchel_eng(src)
+	new /obj/item/storage/backpack/duffel/engineering(src)
 	new /obj/item/clothing/head/beret/ce(src)
 	new /obj/item/areaeditor/blueprints(src)
-	new /obj/item/weapon/storage/box/permits(src)
+	new /obj/item/storage/box/permits(src)
 	new /obj/item/clothing/under/rank/chief_engineer(src)
 	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/glasses/welding/superior(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/weapon/cartridge/ce(src)
-	new /obj/item/device/radio/headset/heads/ce(src)
-	new /obj/item/weapon/storage/toolbox/mechanical(src)
+	new /obj/item/cartridge/ce(src)
+	new /obj/item/radio/headset/heads/ce(src)
+	new /obj/item/storage/toolbox/mechanical(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/multitool(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/multitool(src)
+	new /obj/item/flash(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/weapon/door_remote/chief_engineer(src)
-	new /obj/item/weapon/rpd(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/mug/ce(src)
+	new /obj/item/door_remote/chief_engineer(src)
+	new /obj/item/rpd(src)
+	new /obj/item/reagent_containers/food/drinks/mug/ce(src)
 
 
 /obj/structure/closet/secure_closet/engineering_electrical
@@ -52,15 +52,15 @@
 	..()
 	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
-	new /obj/item/weapon/storage/toolbox/electrical(src)
-	new /obj/item/weapon/storage/toolbox/electrical(src)
-	new /obj/item/weapon/storage/toolbox/electrical(src)
-	new /obj/item/weapon/apc_electronics(src)
-	new /obj/item/weapon/apc_electronics(src)
-	new /obj/item/weapon/apc_electronics(src)
-	new /obj/item/device/multitool(src)
-	new /obj/item/device/multitool(src)
-	new /obj/item/device/multitool(src)
+	new /obj/item/storage/toolbox/electrical(src)
+	new /obj/item/storage/toolbox/electrical(src)
+	new /obj/item/storage/toolbox/electrical(src)
+	new /obj/item/apc_electronics(src)
+	new /obj/item/apc_electronics(src)
+	new /obj/item/apc_electronics(src)
+	new /obj/item/multitool(src)
+	new /obj/item/multitool(src)
+	new /obj/item/multitool(src)
 	new /obj/item/clothing/head/beret/eng
 
 
@@ -79,9 +79,9 @@
 	new /obj/item/clothing/head/welding(src)
 	new /obj/item/clothing/head/welding(src)
 	new /obj/item/clothing/head/welding(src)
-	new /obj/item/weapon/weldingtool/largetank(src)
-	new /obj/item/weapon/weldingtool/largetank(src)
-	new /obj/item/weapon/weldingtool/largetank(src)
+	new /obj/item/weldingtool/largetank(src)
+	new /obj/item/weldingtool/largetank(src)
+	new /obj/item/weldingtool/largetank(src)
 
 
 /obj/structure/closet/secure_closet/engineering_personal
@@ -97,18 +97,18 @@
 /obj/structure/closet/secure_closet/engineering_personal/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/industrial(src)
+		new /obj/item/storage/backpack/industrial(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_eng(src)
-	new /obj/item/weapon/storage/backpack/duffel/engineering(src)
-	new /obj/item/weapon/storage/toolbox/mechanical(src)
-	new /obj/item/device/radio/headset/headset_eng(src)
+		new /obj/item/storage/backpack/satchel_eng(src)
+	new /obj/item/storage/backpack/duffel/engineering(src)
+	new /obj/item/storage/toolbox/mechanical(src)
+	new /obj/item/radio/headset/headset_eng(src)
 	new /obj/item/clothing/under/rank/engineer(src)
 	new /obj/item/clothing/under/rank/engineer/skirt(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson(src)
-	new /obj/item/weapon/cartridge/engineering(src)
+	new /obj/item/cartridge/engineering(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/head/beret/eng(src)
 
@@ -125,20 +125,20 @@
 
 /obj/structure/closet/secure_closet/atmos_personal/New()
 	..()
-	new /obj/item/device/radio/headset/headset_eng(src)
-	new /obj/item/weapon/cartridge/atmos(src)
-	new /obj/item/weapon/storage/toolbox/mechanical(src)
+	new /obj/item/radio/headset/headset_eng(src)
+	new /obj/item/cartridge/atmos(src)
+	new /obj/item/storage/toolbox/mechanical(src)
 	new /obj/item/taperoll/engineering(src)
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/industrial(src)
+		new /obj/item/storage/backpack/industrial(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_eng(src)
-	new /obj/item/weapon/storage/backpack/duffel/atmos(src)
-	new /obj/item/weapon/extinguisher(src)
+		new /obj/item/storage/backpack/satchel_eng(src)
+	new /obj/item/storage/backpack/duffel/atmos(src)
+	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/weapon/tank/emergency_oxygen/engi(src)
-	new /obj/item/weapon/watertank/atmos(src)
+	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/watertank/atmos(src)
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)
-	new /obj/item/weapon/rpd(src)
+	new /obj/item/rpd(src)

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -19,7 +19,7 @@
 	// IF INDIANA JONES CAN DO IT SO CAN YOU
 
 	// Bomb in here? (using same search as space transits searching for nuke disk)
-	var/list/bombs = search_contents_for(/obj/item/device/transfer_valve)
+	var/list/bombs = search_contents_for(/obj/item/transfer_valve)
 	if(!isemptylist(bombs)) // You're fucked.
 		..(severity)
 
@@ -31,9 +31,9 @@
 	New()
 		..()
 		for(var/i in 1 to 3)
-			new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
-		new /obj/item/weapon/reagent_containers/food/condiment/rice(src)
-		new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
+			new /obj/item/reagent_containers/food/condiment/flour(src)
+		new /obj/item/reagent_containers/food/condiment/rice(src)
+		new /obj/item/reagent_containers/food/condiment/sugar(src)
 
 
 /obj/structure/closet/secure_closet/freezer/kitchen/mining
@@ -52,7 +52,7 @@
 /obj/structure/closet/secure_closet/freezer/meat/New()
 	..()
 	for(var/i in 1 to 4)
-		new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+		new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
 
 
 /obj/structure/closet/secure_closet/freezer/fridge
@@ -67,10 +67,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge/New()
 	..()
 	for(var/i in 1 to 5)
-		new /obj/item/weapon/reagent_containers/food/condiment/milk(src)
-		new /obj/item/weapon/reagent_containers/food/condiment/soymilk(src)
+		new /obj/item/reagent_containers/food/condiment/milk(src)
+		new /obj/item/reagent_containers/food/condiment/soymilk(src)
 	for(var/i in 1 to 2)
-		new /obj/item/weapon/storage/fancy/egg_box(src)
+		new /obj/item/storage/fancy/egg_box(src)
 
 
 /obj/structure/closet/secure_closet/freezer/money

code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm

@@ -26,10 +26,10 @@
 	else
 		var/lazors = 0
 		var/shottas = 0
-		for(var/obj/item/weapon/gun/G in contents)
-			if(istype(G, /obj/item/weapon/gun/energy))
+		for(var/obj/item/gun/G in contents)
+			if(istype(G, /obj/item/gun/energy))
 				lazors++
-			if(istype(G, /obj/item/weapon/gun/projectile/))
+			if(istype(G, /obj/item/gun/projectile/))
 				shottas++
 		if(lazors || shottas)
 			for(var/i = 0 to 2)

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -16,11 +16,11 @@
 			new /obj/item/clothing/suit/apron(src)
 		if(2)
 			new /obj/item/clothing/suit/apron/overalls(src)
-	new /obj/item/weapon/storage/bag/plants/portaseeder(src)
+	new /obj/item/storage/bag/plants/portaseeder(src)
 	new /obj/item/clothing/under/rank/hydroponics(src)
-	new /obj/item/device/plant_analyzer(src)
-	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/plant_analyzer(src)
+	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/clothing/mask/bandana/botany(src)
-	new /obj/item/weapon/cultivator(src)
-	new /obj/item/weapon/hatchet(src)
-	new /obj/item/weapon/storage/box/disks_plantgene(src)
+	new /obj/item/cultivator(src)
+	new /obj/item/hatchet(src)
+	new /obj/item/storage/box/disks_plantgene(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -11,16 +11,16 @@
 
 /obj/structure/closet/secure_closet/medical1/New()
 	..()
-	new /obj/item/weapon/storage/box/autoinjectors(src)
-	new /obj/item/weapon/storage/box/syringes(src)
-	new /obj/item/weapon/reagent_containers/dropper(src)
-	new /obj/item/weapon/reagent_containers/dropper(src)
-	new /obj/item/weapon/reagent_containers/glass/beaker(src)
-	new /obj/item/weapon/reagent_containers/glass/beaker(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/epinephrine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/epinephrine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
+	new /obj/item/storage/box/autoinjectors(src)
+	new /obj/item/storage/box/syringes(src)
+	new /obj/item/reagent_containers/dropper(src)
+	new /obj/item/reagent_containers/dropper(src)
+	new /obj/item/reagent_containers/glass/beaker(src)
+	new /obj/item/reagent_containers/glass/beaker(src)
+	new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
+	new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
+	new /obj/item/reagent_containers/glass/bottle/charcoal(src)
+	new /obj/item/reagent_containers/glass/bottle/charcoal(src)
 
 
 /obj/structure/closet/secure_closet/medical2
@@ -36,9 +36,9 @@
 
 /obj/structure/closet/secure_closet/medical2/New()
 	..()
-	new /obj/item/weapon/tank/anesthetic(src)
-	new /obj/item/weapon/tank/anesthetic(src)
-	new /obj/item/weapon/tank/anesthetic(src)
+	new /obj/item/tank/anesthetic(src)
+	new /obj/item/tank/anesthetic(src)
+	new /obj/item/tank/anesthetic(src)
 	new /obj/item/clothing/mask/breath/medical(src)
 	new /obj/item/clothing/mask/breath/medical(src)
 	new /obj/item/clothing/mask/breath/medical(src)
@@ -57,17 +57,17 @@
 /obj/structure/closet/secure_closet/medical3/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/medic(src)
+		new /obj/item/storage/backpack/medic(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_med(src)
-	new /obj/item/weapon/storage/backpack/duffel/medical(src)
+		new /obj/item/storage/backpack/satchel_med(src)
+	new /obj/item/storage/backpack/duffel/medical(src)
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/device/radio/headset/headset_med(src)
+	new /obj/item/radio/headset/headset_med(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
-	new /obj/item/weapon/defibrillator/loaded(src)
-	new /obj/item/weapon/storage/belt/medical(src)
+	new /obj/item/defibrillator/loaded(src)
+	new /obj/item/storage/belt/medical(src)
 	new /obj/item/clothing/glasses/hud/health(src)
 	new /obj/item/clothing/shoes/sandal/white(src)
 
@@ -86,40 +86,40 @@
 
 /obj/structure/closet/secure_closet/exam/New()
 	..()
-	new /obj/item/weapon/storage/box/syringes(src)
-	new /obj/item/weapon/reagent_containers/dropper(src)
-	new /obj/item/weapon/storage/belt/medical(src)
+	new /obj/item/storage/box/syringes(src)
+	new /obj/item/reagent_containers/dropper(src)
+	new /obj/item/storage/belt/medical(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/clothing/glasses/hud/health(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/clothing/accessory/stethoscope(src)
-	new /obj/item/device/flashlight/pen(src)
-	new /obj/item/weapon/storage/firstaid/regular(src)
-	new /obj/item/weapon/storage/firstaid/adv(src)
-	new /obj/item/weapon/storage/firstaid/brute(src)
-	new /obj/item/weapon/storage/firstaid/fire(src)
-	new /obj/item/weapon/storage/firstaid/o2(src)
-	new /obj/item/weapon/storage/firstaid/toxin(src)
+	new /obj/item/flashlight/pen(src)
+	new /obj/item/storage/firstaid/regular(src)
+	new /obj/item/storage/firstaid/adv(src)
+	new /obj/item/storage/firstaid/brute(src)
+	new /obj/item/storage/firstaid/fire(src)
+	new /obj/item/storage/firstaid/o2(src)
+	new /obj/item/storage/firstaid/toxin(src)
 
 
 // Psychiatrist's pill bottle
-/obj/item/weapon/storage/pill_bottle/psychiatrist
+/obj/item/storage/pill_bottle/psychiatrist
 	name = "psychiatrist's pill bottle"
 	desc = "Contains various pills to calm or sedate patients."
 
-/obj/item/weapon/storage/pill_bottle/psychiatrist/New()
+/obj/item/storage/pill_bottle/psychiatrist/New()
 	..()
-	new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
-	new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
-	new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
-	new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
-	new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
-	new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
-	new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src)
-	new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src)
+	new /obj/item/reagent_containers/food/pill/haloperidol(src)
+	new /obj/item/reagent_containers/food/pill/haloperidol(src)
+	new /obj/item/reagent_containers/food/pill/haloperidol(src)
+	new /obj/item/reagent_containers/food/pill/methamphetamine(src)
+	new /obj/item/reagent_containers/food/pill/methamphetamine(src)
+	new /obj/item/reagent_containers/food/pill/methamphetamine(src)
+	new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
+	new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
+	new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
+	new /obj/item/reagent_containers/food/pill/hydrocodone(src)
+	new /obj/item/reagent_containers/food/pill/hydrocodone(src)
 
 /obj/structure/closet/secure_closet/psychiatrist
 	name = "psychiatrist's locker"
@@ -134,15 +134,15 @@
 /obj/structure/closet/secure_closet/psychiatrist/New()
 	..()
 	new /obj/item/clothing/suit/straight_jacket(src)
-	new /obj/item/weapon/reagent_containers/syringe(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/ether(src)
-	new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
-	new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
-	new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
-	new /obj/item/weapon/storage/pill_bottle/psychiatrist(src)
+	new /obj/item/reagent_containers/syringe(src)
+	new /obj/item/reagent_containers/glass/bottle/ether(src)
+	new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
+	new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
+	new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
+	new /obj/item/storage/pill_bottle/psychiatrist(src)
 	new /obj/random/plushie(src)
 	for(var/i in 0 to 3)
-		var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge))
+		var/candy = pick(subtypesof(/obj/item/reagent_containers/food/snacks/candy/fudge))
 		new candy(src)
 
 /obj/structure/closet/secure_closet/CMO
@@ -158,10 +158,10 @@
 /obj/structure/closet/secure_closet/CMO/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/medic(src)
+		new /obj/item/storage/backpack/medic(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_med(src)
-	new /obj/item/weapon/storage/backpack/duffel/medical(src)
+		new /obj/item/storage/backpack/satchel_med(src)
+	new /obj/item/storage/backpack/duffel/medical(src)
 	new /obj/item/clothing/suit/bio_suit/cmo(src)
 	new /obj/item/clothing/head/bio_hood/cmo(src)
 	new /obj/item/clothing/shoes/white(src)
@@ -178,15 +178,15 @@
 	new /obj/item/clothing/suit/storage/labcoat/cmo(src)
 	new /obj/item/clothing/under/rank/chief_medical_officer(src)
 	new /obj/item/clothing/shoes/brown	(src)
-	new /obj/item/device/radio/headset/heads/cmo(src)
+	new /obj/item/radio/headset/heads/cmo(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
-	new /obj/item/weapon/defibrillator/compact/loaded(src)
-	new /obj/item/weapon/storage/belt/medical(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
+	new /obj/item/defibrillator/compact/loaded(src)
+	new /obj/item/storage/belt/medical(src)
+	new /obj/item/flash(src)
+	new /obj/item/reagent_containers/hypospray/CMO(src)
 	new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
-	new /obj/item/weapon/door_remote/chief_medical_officer(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/mug/cmo(src)
+	new /obj/item/door_remote/chief_medical_officer(src)
+	new /obj/item/reagent_containers/food/drinks/mug/cmo(src)
 
 
 /obj/structure/closet/secure_closet/animal
@@ -195,10 +195,10 @@
 
 /obj/structure/closet/secure_closet/animal/New()
 	..()
-	new /obj/item/device/assembly/signaler(src)
-	new /obj/item/device/radio/electropack(src)
-	new /obj/item/device/radio/electropack(src)
-	new /obj/item/device/radio/electropack(src)
+	new /obj/item/assembly/signaler(src)
+	new /obj/item/radio/electropack(src)
+	new /obj/item/radio/electropack(src)
+	new /obj/item/radio/electropack(src)
 
 
 /obj/structure/closet/secure_closet/chemical
@@ -214,8 +214,8 @@
 
 /obj/structure/closet/secure_closet/chemical/New()
 	..()
-	new /obj/item/weapon/storage/box/pillbottles(src)
-	new /obj/item/weapon/storage/box/pillbottles(src)
+	new /obj/item/storage/box/pillbottles(src)
+	new /obj/item/storage/box/pillbottles(src)
 
 
 /obj/structure/closet/secure_closet/medical_wall
@@ -259,9 +259,9 @@
 	..()
 	new /obj/item/clothing/suit/space/eva/paramedic(src)
 	new /obj/item/clothing/head/helmet/space/eva/paramedic(src)
-	new /obj/item/device/sensor_device(src)
+	new /obj/item/sensor_device(src)
 	new /obj/item/key/ambulance(src)
-	new /obj/item/weapon/pinpointer/crew(src)
+	new /obj/item/pinpointer/crew(src)
 
 /obj/structure/closet/secure_closet/reagents
 	name = "chemical storage closet"
@@ -276,9 +276,9 @@
 
 /obj/structure/closet/secure_closet/reagents/New()
 	..()
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/phenol(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/ammonia(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/oil(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/acetone(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/acid(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/diethylamine(src)

code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm

@@ -10,14 +10,14 @@
 
 /obj/structure/closet/secure_closet/clown/New()
 	..()
-	new /obj/item/weapon/storage/backpack/clown(src)
+	new /obj/item/storage/backpack/clown(src)
 	new /obj/item/clothing/under/rank/clown(src)
 	new /obj/item/clothing/shoes/clown_shoes(src)
-	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/clothing/mask/gas/clown_hat(src)
-	new /obj/item/weapon/bikehorn(src)
-	new /obj/item/weapon/reagent_containers/spray/waterflower(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+	new /obj/item/bikehorn(src)
+	new /obj/item/reagent_containers/spray/waterflower(src)
+	new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
 	new /obj/item/toy/crayon/rainbow(src)
 	new /obj/item/seeds/banana(src)
 
@@ -37,12 +37,12 @@
 	..()
 	new /obj/item/clothing/head/beret(src)
 	new /obj/item/clothing/mask/gas/mime(src)
-	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/clothing/under/mime(src)
 	new /obj/item/clothing/suit/suspenders(src)
 	new /obj/item/clothing/gloves/color/white(src)
 	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/weapon/storage/backpack/mime(src)
+	new /obj/item/storage/backpack/mime(src)
 	new /obj/item/toy/crayon/mime(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src)
-	new /obj/item/weapon/cane(src)
+	new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
+	new /obj/item/cane(src)

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -7,12 +7,12 @@
 /obj/structure/closet/secure_closet/personal/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/duffel(src)
+		new /obj/item/storage/backpack/duffel(src)
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack(src)
+		new /obj/item/storage/backpack(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_norm(src)
-	new /obj/item/device/radio/headset( src )
+		new /obj/item/storage/backpack/satchel_norm(src)
+	new /obj/item/radio/headset( src )
 
 
 /obj/structure/closet/secure_closet/personal/patient
@@ -51,20 +51,20 @@
 /obj/structure/closet/secure_closet/personal/cabinet/New()
 	..()
 	contents.Cut()
-	new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
-	new /obj/item/device/radio/headset( src )
+	new /obj/item/storage/backpack/satchel/withwallet( src )
+	new /obj/item/radio/headset( src )
 
-/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(src.opened)
-		if(istype(W, /obj/item/weapon/grab))
+		if(istype(W, /obj/item/grab))
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 		user.drop_item()
 		if(W) W.forceMove(loc)
-	else if(istype(W, /obj/item/weapon/card/id))
+	else if(istype(W, /obj/item/card/id))
 		if(src.broken)
 			to_chat(user, "<span class='warning'>It appears to be broken.</span>")
 			return
-		var/obj/item/weapon/card/id/I = W
+		var/obj/item/card/id/I = W
 		if(!I || !I.registered_name)	return
 		if(src == user.loc)
 			to_chat(user, "<span class='notice'>You can't reach the lock from inside.</span>")
@@ -83,7 +83,7 @@
 				src.desc = "Owned by [I.registered_name]."
 		else
 			to_chat(user, "<span class='warning'>Access Denied</span>")
-	else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
+	else if((istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade)) && !broken)
 		emag_act(user)
 	else
 		to_chat(user, "<span class='warning'>Access Denied</span>")

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -10,15 +10,15 @@
 
 /obj/structure/closet/secure_closet/scientist/New()
 	..()
-	new /obj/item/weapon/storage/backpack/science(src)
-	new /obj/item/weapon/storage/backpack/satchel_tox(src)
+	new /obj/item/storage/backpack/science(src)
+	new /obj/item/storage/backpack/satchel_tox(src)
 	new /obj/item/clothing/under/rank/scientist(src)
 	//new /obj/item/clothing/suit/labcoat/science(src)
 	new /obj/item/clothing/suit/storage/labcoat/science(src)
 	new /obj/item/clothing/shoes/white(src)
-//		new /obj/item/weapon/cartridge/signal/toxins(src)
-	new /obj/item/device/radio/headset/headset_sci(src)
-	new /obj/item/weapon/tank/air(src)
+//		new /obj/item/cartridge/signal/toxins(src)
+	new /obj/item/radio/headset/headset_sci(src)
+	new /obj/item/tank/air(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/shoes/sandal/white(src)
 
@@ -34,16 +34,16 @@
 
 /obj/structure/closet/secure_closet/roboticist/New()
 	..()
-	new /obj/item/weapon/storage/backpack(src)
-	new /obj/item/weapon/storage/backpack(src)
-	new /obj/item/weapon/storage/backpack/satchel_norm(src)
-	new /obj/item/weapon/storage/backpack/satchel_norm(src)
-	new /obj/item/weapon/storage/backpack/duffel(src)
-	new /obj/item/weapon/storage/backpack/duffel(src)
+	new /obj/item/storage/backpack(src)
+	new /obj/item/storage/backpack(src)
+	new /obj/item/storage/backpack/satchel_norm(src)
+	new /obj/item/storage/backpack/satchel_norm(src)
+	new /obj/item/storage/backpack/duffel(src)
+	new /obj/item/storage/backpack/duffel(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
-	new /obj/item/device/radio/headset/headset_sci(src)
-	new /obj/item/device/radio/headset/headset_sci(src)
+	new /obj/item/radio/headset/headset_sci(src)
+	new /obj/item/radio/headset/headset_sci(src)
 
 /obj/structure/closet/secure_closet/RD
 	name = "research director's locker"
@@ -61,17 +61,17 @@
 	new /obj/item/clothing/head/bio_hood/scientist(src)
 	new /obj/item/clothing/under/rank/research_director(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
-	new /obj/item/weapon/cartridge/rd(src)
+	new /obj/item/cartridge/rd(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/gloves/color/latex(src)
-	new /obj/item/device/radio/headset/heads/rd(src)
-	new /obj/item/weapon/tank/air(src)
+	new /obj/item/radio/headset/heads/rd(src)
+	new /obj/item/tank/air(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/suit/armor/reactive/teleport(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/device/laser_pointer(src)
-	new /obj/item/weapon/door_remote/research_director(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/mug/rd(src)
+	new /obj/item/flash(src)
+	new /obj/item/laser_pointer(src)
+	new /obj/item/door_remote/research_director(src)
+	new /obj/item/reagent_containers/food/drinks/mug/rd(src)
 
 
 /obj/structure/closet/secure_closet/research_reagents
@@ -87,17 +87,17 @@
 
 /obj/structure/closet/secure_closet/research_reagents/New()
 	..()
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/phenol(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/ammonia(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/oil(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/acetone(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/acid(src)
+	new /obj/item/reagent_containers/glass/bottle/reagent/diethylamine(src)

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -67,12 +67,12 @@
 	else
 		to_chat(user, "<span class='notice'>Access Denied</span>")
 
-/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/rcs))
+/obj/structure/closet/secure_closet/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/rcs))
 		return ..()
 
 	if(opened)
-		if(istype(W, /obj/item/weapon/grab))
+		if(istype(W, /obj/item/grab))
 			if(large)
 				MouseDrop_T(W:affecting, user)	//act like they were dragged onto the closet
 			else
@@ -84,9 +84,9 @@
 			return
 		if(W)
 			W.forceMove(loc)
-	else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
+	else if((istype(W, /obj/item/card/emag)||istype(W, /obj/item/melee/energy/blade)) && !broken)
 		emag_act(user)
-	else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
+	else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weldingtool))
 		return ..(W,user)
 	else
 		togglelock(user)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -11,11 +11,11 @@
 /obj/structure/closet/secure_closet/captains/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/captain(src)
+		new /obj/item/storage/backpack/captain(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_cap(src)
-	new /obj/item/weapon/book/manual/faxes(src)
-	new /obj/item/weapon/storage/backpack/duffel/captain(src)
+		new /obj/item/storage/backpack/satchel_cap(src)
+	new /obj/item/book/manual/faxes(src)
+	new /obj/item/storage/backpack/duffel/captain(src)
 	new /obj/item/clothing/suit/captunic(src)
 	new /obj/item/clothing/suit/captunic/capjacket(src)
 	new /obj/item/clothing/under/captainparade(src)
@@ -23,15 +23,15 @@
 	new /obj/item/clothing/under/rank/captain(src)
 	new /obj/item/clothing/under/dress/dress_cap(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
-	new /obj/item/weapon/cartridge/captain(src)
+	new /obj/item/cartridge/captain(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/device/radio/headset/heads/captain/alt(src)
+	new /obj/item/radio/headset/heads/captain/alt(src)
 	new /obj/item/clothing/gloves/color/captain(src)
-	new /obj/item/weapon/storage/belt/rapier(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/weapon/door_remote/captain(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/mug/cap(src)
+	new /obj/item/storage/belt/rapier(src)
+	new /obj/item/gun/energy/gun(src)
+	new /obj/item/door_remote/captain(src)
+	new /obj/item/reagent_containers/food/drinks/mug/cap(src)
 
 
 /obj/structure/closet/secure_closet/hop
@@ -48,16 +48,16 @@
 	..()
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/clothing/head/hopcap(src)
-	new /obj/item/weapon/cartridge/hop(src)
-	new /obj/item/device/radio/headset/heads/hop(src)
-	new /obj/item/weapon/storage/box/ids(src)
-	new /obj/item/weapon/storage/box/PDAs(src)
+	new /obj/item/cartridge/hop(src)
+	new /obj/item/radio/headset/heads/hop(src)
+	new /obj/item/storage/box/ids(src)
+	new /obj/item/storage/box/PDAs(src)
 	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/gun/energy/gun/mini(src)
+	new /obj/item/flash(src)
 	new /obj/item/clothing/accessory/petcollar(src)
-	new /obj/item/weapon/door_remote/civillian(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/mug/hop(src)
+	new /obj/item/door_remote/civillian(src)
+	new /obj/item/reagent_containers/food/drinks/mug/hop(src)
 
 
 /obj/structure/closet/secure_closet/hop2
@@ -99,11 +99,11 @@
 /obj/structure/closet/secure_closet/hos/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/security(src)
+		new /obj/item/storage/backpack/security(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_sec(src)
-	new /obj/item/weapon/cartridge/hos(src)
-	new /obj/item/device/radio/headset/heads/hos/alt(src)
+		new /obj/item/storage/backpack/satchel_sec(src)
+	new /obj/item/cartridge/hos(src)
+	new /obj/item/radio/headset/heads/hos/alt(src)
 	new /obj/item/clothing/under/rank/head_of_security(src)
 	new /obj/item/clothing/under/rank/head_of_security/formal(src)
 	new /obj/item/clothing/under/rank/head_of_security/corp(src)
@@ -113,16 +113,16 @@
 	new /obj/item/clothing/head/HoS(src)
 	new /obj/item/clothing/head/HoS/beret(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
-	new /obj/item/weapon/storage/lockbox/mindshield(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/storage/lockbox/mindshield(src)
+	new /obj/item/storage/box/flashbangs(src)
 	new /obj/item/clothing/mask/gas/sechailer/hos(src)
-	new /obj/item/weapon/shield/riot/tele(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/storage/belt/security/sec(src)
+	new /obj/item/shield/riot/tele(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/storage/belt/security/sec(src)
 	new /obj/item/taperoll/police(src)
-	new /obj/item/weapon/gun/energy/gun/hos(src)
-	new /obj/item/weapon/door_remote/head_of_security(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/mug/hos(src)
+	new /obj/item/gun/energy/gun/hos(src)
+	new /obj/item/door_remote/head_of_security(src)
+	new /obj/item/reagent_containers/food/drinks/mug/hos(src)
 
 
 /obj/structure/closet/secure_closet/warden
@@ -138,10 +138,10 @@
 /obj/structure/closet/secure_closet/warden/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/security(src)
+		new /obj/item/storage/backpack/security(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_sec(src)
-	new /obj/item/device/radio/headset/headset_sec/alt(src)
+		new /obj/item/storage/backpack/satchel_sec(src)
+	new /obj/item/radio/headset/headset_sec/alt(src)
 	new /obj/item/clothing/suit/armor/vest/warden(src)
 	new /obj/item/clothing/head/warden(src)
 	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
@@ -153,13 +153,13 @@
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/clothing/mask/gas/sechailer/warden(src)
 	new /obj/item/taperoll/police(src)
-	new /obj/item/weapon/storage/box/zipties(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/reagent_containers/spray/pepper(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/gun/energy/gun/advtaser(src)
-	new /obj/item/weapon/storage/belt/security/sec(src)
-	new /obj/item/weapon/storage/box/holobadge(src)
+	new /obj/item/storage/box/zipties(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/reagent_containers/spray/pepper(src)
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/gun/energy/gun/advtaser(src)
+	new /obj/item/storage/belt/security/sec(src)
+	new /obj/item/storage/box/holobadge(src)
 	new /obj/item/clothing/gloves/color/black/krav_maga/sec(src)
 
 
@@ -176,20 +176,20 @@
 /obj/structure/closet/secure_closet/security/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/security(src)
+		new /obj/item/storage/backpack/security(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/storage/backpack/satchel_sec(src)
 	new /obj/item/clothing/suit/armor/vest/security(src)
-	new /obj/item/device/radio/headset/headset_sec/alt(src)
+	new /obj/item/radio/headset/headset_sec/alt(src)
 	new /obj/item/clothing/head/soft/sec(src)
-	new /obj/item/weapon/reagent_containers/spray/pepper(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/storage/belt/security/sec(src)
+	new /obj/item/reagent_containers/spray/pepper(src)
+	new /obj/item/flash(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/storage/belt/security/sec(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/clothing/head/helmet(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
+	new /obj/item/melee/baton/loaded(src)
 	new /obj/item/taperoll/police(src)
 
 
@@ -206,20 +206,20 @@
 /obj/structure/closet/secure_closet/brigdoc/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/medic(src)
+		new /obj/item/storage/backpack/medic(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_med(src)
-	new /obj/item/weapon/reagent_containers/spray/pepper(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/weapon/storage/firstaid/regular(src)
-	new /obj/item/weapon/storage/firstaid/fire(src)
-	new /obj/item/weapon/storage/firstaid/adv(src)
-	new /obj/item/weapon/storage/firstaid/o2(src)
-	new /obj/item/weapon/storage/firstaid/toxin(src)
+		new /obj/item/storage/backpack/satchel_med(src)
+	new /obj/item/reagent_containers/spray/pepper(src)
+	new /obj/item/flash(src)
+	new /obj/item/storage/firstaid/regular(src)
+	new /obj/item/storage/firstaid/fire(src)
+	new /obj/item/storage/firstaid/adv(src)
+	new /obj/item/storage/firstaid/o2(src)
+	new /obj/item/storage/firstaid/toxin(src)
 	new /obj/item/clothing/suit/storage/brigdoc(src)
 	new /obj/item/clothing/under/rank/security/brigphys(src)
 	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/device/radio/headset/headset_sec/alt(src)
+	new /obj/item/radio/headset/headset_sec/alt(src)
 	new /obj/item/clothing/shoes/sandal/white(src)
 
 
@@ -235,14 +235,14 @@
 
 /obj/structure/closet/secure_closet/blueshield/New()
 	..()
-	new /obj/item/weapon/storage/briefcase(src)
-	new	/obj/item/weapon/storage/firstaid/adv(src)
-	new /obj/item/weapon/pinpointer/crew(src)
-	new /obj/item/weapon/storage/belt/security/sec(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/weapon/restraints/handcuffs(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
+	new /obj/item/storage/briefcase(src)
+	new	/obj/item/storage/firstaid/adv(src)
+	new /obj/item/pinpointer/crew(src)
+	new /obj/item/storage/belt/security/sec(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/flash(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/melee/baton/loaded(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/clothing/glasses/hud/health/health_advanced
 	new /obj/item/clothing/head/beret/centcom/officer(src)
@@ -267,10 +267,10 @@
 
 /obj/structure/closet/secure_closet/ntrep/New()
 	..()
-	new /obj/item/weapon/book/manual/faxes(src)
-	new /obj/item/weapon/storage/briefcase(src)
-	new /obj/item/device/paicard(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/book/manual/faxes(src)
+	new /obj/item/storage/briefcase(src)
+	new /obj/item/paicard(src)
+	new /obj/item/flash(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/clothing/gloves/color/white(src)
 	new /obj/item/clothing/shoes/centcom(src)
@@ -279,8 +279,8 @@
 	new /obj/item/clothing/under/lawyer/female(src)
 	new /obj/item/clothing/head/ntrep(src)
 	new /obj/item/clothing/shoes/sandal/fancy(src)
-	new /obj/item/weapon/storage/box/tapes(src)
-	new /obj/item/device/taperecorder(src)
+	new /obj/item/storage/box/tapes(src)
+	new /obj/item/taperecorder(src)
 
 
 /obj/structure/closet/secure_closet/security/cargo
@@ -288,7 +288,7 @@
 /obj/structure/closet/secure_closet/security/cargo/New()
 	..()
 	new /obj/item/clothing/accessory/armband/cargo(src)
-	new /obj/item/device/encryptionkey/headset_cargo(src)
+	new /obj/item/encryptionkey/headset_cargo(src)
 
 
 /obj/structure/closet/secure_closet/security/engine
@@ -296,7 +296,7 @@
 /obj/structure/closet/secure_closet/security/engine/New()
 	..()
 	new /obj/item/clothing/accessory/armband/engine(src)
-	new /obj/item/device/encryptionkey/headset_eng(src)
+	new /obj/item/encryptionkey/headset_eng(src)
 
 
 /obj/structure/closet/secure_closet/security/science
@@ -304,7 +304,7 @@
 /obj/structure/closet/secure_closet/security/science/New()
 	..()
 	new /obj/item/clothing/accessory/armband/science(src)
-	new /obj/item/device/encryptionkey/headset_sci(src)
+	new /obj/item/encryptionkey/headset_sci(src)
 
 
 /obj/structure/closet/secure_closet/security/med
@@ -312,7 +312,7 @@
 /obj/structure/closet/secure_closet/security/med/New()
 	..()
 	new /obj/item/clothing/accessory/armband/medgreen(src)
-	new /obj/item/device/encryptionkey/headset_med(src)
+	new /obj/item/encryptionkey/headset_med(src)
 
 
 /obj/structure/closet/secure_closet/detective
@@ -336,21 +336,21 @@
 	new /obj/item/clothing/gloves/color/black/forensics(src)
 	new /obj/item/clothing/head/det_hat(src)
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/weapon/storage/box/evidence(src)
-	new /obj/item/weapon/clipboard(src)
-	new /obj/item/device/radio/headset/headset_sec/alt(src)
-	new /obj/item/device/detective_scanner(src)
+	new /obj/item/storage/box/evidence(src)
+	new /obj/item/clipboard(src)
+	new /obj/item/radio/headset/headset_sec/alt(src)
+	new /obj/item/detective_scanner(src)
 	new /obj/item/clothing/suit/armor/vest/det_suit(src)
 	new /obj/item/ammo_box/c38(src)
 	new /obj/item/ammo_box/c38(src)
-	new /obj/item/weapon/gun/projectile/revolver/detective(src)
+	new /obj/item/gun/projectile/revolver/detective(src)
 	new /obj/item/taperoll/police(src)
 	new /obj/item/clothing/accessory/holster/armpit(src)
 	new /obj/item/clothing/glasses/sunglasses/yeah(src)
-	new /obj/item/device/flashlight/seclite(src)
+	new /obj/item/flashlight/seclite(src)
 	new /obj/item/clothing/accessory/black(src)
-	new /obj/item/device/taperecorder(src)
-	new /obj/item/weapon/storage/box/tapes(src)
+	new /obj/item/taperecorder(src)
+	new /obj/item/storage/box/tapes(src)
 
 /obj/structure/closet/secure_closet/detective/update_icon()
 	if(broken)
@@ -371,8 +371,8 @@
 
 /obj/structure/closet/secure_closet/injection/New()
 	..()
-	new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
-	new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
+	new /obj/item/reagent_containers/ld50_syringe/lethal(src)
+	new /obj/item/reagent_containers/ld50_syringe/lethal(src)
 
 
 /obj/structure/closet/secure_closet/brig
@@ -385,8 +385,8 @@
 	..()
 	new /obj/item/clothing/under/color/orange/prison(src)
 	new /obj/item/clothing/shoes/orange(src)
-	new /obj/item/weapon/card/id/prisoner/random(src)
-	new /obj/item/device/radio/headset(src)
+	new /obj/item/card/id/prisoner/random(src)
+	new /obj/item/radio/headset(src)
 
 
 /obj/structure/closet/secure_closet/courtroom
@@ -396,13 +396,13 @@
 /obj/structure/closet/secure_closet/courtroom/New()
 	..()
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/pen (src)
+	new /obj/item/paper/Court (src)
+	new /obj/item/paper/Court (src)
+	new /obj/item/paper/Court (src)
+	new /obj/item/pen (src)
 	new /obj/item/clothing/suit/judgerobe (src)
 	new /obj/item/clothing/head/powdered_wig (src)
-	new /obj/item/weapon/storage/briefcase(src)
+	new /obj/item/storage/briefcase(src)
 
 
 /obj/structure/closet/secure_closet/wall

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -14,8 +14,8 @@
 	new /obj/item/clothing/under/syndicate(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/ammo_box/magazine/m10mm(src)
-	new /obj/item/weapon/storage/belt/military(src)
-	new /obj/item/weapon/crowbar/red(src)
+	new /obj/item/storage/belt/military(src)
+	new /obj/item/crowbar/red(src)
 	new /obj/item/clothing/glasses/night(src)
 
 /obj/structure/closet/syndicate/suits
@@ -26,7 +26,7 @@
 	new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src)
 	new /obj/item/clothing/mask/gas/syndicate(src)
 	new /obj/item/clothing/suit/space/hardsuit/syndi(src)
-	new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
+	new /obj/item/tank/jetpack/oxygen/harness(src)
 	new /obj/item/clothing/shoes/magboots/syndie(src)
 
 /obj/structure/closet/syndicate/nuclear
@@ -39,20 +39,20 @@
 	new /obj/item/ammo_box/magazine/m10mm(src)
 	new /obj/item/ammo_box/magazine/m10mm(src)
 	new /obj/item/ammo_box/magazine/m10mm(src)
-	new /obj/item/weapon/storage/box/teargas(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/backpack/duffel/syndie/med(src)
-	new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
-	new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
-	new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
-	new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
-	new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/weapon/pinpointer/nukeop(src)
-	new /obj/item/device/pda/syndicate(src)
+	new /obj/item/storage/box/teargas(src)
+	new /obj/item/storage/box/flashbangs(src)
+	new /obj/item/storage/backpack/duffel/syndie/med(src)
+	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
+	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
+	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
+	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
+	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
+	new /obj/item/pinpointer/nukeop(src)
+	new /obj/item/pinpointer/nukeop(src)
+	new /obj/item/pinpointer/nukeop(src)
+	new /obj/item/pinpointer/nukeop(src)
+	new /obj/item/pinpointer/nukeop(src)
+	new /obj/item/pda/syndicate(src)
 
 /obj/structure/closet/syndicate/resources/
 	desc = "An old, dusty locker."
@@ -68,7 +68,7 @@
 
 		//Sad trombone
 		if(pickednum == 1)
-			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
+			var/obj/item/paper/P = new /obj/item/paper(src)
 			P.name = "IOU"
 			P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
 
@@ -114,7 +114,7 @@
 
 		//Jetpack (You hit the jackpot!)
 		if(pickednum == 50)
-			new /obj/item/weapon/tank/jetpack/carbondioxide(src)
+			new /obj/item/tank/jetpack/carbondioxide(src)
 
 /obj/structure/closet/syndicate/resources/everything
 	desc = "It's an emergency storage closet for repairs."

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -24,25 +24,25 @@
 
 	switch(pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
 		if("small")
-			new /obj/item/weapon/tank/emergency_oxygen(src)
-			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/tank/emergency_oxygen(src)
+			new /obj/item/tank/emergency_oxygen(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/clothing/mask/breath(src)
 		if("aid")
-			new /obj/item/weapon/tank/emergency_oxygen(src)
-			new /obj/item/weapon/storage/toolbox/emergency(src)
+			new /obj/item/tank/emergency_oxygen(src)
+			new /obj/item/storage/toolbox/emergency(src)
 			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/weapon/storage/firstaid/o2(src)
+			new /obj/item/storage/firstaid/o2(src)
 		if("tank")
-			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
 		if("both")
-			new /obj/item/weapon/storage/toolbox/emergency(src)
-			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/storage/toolbox/emergency(src)
+			new /obj/item/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/weapon/storage/firstaid/o2(src)
+			new /obj/item/storage/firstaid/o2(src)
 		if("nothing")
 			// doot
 
@@ -56,7 +56,7 @@
 			qdel(src)*/
 
 /obj/structure/closet/emcloset/legacy/New()
-	new /obj/item/weapon/tank/oxygen(src)
+	new /obj/item/tank/oxygen(src)
 	new /obj/item/clothing/mask/gas(src)
 
 /*
@@ -74,8 +74,8 @@
 
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
 /obj/structure/closet/firecloset/full/New()
@@ -84,9 +84,9 @@
 
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
+	new /obj/item/flashlight(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
 
@@ -104,21 +104,21 @@
 	if(prob(40))
 		new /obj/item/clothing/suit/storage/hazardvest(src)
 	if(prob(70))
-		new /obj/item/device/flashlight(src)
+		new /obj/item/flashlight(src)
 	if(prob(70))
-		new /obj/item/weapon/screwdriver(src)
+		new /obj/item/screwdriver(src)
 	if(prob(70))
-		new /obj/item/weapon/wrench(src)
+		new /obj/item/wrench(src)
 	if(prob(70))
-		new /obj/item/weapon/weldingtool(src)
+		new /obj/item/weldingtool(src)
 	if(prob(70))
-		new /obj/item/weapon/crowbar(src)
+		new /obj/item/crowbar(src)
 	if(prob(70))
-		new /obj/item/weapon/wirecutters(src)
+		new /obj/item/wirecutters(src)
 	if(prob(70))
-		new /obj/item/device/t_scanner(src)
+		new /obj/item/t_scanner(src)
 	if(prob(20))
-		new /obj/item/weapon/storage/belt/utility(src)
+		new /obj/item/storage/belt/utility(src)
 	if(prob(30))
 		new /obj/item/stack/cable_coil/random(src)
 	if(prob(30))
@@ -126,7 +126,7 @@
 	if(prob(30))
 		new /obj/item/stack/cable_coil/random(src)
 	if(prob(20))
-		new /obj/item/device/multitool(src)
+		new /obj/item/multitool(src)
 	if(prob(5))
 		new /obj/item/clothing/gloves/color/yellow(src)
 	if(prob(40))
@@ -197,9 +197,9 @@
 	..()
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/tank/oxygen/red(src)
-	new /obj/item/weapon/extinguisher(src)
+	new /obj/item/flashlight(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
 /*

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -27,8 +27,8 @@
 
 /obj/structure/closet/wardrobe/red/New()
 	..()
-	new /obj/item/weapon/storage/backpack/duffel/security(src)
-	new /obj/item/weapon/storage/backpack/duffel/security(src)
+	new /obj/item/storage/backpack/duffel/security(src)
+	new /obj/item/storage/backpack/duffel/security(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
@@ -337,12 +337,12 @@
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
 	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
-	new /obj/item/weapon/storage/backpack/chemistry(src)
-	new /obj/item/weapon/storage/backpack/chemistry(src)
-	new /obj/item/weapon/storage/backpack/satchel_chem(src)
-	new /obj/item/weapon/storage/backpack/satchel_chem(src)
-	new /obj/item/weapon/storage/bag/chemistry(src)
-	new /obj/item/weapon/storage/bag/chemistry(src)
+	new /obj/item/storage/backpack/chemistry(src)
+	new /obj/item/storage/backpack/chemistry(src)
+	new /obj/item/storage/backpack/satchel_chem(src)
+	new /obj/item/storage/backpack/satchel_chem(src)
+	new /obj/item/storage/bag/chemistry(src)
+	new /obj/item/storage/bag/chemistry(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/mask/gas(src)
 
@@ -360,10 +360,10 @@
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/labcoat/genetics(src)
 	new /obj/item/clothing/suit/storage/labcoat/genetics(src)
-	new /obj/item/weapon/storage/backpack/genetics(src)
-	new /obj/item/weapon/storage/backpack/genetics(src)
-	new /obj/item/weapon/storage/backpack/satchel_gen(src)
-	new /obj/item/weapon/storage/backpack/satchel_gen(src)
+	new /obj/item/storage/backpack/genetics(src)
+	new /obj/item/storage/backpack/genetics(src)
+	new /obj/item/storage/backpack/satchel_gen(src)
+	new /obj/item/storage/backpack/satchel_gen(src)
 
 
 /obj/structure/closet/wardrobe/virology_white
@@ -383,10 +383,10 @@
 	new /obj/item/clothing/suit/storage/labcoat/virologist(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/weapon/storage/backpack/virology(src)
-	new /obj/item/weapon/storage/backpack/virology(src)
-	new /obj/item/weapon/storage/backpack/satchel_vir(src)
-	new /obj/item/weapon/storage/backpack/satchel_vir(src)
+	new /obj/item/storage/backpack/virology(src)
+	new /obj/item/storage/backpack/virology(src)
+	new /obj/item/storage/backpack/satchel_vir(src)
+	new /obj/item/storage/backpack/satchel_vir(src)
 
 
 /obj/structure/closet/wardrobe/medic_white
@@ -432,7 +432,7 @@
 	new /obj/item/clothing/head/soft/grey(src)
 	new /obj/item/clothing/head/soft/grey(src)
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/duffel(src)
+		new /obj/item/storage/backpack/duffel(src)
 	if(prob(40))
 		new /obj/item/clothing/under/assistantformal(src)
 	if(prob(40))
@@ -469,10 +469,10 @@
 /obj/structure/closet/wardrobe/coroner/New()
 	..()
 	if(prob(50))
-		new /obj/item/weapon/storage/backpack/medic(src)
+		new /obj/item/storage/backpack/medic(src)
 	else
-		new /obj/item/weapon/storage/backpack/satchel_med(src)
-	new /obj/item/weapon/storage/backpack/duffel/medical(src)
+		new /obj/item/storage/backpack/satchel_med(src)
+	new /obj/item/storage/backpack/duffel/medical(src)
 	new /obj/item/clothing/suit/storage/labcoat/mortician(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/under/rank/medical/mortician(src)

code/game/objects/structures/crates_lockers/crates.dm

@@ -8,7 +8,7 @@
 	climbable = 1
 //	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
 	var/rigged = 0
-	var/obj/item/weapon/paper/manifest/manifest
+	var/obj/item/paper/manifest/manifest
 	// A list of beacon names that the crate will announce the arrival of, when delivered.
 	var/list/announce_beacons = list()
 
@@ -34,7 +34,7 @@
 	if(!src.can_open())
 		return 0
 
-	if(rigged && locate(/obj/item/device/radio/electropack) in src)
+	if(rigged && locate(/obj/item/radio/electropack) in src)
 		if(isliving(usr))
 			var/mob/living/L = usr
 			if(L.electrocute_act(17, src))
@@ -80,9 +80,9 @@
 	src.opened = 0
 	return 1
 
-/obj/structure/closet/crate/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/rcs) && !src.opened)
-		var/obj/item/weapon/rcs/E = W
+/obj/structure/closet/crate/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/rcs) && !src.opened)
+		var/obj/item/rcs/E = W
 		if(E.rcell && (E.rcell.charge >= E.chargecost))
 			if(!is_level_reachable(src.z)) // This is inconsistent with the closet sending code
 				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
@@ -168,13 +168,13 @@
 		qdel(W)
 		rigged = 1
 		return
-	else if(istype(W, /obj/item/device/radio/electropack))
+	else if(istype(W, /obj/item/radio/electropack))
 		if(rigged)
 			to_chat(user, "<span class='notice'>You attach [W] to [src].</span>")
 			user.drop_item()
 			W.forceMove(src)
 			return
-	else if(istype(W, /obj/item/weapon/wirecutters))
+	else if(istype(W, /obj/item/wirecutters))
 		if(rigged)
 			to_chat(user, "<span class='notice'>You cut away the wiring.</span>")
 			playsound(loc, W.usesound, 100, 1)
@@ -213,7 +213,7 @@
 		update_icon()
 		return
 	else
-		if(rigged && locate(/obj/item/device/radio/electropack) in src)
+		if(rigged && locate(/obj/item/radio/electropack) in src)
 			if(isliving(user))
 				var/mob/living/L = user
 				if(L.electrocute_act(17, src))
@@ -307,10 +307,10 @@
 		src.toggle(user)
 
 
-/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W, mob/user, params)
-	if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters,/obj/item/weapon/rcs)))
+/obj/structure/closet/crate/secure/attackby(obj/item/W, mob/user, params)
+	if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/radio/electropack, /obj/item/wirecutters,/obj/item/rcs)))
 		return ..()
-	if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)))
+	if((istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade)))
 		emag_act(user)
 		return
 	if(!opened)
@@ -401,10 +401,10 @@
 
 /obj/structure/closet/crate/rcd/New()
 	..()
-	new /obj/item/weapon/rcd_ammo(src)
-	new /obj/item/weapon/rcd_ammo(src)
-	new /obj/item/weapon/rcd_ammo(src)
-	new /obj/item/weapon/rcd(src)
+	new /obj/item/rcd_ammo(src)
+	new /obj/item/rcd_ammo(src)
+	new /obj/item/rcd_ammo(src)
+	new /obj/item/rcd(src)
 
 /obj/structure/closet/crate/freezer
 	desc = "A freezer."
@@ -442,7 +442,7 @@
 	icon_closed = "largebin"
 	anchored = TRUE
 
-/obj/structure/closet/crate/can/attackby(obj/item/weapon/W, mob/living/user, params)
+/obj/structure/closet/crate/can/attackby(obj/item/W, mob/living/user, params)
 	if(iswrench(W))
 		add_fingerprint(user)
 		user.changeNext_move(CLICK_CD_MELEE)
@@ -598,20 +598,20 @@
 
 	New()
 		..()
-		new /obj/item/weapon/reagent_containers/glass/bucket(src)
-		new /obj/item/weapon/reagent_containers/glass/bucket(src)
-		new /obj/item/weapon/screwdriver(src)
-		new /obj/item/weapon/screwdriver(src)
-		new /obj/item/weapon/wrench(src)
-		new /obj/item/weapon/wrench(src)
-		new /obj/item/weapon/wirecutters(src)
-		new /obj/item/weapon/wirecutters(src)
-		new /obj/item/weapon/shovel/spade(src)
-		new /obj/item/weapon/shovel/spade(src)
-		new /obj/item/weapon/storage/box/beakers(src)
-		new /obj/item/weapon/storage/box/beakers(src)
-		new /obj/item/weapon/hand_labeler(src)
-		new /obj/item/weapon/hand_labeler(src)
+		new /obj/item/reagent_containers/glass/bucket(src)
+		new /obj/item/reagent_containers/glass/bucket(src)
+		new /obj/item/screwdriver(src)
+		new /obj/item/screwdriver(src)
+		new /obj/item/wrench(src)
+		new /obj/item/wrench(src)
+		new /obj/item/wirecutters(src)
+		new /obj/item/wirecutters(src)
+		new /obj/item/shovel/spade(src)
+		new /obj/item/shovel/spade(src)
+		new /obj/item/storage/box/beakers(src)
+		new /obj/item/storage/box/beakers(src)
+		new /obj/item/hand_labeler(src)
+		new /obj/item/hand_labeler(src)
 
 /obj/structure/closet/crate/sci
 	name = "science crate"

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/crates.dmi'
 	icon_state = "largecrate"
 	density = 1
-	var/obj/item/weapon/paper/manifest/manifest
+	var/obj/item/paper/manifest/manifest
 
 /obj/structure/largecrate/New()
 	..()
@@ -30,8 +30,8 @@
 		to_chat(user, "<span class='notice'>You need a crowbar to pry this open!</span>")
 		return
 
-/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/crowbar))
+/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/crowbar))
 		if(manifest)
 			manifest.forceMove(loc)
 			manifest = null
@@ -53,8 +53,8 @@
 /obj/structure/largecrate/lisa
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/lisa/attackby(obj/item/weapon/W as obj, mob/user as mob)	//ugly but oh well
-	if(istype(W, /obj/item/weapon/crowbar))
+/obj/structure/largecrate/lisa/attackby(obj/item/W as obj, mob/user as mob)	//ugly but oh well
+	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/pet/corgi/Lisa(loc)
 	..()
 
@@ -62,8 +62,8 @@
 	name = "cow crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/cow/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/crowbar))
+/obj/structure/largecrate/cow/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/cow(loc)
 	..()
 
@@ -71,8 +71,8 @@
 	name = "goat crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/goat/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/crowbar))
+/obj/structure/largecrate/goat/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/hostile/retaliate/goat(loc)
 	..()
 
@@ -80,8 +80,8 @@
 	name = "chicken crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/crowbar))
+/obj/structure/largecrate/chick/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/crowbar))
 		var/num = rand(4, 6)
 		for(var/i = 0, i < num, i++)
 			new /mob/living/simple_animal/chick(loc)
@@ -91,7 +91,7 @@
 	name = "cat crate"
 	icon_state = "lisacrate"
 
-/obj/structure/largecrate/cat/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/crowbar))
+/obj/structure/largecrate/cat/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/pet/cat(loc)
 	..()

code/game/objects/structures/crates_lockers/walllocker.dm

@@ -24,7 +24,7 @@
 /obj/structure/closet/walllocker/emerglocker
 	name = "emergency locker"
 	desc = "A wall mounted locker with emergency supplies"
-	var/list/spawnitems = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/crowbar)
+	var/list/spawnitems = list(/obj/item/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/crowbar)
 	var/amount = 3 // spawns each items X times.
 	icon_state = "emerg"
 	icon_closed = "emerg"

code/game/objects/structures/curtains.dm

@@ -55,7 +55,7 @@
 					return
 				anchored = TRUE
 				to_chat(user, "<span class='notice'>You screw [src] to the floor.</span>")
-	else if(istype(W, /obj/item/weapon/wirecutters))
+	else if(istype(W, /obj/item/wirecutters))
 		if(!anchored)
 			playsound(loc, W.usesound, 100, 1)
 			user.visible_message("<span class='warning'>[user] cuts apart [src].</span>", "<span class='notice'>You start to cut apart [src].</span>", "You hear cutting.")

code/game/objects/structures/displaycase.dm

@@ -19,8 +19,8 @@ var/global/list/captain_display_cases = list()
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "box_glass"
 	armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
-	var/obj/item/weapon/airlock_electronics/circuit = null
-	var/obj/item/device/assembly/prox_sensor/sensor = null
+	var/obj/item/airlock_electronics/circuit = null
+	var/obj/item/assembly/prox_sensor/sensor = null
 	var/state = DISPLAYCASE_FRAME_CIRCUIT
 
 /obj/structure/displaycase_frame/Destroy()
@@ -28,19 +28,19 @@ var/global/list/captain_display_cases = list()
 	QDEL_NULL(sensor)
 	return ..()
 
-/obj/structure/displaycase_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/displaycase_frame/attackby(obj/item/W as obj, mob/user as mob, params)
 	var/pstate = state
 	var/turf/T = get_turf(src)
 	switch(state)
 		if(DISPLAYCASE_FRAME_CIRCUIT)
-			if(istype(W, /obj/item/weapon/airlock_electronics) && W.icon_state != "door_electronics_smoked")
+			if(istype(W, /obj/item/airlock_electronics) && W.icon_state != "door_electronics_smoked")
 				user.drop_item()
 				circuit = W
 				circuit.forceMove(src)
 				state++
 				to_chat(user, "<span class='notice'>You add the airlock electronics to the frame.</span>")
 				playsound(get_turf(src),W.usesound, 50, 1)
-			if(istype(W, /obj/item/weapon/crowbar))
+			if(istype(W, /obj/item/crowbar))
 				new /obj/machinery/constructable_frame/machine_frame(T)
 				var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(T)
 				G.amount = 5
@@ -63,7 +63,7 @@ var/global/list/captain_display_cases = list()
 				playsound(get_turf(src), W.usesound, 50, 1)
 				qdel(src)
 				return
-			if(istype(W, /obj/item/weapon/crowbar))
+			if(istype(W, /obj/item/crowbar))
 				circuit.forceMove(T)
 				circuit = null
 				if(isprox(sensor))
@@ -105,7 +105,7 @@ var/global/list/captain_display_cases = list()
 	var/burglar_alarm = 0
 	var/ue = null
 	var/image/occupant_overlay = null
-	var/obj/item/weapon/airlock_electronics/circuit
+	var/obj/item/airlock_electronics/circuit
 	var/start_showpiece_type = null //add type for items on display
 
 /obj/structure/displaycase/New()
@@ -120,7 +120,7 @@ var/global/list/captain_display_cases = list()
 	burglar_alarm = 1
 	locked = 1
 	req_access = list(access_captain)
-	start_showpiece_type = /obj/item/weapon/gun/energy/laser/captain
+	start_showpiece_type = /obj/item/gun/energy/laser/captain
 
 /obj/structure/displaycase/Destroy()
 	dump()
@@ -148,7 +148,7 @@ var/global/list/captain_display_cases = list()
 /obj/structure/displaycase/ex_act(severity)
 	switch(severity)
 		if(1)
-			new /obj/item/weapon/shard(loc)
+			new /obj/item/shard(loc)
 			if(occupant)
 				dump()
 			qdel(src)
@@ -170,7 +170,7 @@ var/global/list/captain_display_cases = list()
 
 /obj/structure/displaycase/blob_act()
 	if(prob(75))
-		new /obj/item/weapon/shard(loc)
+		new /obj/item/shard(loc)
 		if(occupant) dump()
 		qdel(src)
 
@@ -180,7 +180,7 @@ var/global/list/captain_display_cases = list()
 		if(!( src.destroyed ))
 			src.density = 0
 			src.destroyed = 1
-			new /obj/item/weapon/shard(loc)
+			new /obj/item/shard(loc)
 			playsound(get_turf(src), "shatter", 70, 1)
 			update_icon()
 			spawn(0)
@@ -216,9 +216,9 @@ var/global/list/captain_display_cases = list()
 		overlays += occupant_overlay
 	return
 
-/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/card))
-		var/obj/item/weapon/card/id/I = W
+/obj/structure/displaycase/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/card))
+		var/obj/item/card/id/I = W
 		if(!check_access(I))
 			to_chat(user, "<span class='warning'>Access denied.</span>")
 			return
@@ -229,14 +229,14 @@ var/global/list/captain_display_cases = list()
 			to_chat(user, "[bicon(src)]  <span class='notice'>You close \the [src] and swipe your card, locking it.</span>")
 		update_icon()
 		return
-	if(istype(W,/obj/item/weapon/crowbar) && (!locked || destroyed))
+	if(istype(W,/obj/item/crowbar) && (!locked || destroyed))
 		user.visible_message("[user.name] pries \the [src] apart.", \
 			"You pry \the [src] apart.", \
 			"You hear something pop.")
 		var/turf/T = get_turf(src)
 		playsound(T, W.usesound, 50, 1)
 		dump()
-		var/obj/item/weapon/airlock_electronics/C = circuit
+		var/obj/item/airlock_electronics/C = circuit
 		if(!C)
 			C = new (src)
 		C.one_access = !(req_access && req_access.len>0)
@@ -251,7 +251,7 @@ var/global/list/captain_display_cases = list()
 			F.circuit = C
 			F.circuit.forceMove(F)
 			if(burglar_alarm)
-				new /obj/item/device/assembly/prox_sensor(T)
+				new /obj/item/assembly/prox_sensor(T)
 			F.update_icon()
 		else
 			C.forceMove(T)

code/game/objects/structures/door_assembly.dm

@@ -9,7 +9,7 @@
 	var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES
 	var/mineral
 	var/base_name = "airlock"
-	var/obj/item/weapon/airlock_electronics/electronics
+	var/obj/item/airlock_electronics/electronics
 	var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed
 	var/glass_type = /obj/machinery/door/airlock/glass
 	var/glass = 0 // 0 = glass can be installed. 1 = glass is already installed.
@@ -54,7 +54,7 @@
 		to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname].</span>")
 
 /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/pen))
+	if(istype(W, /obj/item/pen))
 		var/t = copytext(stripped_input(user, "Enter the name for the door.", name, created_name),1,MAX_NAME_LEN)
 		if(!t)
 			return
@@ -64,7 +64,7 @@
 		return
 
 	else if(iswelder(W) && (mineral || glass || !anchored ))
-		var/obj/item/weapon/weldingtool/WT = W
+		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			playsound(loc, WT.usesound, 50, 1)
 			if(mineral)
@@ -139,7 +139,7 @@
 			new/obj/item/stack/cable_coil(get_turf(user), 1)
 			state = AIRLOCK_ASSEMBLY_NEEDS_WIRES
 
-	else if(istype(W, /obj/item/weapon/airlock_electronics) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS && W.icon_state != "door_electronics_smoked")
+	else if(istype(W, /obj/item/airlock_electronics) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS && W.icon_state != "door_electronics_smoked")
 		playsound(loc, W.usesound, 100, 1)
 		user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...")
 
@@ -163,9 +163,9 @@
 			to_chat(user, "<span class='notice'>You remove the airlock electronics.</span>")
 			state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
 			name = "wired airlock assembly"
-			var/obj/item/weapon/airlock_electronics/ae
+			var/obj/item/airlock_electronics/ae
 			if(!electronics)
-				ae = new/obj/item/weapon/airlock_electronics(loc)
+				ae = new/obj/item/airlock_electronics(loc)
 			else
 				ae = electronics
 				electronics = null
@@ -292,7 +292,7 @@
 				else
 					new /obj/item/stack/sheet/glass(T)
 			else
-				new /obj/item/weapon/shard(T)
+				new /obj/item/shard(T)
 		if(mineral)
 			var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
 			new mineral_path(T, 2)

code/game/objects/structures/dresser.dm

@@ -55,7 +55,7 @@
 		add_fingerprint(H)
 		H.update_body()
 
-/obj/structure/dresser/attackby(obj/item/weapon/W, mob/living/user, params)
+/obj/structure/dresser/attackby(obj/item/W, mob/living/user, params)
 	add_fingerprint(user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	if(iswrench(W))

code/game/objects/structures/electricchair.dm

@@ -13,7 +13,7 @@
 		if(isnull(part)) //This e-chair was not custom built
 			part = new(src)
 			var/obj/item/clothing/head/helmet/part1 = new(part)
-			var/obj/item/device/radio/electropack/part2 = new(part)
+			var/obj/item/radio/electropack/part2 = new(part)
 			part2.frequency = 1445
 			part2.code = 6
 			part2.master = part
@@ -21,8 +21,8 @@
 			part.part2 = part2
 	return
 
-/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
+/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/wrench))
 		var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc)
 		playsound(loc, W.usesound, 50, 1)
 		C.dir = dir

code/game/objects/structures/engicart.dm

@@ -8,10 +8,10 @@
 	var/obj/item/stack/sheet/glass/myglass = null
 	var/obj/item/stack/sheet/metal/mymetal = null
 	var/obj/item/stack/sheet/plasteel/myplasteel = null
-	var/obj/item/device/flashlight/myflashlight = null
-	var/obj/item/weapon/storage/toolbox/mechanical/mybluetoolbox = null
-	var/obj/item/weapon/storage/toolbox/electrical/myyellowtoolbox = null
-	var/obj/item/weapon/storage/toolbox/emergency/myredtoolbox = null
+	var/obj/item/flashlight/myflashlight = null
+	var/obj/item/storage/toolbox/mechanical/mybluetoolbox = null
+	var/obj/item/storage/toolbox/electrical/myyellowtoolbox = null
+	var/obj/item/storage/toolbox/emergency/myredtoolbox = null
 	var/obj/item/taperoll/engineering/myengitape = null
 
 /obj/structure/engineeringcart/Destroy()
@@ -55,28 +55,28 @@
 				update_icon()
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/device/flashlight))
+		else if(istype(I, /obj/item/flashlight))
 			if(!myflashlight)
 				put_in_cart(I, user)
 				myflashlight=I
 				update_icon()
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/storage/toolbox/mechanical))
+		else if(istype(I, /obj/item/storage/toolbox/mechanical))
 			if(!mybluetoolbox)
 				put_in_cart(I, user)
 				mybluetoolbox=I
 				update_icon()
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/storage/toolbox/electrical))
+		else if(istype(I, /obj/item/storage/toolbox/electrical))
 			if(!myyellowtoolbox)
 				put_in_cart(I, user)
 				myyellowtoolbox=I
 				update_icon()
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/storage/toolbox))
+		else if(istype(I, /obj/item/storage/toolbox))
 			if(!myredtoolbox)
 				put_in_cart(I, user)
 				myredtoolbox=I
@@ -90,7 +90,7 @@
 				update_icon()
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/wrench))
+		else if(istype(I, /obj/item/wrench))
 			if(!anchored && !isinspace())
 				playsound(src.loc, I.usesound, 50, 1)
 				user.visible_message( \

code/game/objects/structures/extinguisher.dm

@@ -5,7 +5,7 @@
 	icon_state = "extinguisher_closed"
 	anchored = 1
 	density = 0
-	var/obj/item/weapon/extinguisher/has_extinguisher = new/obj/item/weapon/extinguisher
+	var/obj/item/extinguisher/has_extinguisher = new/obj/item/extinguisher
 	var/opened = 0
 
 /obj/structure/extinguisher_cabinet/Destroy()
@@ -15,7 +15,7 @@
 /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params)
 	if(isrobot(user) || isalien(user))
 		return
-	if(istype(O, /obj/item/weapon/extinguisher))
+	if(istype(O, /obj/item/extinguisher))
 		if(!has_extinguisher && opened)
 			user.drop_item(O)
 			contents += O
@@ -64,7 +64,7 @@
 		icon_state = "extinguisher_closed"
 		return
 	if(has_extinguisher)
-		if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini))
+		if(istype(has_extinguisher, /obj/item/extinguisher/mini))
 			icon_state = "extinguisher_mini"
 		else
 			icon_state = "extinguisher_full"

code/game/objects/structures/false_walls.dm

@@ -96,7 +96,7 @@
 		qdel(src)
 	return T
 
-/obj/structure/falsewall/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/falsewall/attackby(obj/item/W, mob/user, params)
 	if(opening)
 		to_chat(user, "<span class='warning'>You must wait until the door has stopped moving.</span>")
 		return
@@ -106,20 +106,20 @@
 		if(T.density)
 			to_chat(user, "<span class='warning'>[src] is blocked!</span>")
 			return
-		if(istype(W, /obj/item/weapon/screwdriver))
+		if(istype(W, /obj/item/screwdriver))
 			if(!istype(T, /turf/simulated/floor))
 				to_chat(user, "<span class='warning'>[src] bolts must be tightened on the floor!</span>")
 				return
 			user.visible_message("<span class='notice'>[user] tightens some bolts on the wall.</span>", "<span class='warning'>You tighten the bolts on the wall.</span>")
 			ChangeToWall()
-		if(istype(W, /obj/item/weapon/weldingtool))
-			var/obj/item/weapon/weldingtool/WT = W
+		if(istype(W, /obj/item/weldingtool))
+			var/obj/item/weldingtool/WT = W
 			if(WT.remove_fuel(0,user))
 				dismantle(user)
 	else
 		to_chat(user, "<span class='warning'>You can't reach, close it first!</span>")
 
-	if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/pickaxe/drill/jackhammer) || istype(W, /obj/item/weapon/melee/energy/blade))
+	if(istype(W, /obj/item/gun/energy/plasmacutter) || istype(W, /obj/item/pickaxe/drill/diamonddrill) || istype(W, /obj/item/pickaxe/drill/jackhammer) || istype(W, /obj/item/melee/energy/blade))
 		dismantle(user)
 
 /obj/structure/falsewall/proc/dismantle(mob/user)
@@ -172,7 +172,7 @@
 	var/last_event = 0
 	canSmoothWith = list(/obj/structure/falsewall/uranium, /turf/simulated/wall/mineral/uranium)
 
-/obj/structure/falsewall/uranium/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/falsewall/uranium/attackby(obj/item/W as obj, mob/user as mob, params)
 	radiate()
 	..()
 
@@ -233,7 +233,7 @@
 	walltype = "plasma"
 	canSmoothWith = list(/obj/structure/falsewall/plasma, /turf/simulated/wall/mineral/plasma, /turf/simulated/wall/mineral/alien)
 
-/obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
 	if(is_hot(W) > 300)
 		message_admins("Plasma falsewall ignited by [key_name_admin(user)] in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 		log_game("Plasma falsewall ignited by [key_name(user)] in ([x],[y],[z])")

code/game/objects/structures/flora.dm

@@ -203,7 +203,7 @@
 	icon_state = "fullgrass_[rand(1, 3)]"
 
 
-/obj/item/weapon/twohanded/required/kirbyplants
+/obj/item/twohanded/required/kirbyplants
 	name = "potted plant"
 	icon = 'icons/obj/flora/plants.dmi'
 	icon_state = "plant-1"
@@ -215,22 +215,22 @@
 	throw_speed = 2
 	throw_range = 4
 
-/obj/item/weapon/twohanded/required/kirbyplants/New()
+/obj/item/twohanded/required/kirbyplants/New()
 	..()
 	icon_state = "plant-[rand(1,35)]"
 	if(prob(1))
 		icon_state = "plant-36"
 
-/obj/item/weapon/twohanded/required/kirbyplants/equipped(mob/living/user)
+/obj/item/twohanded/required/kirbyplants/equipped(mob/living/user)
 	var/image/I = image(icon = 'icons/obj/flora/plants.dmi' , icon_state = src.icon_state, loc = user)
 	I.override = 1
 	user.add_alt_appearance("sneaking_mission", I, player_list)
 
-/obj/item/weapon/twohanded/required/kirbyplants/dropped(mob/living/user)
+/obj/item/twohanded/required/kirbyplants/dropped(mob/living/user)
 	..()
 	user.remove_alt_appearance("sneaking_mission")
 
-/obj/item/weapon/twohanded/required/kirbyplants/dead
+/obj/item/twohanded/required/kirbyplants/dead
 	name = "\improper RD's potted plant"
 	desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
 	icon_state = "plant-dead"
@@ -311,7 +311,7 @@
 
 /obj/structure/bush/attackby(var/obj/I as obj, var/mob/user as mob, params)
 	//hatchets can clear away undergrowth
-	if(istype(I, /obj/item/weapon/hatchet) && !stump)
+	if(istype(I, /obj/item/hatchet) && !stump)
 		if(indestructable)
 			//this bush marks the edge of the map, you can't destroy it
 			to_chat(user, "<span class='warning'>You flail away at the undergrowth, but it's too thick here.</span>")

code/game/objects/structures/foodcart.dm

@@ -7,20 +7,20 @@
 	density = 1
 	//Food slots
 	var/list/food_slots[6]
-	//var/obj/item/weapon/reagent_containers/food/snacks/food1 = null
-	//var/obj/item/weapon/reagent_containers/food/snacks/food2 = null
-	//var/obj/item/weapon/reagent_containers/food/snacks/food3 = null
-	//var/obj/item/weapon/reagent_containers/food/snacks/food4 = null
-	//var/obj/item/weapon/reagent_containers/food/snacks/food5 = null
-	//var/obj/item/weapon/reagent_containers/food/snacks/food6 = null
+	//var/obj/item/reagent_containers/food/snacks/food1 = null
+	//var/obj/item/reagent_containers/food/snacks/food2 = null
+	//var/obj/item/reagent_containers/food/snacks/food3 = null
+	//var/obj/item/reagent_containers/food/snacks/food4 = null
+	//var/obj/item/reagent_containers/food/snacks/food5 = null
+	//var/obj/item/reagent_containers/food/snacks/food6 = null
 	//Drink slots
 	var/list/drink_slots[6]
-	//var/obj/item/weapon/reagent_containers/food/drinks/drink1 = null
-	//var/obj/item/weapon/reagent_containers/food/drinks/drink2 = null
-	//var/obj/item/weapon/reagent_containers/food/drinks/drink3 = null
-	//var/obj/item/weapon/reagent_containers/food/drinks/drink4 = null
-	//var/obj/item/weapon/reagent_containers/food/drinks/drink5 = null
-	//var/obj/item/weapon/reagent_containers/food/drinks/drink6 = null
+	//var/obj/item/reagent_containers/food/drinks/drink1 = null
+	//var/obj/item/reagent_containers/food/drinks/drink2 = null
+	//var/obj/item/reagent_containers/food/drinks/drink3 = null
+	//var/obj/item/reagent_containers/food/drinks/drink4 = null
+	//var/obj/item/reagent_containers/food/drinks/drink5 = null
+	//var/obj/item/reagent_containers/food/drinks/drink6 = null
 
 /obj/structure/foodcart/proc/put_in_cart(obj/item/I, mob/user)
 	user.drop_item()
@@ -32,7 +32,7 @@
 /obj/structure/foodcart/attackby(obj/item/I, mob/user, params)
 	var/fail_msg = "<span class='notice'>There are no open spaces for this in [src].</span>"
 	if(!I.is_robot_module())
-		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks))
+		if(istype(I, /obj/item/reagent_containers/food/snacks))
 			var/success = 0
 			for(var/s=1,s<=6,s++)
 				if(!food_slots[s])
@@ -43,7 +43,7 @@
 					break;
 			if(!success)
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/reagent_containers/food/drinks))
+		else if(istype(I, /obj/item/reagent_containers/food/drinks))
 			var/success = 0
 			for(var/s=1,s<=6,s++)
 				if(!drink_slots[s])
@@ -54,7 +54,7 @@
 					break;
 			if(!success)
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/wrench))
+		else if(istype(I, /obj/item/wrench))
 			if(!anchored && !isinspace())
 				playsound(src.loc, I.usesound, 50, 1)
 				user.visible_message( \

code/game/objects/structures/fullwindow.dm

@@ -42,7 +42,7 @@
 	desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
 	basestate = "plasmawindow"
 	icon_state = "plasmawindow"
-	shardtype = /obj/item/weapon/shard/plasma
+	shardtype = /obj/item/shard/plasma
 	glasstype = /obj/item/stack/sheet/plasmaglass
 	health = 240
 
@@ -56,7 +56,7 @@
 	desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
 	basestate = "plasmarwindow"
 	icon_state = "plasmarwindow"
-	shardtype = /obj/item/weapon/shard/plasma
+	shardtype = /obj/item/shard/plasma
 	glasstype = /obj/item/stack/sheet/plasmaglass
 	reinf = 1
 	health = 320

code/game/objects/structures/girders.dm

@@ -104,7 +104,7 @@
 				transfer_fingerprints_to(G)
 				qdel(src)
 
-	else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
+	else if(istype(W, /obj/item/gun/energy/plasmacutter))
 		to_chat(user, "<span class='notice'>You start slicing apart the girder...</span>")
 		if(do_after(user, 40 * W.toolspeed, target = src))
 			if(!src)
@@ -114,12 +114,12 @@
 			refundMetal(metalUsed)
 			qdel(src)
 
-	else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
+	else if(istype(W, /obj/item/pickaxe/drill/diamonddrill))
 		to_chat(user, "<span class='notice'>You drill through the girder!</span>")
 		refundMetal(metalUsed)
 		qdel(src)
 
-	else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+	else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
 		playsound(loc, W.usesound, 100, 1)
 		to_chat(user, "<span class='notice'>You disintegrate the girder!</span>")
 		refundMetal(metalUsed)
@@ -440,13 +440,13 @@
 
 /obj/structure/girder/cult/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
-	if(istype(W, /obj/item/weapon/tome) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
+	if(istype(W, /obj/item/tome) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
 		user.visible_message("<span class='warning'>[user] strikes [src] with [W]!</span>", "<span class='notice'>You demolish [src].</span>")
 		refundMetal(metalUsed)
 		qdel(src)
 
 	else if(iswelder(W))
-		var/obj/item/weapon/weldingtool/WT = W
+		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0,user))
 			playsound(loc, W.usesound, 50, 1)
 			to_chat(user, "<span class='notice'>You start slicing apart the girder...</span>")
@@ -459,7 +459,7 @@
 				transfer_fingerprints_to(R)
 				qdel(src)
 
-	else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
+	else if(istype(W, /obj/item/gun/energy/plasmacutter))
 		to_chat(user, "<span class='notice'>You start slicing apart the girder...</span>")
 		if(do_after(user, 40* W.toolspeed, target = src))
 			playsound(loc, W.usesound, 100, 1)
@@ -469,8 +469,8 @@
 			transfer_fingerprints_to(R)
 			qdel(src)
 
-	else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
-		var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
+	else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
+		var/obj/item/pickaxe/drill/jackhammer/D = W
 		to_chat(user, "<span class='notice'>Your jackhammer smashes through the girder!</span>")
 		var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
 		R.amount = 1

code/game/objects/structures/grille.dm

@@ -112,7 +112,7 @@
 		var/atom/movable/mover = caller
 		. = . || mover.checkpass(PASSGRILLE)
 
-/obj/structure/grille/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/grille/attackby(obj/item/W, mob/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	add_fingerprint(user)
 	if(iswirecutter(W))
@@ -142,7 +142,7 @@
 		return
 //window placing end
 
-	else if(istype(W, /obj/item/weapon/shard) || !shock(user, 70))
+	else if(istype(W, /obj/item/shard) || !shock(user, 70))
 		return ..()
 
 /obj/structure/grille/proc/build_window(obj/item/stack/sheet/S, mob/user)

code/game/objects/structures/inflatable.dm

@@ -93,7 +93,7 @@
 		return
 	attack_generic(user, rand(10, 15))
 
-/obj/structure/inflatable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/inflatable/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(!istype(W))
 		return
 	if(is_pointed(W))
@@ -273,7 +273,7 @@
 	to_chat(user, "<span class='warning'>The inflatable door is too torn to be inflated!</span>")
 	add_fingerprint(user)
 
-/obj/item/weapon/storage/briefcase/inflatable
+/obj/item/storage/briefcase/inflatable
 	name = "inflatable barrier box"
 	desc = "Contains inflatable walls and doors."
 	icon_state = "inf_box"
@@ -281,7 +281,7 @@
 	max_combined_w_class = 21
 	w_class = WEIGHT_CLASS_NORMAL
 
-/obj/item/weapon/storage/briefcase/inflatable/New()
+/obj/item/storage/briefcase/inflatable/New()
 	..()
 	new /obj/item/inflatable/door(src)
 	new /obj/item/inflatable/door(src)

code/game/objects/structures/janicart.dm

@@ -10,10 +10,10 @@
 	flags = OPENCONTAINER
 	//copypaste sorry
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
-	var/obj/item/weapon/storage/bag/trash/mybag	= null
-	var/obj/item/weapon/mop/mymop = null
-	var/obj/item/weapon/reagent_containers/spray/cleaner/myspray = null
-	var/obj/item/device/lightreplacer/myreplacer = null
+	var/obj/item/storage/bag/trash/mybag	= null
+	var/obj/item/mop/mymop = null
+	var/obj/item/reagent_containers/spray/cleaner/myspray = null
+	var/obj/item/lightreplacer/myreplacer = null
 	var/signs = 0
 	var/const/max_signs = 4
 
@@ -31,7 +31,7 @@
 	QDEL_NULL(myreplacer)
 	return ..()
 
-/obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user)
+/obj/structure/janitorialcart/proc/wet_mop(obj/item/mop, mob/user)
 	if(reagents.total_volume < 1)
 		to_chat(user, "[src] is out of water!</span>")
 	else
@@ -51,8 +51,8 @@
 	var/fail_msg = "<span class='notice'>There is already one of those in [src].</span>"
 
 	if(!I.is_robot_module())
-		if(istype(I, /obj/item/weapon/mop))
-			var/obj/item/weapon/mop/m=I
+		if(istype(I, /obj/item/mop))
+			var/obj/item/mop/m=I
 			if(m.reagents.total_volume < m.reagents.maximum_volume)
 				wet_mop(m, user)
 				return
@@ -61,39 +61,39 @@
 			else
 				to_chat(user, fail_msg)
 
-		else if(istype(I, /obj/item/weapon/storage/bag/trash))
+		else if(istype(I, /obj/item/storage/bag/trash))
 			if(!mybag)
-				var/obj/item/weapon/storage/bag/trash/t=I
+				var/obj/item/storage/bag/trash/t=I
 				t.janicart_insert(user, src)
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/reagent_containers/spray/cleaner))
+		else if(istype(I, /obj/item/reagent_containers/spray/cleaner))
 			if(!myspray)
 				put_in_cart(I, user)
 				myspray=I
 				update_icon()
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/device/lightreplacer))
+		else if(istype(I, /obj/item/lightreplacer))
 			if(!myreplacer)
-				var/obj/item/device/lightreplacer/l=I
+				var/obj/item/lightreplacer/l=I
 				l.janicart_insert(user,src)
 			else
 				to_chat(user, fail_msg)
-		else if(istype(I, /obj/item/weapon/caution))
+		else if(istype(I, /obj/item/caution))
 			if(signs < max_signs)
 				put_in_cart(I, user)
 				signs++
 				update_icon()
 			else
 				to_chat(user, "<span class='notice'>[src] can't hold any more signs.</span>")
-		else if(istype(I, /obj/item/weapon/crowbar))
+		else if(istype(I, /obj/item/crowbar))
 			user.visible_message("<span class='warning'>[user] begins to empty the contents of [src].</span>")
 			if(do_after(user, 30 * I.toolspeed, target = src))
 				to_chat(usr, "<span class='notice'>You empty the contents of [src]'s bucket onto the floor.</span>")
 				reagents.reaction(src.loc)
 				src.reagents.clear_reagents()
-		else if(istype(I, /obj/item/weapon/wrench))
+		else if(istype(I, /obj/item/wrench))
 			if(!anchored && !isinspace())
 				playsound(src.loc, I.usesound, 50, 1)
 				user.visible_message( \
@@ -159,7 +159,7 @@
 			myreplacer = null
 	if(href_list["sign"])
 		if(signs)
-			var/obj/item/weapon/caution/Sign = locate() in src
+			var/obj/item/caution/Sign = locate() in src
 			if(Sign)
 				user.put_in_hands(Sign)
 				to_chat(user, "<span class='notice'>You take \a [Sign] from [src].</span>")

code/game/objects/structures/kitchen_spike.dm

@@ -11,7 +11,7 @@
 
 /obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
 	add_fingerprint(user)
-	if(istype(I, /obj/item/weapon/wrench))
+	if(istype(I, /obj/item/wrench))
 		if(anchored)
 			to_chat(user, "<span class='notice'>You unwrench [src] from the floor.</span>")
 			anchored = 0
@@ -40,8 +40,8 @@
 
 
 
-/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
-	if(istype(G, /obj/item/weapon/crowbar))
+/obj/structure/kitchenspike/attackby(obj/item/grab/G as obj, mob/user as mob)
+	if(istype(G, /obj/item/crowbar))
 		if(!buckled_mob)
 			playsound(loc, G.usesound, 100, 1)
 			if(do_after(user, 20 * G.toolspeed, target = src))
@@ -53,7 +53,7 @@
 		else
 			to_chat(user, "<span class='notice'>You can't do that while something's on the spike!</span>")
 		return
-	if(!istype(G, /obj/item/weapon/grab) || !G.affecting)
+	if(!istype(G, /obj/item/grab) || !G.affecting)
 		return
 	if(buckled_mob)
 		to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")

code/game/objects/structures/ladders.dm

@@ -72,7 +72,7 @@
 
 	add_fingerprint(user)
 
-/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params)
+/obj/structure/ladder/attackby(obj/item/W, mob/user as mob, params)
 	return attack_hand(user)
 
 /obj/structure/ladder/dive_point/buoy

code/game/objects/structures/lamarr_cage.dm

@@ -13,7 +13,7 @@
 /obj/structure/lamarr/ex_act(severity)
 	switch(severity)
 		if(1)
-			new /obj/item/weapon/shard(loc)
+			new /obj/item/shard(loc)
 			Break()
 			qdel(src)
 		if(2)
@@ -35,7 +35,7 @@
 
 /obj/structure/lamarr/blob_act()
 	if(prob(75))
-		new /obj/item/weapon/shard(loc)
+		new /obj/item/shard(loc)
 		Break()
 		qdel(src)
 
@@ -44,7 +44,7 @@
 		if(!( src.destroyed ))
 			src.density = 0
 			src.destroyed = 1
-			new /obj/item/weapon/shard(loc)
+			new /obj/item/shard(loc)
 			playsound(src, "shatter", 70, 1)
 			Break()
 	else
@@ -59,7 +59,7 @@
 	return
 
 
-/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/lamarr/attackby(obj/item/W as obj, mob/user as mob, params)
 	src.health -= W.force
 	src.healthcheck()
 	..()

code/game/objects/structures/lattice.dm

@@ -55,8 +55,8 @@
 		var/turf/T = get_turf(src)
 		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
 		return
-	if(istype(C, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = C
+	if(istype(C, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = C
 		if(WT.remove_fuel(0, user))
 			to_chat(user, "<span class='notice'>Slicing lattice joints...</span>")
 			new /obj/item/stack/rods(src.loc)

code/game/objects/structures/mineral_doors.dm

@@ -129,9 +129,9 @@
 	else
 		icon_state = initial_state
 
-/obj/structure/mineral_door/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/pickaxe))
-		var/obj/item/weapon/pickaxe/digTool = W
+/obj/structure/mineral_door/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/pickaxe))
+		var/obj/item/pickaxe/digTool = W
 		to_chat(user, "<span class='notice'>You start digging \the [src].</span>")
 		if(do_after(user, digTool.digspeed * hardness, target = src) && src)
 			to_chat(user, "<span class='notice'>You finished digging.</span>")
@@ -219,7 +219,7 @@
 	icon_state = "plasma"
 	sheetType = /obj/item/stack/sheet/mineral/plasma
 
-/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/weapon/W, mob/user)
+/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/W, mob/user)
 	if(is_hot(W))
 		message_admins("Plasma mineral door ignited by [key_name_admin(user)] in ([x], [y], [z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)", 0, 1)
 		log_game("Plasma mineral door ignited by [key_name(user)] in ([x], [y], [z])")

code/game/objects/structures/mirror.dm

@@ -59,7 +59,7 @@
 		if(do_after(user, 30 * I.toolspeed, target = src))
 			if(shattered)
 				user.visible_message("<span class='notice'>[user] drops the broken shards to the floor.</span>", "<span class='notice'>You drop the broken shards on the floor.</span>")
-				new /obj/item/weapon/shard(get_turf(user))
+				new /obj/item/shard(get_turf(user))
 			else
 				user.visible_message("<span class='notice'>[user] carefully places [src] on the floor.</span>", "<span class='notice'>You carefully place [src] on the floor.</span>")
 				new /obj/item/mounted/mirror(get_turf(user))

code/game/objects/structures/misc.dm

@@ -11,7 +11,7 @@
 	anchored = 1
 	density = 1
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+	attackby(obj/item/W as obj, mob/user as mob, params)
 		return attack_hand(user)
 
 	attack_hand(mob/user as mob)
@@ -26,7 +26,7 @@
 	anchored = 1
 	density = 0
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+	attackby(obj/item/W as obj, mob/user as mob, params)
 
 		return attack_hand(user)
 

code/game/objects/structures/mop_bucket.dm

@@ -24,8 +24,8 @@
 	if(..(user, 1))
 		to_chat(usr, "[bicon(src)] [src] contains [reagents.total_volume] units of water left!")
 
-/obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/mop))
+/obj/structure/mopbucket/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/mop))
 		if(src.reagents.total_volume >= 2)
 			src.reagents.trans_to(W, 2)
 			to_chat(user, "<span class='notice'>You wet the mop</span>")

code/game/objects/structures/morgue.dm

@@ -119,7 +119,7 @@
 	return
 
 /obj/structure/morgue/attackby(P as obj, mob/user as mob, params)
-	if(istype(P, /obj/item/weapon/pen))
+	if(istype(P, /obj/item/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", name), null)  as text
 		if(user.get_active_hand() != P)
 			return
@@ -314,7 +314,7 @@
 	update()
 
 /obj/structure/crematorium/attackby(P as obj, mob/user as mob, params)
-	if(istype(P, /obj/item/weapon/pen))
+	if(istype(P, /obj/item/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", name), null)  as text
 		if(user.get_active_hand() != P)
 			return
@@ -363,16 +363,14 @@
 		icon_state = "crema_active"
 
 		for(var/mob/living/M in search_contents_for(/mob/living))
-			if(!M || !isnull(M.gcDestroyed))
+			if(QDELETED(M))
 				continue
 			if(M.stat!=2)
 				M.emote("scream")
 			if(istype(user))
-				M.create_attack_log("<font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>")
-				user.create_attack_log("<font color='red'>Cremated [M.name] ([M.ckey])</font>")
-				log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])")
+				add_attack_logs(user, M, "Cremated")
 			M.death(1)
-			if(!M || !isnull(M.gcDestroyed))
+			if(QDELETED(M))
 				continue // Re-check for mobs that delete themselves on death
 			M.ghostize()
 			qdel(M)

code/game/objects/structures/noticeboard.dm

@@ -10,14 +10,14 @@
 /obj/structure/noticeboard/initialize()
 	for(var/obj/item/I in loc)
 		if(notices > 4) break
-		if(istype(I, /obj/item/weapon/paper))
+		if(istype(I, /obj/item/paper))
 			I.loc = src
 			notices++
 	icon_state = "nboard0[notices]"
 
 //attaching papers!!
-/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
-	if(istype(O, /obj/item/weapon/paper))
+/obj/structure/noticeboard/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+	if(istype(O, /obj/item/paper))
 		if(notices < 5)
 			O.add_fingerprint(user)
 			add_fingerprint(user)
@@ -31,7 +31,7 @@
 
 /obj/structure/noticeboard/attack_hand(user as mob)
 	var/dat = "<B>Noticeboard</B><BR>"
-	for(var/obj/item/weapon/paper/P in src)
+	for(var/obj/item/paper/P in src)
 		dat += "<A href='?src=[UID()];read=\ref[P]'>[P.name]</A> <A href='?src=[UID()];write=\ref[P]'>Write</A> <A href='?src=[UID()];remove=\ref[P]'>Remove</A><BR>"
 	user << browse("<HEAD><TITLE>Notices</TITLE></HEAD>[dat]","window=noticeboard")
 	onclose(user, "noticeboard")
@@ -57,18 +57,18 @@
 		var/obj/item/P = locate(href_list["write"])
 
 		if((P && P.loc == src)) //ifthe paper's on the board
-			if(istype(usr.r_hand, /obj/item/weapon/pen)) //and you're holding a pen
+			if(istype(usr.r_hand, /obj/item/pen)) //and you're holding a pen
 				add_fingerprint(usr)
 				P.attackby(usr.r_hand, usr) //then do ittttt
 			else
-				if(istype(usr.l_hand, /obj/item/weapon/pen)) //check other hand for pen
+				if(istype(usr.l_hand, /obj/item/pen)) //check other hand for pen
 					add_fingerprint(usr)
 					P.attackby(usr.l_hand, usr)
 				else
 					to_chat(usr, "<span class='notice'>You'll need something to write with!</span>")
 
 	if(href_list["read"])
-		var/obj/item/weapon/paper/P = locate(href_list["read"])
+		var/obj/item/paper/P = locate(href_list["read"])
 		if((P && P.loc == src))
 			if(!( istype(usr, /mob/living/carbon/human) ))
 				usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[stars(P.info)]</TT></BODY></HTML>", "window=[P.name]")

code/game/objects/structures/plasticflaps.dm

@@ -46,7 +46,7 @@
 				to_chat(user, "<span class='notice'>You screw [src] to the floor.</span>")
 	else if(iswelder(W))
 		if(state == PLASTIC_FLAPS_DETACHED)
-			var/obj/item/weapon/weldingtool/WT = W
+			var/obj/item/weldingtool/WT = W
 			if(!WT.remove_fuel(0, user))
 				return
 			playsound(loc, WT.usesound, 100, 1)

code/game/objects/structures/signs.dm

@@ -25,7 +25,7 @@
 	return
 
 /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
-	if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double))
+	if(istype(tool, /obj/item/screwdriver) && !istype(src, /obj/structure/sign/double))
 		to_chat(user, "You unfasten the sign with your [tool].")
 		var/obj/item/sign/S = new(src.loc)
 		S.name = name
@@ -46,7 +46,7 @@
 	var/sign_state = ""
 
 /obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob)	//construction
-	if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc))
+	if(istype(tool, /obj/item/screwdriver) && isturf(user.loc))
 		var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
 		if(direction == "Cancel") return
 		var/obj/structure/sign/S = new(user.loc)

code/game/objects/structures/spirit_board.dm

@@ -33,7 +33,7 @@
 		notify_ghosts("Someone has begun playing with a [src.name] in [get_area(src)]!", source = src)
 
 	planchette = input("Choose the letter.", "Seance!") in list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
-	add_logs(M, src, "picked a letter on", addition="which was \"[planchette]\".")
+	add_attack_logs(M, src, "Picked a letter on [src] which was \"[planchette]\".")
 	cooldown = world.time
 	lastuser = M.ckey
 

code/game/objects/structures/statues.dm

@@ -9,7 +9,7 @@
 	var/oreAmount = 5
 	var/material_drop_type = /obj/item/stack/sheet/metal
 
-/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params)
+/obj/structure/statue/attackby(obj/item/W, mob/living/user, params)
 	add_fingerprint(user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	if(iswrench(W))
@@ -37,7 +37,7 @@
 									 "<span class='notice'>You have secured the [name]'s bolts.</span>")
 				anchored = 1
 
-	else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
+	else if(istype(W, /obj/item/gun/energy/plasmacutter))
 		playsound(src, W.usesound, 100, 1)
 		user.visible_message("[user] is slicing apart the [name]...", \
 							 "<span class='notice'>You are slicing apart the [name]...</span>")
@@ -48,8 +48,8 @@
 								 "<span class='notice'>You slice apart the [name].</span>")
 			Dismantle(TRUE)
 
-	else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
-		var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
+	else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
+		var/obj/item/pickaxe/drill/jackhammer/D = W
 		if(!loc)
 			return
 		user.visible_message("[user] destroys the [name]!", \
@@ -58,7 +58,7 @@
 		qdel(src)
 
 	else if(iswelder(W) && !anchored)
-		var/obj/item/weapon/weldingtool/WT = W
+		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			playsound(loc, W.usesound, 40, 1)
 			user.visible_message("[user] is slicing apart the [name].", \
@@ -134,7 +134,7 @@
 	desc = "This statue has a sickening green colour."
 	icon_state = "eng"
 
-/obj/structure/statue/uranium/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/statue/uranium/attackby(obj/item/W, mob/user, params)
 	radiate()
 	..()
 
@@ -190,7 +190,7 @@
 			log_game("Plasma statue ignited by [Proj] in ([x],[y],[z]). No known firer.")
 	..()
 
-/obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params)
 	if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
 		message_admins("Plasma statue ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 		log_game("Plasma statue ignited by [key_name(user)] in ([x],[y],[z])")
@@ -288,7 +288,7 @@
 	honk()
 	..()
 
-/obj/structure/statue/bananium/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/statue/bananium/attackby(obj/item/W, mob/user, params)
 	honk()
 	..()
 

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -77,7 +77,7 @@
 		M.layer = initial(M.layer)
 		overlays -= nest_overlay
 
-/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/stool/bed/nest/attackby(obj/item/W as obj, mob/user as mob, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	var/aforce = W.force
 	health = max(0, health - aforce)

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -72,7 +72,7 @@
 	anchored = 0
 	comfort = 1
 
-/obj/structure/stool/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/stool/bed/roller/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/roller_holder))
 		if(buckled_mob)
 			user_unbuckle_mob(user)
@@ -105,7 +105,7 @@
 	R.add_fingerprint(user)
 	qdel(src)
 
-/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/roller/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/roller_holder))
 		var/obj/item/roller_holder/RH = W
 		if(!RH.held)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -25,7 +25,7 @@
 	..()
 	handle_rotation()
 
-/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/structure/stool/bed/chair/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/assembly/shock_kit))
 		var/obj/item/assembly/shock_kit/SK = W

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -29,8 +29,8 @@
 		new buildstacktype(loc, buildstackamount)
 		qdel(src)
 
-/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
+/obj/structure/stool/attackby(obj/item/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/wrench))
 		playsound(loc, W.usesound, 50, 1)
 		new buildstacktype(loc, buildstackamount)
 		qdel(src)
@@ -41,13 +41,13 @@
 	if(istype(over_object, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = over_object
 		if(H==usr && !H.restrained() && !H.stat && in_range(src, over_object))
-			var/obj/item/weapon/stool/S = new/obj/item/weapon/stool()
+			var/obj/item/stool/S = new/obj/item/stool()
 			S.origin = src
 			loc = S
 			H.put_in_hands(S)
 			H.visible_message("<span class='warning'>[H] grabs [src] from the floor!</span>", "<span class='warning'>You grab [src] from the floor!</span>")
 
-/obj/item/weapon/stool
+/obj/item/stool
 	name = "stool"
 	desc = "Uh-hoh, bar is heating up."
 	icon = 'icons/obj/objects.dmi'
@@ -57,14 +57,14 @@
 	w_class = WEIGHT_CLASS_HUGE
 	var/obj/structure/stool/origin = null
 
-/obj/item/weapon/stool/attack_self(mob/user as mob)
+/obj/item/stool/attack_self(mob/user as mob)
 	..()
 	origin.loc = get_turf(src)
 	user.unEquip(src)
 	user.visible_message("<span class='notice'>[user] puts [src] down.</span>", "<span class='notice'>You put [src] down.</span>")
 	qdel(src)
 
-/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
+/obj/item/stool/attack(mob/M as mob, mob/user as mob)
 	if(prob(5) && istype(M,/mob/living))
 		user.visible_message("<span class='danger'>[user] breaks [src] over [M]'s back!.</span>")
 		user.unEquip(src)

code/game/objects/structures/tables_racks.dm

@@ -165,7 +165,7 @@
 
 /obj/structure/table/MouseDrop_T(obj/O, mob/user)
 	..()
-	if((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+	if((!( istype(O, /obj/item) ) || user.get_active_hand() != O))
 		return
 	if(isrobot(user))
 		return
@@ -177,7 +177,7 @@
 
 /obj/structure/table/proc/tablepush(obj/item/I, mob/user)
 	if(get_dist(src, user) < 2)
-		var/obj/item/weapon/grab/G = I
+		var/obj/item/grab/G = I
 		if(G.affecting.buckled)
 			to_chat(user, "<span class='warning'>[G.affecting] is buckled to [G.affecting.buckled]!</span>")
 			return 0
@@ -190,13 +190,13 @@
 		G.affecting.Weaken(2)
 		G.affecting.visible_message("<span class='danger'>[G.assailant] pushes [G.affecting] onto [src].</span>", \
 									"<span class='userdanger'>[G.assailant] pushes [G.affecting] onto [src].</span>")
-		add_logs(G.assailant, G.affecting, "pushed onto a table")
+		add_attack_logs(G.assailant, G.affecting, "Pushed onto a table")
 		qdel(I)
 		return 1
 	qdel(I)
 
 /obj/structure/table/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/grab))
+	if(istype(I, /obj/item/grab))
 		tablepush(I, user)
 		return
 	if(can_deconstruct)
@@ -361,7 +361,7 @@
 /obj/structure/table/glass/New()
 	. = ..()
 	debris += new frame
-	debris += new /obj/item/weapon/shard
+	debris += new /obj/item/shard
 
 /obj/structure/table/glass/Destroy()
 	for(var/i in debris)
@@ -400,7 +400,7 @@
 		var/atom/movable/AM = I
 		AM.forceMove(T)
 		debris -= AM
-		if(istype(AM, /obj/item/weapon/shard))
+		if(istype(AM, /obj/item/shard))
 			AM.throw_impact(L)
 	L.Weaken(5)
 	qdel(src)
@@ -421,7 +421,7 @@
 
 /obj/structure/table/glass/narsie_act()
 	color = NARSIE_WINDOW_COLOUR
-	for(var/obj/item/weapon/shard/S in debris)
+	for(var/obj/item/shard/S in debris)
 		S.color = NARSIE_WINDOW_COLOUR
 
 /*
@@ -507,9 +507,9 @@
 	else
 		return ..()
 
-/obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/table/reinforced/attackby(obj/item/W, mob/user, params)
 	if(iswelder(W))
-		var/obj/item/weapon/weldingtool/WT = W
+		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			playsound(loc, W.usesound, 50, 1)
 			if(deconstruction_ready)
@@ -589,7 +589,7 @@
 		. = . || mover.checkpass(PASSTABLE)
 
 /obj/structure/rack/MouseDrop_T(obj/O, mob/user)
-	if((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+	if((!( istype(O, /obj/item) ) || user.get_active_hand() != O))
 		return
 	if(isrobot(user))
 		return
@@ -598,7 +598,7 @@
 	if(O.loc != src.loc)
 		step(O, get_dir(O, src))
 
-/obj/structure/rack/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/rack/attackby(obj/item/W, mob/user, params)
 	if(iswrench(W) && can_deconstruct)
 		playsound(loc, W.usesound, 50, 1)
 		deconstruct(TRUE)
@@ -650,7 +650,7 @@
 /obj/structure/rack/deconstruct(disassembled = TRUE)
 	if(can_deconstruct)
 		density = FALSE
-		var/obj/item/weapon/rack_parts/newparts = new(loc)
+		var/obj/item/rack_parts/newparts = new(loc)
 		transfer_fingerprints_to(newparts)
 	qdel(src)
 
@@ -658,7 +658,7 @@
  * Rack Parts
  */
 
-/obj/item/weapon/rack_parts
+/obj/item/rack_parts
 	name = "rack parts"
 	desc = "Parts of a rack."
 	icon = 'icons/obj/items.dmi'
@@ -667,14 +667,14 @@
 	materials = list(MAT_METAL=2000)
 	var/building = FALSE
 
-/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W, mob/user, params)
+/obj/item/rack_parts/attackby(obj/item/W, mob/user, params)
 	if(iswrench(W))
 		new /obj/item/stack/sheet/metal(user.loc)
 		qdel(src)
 	else
 		. = ..()
 
-/obj/item/weapon/rack_parts/attack_self(mob/user)
+/obj/item/rack_parts/attack_self(mob/user)
 	if(building)
 		return
 	building = TRUE

code/game/objects/structures/tank_dispenser.dm

@@ -52,7 +52,7 @@
 	return data
 
 /obj/structure/dispenser/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/tank/oxygen) || istype(I, /obj/item/weapon/tank/air) || istype(I, /obj/item/weapon/tank/anesthetic))
+	if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic))
 		if(oxygentanks < 10)
 			user.drop_item()
 			I.forceMove(src)
@@ -63,7 +63,7 @@
 		else
 			to_chat(user, "<span class='notice'>[src] is full.</span>")
 		SSnanoui.update_uis(src)
-	if(istype(I, /obj/item/weapon/tank/plasma))
+	if(istype(I, /obj/item/tank/plasma))
 		if(plasmatanks < 10)
 			user.drop_item()
 			I.forceMove(src)
@@ -74,7 +74,7 @@
 		else
 			to_chat(user, "<span class='notice'>[src] is full.</span>")
 		SSnanoui.update_uis(src)
-	if(istype(I, /obj/item/weapon/wrench))
+	if(istype(I, /obj/item/wrench))
 		if(anchored)
 			to_chat(user, "<span class='notice'>You lean down and unwrench [src].</span>")
 			anchored = 0
@@ -90,24 +90,24 @@
 		usr.set_machine(src)
 		if(href_list["oxygen"])
 			if(oxygentanks > 0)
-				var/obj/item/weapon/tank/oxygen/O
+				var/obj/item/tank/oxygen/O
 				if(oxytanks.len == oxygentanks)
 					O = oxytanks[1]
 					oxytanks.Remove(O)
 				else
-					O = new /obj/item/weapon/tank/oxygen(loc)
+					O = new /obj/item/tank/oxygen(loc)
 				O.loc = loc
 				to_chat(usr, "<span class='notice'>You take [O] out of [src].</span>")
 				oxygentanks--
 				update_icon()
 		if(href_list["plasma"])
 			if(plasmatanks > 0)
-				var/obj/item/weapon/tank/plasma/P
+				var/obj/item/tank/plasma/P
 				if(platanks.len == plasmatanks)
 					P = platanks[1]
 					platanks.Remove(P)
 				else
-					P = new /obj/item/weapon/tank/plasma(loc)
+					P = new /obj/item/tank/plasma(loc)
 				P.loc = loc
 				to_chat(usr, "<span class='notice'>You take [P] out of [src].</span>")
 				plasmatanks--

code/game/objects/structures/transit_tubes/station.dm

@@ -68,8 +68,8 @@
 
 
 /obj/structure/transit_tube/station/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/grab) && icon_state == "open")
-		var/obj/item/weapon/grab/G = W
+	if(istype(W, /obj/item/grab) && icon_state == "open")
+		var/obj/item/grab/G = W
 		if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE)
 			var/mob/GM = G.affecting
 			for(var/obj/structure/transit_tube_pod/pod in loc)

code/game/objects/structures/watercloset.dm

@@ -102,7 +102,7 @@
 				update_icon()	//is this necessary? probably not
 		return
 
-	if(istype(I, /obj/item/weapon/crowbar))
+	if(istype(I, /obj/item/crowbar))
 		to_chat(user, "<span class='notice'>You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...</span>")
 		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
 		if(do_after(user, 30 * I.toolspeed, target = src))
@@ -111,10 +111,10 @@
 			update_icon()
 			return
 
-	if(istype(I, /obj/item/weapon/reagent_containers))
+	if(istype(I, /obj/item/reagent_containers))
 		if(!open)
 			return
-		var/obj/item/weapon/reagent_containers/RG = I
+		var/obj/item/reagent_containers/RG = I
 		if(RG.is_open_container())
 			if(RG.reagents.total_volume >= RG.volume)
 				to_chat(user, "<span class='warning'>[RG] is full.</span>")
@@ -123,9 +123,9 @@
 				to_chat(user, "<span class='notice'>You fill [RG] from [src]. Gross.</span>")
 			return
 
-	if(istype(I, /obj/item/weapon/grab))
+	if(istype(I, /obj/item/grab))
 		user.changeNext_move(CLICK_CD_MELEE)
-		var/obj/item/weapon/grab/G = I
+		var/obj/item/grab/G = I
 		if(!G.confirm())
 			return
 		if(isliving(G.affecting))
@@ -217,8 +217,8 @@
 				pixel_y = 32
 		return
 
-	if(istype(I, /obj/item/weapon/grab))
-		var/obj/item/weapon/grab/G = I
+	if(istype(I, /obj/item/grab))
+		var/obj/item/grab/G = I
 		if(!G.confirm())
 			return
 		if(isliving(G.affecting))
@@ -291,7 +291,7 @@
 			G.water_act(100, convertHeat(), src)
 
 /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(I.type == /obj/item/device/analyzer)
+	if(I.type == /obj/item/analyzer)
 		to_chat(user, "<span class='notice'>The water temperature seems to be [watertemp].</span>")
 	if(iswrench(I))
 		to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with the [I].</span>")
@@ -309,7 +309,7 @@
 		if(on)
 			to_chat(user, "<span class='warning'>Turn [src] off before you attempt to cut it loose.</span>")
 			return
-		var/obj/item/weapon/weldingtool/WT = I
+		var/obj/item/weldingtool/WT = I
 		if(WT.isOn())
 			user.visible_message("<span class='notice'>[user] begins to cut [src] loose.</span>", "<span class='notice'>You begin to cut [src] loose.</span>")
 			if(do_after(user, 40 * WT.toolspeed, target = src))
@@ -496,7 +496,7 @@
 			return
 
 
-/obj/item/weapon/bikehorn/rubberducky
+/obj/item/bikehorn/rubberducky
 	name = "rubber ducky"
 	desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~"	//thanks doohl
 	icon = 'icons/obj/watercloset.dmi'
@@ -575,7 +575,7 @@
 		return
 
 	if(iswrench(O))
-		var/obj/item/weapon/wrench/W = O
+		var/obj/item/wrench/W = O
 
 		var/choices = list()
 		if(anchored)
@@ -709,7 +709,7 @@
 	qdel(src)
 
 
-/obj/item/weapon/bathroom_parts
+/obj/item/bathroom_parts
 	name = "toilet in a box"
 	desc = "An entire toilet in a box, straight from Space Sweden. It has an unpronounceable name."
 	icon = 'icons/obj/storage.dmi'
@@ -718,21 +718,21 @@
 	var/result = /obj/structure/toilet
 	var/result_name = "toilet"
 
-/obj/item/weapon/bathroom_parts/urinal
+/obj/item/bathroom_parts/urinal
 	name = "urinal in a box"
 	result = /obj/structure/urinal
 	result_name = "urinal"
 
-/obj/item/weapon/bathroom_parts/sink
+/obj/item/bathroom_parts/sink
 	name = "sink in a box"
 	result = /obj/structure/sink
 	result_name = "sink"
 
-/obj/item/weapon/bathroom_parts/New()
+/obj/item/bathroom_parts/New()
 	..()
 	desc = "An entire [result_name] in a box, straight from Space Sweden. It has an [pick("unpronounceable", "overly accented", "entirely gibberish", "oddly normal-sounding")] name."
 
-/obj/item/weapon/bathroom_parts/attack_self(mob/user)
+/obj/item/bathroom_parts/attack_self(mob/user)
 	var/turf/T = get_turf(user)
 	if(!T)
 		to_chat(user, "<span class='warning'>You can't build that here!</span>")

code/game/objects/structures/windoor_assembly.dm

@@ -19,7 +19,7 @@
 	dir = NORTH
 	max_integrity = 300
 	var/ini_dir
-	var/obj/item/weapon/airlock_electronics/electronics
+	var/obj/item/airlock_electronics/electronics
 	var/created_name
 
 	//Vars to help with the icon's name
@@ -78,7 +78,7 @@ obj/structure/windoor_assembly/Destroy()
 	switch(state)
 		if("01")
 			if(iswelder(W) && !anchored)
-				var/obj/item/weapon/weldingtool/WT = W
+				var/obj/item/weldingtool/WT = W
 				if(WT.remove_fuel(0,user))
 					user.visible_message("<span class='warning'>[user] disassembles the windoor assembly.</span>", "<span class='notice'>You start to disassemble the windoor assembly...</span>")
 					playsound(loc, 'sound/items/welder2.ogg', 50, 1)
@@ -193,7 +193,7 @@ obj/structure/windoor_assembly/Destroy()
 						name = "anchored windoor assembly"
 
 			//Adding airlock electronics for access. Step 6 complete.
-			else if(istype(W, /obj/item/weapon/airlock_electronics))
+			else if(istype(W, /obj/item/airlock_electronics))
 				playsound(loc, W.usesound, 100, 1)
 				user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...")
 				user.drop_item()
@@ -222,12 +222,12 @@ obj/structure/windoor_assembly/Destroy()
 						return
 					to_chat(user, "<span class='notice'>You remove the airlock electronics.</span>")
 					name = "wired windoor assembly"
-					var/obj/item/weapon/airlock_electronics/ae
+					var/obj/item/airlock_electronics/ae
 					ae = electronics
 					electronics = null
 					ae.forceMove(loc)
 
-			else if(istype(W, /obj/item/weapon/pen))
+			else if(istype(W, /obj/item/pen))
 				var/t = stripped_input(user, "Enter the name for the door.", name, created_name,MAX_NAME_LEN)
 				if(!t)
 					return

code/game/objects/structures/window.dm

@@ -34,7 +34,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	var/state = 2
 	var/reinf = 0
 	var/basestate
-	var/shardtype = /obj/item/weapon/shard
+	var/shardtype = /obj/item/shard
 	var/glasstype = /obj/item/stack/sheet/glass
 	var/disassembled = 0
 	var/sheets = 1 // Number of sheets needed to build this window (determines how much shit is spawned by destroy())
@@ -182,8 +182,8 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 /obj/structure/window/attackby(obj/item/I as obj, mob/living/user as mob, params)
 	if(!istype(I))
 		return//I really wish I did not need this
-	if(istype(I, /obj/item/weapon/grab) && get_dist(src,user)<2)
-		var/obj/item/weapon/grab/G = I
+	if(istype(I, /obj/item/grab) && get_dist(src,user)<2)
+		var/obj/item/grab/G = I
 		if(istype(G.affecting,/mob/living))
 			var/mob/living/M = G.affecting
 			var/state = G.state
@@ -227,7 +227,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
 	..()
 
-/obj/structure/window/proc/handle_decon(obj/item/weapon/W, mob/user, var/takes_time = FALSE)
+/obj/structure/window/proc/handle_decon(obj/item/W, mob/user, var/takes_time = FALSE)
 	//screwdriver
 	if(isscrewdriver(W))
 		playsound(loc, W.usesound, 75, 1)
@@ -443,7 +443,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
 	basestate = "plasmawindow"
 	icon_state = "plasmawindow"
-	shardtype = /obj/item/weapon/shard/plasma
+	shardtype = /obj/item/shard/plasma
 	glasstype = /obj/item/stack/sheet/plasmaglass
 	health = 120
 	armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100)
@@ -471,7 +471,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
 	basestate = "plasmarwindow"
 	icon_state = "plasmarwindow"
-	shardtype = /obj/item/weapon/shard/plasma
+	shardtype = /obj/item/shard/plasma
 	glasstype = /obj/item/stack/sheet/plasmaglass
 	reinf = 1
 	health = 160