Converts Most Destroys to use QDEL_NULL

This commit is contained in:
Fox-McCloud
2017-04-04 23:08:41 -04:00
parent ba8b1dae55
commit 5631d36ff8
121 changed files with 217 additions and 468 deletions
@@ -51,8 +51,7 @@
mob_hunt_server.red_terminal = null
if(mob_hunt_server.blue_terminal == src)
mob_hunt_server.blue_terminal = null
if(avatar)
qdel(avatar)
QDEL_NULL(avatar)
return ..()
/obj/machinery/computer/mob_battle_terminal/attackby(obj/item/O, mob/user)
+1 -2
View File
@@ -12,8 +12,7 @@
sparks.attach(src)
/obj/item/device/assembly/igniter/Destroy()
qdel(sparks)
sparks = null
QDEL_NULL(sparks)
return ..()
+1 -3
View File
@@ -255,9 +255,7 @@
/obj/effect/beam/i_beam/Destroy()
if(master.first == src)
master.first = null
if(next)
qdel(next)
next = null
QDEL_NULL(next)
if(previous)
previous.next = null
master.last = previous
+2 -4
View File
@@ -10,10 +10,8 @@
flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy()
qdel(part1)
part1 = null
qdel(part2)
part2 = null
QDEL_NULL(part1)
QDEL_NULL(part2)
return ..()
/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -18,6 +18,7 @@
if(water_timer)
deltimer(water_timer)
water_timer = null
return ..()
/obj/effect/waterfall/proc/drip()
var/obj/effect/effect/water/W = new(loc)
@@ -116,8 +116,7 @@
if(roomtimer)
deltimer(roomtimer)
roomtimer = null
qdel(card)
card = null
QDEL_NULL(card)
return ..()
/obj/machinery/door/unpowered/hotel_door/examine(mob/user)
@@ -220,9 +219,7 @@
vacant_rooms.Cut()
guests.Cut()
if(radio)
qdel(radio)
radio = null
QDEL_NULL(radio)
return ..()
+1 -2
View File
@@ -111,8 +111,7 @@
init(R)
/turf/unsimulated/floor/upperlevel/Destroy()
qdel(sensor)
sensor = null
QDEL_NULL(sensor)
return ..()
/turf/unsimulated/floor/upperlevel/proc/init(var/obj/effect/levelref/R)
@@ -70,9 +70,7 @@
update_icon()
/obj/item/clothing/gloves/color/yellow/stun/Destroy()
if(cell)
qdel(cell)
cell = null
QDEL_NULL(cell)
return ..()
/obj/item/clothing/gloves/color/yellow/stun/Touch(atom/A, proximity)
+2 -4
View File
@@ -165,10 +165,8 @@
M.unEquip(piece)
qdel(piece)
processing_objects -= src
qdel(wires)
wires = null
qdel(spark_system)
spark_system = null
QDEL_NULL(wires)
QDEL_NULL(spark_system)
return ..()
/obj/item/weapon/rig/proc/suit_is_deployed()
+1 -3
View File
@@ -10,9 +10,7 @@
..()
/obj/item/clothing/suit/hooded/Destroy()
if(hood)
qdel(hood)
hood = null
QDEL_NULL(hood)
return ..()
/obj/item/clothing/suit/hooded/proc/MakeHood()
+1 -2
View File
@@ -9,8 +9,7 @@
pockets.max_combined_w_class = 4
/obj/item/clothing/suit/storage/Destroy()
qdel(pockets)
pockets = null
QDEL_NULL(pockets)
return ..()
/obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
@@ -386,9 +386,7 @@
var/obj/item/weapon/card/id/access_id
/obj/item/clothing/accessory/petcollar/Destroy()
if(access_id)
qdel(access_id)
access_id = null
QDEL_NULL(access_id)
processing_objects -= src
return ..()
@@ -50,8 +50,7 @@
wires = new/datum/wires/smartfridge(src)
/obj/machinery/smartfridge/Destroy()
qdel(wires)
wires = null
QDEL_NULL(wires)
for(var/atom/movable/A in contents)
A.forceMove(loc)
return ..()
+2 -6
View File
@@ -31,12 +31,8 @@
RefreshParts()
/obj/machinery/biogenerator/Destroy()
if(beaker)
qdel(beaker)
beaker = null
if(files)
qdel(files)
files = null
QDEL_NULL(beaker)
QDEL_NULL(files)
return ..()
/obj/machinery/biogenerator/ex_act(severity)
+3 -9
View File
@@ -36,12 +36,8 @@
reagent_genes.Cut()
trait_genes.Cut()
target = null
if(seed)
qdel(seed)
seed = null
if(disk)
qdel(disk)
disk = null
QDEL_NULL(seed)
QDEL_NULL(disk)
return ..()
/obj/machinery/plantgenes/RefreshParts()
@@ -384,9 +380,7 @@
pixel_y = rand(-5, 5)
/obj/item/weapon/disk/plantgene/Destroy()
if(gene)
qdel(gene)
gene = null
QDEL_NULL(gene)
return ..()
/obj/item/weapon/disk/plantgene/attackby(obj/item/weapon/W, mob/user, params)
+1 -3
View File
@@ -40,9 +40,7 @@
add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/Destroy()
if(seed)
qdel(seed)
seed = null
QDEL_NULL(seed)
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/proc/add_juice()
+1 -3
View File
@@ -32,9 +32,7 @@
add_juice()
/obj/item/weapon/grown/Destroy()
if(seed)
qdel(seed)
seed = null
QDEL_NULL(seed)
return ..()
/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params)
+1 -3
View File
@@ -75,9 +75,7 @@
plant_hud_set_water()
/obj/machinery/hydroponics/Destroy()
if(myseed)
qdel(myseed)
myseed = null
QDEL_NULL(myseed)
return ..()
/obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params)
@@ -33,7 +33,7 @@
if(bag)
bag.loc = user
bag.attackby(W, user, params)
/obj/item/device/shared_storage/attack_self(mob/living/carbon/user)
if(!iscarbon(user))
return
@@ -116,7 +116,7 @@
H.adjustBruteLoss(20)
H.emote("scream")
..()*/
//Boat
/obj/vehicle/lavaboat
@@ -183,7 +183,7 @@
generic_pixel_y = 2
generic_pixel_x = 1
vehicle_move_delay = 1
// Wisp Lantern
/obj/item/device/wisp_lantern
name = "spooky lantern"
@@ -238,16 +238,16 @@
layer = ABOVE_ALL_MOB_LAYER
light_power = 1
light_range = 7
//Red/Blue Cubes
/obj/item/device/warp_cube
name = "blue cube"
desc = "A mysterious blue cube."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "blue_cube"
var/obj/item/device/warp_cube/linked
/obj/item/device/warp_cube/Destroy()
if(linked)
linked.linked = null
@@ -260,14 +260,14 @@
return
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
smoke.set_up(1, 0, user.loc)
smoke.set_up(1, 0, user.loc)
smoke.start()
user.forceMove(get_turf(linked))
feedback_add_details("warp_cube","[src.type]")
var/datum/effect/system/harmless_smoke_spread/smoke2 = new /datum/effect/system/harmless_smoke_spread()
smoke2.set_up(1, 0, user.loc)
smoke2.set_up(1, 0, user.loc)
smoke2.start()
/obj/item/device/warp_cube/red
@@ -281,7 +281,7 @@
var/obj/item/device/warp_cube/blue = new(src.loc)
linked = blue
blue.linked = src
//Meat Hook
/obj/item/weapon/gun/magic/hook
@@ -329,9 +329,9 @@
L.forceMove(get_turf(firer))
/obj/item/projectile/hook/Destroy()
qdel(chain)
QDEL_NULL(chain)
return ..()
//Immortality Talisman
/obj/item/device/immortality_talisman
+1
View File
@@ -226,6 +226,7 @@
/obj/item/device/mobcapsule/Destroy()
if(captured)
captured.ghostize()
qdel(captured)
captured = null
return ..()
+3 -4
View File
@@ -62,7 +62,7 @@
points = 1
refined_type = /obj/item/stack/sheet/glass
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/glass/basalt
name = "volcanic ash"
icon_state = "volcanic_sand"
@@ -163,8 +163,7 @@
var/datum/wires/explosive/gibtonite/wires
/obj/item/weapon/twohanded/required/gibtonite/Destroy()
qdel(wires)
wires = null
QDEL_NULL(wires)
return ..()
/obj/item/weapon/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params)
@@ -192,7 +191,7 @@
quality = 1
return
..()
/obj/item/weapon/twohanded/required/gibtonite/attack_ghost(mob/user)
if(wires)
wires.Interact(user)
+2 -6
View File
@@ -167,12 +167,8 @@
if(isrobot(loc))
var/mob/living/silicon/robot/borg = loc
borg.mmi = null
if(brainmob)
qdel(brainmob)
brainmob = null
if(held_brain)
qdel(held_brain)
held_brain = null
QDEL_NULL(brainmob)
QDEL_NULL(held_brain)
return ..()
/obj/item/device/mmi/syndie
@@ -123,7 +123,5 @@
icon_state = "scroll"
/obj/item/organ/internal/brain/Destroy() //copypasted from MMIs.
if(brainmob)
qdel(brainmob)
brainmob = null
QDEL_NULL(brainmob)
return ..()
+1 -1
View File
@@ -246,7 +246,7 @@ var/list/ai_verbs_default = list(
ai_list -= src
shuttle_caller_list -= src
shuttle_master.autoEvac()
qdel(eyeobj) // No AI, no Eye
QDEL_NULL(eyeobj) // No AI, no Eye
malfhack = null
return ..()
@@ -251,12 +251,10 @@ var/list/robot_verbs_default = list(
mmi = null
if(connected_ai)
connected_ai.connected_robots -= src
qdel(wires)
wires = null
qdel(module)
module = null
camera = null
cell = null
QDEL_NULL(wires)
QDEL_NULL(module)
QDEL_NULL(camera)
QDEL_NULL(cell)
return ..()
/mob/living/silicon/robot/proc/pick_module()
@@ -35,8 +35,7 @@
for(var/module in modules)
qdel(module)
modules.Cut()
qdel(emag)
emag = null
QDEL_NULL(emag)
return ..()
/obj/item/weapon/robot_module/proc/fix_modules()
@@ -169,14 +169,11 @@
/mob/living/simple_animal/bot/Destroy()
if(paicard)
ejectpai()
qdel(Radio)
Radio = null
qdel(access_card)
access_card = null
QDEL_NULL(Radio)
QDEL_NULL(access_card)
if(radio_controller && bot_filter)
radio_controller.remove_object(bot_core, control_freq)
qdel(bot_core)
bot_core = null
QDEL_NULL(bot_core)
return ..()
/mob/living/simple_animal/bot/death(gibbed)
@@ -263,7 +260,7 @@
interact(H)
else
return ..()
/mob/living/simple_animal/bot/attack_ghost(mob/M)
interact(M)
@@ -65,12 +65,8 @@
/mob/living/simple_animal/bot/mulebot/Destroy()
unload(0)
if(wires)
qdel(wires)
wires = null
if(cell)
qdel(cell)
cell = null
QDEL_NULL(wires)
QDEL_NULL(cell)
return ..()
/mob/living/simple_animal/bot/mulebot/proc/set_suffix(suffix)
@@ -295,8 +295,7 @@
queen = new(src)
/obj/item/queen_bee/Destroy()
qdel(queen)
queen = null
QDEL_NULL(queen)
return ..()
@@ -108,7 +108,7 @@ Difficulty: Hard
..()
/mob/living/simple_animal/hostile/megafauna/hierophant/Destroy()
qdel(spawned_rune)
QDEL_NULL(spawned_rune)
. = ..()
/mob/living/simple_animal/hostile/megafauna/hierophant/devour(mob/living/L)
@@ -43,7 +43,7 @@
mouse_opacity = 2 // Easier to click on in melee, they're giant targets anyway
/mob/living/simple_animal/hostile/megafauna/Destroy()
qdel(internal_gps)
QDEL_NULL(internal_gps)
. = ..()
/mob/living/simple_animal/hostile/megafauna/death(gibbed)
@@ -77,7 +77,7 @@
OpenFire()
else
devour(L)
/mob/living/simple_animal/hostile/megafauna/onShuttleMove()
var/turf/oldloc = loc
. = ..()
+1 -2
View File
@@ -444,8 +444,7 @@
if(assailant.client)
assailant.client.screen -= hud
assailant = null
qdel(hud)
hud = null
QDEL_NULL(hud)
return ..()
@@ -41,9 +41,7 @@ var/list/global_modular_computers = list()
global_modular_computers.Add(src)
/obj/machinery/modular_computer/Destroy()
if(cpu)
qdel(cpu)
cpu = null
QDEL_NULL(cpu)
return ..()
/obj/machinery/modular_computer/attack_ghost(mob/dead/observer/user)
@@ -18,8 +18,7 @@
/datum/computer_file/program/alarm_monitor/Destroy()
for(var/datum/alarm_handler/AH in alarm_handlers)
AH.unregister(src)
qdel(alarm_handlers)
alarm_handlers = null
QDEL_NULL(alarm_handlers)
return ..()
/datum/computer_file/program/alarm_monitor/proc/update_icon()
@@ -11,9 +11,7 @@
var/locked = FALSE
/obj/item/weapon/computer_hardware/ai_slot/Destroy()
if(stored_card)
qdel(stored_card)
stored_card = null
QDEL_NULL(stored_card)
return ..()
@@ -14,9 +14,7 @@
..()
/obj/item/weapon/computer_hardware/battery/Destroy()
if(battery)
qdel(battery)
battery = null
QDEL_NULL(battery)
return ..()
/obj/item/weapon/computer_hardware/battery/on_remove(obj/item/device/modular_computer/M, mob/living/user = null)
@@ -11,12 +11,8 @@
var/obj/item/weapon/card/id/stored_card2 = null
/obj/item/weapon/computer_hardware/card_slot/Destroy()
if(stored_card)
qdel(stored_card)
stored_card = null
if(stored_card2)
qdel(stored_card2)
stored_card2 = null
QDEL_NULL(stored_card)
QDEL_NULL(stored_card2)
return ..()
/obj/item/weapon/computer_hardware/card_slot/GetAccess()
+1 -2
View File
@@ -74,6 +74,5 @@
spark_system.attach(src)
/obj/item/weapon/katana/energy/Destroy()
qdel(spark_system)
spark_system = null
QDEL_NULL(spark_system)
return ..()
+2 -4
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/bureaucracy.dmi'
usesound = 'sound/items/Deconstruct.ogg'
var/icon_base
var/obj/displayed
@@ -198,9 +198,7 @@
verbs |= /obj/structure/sign/picture_frame/proc/tilt
/obj/structure/sign/picture_frame/Destroy()
if(frame)
qdel(frame)
frame = null
QDEL_NULL(frame)
return ..()
/obj/structure/sign/picture_frame/update_icon()
+2 -4
View File
@@ -440,7 +440,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
scanmode.scan_atom(A, user)
/obj/item/device/pda/proc/explode() //This needs tuning.
if(!detonate)
if(!detonate)
return
var/turf/T = get_turf(src.loc)
@@ -467,9 +467,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
for(var/A in programs)
qdel(A)
programs.Cut()
if(cartridge)
qdel(cartridge)
cartridge = null
QDEL_NULL(cartridge)
return ..()
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
+1 -3
View File
@@ -24,9 +24,7 @@
..()
/obj/item/weapon/cartridge/Destroy()
if(radio)
qdel(radio)
radio = null
QDEL_NULL(radio)
for(var/A in programs)
qdel(A)
programs.Cut()
+2 -5
View File
@@ -178,11 +178,8 @@
area.power_change()
if(occupier)
malfvacate(1)
qdel(wires)
wires = null
if(cell)
qdel(cell) // qdel
cell = null
QDEL_NULL(wires)
QDEL_NULL(cell)
if(terminal)
disconnect_terminal()
area.apc -= src
+1 -2
View File
@@ -52,8 +52,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/part/Destroy()
set_broken()
if(main_part)
qdel(main_part)
QDEL_NULL(main_part)
return ..()
//
@@ -30,8 +30,7 @@
/obj/machinery/particle_accelerator/control_box/Destroy()
if(active)
toggle_power()
qdel(wires)
wires = null
QDEL_NULL(wires)
return ..()
/obj/machinery/particle_accelerator/control_box/attack_ghost(user as mob)
@@ -72,9 +72,7 @@
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", "supermatter")
if(radio)
qdel(radio)
radio = null
QDEL_NULL(radio)
poi_list.Remove(src)
return ..()
+1 -2
View File
@@ -36,8 +36,7 @@
notify_ammo_count(user)
/obj/item/weapon/gun/throw/Destroy()
qdel(to_launch)
to_launch = null
QDEL_NULL(to_launch)
for(var/atom/A in loaded_projectiles)
qdel(A)
loaded_projectiles = null
@@ -93,9 +93,7 @@
return
/obj/machinery/reagentgrinder/Destroy()
if(beaker)
qdel(beaker)
beaker = null
QDEL_NULL(beaker)
return ..()
/obj/machinery/reagentgrinder/ex_act(severity)
+1 -3
View File
@@ -78,9 +78,7 @@
var/accepts_rig = 1
/obj/structure/reagent_dispensers/fueltank/Destroy()
if(rig)
qdel(rig)
rig = null
QDEL_NULL(rig)
return ..()
/obj/structure/reagent_dispensers/fueltank/bullet_act(obj/item/projectile/P)
+1 -3
View File
@@ -429,7 +429,5 @@
desc += " The package is not sealed."
/obj/item/shippingPackage/Destroy()
if(wrapped)
qdel(wrapped)
wrapped = null
QDEL_NULL(wrapped)
return ..()
+1 -2
View File
@@ -62,8 +62,7 @@ Note: Must be placed west/left of and R&D console to function.
reagents.my_atom = src
/obj/machinery/r_n_d/protolathe/Destroy()
qdel(materials)
materials = null
QDEL_NULL(materials)
return ..()
/obj/machinery/r_n_d/protolathe/RefreshParts()
+1 -3
View File
@@ -20,9 +20,7 @@
dir = EAST
/obj/structure/spacepod_frame/Destroy()
if(construct)
qdel(construct)
construct = null
QDEL_NULL(construct)
return ..()
/obj/structure/spacepod_frame/attackby(obj/item/W as obj, mob/user as mob, params)
+8 -16
View File
@@ -124,22 +124,14 @@
/obj/spacepod/Destroy()
if(equipment_system.cargo_system)
equipment_system.cargo_system.removed(null)
qdel(equipment_system)
equipment_system = null
qdel(cargo_hold)
cargo_hold = null
qdel(battery)
battery = null
qdel(cabin_air)
cabin_air = null
qdel(internal_tank)
internal_tank = null
qdel(pr_int_temp_processor)
pr_int_temp_processor = null
qdel(pr_give_air)
pr_give_air = null
qdel(ion_trail)
ion_trail = null
QDEL_NULL(equipment_system)
QDEL_NULL(cargo_hold)
QDEL_NULL(battery)
QDEL_NULL(cabin_air)
QDEL_NULL(internal_tank)
QDEL_NULL(pr_int_temp_processor)
QDEL_NULL(pr_give_air)
QDEL_NULL(ion_trail)
occupant_sanity_check()
if(pilot)
pilot.forceMove(get_turf(src))
@@ -150,8 +150,7 @@
var/obj/item/device/mmi/stored_mmi
/obj/item/organ/internal/brain/mmi_holder/Destroy()
if(stored_mmi)
qdel(stored_mmi)
QDEL_NULL(stored_mmi)
return ..()
/obj/item/organ/internal/brain/mmi_holder/insert(var/mob/living/target,special = 0)
+1 -3
View File
@@ -140,9 +140,7 @@
to_chat(user, "There are [round(rcell.charge/chargecost)] charge\s left.")
/obj/item/weapon/rcs/Destroy()
if(rcell)
qdel(rcell)
rcell = null
QDEL_NULL(rcell)
return ..()
/obj/item/weapon/rcs/attack_self(mob/user)