Merge pull request #1851 from Yoshax/bugfixes

Adjusts the checks to ensure you cannot buckle two people to the same thing
This commit is contained in:
Neerti
2016-06-02 10:36:25 -04:00
2 changed files with 2 additions and 5 deletions

View File

@@ -129,7 +129,7 @@
else if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
var/mob/living/affecting = G.affecting
if(has_buckled) //Handles trying to buckle someone else to a chair when someone else is on it
if(buckled_mob) //Handles trying to buckle someone else to a chair when someone else is on it
user << "<span class='notice'>\The [src] already has someone buckled to it.</span>"
return
user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>")