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

[MIRROR] Fixes Lord Singuloth hungering for more than he should
This commit is contained in:
deathride58
2017-11-24 23:15:09 +00:00
committed by GitHub
31 changed files with 386 additions and 219 deletions
+3
View File
@@ -252,6 +252,9 @@
/obj/effect/chrono_field/singularity_act()
return
/obj/effect/chrono_field/singularity_pull()
return
/obj/effect/chrono_field/ex_act()
return