Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes

A few fixes

code/__HELPERS/unsorted.dm

@@ -1859,8 +1859,8 @@ var/mob/dview/dview_mob = new
 			/obj/structure/closet = "CLOSET",
 			/obj/structure/statue = "STATUE",
 			/obj/structure/chair = "CHAIR", // oh no
-			/obj/structure/stool/bed = "BED",
-			/obj/structure/stool = "STOOL",
+			/obj/structure/bed = "BED",
+			/obj/structure/chair/stool = "STOOL",
 			/obj/structure/table = "TABLE",
 			/obj/structure = "STRUCTURE",
 			/obj/vehicle = "VEHICLE",

code/_globalvars/unused.dm

@@ -18,7 +18,6 @@ var/list/liftable_structures = list(\
 	/obj/machinery/space_heater, \
 	/obj/machinery/recharge_station, \
 	/obj/machinery/flasher, \
-	/obj/structure/stool, \
 	/obj/structure/closet, \
 	/obj/machinery/photocopier, \
 	/obj/structure/filingcabinet, \
@@ -31,4 +30,3 @@ var/endicon = null
 var/datum/air_tunnel/air_tunnel1/SS13_airtunnel = null
 var/going = 1.0
 var/datum/engine_eject/engine_eject_control = null
-

code/datums/weather/weather_types/floor_is_lava.dm

@@ -26,7 +26,7 @@
 	if(issilicon(L))
 		return
 	for(var/obj/structure/O in L.loc)
-		if(O.density || O.buckled_mob && istype(O, /obj/structure/stool/bed))
+		if(O.density || O.buckled_mob && istype(O, /obj/structure/bed))
 			return
 	if(L.loc.density)
 		return
@@ -36,4 +36,4 @@
 
 /datum/weather/floor_is_lava/fake
 	name = "the floor is lava (fake)"
-	aesthetic = TRUE
+	aesthetic = TRUE

code/game/gamemodes/gameticker.dm

@@ -259,7 +259,7 @@ var/round_start_time = 0
 	cinematic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	cinematic.screen_loc = "1,0"
 
-	var/obj/structure/stool/bed/temp_buckle = new(src)
+	var/obj/structure/bed/temp_buckle = new(src)
 	if(station_missed)
 		for(var/mob/M in GLOB.mob_list)
 			M.buckled = temp_buckle				//buckles the mob so it can't do anything

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

@@ -69,8 +69,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.forceMove(src)

code/game/objects/structures/plasticflaps.dm

@@ -65,8 +65,8 @@
 	if(istype(A) && A.checkpass(PASSGLASS))
 		return prob(60)
 
-	var/obj/structure/stool/bed/B = A
-	if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
+	var/obj/structure/bed/B = A
+	if(istype(A, /obj/structure/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
 		return 0
 
 	if(istype(A, /obj/structure/closet/cardboard))
@@ -133,4 +133,4 @@
 	return ..()
 
 /obj/structure/plasticflaps/mining/CanAtmosPass(turf/T)
-	return 0
+	return 0

code/modules/examine/descriptions/structures.dm

@@ -14,7 +14,7 @@
 	description_info = "Add a metal floor tile to build a floor on top of the lattice.<br>\
 	Lattices can be made by applying metal rods to a space tile."
 
-/obj/structure/stool/bed
+/obj/structure/bed
 	description_info = "Click and drag yourself (or anyone) to this to buckle in. Click on this with an empty hand to undo the buckles.<br>\
 	<br>\
 	Anyone with restraints, such as handcuffs, will not be able to unbuckle themselves. They must use the Resist button, or verb, to break free of \

code/modules/power/cable.dm

@@ -502,7 +502,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
 	toolspeed = 1
 
 /obj/item/stack/cable_coil/suicide_act(mob/user)
-	if(locate(/obj/structure/stool) in user.loc)
+	if(locate(/obj/structure/chair/stool) in user.loc)
 		user.visible_message("<span class='suicide'>[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	else
 		user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")

code/modules/surgery/helpers.dm

@@ -106,7 +106,7 @@
 		return 1
 	else if(locate(/obj/structure/table, T))
 		return 0.8
-	else if(locate(/obj/structure/stool/bed, T))
+	else if(locate(/obj/structure/bed, T))
 		return 0.7
 	else
 		return 0.5