cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

src removal

Browse Source
This commit is contained in:
alex-gh
2018-10-19 14:51:58 +02:00
parent 6a4d878940
commit d31d2d71a0
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/headset.dm
+17 -17
View File
@@ -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)
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/radio/radio.dm
+12 -12
View File
@@ -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)