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
@@ -51,6 +51,9 @@
 /obj/effect/accelerated_particle/ex_act(severity, target)
 	qdel(src)

+/obj/effect/accelerated_particle/singularity_pull()
+	return
+
 /obj/effect/accelerated_particle/proc/toxmob(mob/living/M)
 	M.rad_act(energy*6)