cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3730 from Mloc/gc-

Browse Source 
Garbage collection for fire and explosive particles.
This commit is contained in:
Chinsky
2013-10-05 15:23:51 -07:00
parent 818bcf7668 4fa6316d39
commit 06df06a0a3
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/WorkInProgress/explosion_particles.dm
View File

@@ -1,5 +1,5 @@
/obj/effect/expl_particles /obj/effect/expl_particles
name = "fire" name = "explosive particles"
icon = 'icons/effects/effects.dmi' icon = 'icons/effects/effects.dmi'
icon_state = "explosion_particle" icon_state = "explosion_particle"
opacity = 1 opacity = 1
@@ -9,7 +9,7 @@
/obj/effect/expl_particles/New() /obj/effect/expl_particles/New()
..() ..()
spawn (15) spawn (15)
del(src) src.loc = null
return return
/obj/effect/expl_particles/Move() /obj/effect/expl_particles/Move()
@@ -37,7 +37,7 @@
step(expl,direct) step(expl,direct)
/obj/effect/explosion /obj/effect/explosion
name = "fire" name = "explosive particles"
icon = 'icons/effects/96x96.dmi' icon = 'icons/effects/96x96.dmi'
icon_state = "explosion" icon_state = "explosion"
opacity = 1 opacity = 1
@@ -49,7 +49,7 @@
/obj/effect/explosion/New() /obj/effect/explosion/New()
..() ..()
spawn (10) spawn (10)
del(src) src.loc = null
return return
/datum/effect/system/explosion /datum/effect/system/explosion

16
code/ZAS/Fire.dm
View File

@@ -80,7 +80,7 @@ obj
if(firelevel > vsc.IgnitionLevel) if(firelevel > vsc.IgnitionLevel)
var/turf/simulated/floor/S = loc var/turf/simulated/floor/S = loc
if(!S.zone) del src //Cannot exist where zones are broken. if(!S.zone) src.gc_del() //Cannot exist where zones are broken.
if(istype(S)) if(istype(S))
var var
@@ -139,17 +139,17 @@ obj
else else
del src src.gc_del()
S.assume_air(flow) //Then put it back where you found it. S.assume_air(flow) //Then put it back where you found it.
else else
del src src.gc_del()
else else
del src src.gc_del()
else else
del src src.gc_del()
for(var/mob/living/carbon/human/M in loc) for(var/mob/living/carbon/human/M in loc)
@@ -160,13 +160,17 @@ obj
..() ..()
if(!istype(loc, /turf)) if(!istype(loc, /turf))
del src src.gc_del()
dir = pick(cardinal) dir = pick(cardinal)
//sd_SetLuminosity(3,2,0) //sd_SetLuminosity(3,2,0)
firelevel = fl firelevel = fl
air_master.active_hotspots.Add(src) air_master.active_hotspots.Add(src)
proc/gc_del()
loc = null
air_master.active_hotspots.Remove(src)
Del() Del()
if (istype(loc, /turf/simulated)) if (istype(loc, /turf/simulated))
//sd_SetLuminosity(0) //sd_SetLuminosity(0)