Merge pull request #29555

This commit is contained in:
Cyberboss
2017-07-29 20:41:03 -04:00
@@ -114,14 +114,17 @@
to_chat(user, "<span class='notice'>[src] is empty.</span>")
return
if(!target.is_injectable())
if(!L && !target.is_injectable()) //only checks on non-living mobs, due to how can_inject() handles
to_chat(user, "<span class='warning'>You cannot directly fill [target]!</span>")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, "<span class='notice'>[target] is full.</span>")
return
if(L) //living mob
if(!L.can_inject(user, TRUE))
return
if(L != user)
L.visible_message("<span class='danger'>[user] is trying to inject [L]!</span>", \
"<span class='userdanger'>[user] is trying to inject [L]!</span>")