Merge pull request #3267 from Cheridan/Singu

Improved Singularity Ex_act()
This commit is contained in:
Razharas
2014-04-02 16:52:15 -07:00
@@ -54,21 +54,22 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/blob_act(severity)
return
/obj/machinery/singularity/ex_act(severity)
switch(severity)
if(1.0)
if(prob(25))
investigate_log("has been destroyed by an explosion.","singulo")
if(current_size <= 3)
investigate_log("has been destroyed by a heavy explosion.","singulo")
qdel(src)
return
else
energy += 50
if(2.0 to 3.0)
energy += round((rand(20,60)/2),1)
return
energy -= round(((energy+1)/2),1)
if(2.0)
energy -= round(((energy+1)/3),1)
if(3.0)
energy -= round(((energy+1)/4),1)
return
/obj/machinery/singularity/bullet_act(obj/item/projectile/P)
return 0 //Will there be an impact? Who knows. Will we see it? No.