cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of derps in my previous commit

Browse Source 
Also support for moving chairs with people buckled in them.
Beds too. Though beds start anchored by default.
This commit is contained in:
Chinsky
2012-04-25 00:56:39 +04:00
parent 1b2a8b8dc5
commit 337002634d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/stool.dm
+12 -4
View File
@@ -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)))