cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sparks now qdel() cleanly.

Browse Source 
Also takes the opportunity to remove some exces /effect/ pathing.
This commit is contained in:
PsiOmegaDelta
2015-12-07 09:19:06 +01:00
parent 2383e5cdcb
commit d4173355c6
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system.dm
+9 -8
View File
@@ -94,30 +94,31 @@ steam.start() -- spawns the effect
// will always spawn at the items location.
/////////////////////////////////////////////
/obj/effect/effect/sparks
/obj/effect/sparks
name = "sparks"
icon_state = "sparks"
var/amount = 6.0
anchored = 1.0
mouse_opacity = 0
/obj/effect/effect/sparks/New()
/obj/effect/sparks/New()
..()
playsound(src.loc, "sparks", 100, 1)
var/turf/T = src.loc
if (istype(T, /turf))
T.hotspot_expose(1000,100)
spawn (100)
qdel(src)
return
/obj/effect/sparks/initialize()
..()
schedule_task_in(10 SECONDS, /proc/qdel, list(src))
/obj/effect/effect/sparks/Destroy()
/obj/effect/sparks/Destroy()
var/turf/T = src.loc
if (istype(T, /turf))
T.hotspot_expose(1000,100)
return ..()
/obj/effect/effect/sparks/Move()
/obj/effect/sparks/Move()
..()
var/turf/T = src.loc
if (istype(T, /turf))
@@ -145,7 +146,7 @@ steam.start() -- spawns the effect
spawn(0)
if(holder)
src.location = get_turf(holder)
var/obj/effect/effect/sparks/sparks = PoolOrNew(/obj/effect/effect/sparks, src.location)
var/obj/effect/sparks/sparks = PoolOrNew(/obj/effect/sparks, src.location)
src.total_sparks++
var/direction
if(src.cardinals)