From b30da1fa98aa95e4eb19f01c0ac94e3bceab5f67 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Sun, 1 Jan 2012 22:29:04 -0700
Subject: [PATCH] Some fixes and improvements.

---
 code/game/gamemodes/nuclear/nuclear.dm         | 14 +++++++-------
 code/game/objects/radio/radio.dm               |  4 +---
 code/modules/mob/living/carbon/human/emote.dm  |  4 ----
 code/modules/mob/living/silicon/robot/robot.dm |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 9795c495b66..a357e028e23 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -5,8 +5,8 @@
 /datum/game_mode/nuclear
 	name = "nuclear emergency"
 	config_tag = "nuclear"
-	required_players = 3
-	required_enemies = 2
+	required_players = 1
+	required_enemies = 1
 
 	var/const/agents_possible = 5 //If we ever need more syndicate agents.
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
@@ -206,17 +206,17 @@
 	return
 
 
-/datum/game_mode/proc/random_radio_frequency()
-	var/tempfreq = 1459
-	do
-		tempfreq = rand(1400,1600)
-	while(tempfreq in radiochannels || (tempfreq > 1441 && tempfreq < 1489))
+/datum/game_mode/proc/random_radio_frequency(var/tempfreq = 1459)
+	tempfreq = rand(1400,1600)
+	if(tempfreq in radiochannels || (tempfreq > 1441 && tempfreq < 1489))
+		random_radio_frequency(tempfreq)
 	return tempfreq
 
 /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob,radio_freq)
 	var/obj/item/device/radio/R = new /obj/item/device/radio/headset(synd_mob)
 	R.set_frequency(radio_freq)
 	R.freerange = 1
+	R.config(list("Nuclear" = 1))
 	synd_mob.equip_if_possible(R, synd_mob.slot_ears)
 	synd_mob.equip_if_possible(new /obj/item/clothing/under/syndicate(synd_mob), synd_mob.slot_w_uniform)
 	synd_mob.equip_if_possible(new /obj/item/clothing/shoes/black(synd_mob), synd_mob.slot_shoes)
diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm
index 472d51d9ecc..2787e9bacba 100644
--- a/code/game/objects/radio/radio.dm
+++ b/code/game/objects/radio/radio.dm
@@ -412,9 +412,7 @@
 			hear+=M
 	return hear
 
-/obj/item/device/radio/proc/borg(mob/user as mob, op)
-	if(!(issilicon(user)))
-		return
+/obj/item/device/radio/proc/config(op)
 	for (var/ch_name in channels)
 		radio_controller.remove_object(src, radiochannels[ch_name])
 	secure_radio_connections = new
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index aeb34d66ddd..6c906ea1b83 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -190,10 +190,6 @@
 			message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
 			m_type = 1
 
-		if ("struckdown")
-			message = "<B>[src]</B>, Station Dweller, has been struck down."
-			m_type = 2
-
 		if ("giggle")
 			if (!muzzled)
 				message = "<B>[src]</B> giggles."
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 0056bb2a90c..b05d23edeff 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -142,7 +142,7 @@
 			channels = list()
 
 	overlays -= "eyes" //Takes off the eyes that it started with
-	radio.borg(src, channels)
+	radio.config(channels)
 	updateicon()
 
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
@@ -959,7 +959,7 @@ Frequency:
 	icon_state = "robot"
 	updateicon()
 	channels = list()
-	radio.borg(src, channels)
+	radio.config(channels)
 	uneq_all()
 	del(module)