diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 71328bbab56..f270b5a214b 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -798,4 +798,16 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	dat+={"[text_wires()]</TT></body></html>"}
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")
+	return
+
+
+/obj/item/device/radio/proc/config(op)
+	if(radio_controller)
+		for (var/ch_name in channels)
+			radio_controller.remove_object(src, radiochannels[ch_name])
+	secure_radio_connections = new
+	channels = op
+	if(radio_controller)
+		for (var/ch_name in op)
+			secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
 	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index edaaa34e9e4..3cce88cde48 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -32,6 +32,7 @@
 	organs_by_name["r_hand"] = new/datum/organ/external/r_hand()
 	organs_by_name["l_foot"] = new/datum/organ/external/l_foot()
 	organs_by_name["r_foot"] = new/datum/organ/external/r_foot()
+	organs_by_name["groin"] = new/datum/organ/external/groin()
 
 	// connect feet to legs and hands to arms
 	var/datum/organ/external/organ = organs_by_name["l_hand"]
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index ee7f3fbf270..e3e8b0d823f 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -114,6 +114,7 @@
 	if(module)
 		return
 	var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service", "Security")
+	var/channels = list()
 	if(module)
 		return
 	switch(mod)
@@ -146,6 +147,7 @@
 			icon_state = "Miner"
 			modtype = "Miner"
 			feedback_inc("cyborg_miner",1)
+			channels = list("Mining" = 1)
 
 		if("Medical")
 			updatename(mod)
@@ -155,6 +157,7 @@
 			modtype = "Med"
 			nopush = 1
 			feedback_inc("cyborg_medical",1)
+			channels = list("Medical" = 1)
 
 		if("Security")
 			updatename(mod)
@@ -165,6 +168,7 @@
 			//speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary
 			nopush = 1
 			feedback_inc("cyborg_security",1)
+			channels = list("Security" = 1)
 
 		if("Engineering")
 			updatename(mod)
@@ -173,6 +177,7 @@
 			icon_state = "landmate"
 			modtype = "Eng"
 			feedback_inc("cyborg_engineering",1)
+			channels = list("Engineering" = 0)
 
 		if("Janitor")
 			updatename(mod)
@@ -183,6 +188,7 @@
 			feedback_inc("cyborg_janitor",1)
 
 	overlays -= "eyes" //Takes off the eyes that it started with
+	radio.config(channels)
 	updateicon()
 
 /mob/living/silicon/robot/proc/updatename(var/prefix as text)