From be9723678e7c1f88817ac6f615aea6e0222b6fea Mon Sep 17 00:00:00 2001 From: Keate Senior Date: Thu, 23 Jul 2020 23:46:10 -0400 Subject: [PATCH] /probably/ gets Travis to stop shouting about guardians --- .../antagonists/clockcult/clock_mobs/clockwork_marauder.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index fcc1ace88e..bf81fbc999 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -164,6 +164,11 @@ Stay near your host to protect and heal them; being too far from your host will rapidly cause you massive damage. Recall to your host if you are too weak and believe you cannot continue \ fighting safely. As a final note, you should probably avoid harming any fellow servants of Ratvar." +/mob/living/simple_animal/hostile/clockwork/marauder/guardian/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum) + return + ..() + + /mob/living/simple_animal/hostile/clockwork/marauder/guardian/Initialize() . = ..() true_name = pick(possible_true_names)