Fixed some bugs, did some testing, moved some procs around for robot functionality.

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
This commit is contained in:
Zuhayr
2014-07-11 13:50:34 +09:30
committed by ZomgPonies
parent ff2557eb91
commit 3098c80f9c
4 changed files with 28 additions and 5 deletions
@@ -78,7 +78,9 @@
"You hear metal clanking")
unbuckle()
src.add_fingerprint(user)
return
return 1
return 0
/obj/structure/stool/bed/proc/buckle_mob(mob/M as mob, mob/user as mob)
if (!ticker)
@@ -119,6 +121,18 @@
icon_state = "down"
anchored = 0
/obj/structure/stool/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/roller_holder))
if(buckled_mob)
manual_unbuckle()
else
visible_message("[user] collapses \the [src.name].")
new/obj/item/roller(get_turf(src))
spawn(0)
del(src)
return
..()
/obj/item/roller
name = "roller bed"
desc = "A collapsed roller bed that can be carried around."