From 6c6d35d13303902702de3f24a8cbe48488706343 Mon Sep 17 00:00:00 2001 From: Purpose Date: Thu, 11 Oct 2018 22:02:23 +0100 Subject: [PATCH] fixies --- code/__HELPERS/unsorted.dm | 4 ++-- code/_globalvars/unused.dm | 2 -- code/datums/weather/weather_types/floor_is_lava.dm | 4 ++-- code/game/gamemodes/gameticker.dm | 2 +- code/game/objects/structures/crates_lockers/crates.dm | 4 ++-- code/game/objects/structures/plasticflaps.dm | 6 +++--- code/modules/examine/descriptions/structures.dm | 2 +- code/modules/power/cable.dm | 2 +- code/modules/surgery/helpers.dm | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index e01a1fd9895..2e413daf0b1 100644 --- a/code/__HELPERS/unsorted.dm +++ b/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", diff --git a/code/_globalvars/unused.dm b/code/_globalvars/unused.dm index 3925ea1237e..6f55887ee66 100644 --- a/code/_globalvars/unused.dm +++ b/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 - diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm index fe7391ec9f0..6d06e3ca1ef 100644 --- a/code/datums/weather/weather_types/floor_is_lava.dm +++ b/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 \ No newline at end of file + aesthetic = TRUE diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 1941c0c323f..df195ec9c1f 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/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 mob_list) M.buckled = temp_buckle //buckles the mob so it can't do anything diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 26b3e53362e..648f3c95622 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/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) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 3911d366ad6..19b6dc02617 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/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 \ No newline at end of file + return 0 diff --git a/code/modules/examine/descriptions/structures.dm b/code/modules/examine/descriptions/structures.dm index d8e9b337606..0f7d6c98834 100644 --- a/code/modules/examine/descriptions/structures.dm +++ b/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.
\ 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.
\
\ 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 \ diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index ed1458c1cae..9184220bb85 100644 --- a/code/modules/power/cable.dm +++ b/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("[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") else user.visible_message("[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 1ae29143496..b235ddc08cd 100644 --- a/code/modules/surgery/helpers.dm +++ b/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