Merge pull request #5898 from Walter0o/patch-1

fixes #5876
2025-12-10 18:22:39 +00:00 · 2014-08-05 13:22:26 +09:30
parent 4df46548ac dcc3393b25
commit 00fc8c53ba
1 changed files with 3 additions and 1 deletions
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -229,7 +229,9 @@
 		adjustBruteLoss(damage)

 /mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
-	if(!Proj)	return
+	if(!Proj || Proj.nodamage)
+		return
+	
 	adjustBruteLoss(Proj.damage)
 	return 0