From b9db5ff1756a9a9b4b5fe34cd5270c2aa811d632 Mon Sep 17 00:00:00 2001
From: ProbablyCarl <Stats-and-tracks@hotmail.com>
Date: Sun, 15 May 2022 06:54:07 -0400
Subject: [PATCH] ready

---
 code/game/objects/items/devices/radio/radio.dm    |  6 ++++++
 .../mob/living/silicon/robot/robot_modules.dm     |  4 ++++
 .../game/objects/items/devices/radio/radio.dm     |  2 ++
 .../mob/living/silicon/robot/robot_modules.dm     | 15 ++++++---------
 tgstation.dme                                     |  1 +
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 hyperstation/code/game/objects/items/devices/radio/radio.dm

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 7b6b6edc5..adcffbc80 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -67,6 +67,12 @@
 			syndie = TRUE
 		if(keyslot.independent)
 			independent = TRUE
+	//Skyrat edit start
+	if(extra_channels)
+		for(var/ch_name in extra_channels)
+			if(!(ch_name in channels))
+				channels[ch_name] = extra_channels[ch_name]
+	//Skyrat edit end
 
 	for(var/ch_name in channels)
 		secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 1148d6692..8cb24c86e 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -200,6 +200,10 @@
 	INVOKE_ASYNC(RM, .proc/do_transform_animation)
 	SEND_SIGNAL(R, COMSIG_CYBORG_MODULE_CHANGE)	//hyperstation edit
 	qdel(src)
+	//Skyrat change start
+	R.radio.extra_channels = RM.added_channels
+	R.radio.recalculateChannels()
+	//Skyrat change stop
 	return RM
 
 /obj/item/robot_module/proc/be_transformed_to(obj/item/robot_module/old_module)
diff --git a/hyperstation/code/game/objects/items/devices/radio/radio.dm b/hyperstation/code/game/objects/items/devices/radio/radio.dm
new file mode 100644
index 000000000..67ea054ff
--- /dev/null
+++ b/hyperstation/code/game/objects/items/devices/radio/radio.dm
@@ -0,0 +1,2 @@
+/obj/item/radio
+	var/list/extra_channels = list() //Allows indivudal channels, used for borgs
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
index ac16040a5..39684f180 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -10,6 +10,9 @@
 /mob/living/silicon/robot/modules/borgi
 	set_module = /obj/item/robot_module/borgi
 
+/mob/living/silicon/robot/modules/orepup
+	set_module = /obj/item/robot_module/orepup
+
 /mob/living/silicon/robot/proc/get_cit_modules()
 	var/list/modulelist = list()
 	modulelist["MediHound"] = /obj/item/robot_module/medihound
@@ -17,6 +20,7 @@
 		modulelist["Security K-9"] = /obj/item/robot_module/k9
 	modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
 	modulelist["Borgi"] = /obj/item/robot_module/borgi
+	modulelist["Orepup"] = /obj/item/robot_module/orepup
 	return modulelist
 
 /obj/item/robot_module
@@ -282,7 +286,7 @@
 		/obj/item/clockwork/weapon/ratvarian_spear,
 		/obj/item/borg/sight/xray/truesight_lens)
 	cyborg_base_icon = "blade"
-	moduleselect_icon = "blade"
+	moduleselect_icon = "miner"
 	sleeper_overlay = "bladesleeper"
 	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 	has_snowflake_deadsprite = TRUE
@@ -293,7 +297,7 @@
 	var/static/list/orepup_models
 	if(!orepup_models)
 		orepup_models = list(
-		"blade" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "medihound"),
+		"blade" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "blade"),
 		"vale" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "valemine")
 		)
 		orepup_models = sortList(orepup_models)
@@ -309,13 +313,6 @@
 			has_snowflake_deadsprite = TRUE
 	return ..()
 
-/obj/item/robot_module/orepup/do_transform_animation()
-	var/mob/living/silicon/robot/R = loc
-	R.cut_overlays()
-	R.setDir(SOUTH)
-	do_transform_delay()
-	R.update_headlamp()
-
 /obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
 	var/static/list/med_models
diff --git a/tgstation.dme b/tgstation.dme
index 41f9eb284..673aeb411 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3115,6 +3115,7 @@
 #include "hyperstation\code\game\objects\items\coconutcannon.dm"
 #include "hyperstation\code\game\objects\items\cosmetics.dm"
 #include "hyperstation\code\game\objects\items\lovedice.dm"
+#include "hyperstation\code\game\objects\items\devices\radio\radio.dm"
 #include "hyperstation\code\game\objects\items\stacks\tiles\tile_types.dm"
 #include "hyperstation\code\game\objects\items\storage\big_bag.dm"
 #include "hyperstation\code\game\objects\structures\bench.dm"