Fixed a few runtimes

Blob mode updated slightly
Wizard smoke from his smoke spell will partly block lasers that go through it.
Going to try and test a diff way for the singularity to "del" items, might cause less lag, it will also eat absorb other singularities.
RD lost tech storage access, see http://nanotrasen.com/phpBB3/viewtopic.php?f=9&t=5991 for details


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2192 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-13 07:30:07 +00:00
parent 9b7afeb978
commit 81c68898ae
17 changed files with 595 additions and 88 deletions
+17 -5
View File
@@ -1,10 +1,9 @@
var/global/list/uneatable = list(
/obj/machinery/singularity,
/turf/space,
/obj/effects,
/obj/overlay,
/obj/decal/cleanable,
/obj/rune,
/obj/rune
)
/obj/machinery/singularity/
@@ -32,7 +31,7 @@ var/global/list/uneatable = list(
event_chance = 15 //Prob for event each tick
target = null //its target. moves towards the target if it has one
last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
teleport_del = 0
New(loc, var/starting_energy = 50, var/temp = 0)
src.energy = starting_energy
@@ -250,8 +249,21 @@ var/global/list/uneatable = list(
A:gib()
sleep(1)
else if(istype(A,/obj/))
A:ex_act(1.0)
if(A) del(A)
if(istype(A, /obj/machinery/singularity))//Welp now you did it
var/obj/machinery/singularity/S = A
src.energy += S.energy
del(S)
explosion(src.loc,20,25,30,40,1)
return//Quits here, the obj should be gone, hell we might be
if((teleport_del) && (!istype(A, /obj/machinery)))//Going to see if it does not lag less to tele items over to Z 2
var/obj/O = A
O.x = 2
O.y = 2
O.z = 2
else
A:ex_act(1.0)
if(A) del(A)
gain = 2
else if(isturf(A))
var/turf/T = A