God I hate travis, will this appease you?

This commit is contained in:
Keate Senior
2020-07-24 14:47:53 -04:00
parent 8473a0291d
commit 18bdf83136
@@ -361,7 +361,7 @@
return
return ..()
/mob/living/simple_animal/hostile/clockwork/marauder/guardian/hitby(atom/movable/AM, skipcatch, hitpush, blocked)
/mob/living/simple_animal/hostile/clockwork/marauder/guardian/hitby(atom/movable/AM, skipcatch, hitpush, blockedatom/movable/AM, datum/thrownthing/throwingdatum)
if(blockOrCounter(null, AM))
return
return ..()