Merge pull request #10684 from Ghommie/Ghommie-cit521

fix for hypospray jank.
2020-01-25 05:53:42 -07:00
parent 0d1dbedf56 9ee70c7931
commit 72cfd35438
4 changed files with 39 additions and 99 deletions
@@ -13,7 +13,7 @@

 	var/alt_inhands_file = 'icons/mob/alienqueen.dmi'

-/mob/living/carbon/alien/humanoid/royal/can_inject()
+/mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
 	return 0

 /mob/living/carbon/alien/humanoid/royal/queen
@@ -459,7 +459,7 @@
 	return ret

 // Living mobs use can_inject() to make sure that the mob is not syringe-proof in general.
-/mob/living/proc/can_inject()
+/mob/living/proc/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
 	return TRUE

 /mob/living/is_injectable(allowmobs = TRUE)
@@ -151,7 +151,7 @@
 			for(var/key in alarm_types_clear)
 				alarm_types_clear[key] = 0

-/mob/living/silicon/can_inject(mob/user, error_msg)
+/mob/living/silicon/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
 	if(error_msg)
 		to_chat(user, "<span class='alert'>[p_their(TRUE)] outer shell is too tough.</span>")
 	return FALSE