From 5541395022f7b78fee6c0b19f9331664a5e96fe3 Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Mon, 29 Jan 2018 22:33:12 +0200
Subject: [PATCH 1/2] Merge pull request #35047 from
 ShizCalev/servant_blocker-bomb

Fixes being able to bomb servant blockers
---
 code/game/gamemodes/clock_cult/clock_effect.dm                 | 2 +-
 .../game/gamemodes/clock_cult/clock_effects/servant_blocker.dm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/gamemodes/clock_cult/clock_effect.dm b/code/game/gamemodes/clock_cult/clock_effect.dm
index 10abf4e68b..b9de95b030 100644
--- a/code/game/gamemodes/clock_cult/clock_effect.dm
+++ b/code/game/gamemodes/clock_cult/clock_effect.dm
@@ -8,7 +8,7 @@
 	anchored = TRUE
 	density = FALSE
 	opacity = 0
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
 
 /obj/effect/clockwork/Initialize()
 	. = ..()
diff --git a/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm b/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm
index ee49c0e2c1..86ca217dda 100644
--- a/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm
+++ b/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm
@@ -39,3 +39,6 @@
 
 /obj/effect/clockwork/servant_blocker/singularity_pull()
 	return
+
+/obj/effect/clockwork/servant_blocker/ex_act(severity, target)
+	return