more de-referencing

This commit is contained in:
Fox-McCloud
2015-10-12 04:18:49 -04:00
parent 81cfcd7af3
commit 46f9f68f31
9 changed files with 20 additions and 7 deletions
+2
View File
@@ -109,7 +109,9 @@
/obj/machinery/bot/Destroy()
aibots -= src
qdel(Radio)
Radio = null
qdel(botcard)
botcard = null
return ..()
/obj/machinery/bot/proc/add_to_beacons(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
+3
View File
@@ -82,6 +82,9 @@ var/global/mulebot_count = 0
unload(0)
qdel(wires)
wires = null
if(cell)
qdel(cell)
cell = null
return ..()
// attack by item
+2
View File
@@ -116,6 +116,8 @@
recharge_console.voltage = MC * 10
/obj/machinery/mech_bay_recharge_port/Destroy()
qdel(pr_recharger)
pr_recharger = null
recharge_console.recharge_port = null
recharge_floor.recharge_port = null
return ..()
@@ -25,10 +25,13 @@
/obj/item/weapon/flamethrower/Destroy()
if(weldtool)
qdel(weldtool)
weldtool = null
if(igniter)
qdel(igniter)
igniter = null
if(ptank)
qdel(ptank)
ptank = null
return ..()
@@ -15,6 +15,7 @@
Destroy()
qdel(smoke)
smoke = null
return ..()
prime()
@@ -1,4 +1,4 @@
/obj/machinery/power/supermatter
/obj/machinery/power/supermatter_shard
description_info = "When energized by a laser (or something hitting it), it emits radiation and heat. If the heat reaches above 7000 kelvin, it will send an alert and start taking damage. \
After integrity falls to zero percent, it will delaminate, causing a massive explosion, station-wide radiation spikes, and hallucinations. \
Supermatter reacts badly to oxygen in the atmosphere. It'll also heat up really quick if it is in vacuum.<br>\
@@ -161,7 +161,7 @@
..()
qdel(src)
/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy()
/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy() //Seriously, what the actual hell.
//some random debris left behind
if(has_loot)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -45,6 +45,7 @@
/obj/singularity/Destroy()
processing_objects.Remove(src)
singularities -= src
target = null
return ..()
/obj/singularity/Move(atom/newloc, direct)
@@ -72,6 +72,7 @@
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", "supermatter")
qdel(radio)
radio = null
return ..()
/obj/machinery/power/supermatter_shard/proc/explode()
@@ -233,7 +234,7 @@
/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob)
ui_interact(user)
/obj/machinery/power/supermatter_shard/attack_ghost(mob/user as mob)
ui_interact(user)
@@ -242,16 +243,16 @@
"<span class=\"danger\">You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"</span>",\
"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
Consume(user)
/obj/machinery/power/supermatter_shard/proc/get_integrity()
var/integrity = damage / explosion_point
integrity = round(100 - integrity * 100)
integrity = integrity < 0 ? 0 : integrity
return integrity
// This is purely informational UI that may be accessed by AIs or robots
/obj/machinery/power/supermatter_shard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
var/data[0]