From 3eae0d5101817daa90c37af7b76554d51313c5fa Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 25 Sep 2015 10:40:05 +0200 Subject: [PATCH] Destroy tweaks. Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091. Adds returns in Destroy()s, to prepare for future return values. --- code/game/objects/items/devices/radio/headset.dm | 2 +- code/game/objects/items/devices/radio/radio.dm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index d963080face..fad3e6731a5 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -32,7 +32,7 @@ qdel(keyslot2) keyslot1 = null keyslot2 = null - ..() + return ..() /obj/item/device/radio/headset/list_channels(var/mob/user) return list_secure_channels() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 54ebfa85af0..b88f34ef519 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -32,7 +32,6 @@ var/global/list/default_medbay_channels = list( var/frequency = PUB_FREQ //common chat var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies var/canhear_range = 3 // the range which mobs can hear this radio from - var/obj/item/device/radio/patch_link = null var/datum/wires/radio/wires = null var/b_stat = 0 var/broadcasting = 0 @@ -71,7 +70,7 @@ var/global/list/default_medbay_channels = list( radio_controller.remove_object(src, frequency) for (var/ch_name in channels) radio_controller.remove_object(src, radiochannels[ch_name]) - ..() + return ..() /obj/item/device/radio/initialize()