Last Few Destroy Fixes

This commit is contained in:
Fox-McCloud
2015-10-10 00:16:31 -04:00
parent 07770fdda7
commit ec10abc480
2 changed files with 23 additions and 32 deletions
+19 -29
View File
@@ -454,6 +454,11 @@ steam.start() -- spawns the effect
var/direction
var/obj/chemholder
Destroy()
qdel(chemholder)
chemholder = null
return ..()
New()
..()
chemholder = new/obj()
@@ -548,35 +553,6 @@ steam.start() -- spawns the effect
if(smoke) smoke.delete()
src.total_smoke--
// Goon compat.
/datum/effect/effect/system/chem_smoke_spread/fart
set_up(var/mob/M, n = 5, c = 0, loca, direct)
if(n > 20)
n = 20
number = n
cardinals = c
chemholder.reagents.add_reagent("space_drugs", rand(1,10))
if(istype(loca, /turf/))
location = loca
else
location = get_turf(loca)
if(direct)
direction = direct
var/contained = "\[[chemholder.reagents.get_reagent_ids()]\]"
var/area/A = get_area(location)
var/where = "[A.name] | [location.x], [location.y]"
var/whereLink=formatJumpTo(location,where)
var/more = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</a>)"
message_admins("[M][more] produced a toxic fart in ([whereLink])[contained].", 0, 1)
log_game("[M][more] produced a toxic fart in ([where])[contained].")
/////////////////////////////////////////////
// Sleep smoke
/////////////////////////////////////////////
@@ -777,6 +753,10 @@ steam.start() -- spawns the effect
var/processing = 1
var/on = 1
/datum/effect/effect/system/ion_trail_follow/Destroy()
oldposition = null
return ..()
/datum/effect/effect/system/ion_trail_follow/set_up(atom/atom)
attach(atom)
@@ -810,6 +790,12 @@ steam.start() -- spawns the effect
/datum/effect/effect/system/ion_trail_follow/space_trail
var/turf/oldloc // secondary ion trail loc
var/turf/currloc
/datum/effect/effect/system/ion_trail_follow/space_trail/Destroy()
oldloc = null
currloc = null
return ..()
/datum/effect/effect/system/ion_trail_follow/space_trail/start()
if(!src.on)
src.on = 1
@@ -870,6 +856,10 @@ steam.start() -- spawns the effect
var/processing = 1
var/on = 1
Destroy()
oldposition = null
return ..()
set_up(atom/atom)
attach(atom)
oldposition = get_turf(atom)