From 66bbd956b236c28c9397d34407fd337aa585b511 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 1 Jun 2017 00:16:43 -0500 Subject: [PATCH 1/5] tegir --- code/game/objects/items/devices/radio/radio.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index d324de69231..6de8ab9b98c 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -600,9 +600,9 @@ var/global/list/default_medbay_channels = list( /obj/item/device/radio/emp_act(severity) frequency = get_random_freq() - if(listening == 1) - visible_message("\The [src] screeches violently!") - + if(listening) + visible_message("[src] buzzes violently!") + broadcasting = 0 listening = 0 for(var/ch_name in channels) @@ -610,7 +610,7 @@ var/global/list/default_medbay_channels = list( ..() /obj/item/device/radio/proc/get_random_freq() - var/rand_freq = round(rand(1440, 1480), 10) + pick(1, 3, 5, 9) + var/rand_freq = round(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ - 9), 10) + pick(1, 3, 5, 9) return rand_freq /////////////////////////////// From e4bafed7dfe6e882a2e202ae876ea492a6f281a8 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 1 Jun 2017 11:36:40 -0500 Subject: [PATCH 2/5] rip-freq --- code/game/objects/items/devices/radio/radio.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 6de8ab9b98c..5798d77f890 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -599,7 +599,14 @@ var/global/list/default_medbay_channels = list( else return /obj/item/device/radio/emp_act(severity) - frequency = get_random_freq() + var/emp + on = 0 + emp++ + spawn(70) + emp-- + if(!emp) + on = 1 + if(listening) visible_message("[src] buzzes violently!") @@ -609,10 +616,6 @@ var/global/list/default_medbay_channels = list( channels[ch_name] = 0 ..() -/obj/item/device/radio/proc/get_random_freq() - var/rand_freq = round(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ - 9), 10) + pick(1, 3, 5, 9) - return rand_freq - /////////////////////////////// //////////Borg Radios////////// /////////////////////////////// From 90de04c77ba5524d8807fb3df423ebc9f9d5500a Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 1 Jun 2017 11:37:44 -0500 Subject: [PATCH 3/5] randomness --- code/game/objects/items/devices/radio/radio.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 5798d77f890..6fa955b461f 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -602,7 +602,7 @@ var/global/list/default_medbay_channels = list( var/emp on = 0 emp++ - spawn(70) + spawn(rand(100, 200)) emp-- if(!emp) on = 1 From 93c7b4c6c321b2bfe169d763404a7c7b2ff476b2 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 1 Jun 2017 13:38:53 -0500 Subject: [PATCH 4/5] faux --- code/game/objects/items/devices/radio/radio.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 6fa955b461f..3930192ba47 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -37,6 +37,7 @@ var/global/list/default_medbay_channels = list( var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h var/subspace_transmission = 0 var/syndie = 0//Holder to see if it's a syndicate encrpyed radio + var/emp = 0 //How many times this is affected by EMPs var/is_special = 0 //For electropacks mostly, skips Topic() checks @@ -599,13 +600,9 @@ var/global/list/default_medbay_channels = list( else return /obj/item/device/radio/emp_act(severity) - var/emp on = 0 emp++ - spawn(rand(100, 200)) - emp-- - if(!emp) - on = 1 + addtimer(src, "enable_radio", rand(100, 200)) if(listening) visible_message("[src] buzzes violently!") @@ -616,6 +613,12 @@ var/global/list/default_medbay_channels = list( channels[ch_name] = 0 ..() +/obj/item/device/radio/proc/enable_radio() + if(emp > 0) + emp-- + if(!emp) + on = 1 + /////////////////////////////// //////////Borg Radios////////// /////////////////////////////// From db378ae8a7bd9dcebb7a1f48a5e1147efce04d5a Mon Sep 17 00:00:00 2001 From: Chakirski Date: Thu, 1 Jun 2017 13:54:39 -0500 Subject: [PATCH 5/5] faux2.0 --- code/game/objects/items/devices/radio/radio.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 3930192ba47..3c9c0211663 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -37,7 +37,7 @@ var/global/list/default_medbay_channels = list( var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h var/subspace_transmission = 0 var/syndie = 0//Holder to see if it's a syndicate encrpyed radio - var/emp = 0 //How many times this is affected by EMPs + var/disable_timer = 0 //How many times this is disabled by EMPs var/is_special = 0 //For electropacks mostly, skips Topic() checks @@ -601,7 +601,7 @@ var/global/list/default_medbay_channels = list( /obj/item/device/radio/emp_act(severity) on = 0 - emp++ + disable_timer++ addtimer(src, "enable_radio", rand(100, 200)) if(listening) @@ -614,9 +614,9 @@ var/global/list/default_medbay_channels = list( ..() /obj/item/device/radio/proc/enable_radio() - if(emp > 0) - emp-- - if(!emp) + if(disable_timer > 0) + disable_timer-- + if(!disable_timer) on = 1 ///////////////////////////////