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

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Browse Source
This commit is contained in:
Ren Erthilo
2012-04-25 18:57:20 +01:00
parent 1fa9b6a848 36982a56f9
commit cf85409efe
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/stool.dm
+17 -2
View File
@@ -19,6 +19,13 @@
del(src)
/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/screwdriver))
if (src.anchored)
src.anchored = 0
user << "\blue You unfasten [src] from the floor."
else
src.anchored = 1
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)
@@ -111,7 +118,6 @@
return
/obj/structure/stool/bed/chair/New()
src.verbs -= /atom/movable/verb/pull
if(src.dir == NORTH)
src.layer = FLY_LAYER
..()
@@ -145,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)))