Skip to content

Commit

Permalink
Fixes syringe injection not working
Browse files Browse the repository at this point in the history
  • Loading branch information
Xhuis committed Jul 28, 2017
1 parent a6c79b7 commit 3810820
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion code/modules/reagents/reagent_containers/syringes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,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>")
Expand Down

0 comments on commit 3810820

Please sign in to comment.