From 19140f2cb2554ba2d12aada951a8fc44c71e7921 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 3 May 2018 09:40:31 -0400 Subject: [PATCH] Merge pull request #37620 from AutomaticFrenzy/patch/dominator Remove a leftover reference to the gang dominator --- code/modules/antagonists/revenant/revenant_abilities.dm | 4 ++-- code/modules/antagonists/swarmer/swarmer.dm | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index e3a068eed4..95ea189dde 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -290,7 +290,7 @@ unlock_amount = 200 action_icon_state = "malfunction" -//A note to future coders: do not replace this with an EMP because it will wreck malf AIs and gang dominators and everyone will hate you. +//A note to future coders: do not replace this with an EMP because it will wreck malf AIs and everyone will hate you. /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) @@ -312,7 +312,7 @@ new /obj/effect/temp_visual/revenant(human.loc) human.emp_act(EMP_HEAVY) for(var/obj/thing in T) - if(istype(thing, /obj/machinery/dominator) || istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery + if(istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes)) //Doesn't work on SMES and APCs, to prevent kekkery continue if(prob(20)) if(prob(50)) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 8a87191c0d..4d6887f3e8 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -302,10 +302,6 @@ to_chat(S, "This device's destruction would result in the extermination of everything in the area. Aborting.") return FALSE -/obj/machinery/dominator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This device is attempting to corrupt our entire network; attempting to interact with it is too risky. Aborting.") - return FALSE - /obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") return FALSE