Merge pull request #918 from Erthilo/master

Fixes security records not changing properly, welding healing shortsightedness, singularity not increasing beyond 5x5, singularity eating ghosts
This commit is contained in:
SkyMarshal
2012-04-25 13:19:22 -07:00
4 changed files with 6 additions and 5 deletions
@@ -36,7 +36,7 @@
toxmob(A)
if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/)))
A:energy += energy
energy = 0
// energy = 0 //This breaks the current singularity
if( istype(A,/obj/machinery/rust/particle_catcher) )
var/obj/machinery/rust/particle_catcher/collided_catcher = A
if(particle_type && particle_type != "neutron")
@@ -1,7 +1,8 @@
var/global/list/uneatable = list(
/turf/space,
/obj/effect/overlay,
/mob/aiEye
/mob/aiEye,
/mob/dead/observer // Stop ghosts being ate and not being able to get back to their bodies
)
/obj/machinery/singularity/