Revert "Revert "Emergency communications hotfix""

This reverts commit 3ea36839a8.
This commit is contained in:
Markolie
2015-02-20 17:59:07 +01:00
parent d8d1670b68
commit c89e3ac1eb
17 changed files with 185 additions and 232 deletions
+6 -7
View File
@@ -144,14 +144,13 @@
proc/set_frequency(new_frequency)
if(!radio_controller)
sleep(20)
if(!radio_controller)
spawn(20)
if(!radio_controller)
return
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
return
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
return
// Embedded signaller used in anomalies.
/obj/item/device/assembly/signaler/anomaly
+1 -1
View File
@@ -33,7 +33,7 @@
if(!holder) return
prefs.toggles ^= CHAT_RADIO
prefs.save_preferences(src)
usr << "You will [(prefs.toggles & CHAT_RADIO) ? "no longer" : "now"] see radio chatter from radios or speakers"
usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers"
feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/toggleadminhelpsound()
+1 -1
View File
@@ -342,7 +342,7 @@
//I'm not sure how much of this is necessary, but I would rather avoid issues.
if(istype(card.loc,/mob))
var/mob/holder = card.loc
holder.drop_from_inventory(card)
holder.unEquip(card)
else if(istype(card.loc,/obj/item/clothing/suit/space/space_ninja))
var/obj/item/clothing/suit/space/space_ninja/holder = card.loc
holder.pai = null