cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 18:46:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16346 from VOREStation/revert-16343-ERT

Browse Source 
Revert "fix ERT radio access"
This commit is contained in:
Heroman3003
2024-09-22 16:31:41 +10:00
committed by GitHub
parent 2083ba6fe4 bc3302cc25
commit d69ac57316
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/modify_robot.dm
+2 -2
View File
@@ -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]))
code/modules/mob/living/silicon/robot/robot_modules/station.dm
-2
View File
@@ -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 */