From bc3302cc25bdd876fe7efb88de7624c597dae971 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 22 Sep 2024 16:25:00 +1000 Subject: [PATCH] Revert "fix ERT radio access" --- code/modules/admin/verbs/modify_robot.dm | 4 ++-- .../modules/mob/living/silicon/robot/robot_modules/station.dm | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm index 9a5c937028..540cc26d30 100644 --- a/code/modules/admin/verbs/modify_robot.dm +++ b/code/modules/admin/verbs/modify_robot.dm @@ -229,7 +229,7 @@ var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to add", "Channels", available_channels) if(!selected_radio_channel || selected_radio_channel == "Cancel") break - if(selected_radio_channel == CHANNEL_SPECIAL_OPS || selected_radio_channel == CHANNEL_RESPONSE_TEAM) + if(selected_radio_channel == CHANNEL_SPECIAL_OPS) target.radio.centComm = 1 if(selected_radio_channel == CHANNEL_RAIDER) qdel(target.radio.keyslot) @@ -249,7 +249,7 @@ var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to remove", "Channels", target.radio.channels) if(!selected_radio_channel || selected_radio_channel == "Cancel") break - if(selected_radio_channel == CHANNEL_SPECIAL_OPS || selected_radio_channel == CHANNEL_RESPONSE_TEAM && !(target.module.channels[CHANNEL_SPECIAL_OPS] || target.module.channels[CHANNEL_RESPONSE_TEAM])) + if(selected_radio_channel == CHANNEL_SPECIAL_OPS) target.radio.centComm = 0 target.module.channels -= selected_radio_channel if((selected_radio_channel == CHANNEL_MERCENARY || selected_radio_channel == CHANNEL_RAIDER) && !(target.module.channels[CHANNEL_RAIDER] || target.module.channels[CHANNEL_MERCENARY])) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 64c70cea71..3605dd4b99 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -751,7 +751,6 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/security/combat name = "combat robot module" hide_on_manifest = TRUE - channels = list(CHANNEL_SECURITY = 1, CHANNEL_RESPONSE_TEAM = 1) supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade) /obj/item/weapon/robot_module/robot/security/combat/create_equipment(var/mob/living/silicon/robot/robot) @@ -770,7 +769,6 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/device/dogborg/sleeper/K9/ert(src) src.modules += new /obj/item/weapon/dogborg/pounce(src) - robot.radio.centComm = 1 /* Drones */