mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Push sparks lag to GC this should greatly reduce lags.
Test: 20 emitters shooting for 10 minutes. No lag. Along with other various tests. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5757 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
committed by
Spamcat
parent
715bb679e6
commit
8203e7dced
@@ -30,6 +30,10 @@ would spawn and follow the beaker, even if it is carried or thrown.
|
||||
mouse_opacity = 0
|
||||
var/amount = 8.0
|
||||
|
||||
/obj/effect/effect/proc/delete()
|
||||
loc = null
|
||||
return
|
||||
|
||||
|
||||
/obj/effect/effect/water/New()
|
||||
..()
|
||||
@@ -37,7 +41,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
|
||||
//if (istype(T, /turf))
|
||||
// T.firelevel = 0 //TODO: FIX
|
||||
spawn( 70 )
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
return
|
||||
|
||||
@@ -54,7 +58,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
|
||||
// T.firelevel = 0 //TODO: FIX
|
||||
if (--src.life < 1)
|
||||
//SN src = null
|
||||
del(src)
|
||||
delete()
|
||||
if(newloc.density)
|
||||
return 0
|
||||
.=..()
|
||||
@@ -132,7 +136,7 @@ steam.start() -- spawns the effect
|
||||
sleep(5)
|
||||
step(steam,direction)
|
||||
spawn(20)
|
||||
del(steam)
|
||||
steam.delete()
|
||||
|
||||
/////////////////////////////////////////////
|
||||
//SPARK SYSTEM (like steam system)
|
||||
@@ -155,7 +159,7 @@ steam.start() -- spawns the effect
|
||||
if (istype(T, /turf))
|
||||
T.hotspot_expose(1000,100)
|
||||
spawn (100)
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
|
||||
/obj/effect/effect/sparks/Del()
|
||||
@@ -204,7 +208,7 @@ steam.start() -- spawns the effect
|
||||
sleep(5)
|
||||
step(sparks,direction)
|
||||
spawn(20)
|
||||
del(sparks)
|
||||
sparks.delete()
|
||||
src.total_sparks--
|
||||
|
||||
|
||||
@@ -231,7 +235,7 @@ steam.start() -- spawns the effect
|
||||
/obj/effect/effect/harmless_smoke/New()
|
||||
..()
|
||||
spawn (100)
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
|
||||
/obj/effect/effect/harmless_smoke/Move()
|
||||
@@ -275,7 +279,7 @@ steam.start() -- spawns the effect
|
||||
sleep(10)
|
||||
step(smoke,direction)
|
||||
spawn(75+rand(10,30))
|
||||
del(smoke)
|
||||
smoke.delete()
|
||||
src.total_smoke--
|
||||
|
||||
|
||||
@@ -298,7 +302,7 @@ steam.start() -- spawns the effect
|
||||
/obj/effect/effect/bad_smoke/New()
|
||||
..()
|
||||
spawn (200+rand(10,30))
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
|
||||
/obj/effect/effect/bad_smoke/Move()
|
||||
@@ -375,7 +379,7 @@ steam.start() -- spawns the effect
|
||||
sleep(10)
|
||||
step(smoke,direction)
|
||||
spawn(150+rand(10,30))
|
||||
del(smoke)
|
||||
smoke.delete()
|
||||
src.total_smoke--
|
||||
|
||||
|
||||
@@ -402,7 +406,7 @@ steam.start() -- spawns the effect
|
||||
R.my_atom = src
|
||||
|
||||
spawn (200+rand(10,30))
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
|
||||
/obj/effect/effect/chem_smoke/Move()
|
||||
@@ -504,7 +508,7 @@ steam.start() -- spawns the effect
|
||||
sleep(10)
|
||||
step(smoke,direction)
|
||||
spawn(150+rand(10,30))
|
||||
del(smoke)
|
||||
smoke.delete()
|
||||
src.total_smoke--
|
||||
|
||||
|
||||
@@ -528,7 +532,7 @@ steam.start() -- spawns the effect
|
||||
/obj/effect/effect/sleep_smoke/New()
|
||||
..()
|
||||
spawn (200+rand(10,30))
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
|
||||
/obj/effect/effect/sleep_smoke/Move()
|
||||
@@ -599,7 +603,7 @@ steam.start() -- spawns the effect
|
||||
sleep(10)
|
||||
step(smoke,direction)
|
||||
spawn(150+rand(10,30))
|
||||
del(smoke)
|
||||
smoke.delete()
|
||||
src.total_smoke--
|
||||
|
||||
/////////////////////////////////////////////
|
||||
@@ -727,7 +731,7 @@ steam.start() -- spawns the effect
|
||||
flick("ion_fade", I)
|
||||
I.icon_state = "blank"
|
||||
spawn( 20 )
|
||||
del(I)
|
||||
I.delete()
|
||||
spawn(2)
|
||||
if(src.on)
|
||||
src.processing = 1
|
||||
@@ -772,7 +776,7 @@ steam.start() -- spawns the effect
|
||||
src.oldposition = get_turf(holder)
|
||||
I.dir = src.holder.dir
|
||||
spawn(10)
|
||||
del(I)
|
||||
I.delete()
|
||||
src.number--
|
||||
spawn(2)
|
||||
if(src.on)
|
||||
@@ -826,7 +830,7 @@ steam.start() -- spawns the effect
|
||||
|
||||
flick("[icon_state]-disolve", src)
|
||||
sleep(5)
|
||||
del(src)
|
||||
delete()
|
||||
return
|
||||
|
||||
// on delete, transfer any reagents to the floor
|
||||
@@ -872,7 +876,7 @@ steam.start() -- spawns the effect
|
||||
flick("[icon_state]-disolve", src)
|
||||
|
||||
spawn(5)
|
||||
del(src)
|
||||
delete()
|
||||
|
||||
|
||||
/obj/effect/effect/foam/HasEntered(var/atom/movable/AM)
|
||||
|
||||
Reference in New Issue
Block a user