From edd68c5174f1c3315373b52f59472b5500af7f19 Mon Sep 17 00:00:00 2001
From: Keate Senior <keatesequoy@gmail.com>
Date: Thu, 23 Jul 2020 22:35:48 -0400
Subject: [PATCH] makes Travis not yell at marauders I don't know they worked
 fine /shrug

---
 .../antagonists/clockcult/clock_mobs/clockwork_marauder.dm    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
index fc8a3d61db..fcc1ace88e 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
@@ -36,6 +36,10 @@
 	var/shield_health = 3 //Amount of projectiles that can be deflected within
 	var/shield_health_regen = 0 //When world.time equals this, shield health will regenerate
 
+/mob/living/simple_animal/hostile/clockwork/marauder/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
+	return
+	..()
+
 /mob/living/simple_animal/hostile/clockwork/marauder/examine_info()
 	if(!shield_health)
 		return "<span class='warning'>Its shield has been destroyed!</span>"