Wheelchair fixes

This commit is contained in:
Hubblenaut
2016-01-05 00:51:32 +01:00
parent beb54f906a
commit 61e31ab8ad
7 changed files with 22 additions and 27 deletions

View File

@@ -15,7 +15,7 @@
/obj/structure/bed/chair/wheelchair/set_dir()
..()
overlays = null
var/image/O = image(icon = 'icons/obj/objects.dmi', icon_state = "w_overlay", layer = FLY_LAYER, dir = src.dir)
var/image/O = image(icon = 'icons/obj/furniture.dmi', icon_state = "w_overlay", layer = FLY_LAYER, dir = src.dir)
overlays += O
if(buckled_mob)
buckled_mob.set_dir(dir)
@@ -116,26 +116,21 @@
user_unbuckle_mob(user)
return
/obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
..()
if(over_object == usr && in_range(src, usr))
if(!ishuman(usr)) return
if(usr == buckled_mob)
usr << "<span class='warning'>You realize you are unable to push the wheelchair you sit in.</span>"
/obj/structure/bed/chair/wheelchair/CtrlClick(var/mob/user)
if(in_range(src, user))
if(!ishuman(user)) return
if(user == buckled_mob)
user << "<span class='warning'>You realize you are unable to push the wheelchair you sit in.</span>"
return
if(!pulling)
pulling = usr
usr.pulledby = src
if(usr.pulling)
usr.stop_pulling()
usr.set_dir(get_dir(usr, src))
usr << "You grip \the [name]'s handles."
pulling = user
user.pulledby = src
if(user.pulling)
user.stop_pulling()
user.set_dir(get_dir(user, src))
user << "You grip \the [name]'s handles."
else
if(usr != pulling)
for(var/mob/O in viewers(pulling, null))
O.show_message("<span class='warning'>[usr] breaks [pulling]'s grip on the wheelchair.</span>", 1)
else
usr << "You let go of \the [name]'s handles."
usr << "You let go of \the [name]'s handles."
pulling.pulledby = null
pulling = null
return