From 337002634d0782a5773c688cb817e10ff5e2aafd Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 25 Apr 2012 00:56:39 +0400 Subject: [PATCH] Fixed a couple of derps in my previous commit Also support for moving chairs with people buckled in them. Beds too. Though beds start anchored by default. --- code/game/objects/stool.dm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 6e9fea0f798..1fffa4c72c0 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -22,10 +22,10 @@ if(istype(W, /obj/item/weapon/screwdriver)) if (src.anchored) src.anchored = 0 - user << "/blue You unfasten [src] from the floor." + user << "\blue You unfasten [src] from the floor." else src.anchored = 1 - user << "/blue You fasten [src] to the floor." + user << "\blue You fasten [src] to the floor." if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(src.loc) @@ -118,7 +118,6 @@ return /obj/structure/stool/bed/chair/New() - src.verbs -= /atom/movable/verb/pull if(src.dir == NORTH) src.layer = FLY_LAYER ..() @@ -152,11 +151,20 @@ icon_state = "down" anchored = 0 -/obj/structure/stool/bed/roller/Move() +//obj/structure/stool/bed/roller/Move() +/obj/structure/stool/bed/Move() ..() if(buckled_mob) if(buckled_mob.buckled == src) buckled_mob.loc = src.loc + buckled_mob.dir = src.dir + +/obj/structure/stool/bed/chair/Move() + ..() + if(src.dir == NORTH) + src.layer = FLY_LAYER + else + src.layer = OBJ_LAYER /obj/structure/stool/bed/roller/buckle_mob(mob/M as mob, mob/user as mob) if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled || istype(usr, /mob/living/silicon/pai)))