Merge branch 'master' into upstream-merge-14344

2026-08-24 13:47:33 +01:00 · 2023-01-19 14:42:57 -07:00
parent aaeb45c533 36b02dd6c1
commit e67f4504dc
3 changed files with 2 additions and 2 deletions
@@ -185,9 +185,9 @@
 		user.do_attack_animation(src)
 		shatter()

-	else if (usr.a_intent == I_HURT)
+	else if(usr && usr.a_intent == I_HURT) //CHOMPEdit

-		if (istype(usr,/mob/living/carbon/human))
+		if(istype(usr,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = usr
 			if(H.species.can_shred(H))
 				attack_generic(H,25)