Merge pull request #10947 from Ghommie/Ghommie-cit563

Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
parent c7176b522f 9ee2ede0e7
commit f79148d549
6 changed files with 24 additions and 22 deletions
@@ -320,10 +320,10 @@
 		if(C.setting == counter_setting)
 			return BULLET_ACT_BLOCK

-	var/mob/living/L = target
-	if(!istype(target))
+	if(!isliving(target))
 		return BULLET_ACT_BLOCK

+	var/mob/living/L = target
 	switch(hugbox)
 		if(DUEL_HUGBOX_NONE)
 			var/obj/item/bodypart/B = L.get_bodypart(BODY_ZONE_HEAD)