From d31d2d71a061cd3d3f2b99a05d918ac79dcbbc45 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 19 Oct 2018 14:51:58 +0200 Subject: [PATCH] src removal --- .../objects/items/devices/radio/headset.dm | 34 +++++++++---------- .../objects/items/devices/radio/intercom.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 24 ++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index a3b3fa8867c..c9463977cc2 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -353,47 +353,47 @@ /obj/item/radio/headset/proc/recalculateChannels(var/setDescription = 0) - src.channels = list() - src.translate_binary = 0 - src.translate_hive = 0 - src.syndiekey = null + channels = list() + translate_binary = 0 + translate_hive = 0 + syndiekey = null if(keyslot1) for(var/ch_name in keyslot1.channels) - if(ch_name in src.channels) + if(ch_name in channels) continue - src.channels += ch_name - src.channels[ch_name] = keyslot1.channels[ch_name] + channels += ch_name + channels[ch_name] = keyslot1.channels[ch_name] if(keyslot1.translate_binary) - src.translate_binary = 1 + translate_binary = 1 if(keyslot1.translate_hive) - src.translate_hive = 1 + translate_hive = 1 if(keyslot1.syndie) - src.syndiekey = keyslot1 + syndiekey = keyslot1 if(keyslot2) for(var/ch_name in keyslot2.channels) - if(ch_name in src.channels) + if(ch_name in channels) continue - src.channels += ch_name - src.channels[ch_name] = keyslot2.channels[ch_name] + channels += ch_name + channels[ch_name] = keyslot2.channels[ch_name] if(keyslot2.translate_binary) - src.translate_binary = 1 + translate_binary = 1 if(keyslot2.translate_hive) - src.translate_hive = 1 + translate_hive = 1 if(keyslot2.syndie) - src.syndiekey = keyslot2 + syndiekey = keyslot2 for(var/ch_name in channels) if(!radio_controller) - src.name = "broken radio headset" + name = "broken radio headset" return secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index ee7488fdd35..a351e4c3841 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -129,7 +129,7 @@ if(isnull(position) || !(position.z in level)) return -1 if(freq in ANTAG_FREQS) - if(!(src.syndiekey)) + if(!(syndiekey)) return -1//Prevents broadcast of messages over devices lacking the encryption return canhear_range diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index a5fd279bb0d..3cbb35e8da1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -730,32 +730,32 @@ var/global/list/default_medbay_channels = list( return /obj/item/radio/borg/proc/recalculateChannels() - src.channels = list() - src.syndiekey = null + channels = list() + syndiekey = null - var/mob/living/silicon/robot/D = src.loc + var/mob/living/silicon/robot/D = loc if(D.module) for(var/ch_name in D.module.channels) - if(ch_name in src.channels) + if(ch_name in channels) continue - src.channels += ch_name - src.channels[ch_name] += D.module.channels[ch_name] + channels += ch_name + channels[ch_name] += D.module.channels[ch_name] if(keyslot) for(var/ch_name in keyslot.channels) - if(ch_name in src.channels) + if(ch_name in channels) continue - src.channels += ch_name - src.channels[ch_name] += keyslot.channels[ch_name] + channels += ch_name + channels[ch_name] += keyslot.channels[ch_name] if(keyslot.syndie) - src.syndiekey = keyslot + syndiekey = keyslot - for(var/ch_name in src.channels) + for(var/ch_name in channels) if(!radio_controller) sleep(30) // Waiting for the radio_controller to be created. if(!radio_controller) - src.name = "broken radio" + name = "broken radio" return secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)