Dev merge.

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -79,8 +79,8 @@ var/global/list/image/splatter_cache=list()
 		if(!perp.feet_blood_DNA)
 			perp.feet_blood_DNA = list()
 		perp.feet_blood_DNA |= blood_DNA.Copy()
-	else if (perp.buckled && istype(perp.buckled, /obj/structure/stool/bed/chair/wheelchair))
-		var/obj/structure/stool/bed/chair/wheelchair/W = perp.buckled
+	else if (perp.buckled && istype(perp.buckled, /obj/structure/bed/chair/wheelchair))
+		var/obj/structure/bed/chair/wheelchair/W = perp.buckled
 		W.bloodiness = 4
 
 	perp.update_inv_shoes(1)

code/game/objects/effects/landmarks.dm

@@ -6,7 +6,6 @@
 	unacidable = 1
 
 /obj/effect/landmark/New()
-
 	..()
 	tag = text("landmark*[]", name)
 	invisibility = 101
@@ -113,6 +112,13 @@
 
 	return 1
 
+/obj/effect/landmark/start/ninja
+	name = "ninja"
+
+/obj/effect/landmark/start/ninja/New()
+	..()
+	ninjastart += loc
+
 //Costume spawner landmarks
 
 /obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears

code/game/objects/items/devices/lightreplacer.dm

@@ -55,7 +55,7 @@
 	var/uses = 0
 	var/emagged = 0
 	var/failmsg = ""
-	var/charge = 1
+	var/charge = 0
 
 /obj/item/device/lightreplacer/New()
 	uses = max_uses / 2
@@ -122,11 +122,11 @@
 /obj/item/device/lightreplacer/proc/AddUses(var/amount = 1)
 	uses = min(max(uses + amount, 0), max_uses)
 
-/obj/item/device/lightreplacer/proc/Charge(var/mob/user)
-	charge += 1
-	if(charge > 7)
+/obj/item/device/lightreplacer/proc/Charge(var/mob/user, var/amount = 1)
+	charge += amount
+	if(charge > 6)
 		AddUses(1)
-		charge = 1
+		charge = 0
 
 /obj/item/device/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U)
 

code/game/objects/items/stacks/matter_synth.dm

@@ -0,0 +1,50 @@
+/datum/matter_synth
+	var/name = "Generic Synthesizer"
+	var/max_energy = 60000
+	var/recharge_rate = 2000
+	var/energy
+
+/datum/matter_synth/New(var/store = 0)
+	if(store)
+		max_energy = store
+	energy = max_energy
+	return
+
+/datum/matter_synth/proc/get_charge()
+	return energy
+
+/datum/matter_synth/proc/use_charge(var/amount)
+	if (energy >= amount)
+		energy -= amount
+		return 1
+	return 0
+
+/datum/matter_synth/proc/add_charge(var/amount)
+	energy = min(energy + amount, max_energy)
+
+/datum/matter_synth/proc/emp_act(var/severity)
+	use_charge(max_energy * 0.1 / severity)
+
+/datum/matter_synth/medicine
+	name = "Medicine Synthesizer"
+
+/datum/matter_synth/metal
+	name = "Metal Synthesizer"
+
+/datum/matter_synth/plasteel
+	name = "Plasteel Synthesizer"
+	max_energy = 10000
+
+/datum/matter_synth/glass
+	name = "Glass Synthesizer"
+
+/datum/matter_synth/wood
+	name = "Wood Synthesizer"
+
+/datum/matter_synth/plastic
+	name = "Plastic Synthesizer"
+
+/datum/matter_synth/wire
+	name = "Wire Synthesizer"
+	max_energy = 50
+	recharge_rate = 2

code/game/objects/items/stacks/rods.dm

@@ -13,12 +13,21 @@
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 
+/obj/item/stack/rods/cyborg
+	name = "metal rod synthesizer"
+	desc = "A device that makes metal rods."
+	gender = NEUTER
+	matter = null
+	uses_charge = 1
+	charge_costs = list(500)
+	stacktype = /obj/item/stack/rods
+
 /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob)
 	..()
 	if (istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 
-		if(amount < 2)
+		if(get_amount() < 2)
 			user << "\red You need at least two rods to do this."
 			return
 
@@ -54,7 +63,7 @@
 				return 1
 
 	else if(!in_use)
-		if(amount < 2)
+		if(get_amount() < 2)
 			user << "\blue You need at least two rods to do this."
 			return
 		usr << "\blue Assembling grille..."

code/game/objects/items/stacks/sheets/glass.dm

@@ -22,12 +22,13 @@
 	var/list/construction_options = list("One Direction", "Full Window")
 
 /obj/item/stack/sheet/glass/cyborg
-	name = "glass"
-	desc = "HOLY SHEET! That is a lot of glass."
-	singular_name = "glass sheet"
-	icon_state = "sheet-glass"
+	name = "glass synthesizer"
+	desc = "A device that makes glass."
+	gender = NEUTER
+	singular_name = "glass"
 	matter = null
-	created_window = /obj/structure/window/basic
+	uses_charge = 1
+	charge_costs = list(1000)
 	stacktype = /obj/item/stack/sheet/glass
 
 /obj/item/stack/sheet/glass/attack_self(mob/user as mob)
@@ -69,7 +70,7 @@
 	if(!user.IsAdvancedToolUser())
 		return 0
 	var/title = "Sheet-[name]"
-	title += " ([src.amount] sheet\s left)"
+	title += " ([src.get_amount()] sheet\s left)"
 	switch(input(title, "What would you like to construct?") as null|anything in construction_options)
 		if("One Direction")
 			if(!src)	return 1
@@ -102,7 +103,7 @@
 		if("Full Window")
 			if(!src)	return 1
 			if(src.loc != user)	return 1
-			if(src.amount < 4)
+			if(src.get_amount() < 4)
 				user << "\red You need more glass to do that."
 				return 1
 			if(locate(/obj/structure/window) in user.loc)
@@ -124,7 +125,7 @@
 				user << "\red There is already a windoor in that location."
 				return 1
 
-			if(src.amount < 5)
+			if(src.get_amount() < 5)
 				user << "\red You need more glass to do that."
 				return 1
 
@@ -151,10 +152,15 @@
 	construction_options = list("One Direction", "Full Window", "Windoor")
 
 /obj/item/stack/sheet/glass/reinforced/cyborg
-	name = "reinforced glass"
-	desc = "Glass which has been reinforced with metal rods."
+	name = "reinforced glass synthesizer"
+	desc = "A device that makes reinforced glass."
+	gender = NEUTER
+	matter = null
+	uses_charge = 2
+	charge_costs = list(1000)
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
+	charge_costs = list(500, 1000)
 
 /*
  * Phoron Glass sheets

code/game/objects/items/stacks/sheets/mineral.dm

@@ -137,9 +137,10 @@ obj/item/stack/sheet/mineral/iron/New()
 	recipes = plastic_recipes
 
 /obj/item/stack/sheet/mineral/plastic/cyborg
-	name = "plastic sheets"
-	icon_state = "sheet-plastic"
-	perunit = 2000
+	name = "plastic sheets synthesizer"
+	gender = NEUTER
+	uses_charge = 1
+	charge_costs = list(1000)
 	stacktype = /obj/item/stack/sheet/mineral/plastic
 
 /obj/item/stack/sheet/mineral/gold

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -11,20 +11,20 @@
  * Metal
  */
 var/global/list/datum/stack_recipe/metal_recipes = list ( \
-	new/datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("stool", /obj/item/weapon/stool, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("chair", /obj/structure/bed/chair, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe_list("office chairs",list( \
-		new/datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("light office chair", /obj/structure/stool/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("dark office chair", /obj/structure/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("light office chair", /obj/structure/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1), \
 		), 5), \
 	new/datum/stack_recipe_list("comfy chairs", list( \
-		new/datum/stack_recipe("beige comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("black comfy chair", /obj/structure/stool/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("brown comfy chair", /obj/structure/stool/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("lime comfy chair", /obj/structure/stool/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("teal comfy chair", /obj/structure/stool/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("beige comfy chair", /obj/structure/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("black comfy chair", /obj/structure/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("brown comfy chair", /obj/structure/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("lime comfy chair", /obj/structure/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("teal comfy chair", /obj/structure/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1), \
 		), 2), \
 	null, \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \
@@ -86,12 +86,12 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	origin_tech = "materials=1"
 
 /obj/item/stack/sheet/metal/cyborg
-	name = "metal"
-	desc = "Sheets made out off metal. It has been dubbed Metal Sheets."
-	singular_name = "metal sheet"
-	icon_state = "sheet-metal"
-	throwforce = 14.0
-	flags = CONDUCT
+	name = "metal synthesizer"
+	desc = "A device that makes metal sheets."
+	gender = NEUTER
+	matter = null
+	uses_charge = 1
+	charge_costs = list(1000)
 	stacktype = /obj/item/stack/sheet/metal
 
 /obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
@@ -121,9 +121,19 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	flags = CONDUCT
 	origin_tech = "materials=2"
 
+/obj/item/stack/sheet/plasteel/cyborg
+	name = "plasteel synthesizer"
+	desc = "A device that makes plasteel sheets."
+	gender = NEUTER
+	singular_name = "plasteel sheet"
+	matter = null
+	uses_charge = 1
+	charge_costs = list(1000)
+	stacktype = /obj/item/stack/sheet/plasteel
+
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
-		recipes = plasteel_recipes
-		return ..()
+	recipes = plasteel_recipes
+	return ..()
 
 /*
  * Wood
@@ -132,7 +142,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
 	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \
-	new/datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
@@ -149,10 +159,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	origin_tech = "materials=1;biotech=1"
 
 /obj/item/stack/sheet/wood/cyborg
-	name = "wooden plank"
-	desc = "One can only guess that this is a bunch of wood."
+	name = "wood synthesizer"
+	desc = "A device that makes wooden planks."
+	gender = NEUTER
 	singular_name = "wood plank"
 	icon_state = "sheet-wood"
+	uses_charge = 1
+	charge_costs = list(1000)
 	stacktype = /obj/item/stack/sheet/wood
 
 /obj/item/stack/sheet/wood/New(var/loc, var/amount=null)

code/game/objects/items/stacks/stack.dm

@@ -17,6 +17,9 @@
 	var/amount = 1
 	var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
 	var/stacktype //determines whether different stack types can merge
+	var/uses_charge = 0
+	var/list/charge_costs = null
+	var/list/datum/matter_synth/synths = null
 
 /obj/item/stack/New(var/loc, var/amount=null)
 	..()
@@ -27,13 +30,18 @@
 	return
 
 /obj/item/stack/Del()
+	if(uses_charge)
+		return
 	if (src && usr && usr.machine == src)
 		usr << browse(null, "window=stack")
 	..()
 
 /obj/item/stack/examine(mob/user)
 	if(..(user, 1))
-		user << "There are [src.amount] [src.singular_name]\s in the stack."
+		if(!uses_charge)
+			user << "There are [src.amount] [src.singular_name]\s in the stack."
+		else
+			user << "There is enough charge for [get_amount()]."
 
 /obj/item/stack/attack_self(mob/user as mob)
 	list_recipes(user)
@@ -41,14 +49,14 @@
 /obj/item/stack/proc/list_recipes(mob/user as mob, recipes_sublist)
 	if (!recipes)
 		return
-	if (!src || amount<=0)
+	if (!src || get_amount() <= 0)
 		user << browse(null, "window=stack")
 	user.set_machine(src) //for correct work of onclose
 	var/list/recipe_list = recipes
 	if (recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list))
 		var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist]
 		recipe_list = srl.recipes
-	var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []<br>", src, src.amount)
+	var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []<br>", src, src.get_amount())
 	for(var/i=1;i<=recipe_list.len,i++)
 		var/E = recipe_list[i]
 		if (isnull(E))
@@ -60,14 +68,14 @@
 
 		if (istype(E, /datum/stack_recipe_list))
 			var/datum/stack_recipe_list/srl = E
-			if (src.amount >= srl.req_amount)
+			if (src.get_amount() >= srl.req_amount)
 				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
 			else
 				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
 
 		if (istype(E, /datum/stack_recipe))
 			var/datum/stack_recipe/R = E
-			var/max_multiplier = round(src.amount / R.req_amount)
+			var/max_multiplier = round(src.get_amount() / R.req_amount)
 			var/title as text
 			var/can_build = 1
 			can_build = can_build && (max_multiplier>0)
@@ -142,7 +150,7 @@
 		list_recipes(usr, text2num(href_list["sublist"]))
 
 	if (href_list["make"])
-		if (src.amount < 1) del(src) //Never should happen
+		if (src.get_amount() < 1) del(src) //Never should happen
 
 		var/list/recipes_list = recipes
 		if (href_list["sublist"])
@@ -165,28 +173,44 @@
 //Return 1 if an immediate subsequent call to use() would succeed.
 //Ensures that code dealing with stacks uses the same logic
 /obj/item/stack/proc/can_use(var/used)
-	if (amount < used)
+	if (get_amount() < used)
 		return 0
 	return 1
 
 /obj/item/stack/proc/use(var/used)
 	if (!can_use(used))
 		return 0
-	amount -= used
-	if (amount <= 0)
-		spawn(0) //delete the empty stack once the current context yields
-			if (amount <= 0) //check again in case someone transferred stuff to us
-				if(usr)
-					usr.before_take_item(src)
-				del(src)
-	return 1
+	if(!uses_charge)
+		amount -= used
+		if (amount <= 0)
+			spawn(0) //delete the empty stack once the current context yields
+				if (amount <= 0) //check again in case someone transferred stuff to us
+					if(usr)
+						usr.before_take_item(src)
+					del(src)
+		return 1
+	else
+		if(get_amount() < used)
+			return 0
+		for(var/i = 1 to uses_charge)
+			var/datum/matter_synth/S = synths[i]
+			S.use_charge(charge_costs[i] * used) // Doesn't need to be deleted
+		return 1
+	return 0
 
 /obj/item/stack/proc/add(var/extra)
-	if(amount + extra > max_amount)
+	if(!uses_charge)
+		if(amount + extra > get_max_amount())
+			return 0
+		else
+			amount += extra
+		return 1
+	else if(!synths || synths.len < uses_charge)
 		return 0
 	else
-		amount += extra
-	return 1
+		for(var/i = 1 to uses_charge)
+			var/datum/matter_synth/S = synths[i]
+			S.add_charge(charge_costs[i] * extra)
 
 /*
 	The transfer and split procs work differently than use() and add().
@@ -196,16 +220,16 @@
 
 //attempts to transfer amount to S, and returns the amount actually transferred
 /obj/item/stack/proc/transfer_to(obj/item/stack/S, var/tamount=null)
-	if (!amount)
+	if (!get_amount())
 		return 0
 	if (stacktype != S.stacktype)
 		return 0
 	if (isnull(tamount))
-		tamount = src.amount
+		tamount = src.get_amount()
 
-	var/transfer = max(min(tamount, src.amount, (S.max_amount - S.amount)), 0)
+	var/transfer = max(min(tamount, src.get_amount(), (S.get_max_amount() - S.get_amount())), 0)
 
-	var/orig_amount = src.amount
+	var/orig_amount = src.get_amount()
 	if (transfer && src.use(transfer))
 		S.add(transfer)
 		if (prob(transfer/orig_amount * 100))
@@ -220,6 +244,8 @@
 /obj/item/stack/proc/split(var/tamount)
 	if (!amount)
 		return null
+	if(uses_charge)
+		return null
 
 	var/transfer = max(min(tamount, src.amount, initial(max_amount)), 0)
 
@@ -234,8 +260,31 @@
 	return null
 
 /obj/item/stack/proc/get_amount()
+	if(uses_charge)
+		if(!synths || synths.len < uses_charge)
+			return 0
+		var/datum/matter_synth/S = synths[1]
+		. = round(S.get_charge() / charge_costs[1])
+		if(uses_charge > 1)
+			for(var/i = 2 to uses_charge)
+				S = synths[i]
+				. = min(., round(S.get_charge() / charge_costs[i]))
+		return
 	return amount
 
+/obj/item/stack/proc/get_max_amount()
+	if(uses_charge)
+		if(!synths || synths.len < uses_charge)
+			return 0
+		var/datum/matter_synth/S = synths[1]
+		. = round(S.max_energy / charge_costs[1])
+		if(uses_charge > 1)
+			for(var/i = 2 to uses_charge)
+				S = synths[i]
+				. = min(., round(S.max_energy / charge_costs[i]))
+		return
+	return max_amount
+
 /obj/item/stack/proc/add_to_stacks(mob/usr as mob)
 	for (var/obj/item/stack/item in usr.loc)
 		if (item==src)

code/game/objects/items/stacks/tiles/plasteel.dm

@@ -3,14 +3,12 @@
 	singular_name = "floor tile"
 	desc = "Those could work as a pretty decent throwing weapon"
 	icon_state = "tile"
-	w_class = 3.0
 	force = 6.0
 	matter = list("metal" = 937.5)
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
 	flags = CONDUCT
-	max_amount = 60
 
 /obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
 	..()
@@ -18,6 +16,16 @@
 	src.pixel_y = rand(1, 14)
 	return
 
+/obj/item/stack/tile/plasteel/cyborg
+	name = "floor tile synthesizer"
+	desc = "A device that makes floor tiles."
+	gender = NEUTER
+	matter = null
+	uses_charge = 1
+	charge_costs = list(250)
+	stacktype = /obj/item/stack/tile/plasteel
+	build_type = /obj/item/stack/tile/plasteel
+
 /*
 /obj/item/stack/tile/plasteel/attack_self(mob/user as mob)
 	if (usr.stat)

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -1,9 +1,18 @@
 /* Diffrent misc types of tiles
  * Contains:
+ *		Prototype
  *		Grass
  *		Wood
  *		Carpet
  */
+ 
+/obj/item/stack/tile
+	name = "tile"
+	singular_name = "tile"
+	desc = "A non-descript floor tile"
+	w_class = 3
+	max_amount = 60
+	var/build_type = null
 
 /*
  * Grass
@@ -13,13 +22,11 @@
 	singular_name = "grass floor tile"
 	desc = "A patch of grass like they often use on golf courses."
 	icon_state = "tile_grass"
-	w_class = 3.0
 	force = 1.0
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
 	flags = CONDUCT
-	max_amount = 60
 	origin_tech = "biotech=1"
 
 /*
@@ -30,13 +37,19 @@
 	singular_name = "wood floor tile"
 	desc = "An easy to fit wooden floor tile."
 	icon_state = "tile-wood"
-	w_class = 3.0
 	force = 1.0
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
 	flags = CONDUCT
-	max_amount = 60
+
+/obj/item/stack/tile/wood/cyborg
+	name = "wood floor tile synthesizer"
+	desc = "A device that makes wood floor tiles."
+	uses_charge = 1
+	charge_costs = list(250)
+	stacktype = /obj/item/stack/tile/wood
+	build_type = /obj/item/stack/tile/wood
 
 /*
  * Carpets
@@ -46,10 +59,8 @@
 	singular_name = "carpet"
 	desc = "A piece of carpet. It is the same size as a normal floor tile!"
 	icon_state = "tile-carpet"
-	w_class = 3.0
 	force = 1.0
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
 	flags = CONDUCT
-	max_amount = 60

code/game/objects/items/toys.dm

@@ -6,6 +6,7 @@
  *		Toy gun
  *		Toy crossbow
  *		Toy swords
+ *		Toy bosun's whistle
  *      Toy mechs
  *		Crayons
  *		Snap pops
@@ -13,6 +14,9 @@
  *      Therapy dolls
  *      Toddler doll
  *      Inflatable duck
+ *		Action figures
+ *		Plushies
+ *		Toy cult sword
  */
 
 
@@ -98,7 +102,7 @@
 	icon_state = "syndballoon"
 	item_state = "syndballoon"
 	w_class = 4.0
-	
+
 /obj/item/toy/nanotrasenballoon
 	name = "criminal balloon"
 	desc = "Across the balloon the following is printed: \"Man, I love NT soooo much. I use only NanoTrasen products. You have NO idea.\""
@@ -498,6 +502,22 @@
 	if(..(user, 0))
 		user << text("\icon[] [] units of water left!", src, src.reagents.total_volume)
 
+/*
+ * Bosun's whistle
+ */
+
+ /obj/item/toy/bosunwhistle
+ 	name = "bosun's whistle"
+ 	desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow."
+ 	icon = 'icons/obj/toy.dmi'
+ 	icon_state = "bosunwhistle"
+ 	var/cooldown = 0
+
+/obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
+	if(cooldown < world.time - 35)
+		user << "<span class='notice'>You blow on [src], creating an ear-splitting noise!</span>"
+		playsound(user, 'sound/misc/boatswain.ogg', 20, 1)
+		cooldown = world.time
 
 /*
  * Mech prizes
@@ -542,7 +562,6 @@
 	desc = "Mini-Mecha action figure! Collect them all! 4/11."
 	icon_state = "gygaxtoy"
 
-
 /obj/item/toy/prize/durand
 	name = "toy durand"
 	desc = "Mini-Mecha action figure! Collect them all! 5/11."
@@ -578,6 +597,206 @@
 	desc = "Mini-Mecha action figure! Collect them all! 11/11."
 	icon_state = "phazonprize"
 
+/*
+ * Action figures
+ */
+
+/obj/item/toy/figure
+	name = "Completely Glitched action figure"
+	desc = "A \"Space Life\" brand... wait, what the hell is this thing? It seems to be requesting the sweet release of death."
+	icon_state = "assistant"
+	icon = 'icons/obj/toy.dmi'
+
+/obj/item/toy/figure/cmo
+	name = "Chief Medical Officer action figure"
+	desc = "A \"Space Life\" brand Chief Medical Officer action figure."
+	icon_state = "cmo"
+
+/obj/item/toy/figure/assistant
+	name = "Assistant action figure"
+	desc = "A \"Space Life\" brand Assistant action figure."
+	icon_state = "assistant"
+
+/obj/item/toy/figure/atmos
+	name = "Atmospheric Technician action figure"
+	desc = "A \"Space Life\" brand Atmospheric Technician action figure."
+	icon_state = "atmos"
+
+/obj/item/toy/figure/bartender
+	name = "Bartender action figure"
+	desc = "A \"Space Life\" brand Bartender action figure."
+	icon_state = "bartender"
+
+/obj/item/toy/figure/borg
+	name = "Cyborg action figure"
+	desc = "A \"Space Life\" brand Cyborg action figure."
+	icon_state = "borg"
+
+/obj/item/toy/figure/gardener
+	name = "Gardener action figure"
+	desc = "A \"Space Life\" brand Gardener action figure."
+	icon_state = "botanist"
+
+/obj/item/toy/figure/captain
+	name = "Captain action figure"
+	desc = "A \"Space Life\" brand Captain action figure."
+	icon_state = "captain"
+
+/obj/item/toy/figure/cargotech
+	name = "Cargo Technician action figure"
+	desc = "A \"Space Life\" brand Cargo Technician action figure."
+	icon_state = "cargotech"
+
+/obj/item/toy/figure/ce
+	name = "Chief Engineer action figure"
+	desc = "A \"Space Life\" brand Chief Engineer action figure."
+	icon_state = "ce"
+
+/obj/item/toy/figure/chaplain
+	name = "Chaplain action figure"
+	desc = "A \"Space Life\" brand Chaplain action figure."
+	icon_state = "chaplain"
+
+/obj/item/toy/figure/chef
+	name = "Chef action figure"
+	desc = "A \"Space Life\" brand Chef action figure."
+	icon_state = "chef"
+
+/obj/item/toy/figure/chemist
+	name = "Chemist action figure"
+	desc = "A \"Space Life\" brand Chemist action figure."
+	icon_state = "chemist"
+
+/obj/item/toy/figure/clown
+	name = "Clown action figure"
+	desc = "A \"Space Life\" brand Clown action figure."
+	icon_state = "clown"
+
+/obj/item/toy/figure/corgi
+	name = "Corgi action figure"
+	desc = "A \"Space Life\" brand Corgi action figure."
+	icon_state = "ian"
+
+/obj/item/toy/figure/detective
+	name = "Detective action figure"
+	desc = "A \"Space Life\" brand Detective action figure."
+	icon_state = "detective"
+
+/obj/item/toy/figure/dsquad
+	name = "Space Commando action figure"
+	desc = "A \"Space Life\" brand Space Commando action figure."
+	icon_state = "dsquad"
+
+/obj/item/toy/figure/engineer
+	name = "Engineer action figure"
+	desc = "A \"Space Life\" brand Engineer action figure."
+	icon_state = "engineer"
+
+/obj/item/toy/figure/geneticist
+	name = "Geneticist action figure"
+	desc = "A \"Space Life\" brand Geneticist action figure, which was recently dicontinued."
+	icon_state = "geneticist"
+
+/obj/item/toy/figure/hop
+	name = "Head of Personel action figure"
+	desc = "A \"Space Life\" brand Head of Personel action figure."
+	icon_state = "hop"
+
+/obj/item/toy/figure/hos
+	name = "Head of Security action figure"
+	desc = "A \"Space Life\" brand Head of Security action figure."
+	icon_state = "hos"
+
+/obj/item/toy/figure/qm
+	name = "Quartermaster action figure"
+	desc = "A \"Space Life\" brand Quartermaster action figure."
+	icon_state = "qm"
+
+/obj/item/toy/figure/janitor
+	name = "Janitor action figure"
+	desc = "A \"Space Life\" brand Janitor action figure."
+	icon_state = "janitor"
+
+/obj/item/toy/figure/agent
+	name = "Internal Affairs Agent action figure"
+	desc = "A \"Space Life\" brand Internal Affairs Agent action figure."
+	icon_state = "agent"
+
+/obj/item/toy/figure/librarian
+	name = "Librarian action figure"
+	desc = "A \"Space Life\" brand Librarian action figure."
+	icon_state = "librarian"
+
+/obj/item/toy/figure/md
+	name = "Medical Doctor action figure"
+	desc = "A \"Space Life\" brand Medical Doctor action figure."
+	icon_state = "md"
+
+/obj/item/toy/figure/mime
+	name = "Mime action figure"
+	desc = "A \"Space Life\" brand Mime action figure."
+	icon_state = "mime"
+
+/obj/item/toy/figure/miner
+	name = "Shaft Miner action figure"
+	desc = "A \"Space Life\" brand Shaft Miner action figure."
+	icon_state = "miner"
+
+/obj/item/toy/figure/ninja
+	name = "Space Ninja action figure"
+	desc = "A \"Space Life\" brand Space Ninja action figure."
+	icon_state = "ninja"
+
+/obj/item/toy/figure/wizard
+	name = "Wizard action figure"
+	desc = "A \"Space Life\" brand Wizard action figure."
+	icon_state = "wizard"
+
+/obj/item/toy/figure/rd
+	name = "Research Director action figure"
+	desc = "A \"Space Life\" brand Research Director action figure."
+	icon_state = "rd"
+
+/obj/item/toy/figure/roboticist
+	name = "Roboticist action figure"
+	desc = "A \"Space Life\" brand Roboticist action figure."
+	icon_state = "roboticist"
+
+/obj/item/toy/figure/scientist
+	name = "Scientist action figure"
+	desc = "A \"Space Life\" brand Scientist action figure."
+	icon_state = "scientist"
+
+/obj/item/toy/figure/syndie
+	name = "Doom Operative action figure"
+	desc = "A \"Space Life\" brand Doom Operative action figure."
+	icon_state = "syndie"
+
+/obj/item/toy/figure/secofficer
+	name = "Security Officer action figure"
+	desc = "A \"Space Life\" brand Security Officer action figure."
+	icon_state = "secofficer"
+
+/obj/item/toy/figure/warden
+	name = "Warden action figure"
+	desc = "A \"Space Life\" brand Warden action figure."
+	icon_state = "warden"
+
+/obj/item/toy/figure/psychologist
+	name = "Psychologist action figure"
+	desc = "A \"Space Life\" brand Psychologist action figure."
+	icon_state = "psychologist"
+
+/obj/item/toy/figure/paramedic
+	name = "Paramedic action figure"
+	desc = "A \"Space Life\" brand Paramedic action figure."
+	icon_state = "paramedic"
+
+/obj/item/toy/figure/ert
+	name = "Emergency Response Team Commander action figure"
+	desc = "A \"Space Life\" brand Emergency Response Team Commander action figure."
+	icon_state = "ert"
+
 /obj/item/toy/katana
 	name = "replica katana"
 	desc = "Woefully underpowered in D20."
@@ -639,6 +858,106 @@
 	item_state = "egg3" // It's the green egg in items_left/righthand
 	w_class = 1
 
+/*
+ * Plushies
+ */
+
+//Large plushies.
+/obj/structure/plushie
+	name = "generic plush"
+	desc = "A very generic plushie. It seems to not want to exist."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "ianplushie"
+	anchored = 0
+	density = 1
+	var/phrase = "I don't want to exist anymore!"
+
+/obj/structure/plushie/attack_hand(mob/user)
+	if(user.a_intent == "help")
+		user.visible_message("<span class='notice'><b>[user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
+	else if (user.a_intent == "hurt")
+		user.visible_message("<span class='warning'><b>[user]</b> punches [src]!</span>","<span class='warning'>You punch [src]!</span>")
+	else if (user.a_intent == "grab")
+		user.visible_message("<span class='warning'><b>[user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
+	else
+		user.visible_message("<span class='notice'><b>[user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
+		visible_message("[src] says, \"[phrase]\"")
+
+/obj/structure/plushie/ian
+	name = "plush corgi"
+	desc = "A plushie of an adorable corgi! Don't you just want to hug it and squeeze it and call it \"Ian\"?"
+	icon_state = "ianplushie"
+	phrase = "Arf!"
+
+/obj/structure/plushie/drone
+	name = "plush drone"
+	desc = "A plushie of a happy drone! It appears to be smiling, and has a small tag which reads \"N.D.V. Icarus Gift Shop\"."
+	icon_state = "droneplushie"
+	phrase = "Beep boop!"
+
+/obj/structure/plushie/carp
+	name = "plush carp"
+	desc = "A plushie of an elated carp! Straight from the wilds of the Nyx frontier, now right here in your hands."
+	icon_state = "carpplushie"
+	phrase = "Glorf!"
+
+/obj/structure/plushie/beepsky
+	name = "plush Officer Sweepsky"
+	desc = "A plushie of a popular industrious cleaning robot! If it could feel emotions, it would love you."
+	icon_state = "beepskyplushie"
+	phrase = "Ping!"
+
+//Small plushies.
+/obj/item/toy/plushie
+	name = "generic small plush"
+	desc = "A very generic small plushie. It seems to not want to exist."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "nymphplushie"
+
+/obj/item/toy/plushie/attack_self(mob/user as mob)
+	if(user.a_intent == "help")
+		user.visible_message("<span class='notice'><b>[user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
+	else if (user.a_intent == "hurt")
+		user.visible_message("<span class='warning'><b>[user]</b> punches [src]!</span>","<span class='warning'>You punch [src]!</span>")
+	else if (user.a_intent == "grab")
+		user.visible_message("<span class='warning'><b>[user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
+	else
+		user.visible_message("<span class='notice'><b>[user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
+
+/obj/item/toy/plushie/nymph
+	name = "diona nymph plush"
+	desc = "A plushie of an adorable diona nymph! While its level of self-awareness is still being debated, its level of cuteness is not."
+	icon_state = "nymphplushie"
+
+/obj/item/toy/plushie/mouse
+	name = "mouse plush"
+	desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend."
+	icon_state = "mouseplushie"
+
+/obj/item/toy/plushie/kitten
+	name = "kitten plush"
+	desc = "A plushie of a cute kitten! Watch as it purrs it's way right into your heart."
+	icon_state = "kittenplushie"
+
+/obj/item/toy/plushie/lizard
+	name = "lizard plush"
+	desc = "A plushie of a scaly lizard! Very controversial, after being accused as \"racist\" by some Unathi."
+	icon_state = "lizardplushie"
+
+/obj/item/toy/plushie/spider
+	name = "spider plush"
+	desc = "A plushie of a fuzzy spider! It has eight legs - all the better to hug you with."
+	icon_state = "spiderplushie"
+
+//Toy cult sword
+/obj/item/toy/cultsword
+	name = "foam sword"
+	desc = "An arcane weapon (made of foam) wielded by the followers of the hit Saturday morning cartoon \"King Nursee and the Acolytes of Heroism\"."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "cultblade"
+	item_state = "cultblade"
+	w_class = 4
+	attack_verb = list("attacked", "slashed", "stabbed", "poked")
 
 /* NYET.
 /obj/item/weapon/toddler

code/game/objects/items/weapons/extinguisher.dm

@@ -79,8 +79,8 @@
 
 		if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored )
 			spawn(0)
-				var/obj/structure/stool/bed/chair/C = null
-				if(istype(usr.buckled, /obj/structure/stool/bed/chair))
+				var/obj/structure/bed/chair/C = null
+				if(istype(usr.buckled, /obj/structure/bed/chair))
 					C = usr.buckled
 				var/obj/B = usr.buckled
 				var/movementdirection = turn(direction,180)

code/game/objects/items/weapons/storage/boxes.dm

@@ -250,7 +250,7 @@
 
 /obj/item/weapon/storage/box/emps
 	name = "box of emp grenades"
-	desc = "A box with 5 emp grenades."
+	desc = "A box containing 5 military grade EMP grenades.<br> WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
 	icon_state = "flashbang"
 
 	New()
@@ -380,7 +380,7 @@
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		
+
 /obj/item/weapon/storage/box/sinpockets
 	name = "box of sin-pockets"
 	desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"

code/game/objects/items/weapons/surgery_limbattachment.dm

@@ -4,7 +4,7 @@
 	if(!istype(M))
 		return ..()
 
-	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/stool/bed/roller, M.loc) && (M.buckled || M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat)) && prob(75) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(66))))
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/bed/roller, M.loc) && (M.buckled || M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat)) && prob(75) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(66))))
 		return ..()
 
 	if(!istype(M, /mob/living/carbon/human))

code/game/objects/objs.dm

@@ -16,15 +16,27 @@
 	var/damtype = "brute"
 	var/force = 0
 
-/obj/Topic(href, href_list, var/nowindow = 0, var/checkrange = 1)
+/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/custom_state)
 	// Calling Topic without a corresponding window open causes runtime errors
 	if(!nowindow && ..())
 		return 1
 
-	if(usr.can_interact_with_interface(nano_host(), checkrange) != STATUS_INTERACTIVE)
-		return 1
-	add_fingerprint(usr)
-	return 0
+	// In the far future no checks are made in an overriding Topic() beyond if(..()) return
+	// Instead any such checks are made in CanUseTopic()
+	var/obj/host = nano_host()
+	if(host.CanUseTopic(usr, href_list, custom_state) == STATUS_INTERACTIVE)
+		CouldUseTopic(usr)
+		return 0
+
+	CouldNotUseTopic(usr)
+	return 1
+
+/obj/proc/CouldUseTopic(var/mob/user)
+	var/atom/host = nano_host()
+	host.add_fingerprint(user)
+
+/obj/proc/CouldNotUseTopic(var/mob/user)
+	// Nada
 
 /obj/item/proc/is_used_on(obj/O, mob/user)
 

code/game/objects/random/random.dm

@@ -113,3 +113,130 @@
 					prob(2);/obj/item/weapon/storage/belt/utility,\
 					prob(5);/obj/random/tool,\
 					prob(2);/obj/item/weapon/tape_roll)
+
+/obj/random/medical
+	name = "Random Medicine"
+	desc = "This is a random medical item."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "brutepack"
+	spawn_nothing_percentage = 25
+	item_to_spawn()
+		return pick(prob(4);/obj/item/stack/medical/bruise_pack,\
+					prob(4);/obj/item/stack/medical/ointment,\
+					prob(2);/obj/item/stack/medical/advanced/bruise_pack,\
+					prob(2);/obj/item/stack/medical/advanced/ointment,\
+					prob(1);/obj/item/stack/medical/splint,\
+					prob(2);/obj/item/bodybag,\
+					prob(1);/obj/item/bodybag/cryobag,\
+					prob(2);/obj/item/weapon/storage/pill_bottle/kelotane,\
+					prob(2);/obj/item/weapon/storage/pill_bottle/antitox,\
+					prob(2);/obj/item/weapon/storage/pill_bottle/tramadol,\
+					prob(2);/obj/item/weapon/reagent_containers/syringe/antitoxin,\
+					prob(1);/obj/item/weapon/reagent_containers/syringe/antiviral,\
+					prob(2);/obj/item/weapon/reagent_containers/syringe/inaprovaline,\
+					prob(1);/obj/item/stack/nanopaste)
+
+
+/obj/random/firstaid
+	name = "Random First Aid Kit"
+	desc = "This is a random first aid kit."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "firstaid"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/storage/firstaid/regular,\
+					prob(2);/obj/item/weapon/storage/firstaid/toxin,\
+					prob(2);/obj/item/weapon/storage/firstaid/o2,\
+					prob(1);/obj/item/weapon/storage/firstaid/adv,\
+					prob(2);/obj/item/weapon/storage/firstaid/fire)
+
+
+/obj/random/contraband
+	name = "Random Illegal Item"
+	desc = "Hot Stuff."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "purplecomb"
+	spawn_nothing_percentage = 50
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/storage/pill_bottle/tramadol,\
+					prob(4);/obj/item/weapon/haircomb/fluff/cado_keppel_1,\
+					prob(2);/obj/item/weapon/storage/pill_bottle/happy,\
+					prob(2);/obj/item/weapon/storage/pill_bottle/zoom,\
+					prob(5);/obj/item/weapon/contraband/poster,\
+					prob(2);/obj/item/weapon/butterfly,\
+					prob(3);/obj/item/butterflyblade,\
+					prob(3);/obj/item/butterflyhandle,\
+					prob(3);/obj/item/weapon/wirerod,\
+					prob(1);/obj/item/weapon/butterfly/switchblade,\
+					prob(1);/obj/item/weapon/reagent_containers/syringe/drugs)
+
+
+/obj/random/armory
+	name = "Random Armory Weapon"
+	desc = "This is a random security weapon."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "energykill100"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,\
+					prob(2);/obj/item/weapon/gun/energy/ionrifle,\
+					prob(2);/obj/item/weapon/gun/projectile/automatic/wt550,\
+					prob(1);/obj/item/weapon/gun/projectile/automatic/z8,\
+					prob(2);/obj/item/weapon/gun/energy/laser,\
+					prob(1);/obj/item/weapon/gun/energy/gun,\
+					prob(3);/obj/item/weapon/gun/projectile/sec,\
+					prob(2);/obj/item/weapon/gun/projectile/sec/wood,\
+					prob(3);/obj/item/weapon/gun/energy/taser,\
+					prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat)
+
+
+/obj/random/ammo
+	name = "Random Ammunition"
+	desc = "This is random ammunition."
+	icon = 'icons/obj/ammo.dmi'
+	icon_state = "45-10"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/storage/box/beanbags,\
+					prob(1);/obj/item/weapon/storage/box/shotgunammo,\
+					prob(2);/obj/item/weapon/storage/box/shotgunshells,\
+					prob(2);/obj/item/weapon/storage/box/stunshells,\
+					prob(1);/obj/item/ammo_magazine/c45m,\
+					prob(2);/obj/item/ammo_magazine/c45m/rubber,\
+					prob(2);/obj/item/ammo_magazine/c45m/flash,\
+					prob(1);/obj/item/ammo_magazine/mc9mmt,\
+					prob(3);/obj/item/ammo_magazine/mc9mmt/rubber,\
+					prob(2);/obj/item/ammo_magazine/a556)
+
+
+
+/obj/random/armor
+	name = "Random Armor"
+	desc = "This is a random armor vest."
+	icon = 'icons/obj/clothing/suits.dmi'
+	icon_state = "kvest"
+	item_to_spawn()
+		return pick(prob(4);/obj/item/clothing/suit/storage/vest,\
+					prob(3);/obj/item/clothing/suit/storage/vest/officer,\
+					prob(3);/obj/item/clothing/suit/storage/vest/warden,\
+					prob(3);/obj/item/clothing/suit/storage/vest/hos,\
+					prob(2);/obj/item/clothing/suit/storage/vest/pcrc,\
+					prob(1);/obj/item/clothing/suit/storage/vest/detective,\
+					prob(2);/obj/item/clothing/suit/storage/vest/heavy,\
+					prob(2);/obj/item/clothing/suit/storage/vest/heavy/officer,\
+					prob(2);/obj/item/clothing/suit/storage/vest/heavy/warden,\
+					prob(2);/obj/item/clothing/suit/storage/vest/heavy/hos,\
+					prob(2);/obj/item/clothing/suit/storage/vest/heavy/pcrc)
+
+/obj/random/plushie
+	name = "random plushie"
+	desc = "This is a random plushie."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "nymphplushie"
+	item_to_spawn()
+		return pick(/obj/structure/plushie/ian,\
+					/obj/structure/plushie/drone,\
+					/obj/structure/plushie/carp,\
+					/obj/structure/plushie/beepsky,\
+					/obj/item/toy/plushie/nymph,\
+					/obj/item/toy/plushie/mouse,\
+					/obj/item/toy/plushie/kitten,\
+					/obj/item/toy/plushie/lizard)
+

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

@@ -18,7 +18,7 @@
 		new /obj/item/clothing/suit/captunic/capjacket(src)
 		new /obj/item/clothing/head/helmet/cap(src)
 		new /obj/item/clothing/under/rank/captain(src)
-		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/suit/storage/vest(src)
 		new /obj/item/weapon/cartridge/captain(src)
 		new /obj/item/clothing/head/helmet/swat(src)
 		new /obj/item/clothing/shoes/brown(src)
@@ -47,7 +47,7 @@
 	New()
 		..()
 		new /obj/item/clothing/glasses/sunglasses(src)
-		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/suit/storage/vest(src)
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/weapon/cartridge/hop(src)
 		new /obj/item/device/radio/headset/heads/hop(src)
@@ -104,7 +104,7 @@
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
 		new /obj/item/clothing/head/helmet/HoS(src)
-		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/suit/storage/vest/hos(src)
 		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
 		new /obj/item/clothing/under/rank/head_of_security/corp(src)
 		new /obj/item/clothing/suit/armor/hos/jensen(src)
@@ -144,12 +144,12 @@
 			new /obj/item/weapon/storage/backpack/security(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/clothing/suit/armor/vest/security(src)
+		new /obj/item/clothing/suit/storage/vest/warden(src)
 		new /obj/item/clothing/under/rank/warden(src)
 		new /obj/item/clothing/under/rank/warden/corp(src)
 		new /obj/item/clothing/suit/armor/vest/warden(src)
 		new /obj/item/clothing/head/helmet/warden(src)
-//		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/taperoll/police(src)
@@ -160,6 +160,7 @@
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/weapon/storage/box/holobadge(src)
 		new /obj/item/clothing/head/beret/sec/warden(src)
+		new /obj/item/weapon/gun/projectile/shotgun/pump(src)
 		return
 
 
@@ -180,7 +181,7 @@
 			new /obj/item/weapon/storage/backpack/security(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/clothing/suit/armor/vest/security(src)
+		new /obj/item/clothing/suit/storage/vest/officer(src)
 		new /obj/item/clothing/head/helmet(src)
 //		new /obj/item/weapon/cartridge/security(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
@@ -196,6 +197,8 @@
 		new /obj/item/clothing/accessory/storage/black_vest(src)
 		new /obj/item/clothing/head/soft/sec/corp(src)
 		new /obj/item/clothing/under/rank/security/corp(src)
+		new /obj/item/ammo_magazine/c45m/rubber(src)
+		new /obj/item/weapon/gun/projectile/sec(src)
 		return
 
 
@@ -258,7 +261,7 @@
 		new /obj/item/weapon/storage/box/evidence(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/device/detective_scanner(src)
-		new /obj/item/clothing/suit/armor/det_suit(src)
+		new /obj/item/clothing/suit/storage/vest/detective(src)
 		new /obj/item/ammo_magazine/c45m/rubber(src)
 		new /obj/item/ammo_magazine/c45m/rubber(src)
 		new /obj/item/taperoll/police(src)

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

@@ -28,11 +28,15 @@
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/clothing/suit/space/emergency(src)
+			new /obj/item/clothing/head/helmet/space/emergency(src)
 		if ("aid")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/storage/toolbox/emergency(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/storage/firstaid/o2(src)
+			new /obj/item/clothing/suit/space/emergency(src)
+			new /obj/item/clothing/head/helmet/space/emergency(src)
 		if ("tank")
 			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
@@ -43,6 +47,10 @@
 			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/storage/firstaid/o2(src)
+			new /obj/item/clothing/suit/space/emergency(src)
+			new /obj/item/clothing/suit/space/emergency(src)
+			new /obj/item/clothing/head/helmet/space/emergency(src)
+			new /obj/item/clothing/head/helmet/space/emergency(src)
 		if ("nothing")
 			// doot
 

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

@@ -55,8 +55,8 @@
 			break
 		if(O.density || O.anchored || istype(O,/obj/structure/closet))
 			continue
-		if(istype(O, /obj/structure/stool/bed)) //This is only necessary because of rollerbeds and swivel chairs.
-			var/obj/structure/stool/bed/B = O
+		if(istype(O, /obj/structure/bed)) //This is only necessary because of rollerbeds and swivel chairs.
+			var/obj/structure/bed/B = O
 			if(B.buckled_mob)
 				continue
 		O.loc = src
@@ -341,8 +341,10 @@
 
 /obj/structure/closet/crate/freezer/rations/New()
 	..()
-	new /obj/item/weapon/storage/box/donkpockets(src)
-	new /obj/item/weapon/storage/box/donkpockets(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
 
 /obj/structure/closet/crate/bin
 	name = "large bin"

code/game/objects/structures/electricchair.dm

@@ -1,4 +1,4 @@
-/obj/structure/stool/bed/chair/e_chair
+/obj/structure/bed/chair/e_chair
 	name = "electric chair"
 	desc = "Looks absolutely SHOCKING!"
 	icon_state = "echair0"
@@ -6,14 +6,14 @@
 	var/obj/item/assembly/shock_kit/part = null
 	var/last_time = 1.0
 
-/obj/structure/stool/bed/chair/e_chair/New()
+/obj/structure/bed/chair/e_chair/New()
 	..()
 	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
 	return
 
-/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
-		var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc)
+		var/obj/structure/bed/chair/C = new /obj/structure/bed/chair(loc)
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		C.set_dir(dir)
 		part.loc = loc
@@ -23,7 +23,7 @@
 		return
 	return
 
-/obj/structure/stool/bed/chair/e_chair/verb/toggle()
+/obj/structure/bed/chair/e_chair/verb/toggle()
 	set name = "Toggle Electric Chair"
 	set category = "Object"
 	set src in oview(1)
@@ -37,13 +37,13 @@
 	usr << "<span class='notice'>You switch [on ? "on" : "off"] [src].</span>"
 	return
 
-/obj/structure/stool/bed/chair/e_chair/rotate()
+/obj/structure/bed/chair/e_chair/rotate()
 	..()
 	overlays.Cut()
 	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)	//there's probably a better way of handling this, but eh. -Pete
 	return
 
-/obj/structure/stool/bed/chair/e_chair/proc/shock()
+/obj/structure/bed/chair/e_chair/proc/shock()
 	if(!on)
 		return
 	if(last_time + 50 > world.time)

code/game/objects/structures/janicart.dm

@@ -156,7 +156,7 @@
 
 
 //old style retardo-cart
-/obj/structure/stool/bed/chair/janicart
+/obj/structure/bed/chair/janicart
 	name = "janicart"
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "pussywagon"
@@ -169,12 +169,12 @@
 	var/callme = "pimpin' ride"	//how do people refer to it?
 
 
-/obj/structure/stool/bed/chair/janicart/New()
+/obj/structure/bed/chair/janicart/New()
 	create_reagents(100)
 	update_layer()
 
 
-/obj/structure/stool/bed/chair/janicart/examine(mob/user)
+/obj/structure/bed/chair/janicart/examine(mob/user)
 	if(!..(user, 1))
 		return
 
@@ -183,7 +183,7 @@
 		user << "\A [mybag] is hanging on the [callme]."
 
 
-/obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user)
+/obj/structure/bed/chair/janicart/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/weapon/mop))
 		if(reagents.total_volume > 1)
 			reagents.trans_to(I, 2)
@@ -200,7 +200,7 @@
 		mybag = I
 
 
-/obj/structure/stool/bed/chair/janicart/attack_hand(mob/user)
+/obj/structure/bed/chair/janicart/attack_hand(mob/user)
 	if(mybag)
 		mybag.loc = get_turf(user)
 		user.put_in_hands(mybag)
@@ -209,7 +209,7 @@
 		..()
 
 
-/obj/structure/stool/bed/chair/janicart/relaymove(mob/user, direction)
+/obj/structure/bed/chair/janicart/relaymove(mob/user, direction)
 	if(user.stat || user.stunned || user.weakened || user.paralysis)
 		unbuckle_mob()
 	if(istype(user.l_hand, /obj/item/key) || istype(user.r_hand, /obj/item/key))
@@ -219,26 +219,26 @@
 		user << "<span class='notice'>You'll need the keys in one of your hands to drive this [callme].</span>"
 
 
-/obj/structure/stool/bed/chair/janicart/Move()
+/obj/structure/bed/chair/janicart/Move()
 	..()
 	if(buckled_mob)
 		if(buckled_mob.buckled == src)
 			buckled_mob.loc = loc
 
 
-/obj/structure/stool/bed/chair/janicart/post_buckle_mob(mob/living/M)
+/obj/structure/bed/chair/janicart/post_buckle_mob(mob/living/M)
 	update_mob()
 	return ..()
 
 
-/obj/structure/stool/bed/chair/janicart/update_layer()
+/obj/structure/bed/chair/janicart/update_layer()
 	if(dir == SOUTH)
 		layer = FLY_LAYER
 	else
 		layer = OBJ_LAYER
 
 
-/obj/structure/stool/bed/chair/janicart/unbuckle_mob()
+/obj/structure/bed/chair/janicart/unbuckle_mob()
 	var/mob/living/M = ..()
 	if(M)
 		M.pixel_x = 0
@@ -246,7 +246,7 @@
 	return M
 
 
-/obj/structure/stool/bed/chair/janicart/set_dir()
+/obj/structure/bed/chair/janicart/set_dir()
 	..()
 	update_layer()
 	if(buckled_mob)
@@ -257,7 +257,7 @@
 	update_mob()
 
 
-/obj/structure/stool/bed/chair/janicart/proc/update_mob()
+/obj/structure/bed/chair/janicart/proc/update_mob()
 	if(buckled_mob)
 		buckled_mob.set_dir(dir)
 		switch(dir)
@@ -275,7 +275,7 @@
 				buckled_mob.pixel_y = 7
 
 
-/obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj)
 	if(buckled_mob)
 		if(prob(85))
 			return buckled_mob.bullet_act(Proj)

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

@@ -1,14 +1,14 @@
 //Alium nests. Essentially beds with an unbuckle delay that only aliums can buckle mobs to.
 #define NEST_RESIST_TIME 1200
 
-/obj/structure/stool/bed/nest
+/obj/structure/bed/nest
 	name = "alien nest"
 	desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "nest"
 	var/health = 100
 
-/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob)
+/obj/structure/bed/nest/user_unbuckle_mob(mob/user as mob)
 	if(buckled_mob)
 		if(buckled_mob.buckled == src)
 			if(buckled_mob != user)
@@ -36,7 +36,7 @@
 			src.add_fingerprint(user)
 	return
 
-/obj/structure/stool/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
+/obj/structure/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
 	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
 		return
 
@@ -68,7 +68,7 @@
 	src.add_fingerprint(user)
 	return
 
-/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	var/aforce = W.force
 	health = max(0, health - aforce)
 	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
@@ -76,7 +76,7 @@
 		M.show_message("<span class='warning'>[user] hits [src] with [W]!</span>", 1)
 	healthcheck()
 
-/obj/structure/stool/bed/nest/proc/healthcheck()
+/obj/structure/bed/nest/proc/healthcheck()
 	if(health <=0)
 		density = 0
 		del(src)

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

@@ -7,119 +7,63 @@
 /*
  * Beds
  */
-/obj/structure/stool/bed
+/obj/structure/bed
 	name = "bed"
 	desc = "This is used to lie in, sleep in or strap on."
+	icon = 'icons/obj/objects.dmi'
 	icon_state = "bed"
+	pressure_resistance = 15
+	anchored = 1
 	can_buckle = 1
 	buckle_lying = 1
-	//var/mob/living/buckled_mob
-	//var/movable = 0 // For mobility checks
 
-/obj/structure/stool/bed/psych
+/obj/structure/bed/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			if (prob(50))
+				del(src)
+				return
+		if(3.0)
+			if (prob(5))
+				del(src)
+				return
+
+/obj/structure/bed/blob_act()
+	if(prob(75))
+		new /obj/item/stack/sheet/metal(src.loc)
+		del(src)
+
+/obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/wrench))
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		new /obj/item/stack/sheet/metal(src.loc)
+		del(src)
+	else
+		..()
+
+/obj/structure/bed/psych
 	name = "psychiatrists couch"
 	desc = "For prime comfort during psychiatric evaluations."
 	icon_state = "psychbed"
 
-/obj/structure/stool/bed/alien
+/obj/structure/bed/alien
 	name = "resting contraption"
 	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
 	icon_state = "abed"
 
-/*/obj/structure/stool/bed/Del()
-	unbuckle()
-	..()
-	return
-
-/obj/structure/stool/bed/attack_hand(mob/user as mob)
-	manual_unbuckle(user)
-	return
-
-/obj/structure/stool/bed/MouseDrop(atom/over_object)
-	return
-
-/obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
-	if(!istype(M)) return
-	buckle_mob(M, user)
-	return
-
-/obj/structure/stool/bed/proc/afterbuckle(mob/M as mob) // Called after somebody buckled / unbuckled
-	return
-
-
-/obj/structure/stool/bed/proc/unbuckle()
-	if(buckled_mob)
-		if(buckled_mob.buckled == src)	//this is probably unneccesary, but it doesn't hurt
-			buckled_mob.buckled = null
-			buckled_mob.anchored = initial(buckled_mob.anchored)
-			buckled_mob.update_canmove()
-
-			var/M = buckled_mob
-			buckled_mob = null
-
-			afterbuckle(M)
-	return
-
-/obj/structure/stool/bed/proc/manual_unbuckle(mob/user as mob)
-	if(buckled_mob)
-		if(buckled_mob.buckled == src)
-			if(buckled_mob != user)
-				buckled_mob.visible_message(\
-					"\blue [buckled_mob.name] was unbuckled by [user.name]!",\
-					"You were unbuckled from [src] by [user.name].",\
-					"You hear metal clanking")
-			else
-				buckled_mob.visible_message(\
-					"\blue [buckled_mob.name] unbuckled \himself!",\
-					"You unbuckle yourself from [src].",\
-					"You hear metal clanking")
-			unbuckle()
-			src.add_fingerprint(user)
-			return 1
-
-	return 0
-
-/obj/structure/stool/bed/proc/buckle_mob(mob/M as mob, mob/user as mob)
-	if (!ticker)
-		user << "You can't buckle anyone in before the game starts."
-	if (!ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || M.pinned.len || istype(user, /mob/living/silicon/pai) )
-		return
-
-	if (istype(M, /mob/living/carbon/slime))
-		user << "The [M] is too squishy to buckle in."
-		return
-
-	unbuckle()
-
-	if (M == usr)
-		M.visible_message(\
-			"\blue [M.name] buckles in!",\
-			"You buckle yourself to [src].",\
-			"You hear metal clanking")
-	else
-		M.visible_message(\
-			"\blue [M.name] is buckled in to [src] by [user.name]!",\
-			"You are buckled in to [src] by [user.name].",\
-			"You hear metal clanking")
-	M.buckled = src
-	M.loc = src.loc
-	M.set_dir(src.dir)
-	M.update_canmove()
-	src.buckled_mob = M
-	src.add_fingerprint(user)
-	afterbuckle(M)
-	return*/
-
 /*
  * Roller beds
  */
-/obj/structure/stool/bed/roller
+/obj/structure/bed/roller
 	name = "roller bed"
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "down"
 	anchored = 0
 
-/obj/structure/stool/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/roller_holder))
 		if(buckled_mob)
 			user_unbuckle_mob(user)
@@ -139,7 +83,7 @@
 	w_class = 4.0 // Can't be put in backpacks. Oh well.
 
 /obj/item/roller/attack_self(mob/user)
-		var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
+		var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
 		R.add_fingerprint(user)
 		del(src)
 
@@ -173,13 +117,13 @@
 		return
 
 	user << "\blue You deploy the roller bed."
-	var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
+	var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
 	R.add_fingerprint(user)
 	del(held)
 	held = null
 
 
-/obj/structure/stool/bed/roller/Move()
+/obj/structure/bed/roller/Move()
 	..()
 	if(buckled_mob)
 		if(buckled_mob.buckled == src)
@@ -187,7 +131,7 @@
 		else
 			buckled_mob = null
 
-/obj/structure/stool/bed/roller/post_buckle_mob(mob/living/M as mob)
+/obj/structure/bed/roller/post_buckle_mob(mob/living/M as mob)
 	if(M == buckled_mob)
 		M.pixel_y = 6
 		M.old_y = 6
@@ -201,7 +145,7 @@
 
 	return ..()
 
-/obj/structure/stool/bed/roller/MouseDrop(over_object, src_location, over_location)
+/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location)
 	..()
 	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
 		if(!ishuman(usr))	return

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

@@ -1,4 +1,4 @@
-/obj/structure/stool/bed/chair	//YES, chairs are a type of bed, which are a type of stool. This works, believe me.	-Pete
+/obj/structure/bed/chair	//YES, chairs are a type of bed, which are a type of stool. This works, believe me.	-Pete
 	name = "chair"
 	desc = "You sit in this. Either by will or force."
 	icon_state = "chair"
@@ -6,13 +6,13 @@
 
 	var/propelled = 0 // Check for fire-extinguisher-driven chairs
 
-/obj/structure/stool/bed/chair/New()
+/obj/structure/bed/chair/New()
 	..()
 	spawn(3)	//sorry. i don't think there's a better way to do this.
 		update_layer()
 	return
 
-/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 	if(istype(W, /obj/item/assembly/shock_kit))
 		var/obj/item/assembly/shock_kit/SK = W
@@ -20,7 +20,7 @@
 			user << "<span class='notice'>[SK] is not ready to be attached!</span>"
 			return
 		user.drop_item()
-		var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc)
+		var/obj/structure/bed/chair/e_chair/E = new /obj/structure/bed/chair/e_chair(src.loc)
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		E.set_dir(dir)
 		E.part = SK
@@ -28,26 +28,26 @@
 		SK.master = E
 		del(src)
 
-/obj/structure/stool/bed/chair/attack_tk(mob/user as mob)
+/obj/structure/bed/chair/attack_tk(mob/user as mob)
 	if(buckled_mob)
 		..()
 	else
 		rotate()
 	return
 
-/obj/structure/stool/bed/chair/proc/update_layer()
+/obj/structure/bed/chair/proc/update_layer()
 	if(src.dir == NORTH)
 		src.layer = FLY_LAYER
 	else
 		src.layer = OBJ_LAYER
 
-/obj/structure/stool/bed/chair/set_dir()
+/obj/structure/bed/chair/set_dir()
 	..()
 	update_layer()
 	if(buckled_mob)
 		buckled_mob.set_dir(dir)
 
-/obj/structure/stool/bed/chair/verb/rotate()
+/obj/structure/bed/chair/verb/rotate()
 	set name = "Rotate Chair"
 	set category = "Object"
 	set src in oview(1)
@@ -67,17 +67,17 @@
 		return
 
 // Chair types
-/obj/structure/stool/bed/chair/wood/normal
+/obj/structure/bed/chair/wood/normal
 	icon_state = "wooden_chair"
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
 
-/obj/structure/stool/bed/chair/wood/wings
+/obj/structure/bed/chair/wood/wings
 	icon_state = "wooden_chair_wings"
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
 
-/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		new /obj/item/stack/sheet/wood(src.loc)
@@ -85,45 +85,45 @@
 	else
 		..()
 
-/obj/structure/stool/bed/chair/comfy
+/obj/structure/bed/chair/comfy
 	name = "comfy chair"
 	desc = "It looks comfy."
 	icon_state = "comfychair"
 	color = rgb(255,255,255)
 	var/image/armrest = null
 
-/obj/structure/stool/bed/chair/comfy/New()
+/obj/structure/bed/chair/comfy/New()
 	armrest = image("icons/obj/objects.dmi", "comfychair_armrest")
 	armrest.layer = MOB_LAYER + 0.1
 
 	return ..()
 
-/obj/structure/stool/bed/chair/comfy/post_buckle_mob()
+/obj/structure/bed/chair/comfy/post_buckle_mob()
 	if(buckled_mob)
 		overlays += armrest
 	else
 		overlays -= armrest
 
-/obj/structure/stool/bed/chair/comfy/brown
+/obj/structure/bed/chair/comfy/brown
 	color = rgb(255,113,0)
 
-/obj/structure/stool/bed/chair/comfy/beige
+/obj/structure/bed/chair/comfy/beige
 	color = rgb(255,253,195)
 
-/obj/structure/stool/bed/chair/comfy/teal
+/obj/structure/bed/chair/comfy/teal
 	color = rgb(0,255,255)
 
-/obj/structure/stool/bed/chair/office
+/obj/structure/bed/chair/office
 	anchored = 0
 	buckle_movable = 1
 
-/obj/structure/stool/bed/chair/comfy/black
+/obj/structure/bed/chair/comfy/black
 	color = rgb(167,164,153)
 
-/obj/structure/stool/bed/chair/comfy/lime
+/obj/structure/bed/chair/comfy/lime
 	color = rgb(255,251,0)
 
-/obj/structure/stool/bed/chair/office/Move()
+/obj/structure/bed/chair/office/Move()
 	..()
 	if(buckled_mob)
 		var/mob/living/occupant = buckled_mob
@@ -138,7 +138,7 @@
 			else
 				unbuckle_mob()
 
-/obj/structure/stool/bed/chair/office/Bump(atom/A)
+/obj/structure/bed/chair/office/Bump(atom/A)
 	..()
 	if(!buckled_mob)	return
 
@@ -163,8 +163,8 @@
 			victim.apply_damage(10, BRUTE, def_zone, blocked)
 		occupant.visible_message("<span class='danger'>[occupant] crashed into \the [A]!</span>")
 
-/obj/structure/stool/bed/chair/office/light
+/obj/structure/bed/chair/office/light
 	icon_state = "officechair_white"
 
-/obj/structure/stool/bed/chair/office/dark
+/obj/structure/bed/chair/office/dark
 	icon_state = "officechair_dark"

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

@@ -1,81 +1,11 @@
-/obj/structure/stool
+/obj/item/weapon/stool
 	name = "stool"
 	desc = "Apply butt."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "stool"
-	anchored = 1.0
-	pressure_resistance = 15
-
-/obj/structure/stool/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			del(src)
-			return
-		if(2.0)
-			if (prob(50))
-				del(src)
-				return
-		if(3.0)
-			if (prob(5))
-				del(src)
-				return
-	return
-
-/obj/structure/stool/blob_act()
-	if(prob(75))
-		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
-
-/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/wrench))
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
-	return
-
-/obj/structure/stool/MouseDrop(atom/over_object)
-	if(istype(over_object, /mob/living/carbon/human) && type == /obj/structure/stool) //i am sorry for this, but the inheritance mess requires it
-		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()
-			S.origin = src
-			src.loc = S
-			H.put_in_hands(S)
-			H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!")
-			return
-	return ..()
-
-/obj/item/weapon/stool
-	name = "stool"
-	desc = "Uh-hoh, bar is heating up."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "stool"
 	force = 10
 	throwforce = 10
-	w_class = 5.0
-	var/obj/structure/stool/origin = null
-
-/obj/item/weapon/stool/proc/deploy(var/mob/user)
-
-	if(!origin)
-		del src
-
-	origin.loc = get_turf(src)
-
-	if(user)
-		user.u_equip(src)
-		user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
-
-	del src
-
-/obj/item/weapon/stool/dropped(mob/user as mob)
-	..()
-	if(istype(loc,/turf/))
-		deploy(user)
-
-/obj/item/weapon/stool/attack_self(mob/user as mob)
-	..()
-	deploy(user)
+	w_class = 5
 
 /obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
 	if (prob(5) && istype(M,/mob/living))
@@ -89,3 +19,29 @@
 		T.apply_damage(20)
 		return
 	..()
+
+/obj/item/weapon/stool/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			if (prob(50))
+				del(src)
+				return
+		if(3.0)
+			if (prob(5))
+				del(src)
+				return
+
+/obj/item/weapon/stool/blob_act()
+	if(prob(75))
+		new /obj/item/stack/sheet/metal(src.loc)
+		del(src)
+
+/obj/item/weapon/stool/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/wrench))
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		new /obj/item/stack/sheet/metal(src.loc)
+		del(src)
+	..()

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

@@ -1,4 +1,4 @@
-/obj/structure/stool/bed/chair/wheelchair
+/obj/structure/bed/chair/wheelchair
 	name = "wheelchair"
 	desc = "You sit in this. Either by will or force."
 	icon_state = "wheelchair"
@@ -10,7 +10,7 @@
 	var/bloodiness
 
 
-/obj/structure/stool/bed/chair/wheelchair/set_dir()
+/obj/structure/bed/chair/wheelchair/set_dir()
 	..()
 	overlays = null
 	var/image/O = image(icon = 'icons/obj/objects.dmi', icon_state = "w_overlay", layer = FLY_LAYER, dir = src.dir)
@@ -18,7 +18,7 @@
 	if(buckled_mob)
 		buckled_mob.set_dir(dir)
 
-/obj/structure/stool/bed/chair/wheelchair/relaymove(mob/user, direction)
+/obj/structure/bed/chair/wheelchair/relaymove(mob/user, direction)
 	// Redundant check?
 	if(user.stat || user.stunned || user.weakened || user.paralysis || user.lying || user.restrained())
 		if(user==pulling)
@@ -79,7 +79,7 @@
 		create_track()
 	driving = 0
 
-/obj/structure/stool/bed/chair/wheelchair/Move()
+/obj/structure/bed/chair/wheelchair/Move()
 	..()
 	if(buckled_mob)
 		var/mob/living/occupant = buckled_mob
@@ -102,14 +102,14 @@
 			if (occupant && (src.loc != occupant.loc))
 				src.loc = occupant.loc // Failsafe to make sure the wheelchair stays beneath the occupant after driving
 
-/obj/structure/stool/bed/chair/wheelchair/attack_hand(mob/living/user as mob)
+/obj/structure/bed/chair/wheelchair/attack_hand(mob/living/user as mob)
 	if (pulling)
 		MouseDrop(usr)
 	else
 		user_unbuckle_mob(user)
 	return
 
-/obj/structure/stool/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
+/obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
 	..()
 	if(over_object == usr && in_range(src, usr))
 		if(!ishuman(usr))	return
@@ -133,7 +133,7 @@
 			pulling = null
 		return
 
-/obj/structure/stool/bed/chair/wheelchair/Bump(atom/A)
+/obj/structure/bed/chair/wheelchair/Bump(atom/A)
 	..()
 	if(!buckled_mob)	return
 
@@ -170,7 +170,7 @@
 		else
 			occupant.visible_message("<span class='danger'>[occupant] crashed into \the [A]!</span>")
 
-/obj/structure/stool/bed/chair/wheelchair/proc/create_track()
+/obj/structure/bed/chair/wheelchair/proc/create_track()
 	var/obj/effect/decal/cleanable/blood/tracks/B = new(loc)
 	var/newdir = get_dir(get_step(loc, dir), loc)
 	if(newdir == dir)
@@ -184,7 +184,7 @@
 		B.set_dir(newdir)
 	bloodiness--
 
-/obj/structure/stool/bed/chair/wheelchair/buckle_mob(mob/M as mob, mob/user as mob)
+/obj/structure/bed/chair/wheelchair/buckle_mob(mob/M as mob, mob/user as mob)
 	if(M == pulling)
 		pulling = null
 		usr.pulledby = null