diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b723da353f..f7e34fe47d 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -1,25 +1,28 @@ // Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't +//VOREStation Edit Start - Updating this for Virgo var/global/list/default_internal_channels = list( num2text(PUB_FREQ) = list(), - num2text(AI_FREQ) = list(access_synth), num2text(ENT_FREQ) = list(), + num2text(AI_FREQ) = list(access_synth), num2text(ERT_FREQ) = list(access_cent_specops), num2text(COMM_FREQ)= list(access_heads), num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics), - num2text(MED_FREQ) = list(access_medical_equip), - num2text(MED_I_FREQ)=list(access_medical_equip), + num2text(MED_FREQ) = list(access_medical), + num2text(MED_I_FREQ)=list(access_medical), num2text(SEC_FREQ) = list(access_security), num2text(SEC_I_FREQ)=list(access_security), - num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), - num2text(SUP_FREQ) = list(access_cargo), - num2text(SRV_FREQ) = list(access_janitor, access_hydroponics) + num2text(SCI_FREQ) = list(access_research), + num2text(SUP_FREQ) = list(access_cargo, access_mining), + num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), + num2text(EXP_FREQ) = list(access_pilot, access_explorer, access_rd) ) var/global/list/default_medbay_channels = list( num2text(PUB_FREQ) = list(), - num2text(MED_FREQ) = list(access_medical_equip), - num2text(MED_I_FREQ) = list(access_medical_equip) + num2text(MED_FREQ) = list(), + num2text(MED_I_FREQ) = list() ) +//VOREStation Edit End /obj/item/device/radio icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit diff --git a/code/game/objects/items/devices/radio/radio_vr.dm b/code/game/objects/items/devices/radio/radio_vr.dm index 00bc5fca70..e546a62298 100644 --- a/code/game/objects/items/devices/radio/radio_vr.dm +++ b/code/game/objects/items/devices/radio/radio_vr.dm @@ -1,6 +1,22 @@ +/obj/item/device/radio/phone + subspace_transmission = 1 + canhear_range = 0 + adhoc_fallback = TRUE + /obj/item/device/radio var/bluespace_radio = FALSE +/obj/item/device/radio/emergency + name = "Medbay Emergency Radio Link" + icon_state = "med_walkietalkie" + frequency = MED_I_FREQ + subspace_transmission = 1 + adhoc_fallback = TRUE + +/obj/item/device/radio/emergency/New() + ..() + internal_channels = default_medbay_channels.Copy() + //Pathfinder's Subspace Radio /obj/item/device/subspaceradio name = "subspace radio" diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 2f3d16e25a..b7c6a77749 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -13773,11 +13773,7 @@ "aGx" = ( /obj/structure/table/glass, /obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/radio{ - frequency = 1487; - icon_state = "med_walkietalkie"; - name = "Medbay Emergency Radio Link" - }, +/obj/item/device/radio/emergency, /obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) @@ -14750,14 +14746,7 @@ /area/engineering/atmos/processing) "aJj" = ( /obj/structure/table/glass, -/obj/item/device/radio{ - anchored = 1; - broadcasting = 0; - canhear_range = 1; - frequency = 1487; - icon = 'icons/obj/items.dmi'; - icon_state = "red_phone"; - listening = 1; +/obj/item/device/radio/phone/medbay{ name = "Medical Emergency Phone" }, /obj/machinery/atmospherics/unary/vent_pump/on{