Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025

[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
parent 38a7229bdd d04bbbdd67
commit 837779b683
31 changed files with 386 additions and 219 deletions
@@ -117,3 +117,9 @@
 		var/list/guardians = spawner.summoner.hasparasites()
 		for(var/para in guardians)
 			to_chat(para, "<span class='danger'><B>[AM] has crossed surveillance snare, [name].</span></B>")
+
+/obj/effect/snare/singularity_act()
+	return
+
+/obj/effect/snare/singularity_pull()
+	return