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

This reverts commit edd68c5174f1c3315373b52f59472b5500af7f19.
---
 .../antagonists/clockcult/clock_mobs/clockwork_marauder.dm    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
index bf81fbc999..ac4bb08cd2 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
@@ -36,10 +36,6 @@
 	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>"