From 381082066d793c8c248d9abd341f6e44eeb61ca2 Mon Sep 17 00:00:00 2001
From: Xhuis <ashe.f.higgs@gmail.com>
Date: Fri, 28 Jul 2017 11:16:06 -0400
Subject: [PATCH] Fixes syringe injection not working

---
 code/modules/reagents/reagent_containers/syringes.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 4a0faea7226..68781a5e45f 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -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>")