Syringe Refactor. Overhauls Lethal Injection Syringe

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -54,6 +54,8 @@
 		else
 			healths.icon_state = "health6"
 
+/mob/living/carbon/alien/humanoid/queen/can_inject()
+	return FALSE
 
 //Queen verbs
 /mob/living/carbon/alien/humanoid/queen/verb/lay_egg()

code/modules/mob/living/carbon/human/human.dm

@@ -1006,7 +1006,7 @@
 			xylophone=0
 	return
 
-/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone, var/penetrate_thick = 0)
+/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE)
 	. = 1
 
 	if(!target_zone)

code/modules/mob/living/living.dm

@@ -362,15 +362,15 @@
 			return 1
 	return 0
 
-
+// Living mobs use can_inject() to make sure that the mob is not syringe-proof in general.
 /mob/living/proc/can_inject()
 	return TRUE
 
-/mob/living/is_injectable(allowmobs = TRUE)
-	return (allowmobs && reagents && can_inject())
+/mob/living/is_injectable(mob/user, allowmobs = TRUE)
+	return (allowmobs && reagents && can_inject(user))
 
-/mob/living/is_drawable(allowmobs = TRUE)
-	return (allowmobs && reagents && can_inject())
+/mob/living/is_drawable(mob/user, allowmobs = TRUE)
+	return (allowmobs && reagents && can_inject(user))
 
 /mob/living/proc/get_organ_target()
 	var/mob/shooter = src

code/modules/mob/living/silicon/silicon.dm

@@ -92,10 +92,10 @@
 /mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0)
 	return
 
-/mob/living/silicon/can_inject(var/mob/user, var/error_msg)
+/mob/living/silicon/can_inject(mob/user, error_msg)
 	if(error_msg)
-		to_chat(user, "<span class='alert'>Their outer shell is too tough.</span>")
-	return 0
+		to_chat(user, "<span class='alert'>[p_their(TRUE)] outer shell is too tough.</span>")
+	return FALSE
 
 /mob/living/silicon/IsAdvancedToolUser()
 	return TRUE

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -44,7 +44,7 @@
 	if(. && venom_per_bite > 0 && iscarbon(target) && (!client || a_intent == INTENT_HARM))
 		var/mob/living/carbon/C = target
 		var/inject_target = pick("chest", "head")
-		if(C.can_inject(null, 0, inject_target, 0))
+		if(C.can_inject(null, FALSE, inject_target, FALSE))
 			C.reagents.add_reagent("spidertoxin", venom_per_bite)
 
 //nursemaids - these create webs and eggs

code/modules/mob/living/simple_animal/hostile/headcrab.dm

@@ -18,7 +18,7 @@
 	attack_sound = 'sound/creatures/headcrab_attack.ogg'
 	speak_emote = list("hisses")
 	var/is_zombie = 0
-	stat_attack = DEAD //so they continue to attack when they are on the ground. 
+	stat_attack = DEAD //so they continue to attack when they are on the ground.
 	var/host_species = ""
 	var/list/human_overlays = list()
 
@@ -168,5 +168,5 @@
 /mob/living/simple_animal/hostile/headcrab/poison/AttackingTarget()
 	. = ..()
 	var/mob/living/carbon/C = target
-	if(C.can_inject(null, 0, "head", 0))
+	if(C.can_inject(null, FALSE, "head", FALSE))
 		C.reagents.add_reagent("lsd", 5)

code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm

@@ -32,7 +32,7 @@
 	if(L.reagents.has_reagent("terror_black_toxin", 100))
 		return ..()
 	var/inject_target = pick("chest", "head")
-	if(L.stunned || L.can_inject(null, 0, inject_target, 0))
+	if(L.stunned || L.can_inject(null, FALSE, inject_target, FALSE))
 		L.reagents.add_reagent("terror_black_toxin", 30) // inject our special poison
 		visible_message("<span class='danger'>[src] buries its long fangs deep into the [inject_target] of [target]!</span>")
 	else
@@ -54,6 +54,6 @@
 	if(istype(C))
 		if(!C.reagents.has_reagent("terror_black_toxin", 60))
 			var/inject_target = pick("chest","head")
-			if(C.can_inject(null, 0, inject_target, 0))
+			if(C.can_inject(null, FALSE, inject_target, FALSE))
 				to_chat(C, "<span class='danger'>[src] slices into you!</span>")
 				C.reagents.add_reagent("terror_black_toxin", 30)

code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm

@@ -80,7 +80,7 @@
 		..()
 		return
 	var/inject_target = pick("chest","head")
-	if(L.stunned || L.can_inject(null,0,inject_target,0))
+	if(L.stunned || L.can_inject(null, FALSE, inject_target, FALSE))
 		if(L.eye_blurry < 60)
 			L.AdjustEyeBlurry(10)
 		// instead of having a venom that only lasts seconds, we just add the eyeblur directly.

code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm

@@ -339,7 +339,7 @@
 	if(ismob(target))
 		var/mob/living/L = target
 		if(L.reagents)
-			if(L.can_inject(null, 0, "chest", 0))
+			if(L.can_inject(null, FALSE, "chest", FALSE))
 				L.Hallucinate(400)
 		if(!isterrorspider(L))
 			L.adjustToxLoss(bonus_tox)
@@ -351,6 +351,6 @@
 /obj/structure/spider/terrorweb/queen/web_special_ability(mob/living/carbon/C)
 	if(istype(C))
 		var/inject_target = pick("chest","head")
-		if(C.can_inject(null, 0, inject_target, 0))
+		if(C.can_inject(null, FALSE, inject_target, FALSE))
 			C.Hallucinate(400)
 			C.adjustToxLoss(30)

code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm

@@ -42,7 +42,7 @@
 					else
 						targets3 += C
 				else if(ai_target_method == TS_DAMAGE_POISON)
-					if(C.can_inject(null,0,"chest",0))
+					if(C.can_inject(null, FALSE, "chest", FALSE))
 						targets1 += C
 					else if(C in enemies)
 						targets2 += C

code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm

@@ -40,7 +40,7 @@
 		return
 	var/inject_target = pick("chest","head")
 	L.attack_animal(src)
-	if(L.stunned || L.paralysis || L.can_inject(null, 0, inject_target, 0))
+	if(L.stunned || L.paralysis || L.can_inject(null, FALSE, inject_target, FALSE))
 		if(!IsTSInfected(L) && ishuman(L))
 			visible_message("<span class='danger'>[src] buries its long fangs deep into the [inject_target] of [L]!</span>")
 			new /obj/item/organ/internal/body_egg/terror_eggs(L)
@@ -66,6 +66,6 @@
 	if(istype(C))
 		if(!IsTSInfected(C) && ishuman(C))
 			var/inject_target = pick("chest","head")
-			if(C.can_inject(null, 0, inject_target, 0))
+			if(C.can_inject(null, FALSE, inject_target, FALSE))
 				to_chat(C, "<span class='danger'>[src] slices into you!</span>")
 				new /obj/item/organ/internal/body_egg/terror_eggs(C)