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.
This commit is contained in:
PsiOmegaDelta
2015-11-22 21:42:27 -05:00
committed by Neerti
parent 2200bfe436
commit 3eae0d5101
2 changed files with 2 additions and 3 deletions
@@ -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()
@@ -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()