For qdel and Destroy Fixes

This commit is contained in:
Fox-McCloud
2017-04-03 19:06:20 -04:00
parent 8400db9e0f
commit fb02933f30
8 changed files with 49 additions and 37 deletions
+3 -1
View File
@@ -19,8 +19,10 @@
var/new_frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ))
aSignal.set_frequency(new_frequency)
poi_list |= src
/obj/effect/anomaly/Destroy()
if(aSignal)
QDEL_NULL(aSignal)
poi_list.Remove(src)
return ..()
+9 -2
View File
@@ -6,6 +6,11 @@
anchored = 1
density = 0
var/health = 15
var/master_commander = null
/obj/structure/spider/Destroy()
master_commander = null
return ..()
//similar to weeds, but only barfed out by nurses manually
/obj/structure/spider/ex_act(severity)
@@ -78,7 +83,6 @@
var/amount_grown = 0
var/player_spiders = 0
var/faction = list()
var/master_commander = null
/obj/structure/spider/eggcluster/New()
pixel_x = rand(3,-3)
@@ -110,7 +114,6 @@
var/travelling_in_vent = 0
var/player_spiders = 0
var/faction = list()
var/master_commander = null
var/selecting_player = 0
/obj/structure/spider/spiderling/New()
@@ -118,6 +121,10 @@
pixel_y = rand(6,-6)
processing_objects.Add(src)
/obj/structure/spider/spiderling/Destroy()
entry_vent = null
return ..()
/obj/structure/spider/spiderling/Bump(atom/user)
if(istype(user, /obj/structure/table))
src.loc = user.loc
@@ -271,7 +271,7 @@ var/global/list/default_medbay_channels = list(
/mob/living/automatedannouncer/Destroy()
if(lifetime_timer)
deltimer(lifetime_timer)
..()
return ..()
/mob/living/automatedannouncer/proc/autocleanup()
log_runtime(EXCEPTION("An announcer somehow managed to outlive the radio! Deleting!"), src, list("Message: '[message]'"))
@@ -5,7 +5,7 @@
icon_state = "dnainjector"
item_state = "dnainjector"
var/block = 0
var/datum/dna2/record/buf=null
var/datum/dna2/record/buf = null
throw_speed = 3
throw_range = 5
w_class = 1
@@ -26,6 +26,11 @@
buf.dna.ResetSE()
SetValue(value)
/obj/item/weapon/dnainjector/Destroy()
if(buf)
QDEL_NULL(buf)
return ..()
/obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock)
if(selblock==0)
return block