Merge pull request #5185 from Citadel-Station-13/upstream-merge-35047

[MIRROR] Fixes being able to bomb servant blockers
This commit is contained in:
LetterJay
2018-01-30 23:15:52 -06:00
committed by GitHub
2 changed files with 4 additions and 1 deletions
@@ -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()
. = ..()
@@ -39,3 +39,6 @@
/obj/effect/clockwork/servant_blocker/singularity_pull()
return
/obj/effect/clockwork/servant_blocker/ex_act(severity, target)
return