diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm index f64a7fbb450..f201488678b 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -131,11 +131,19 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) ui_interact(user) /obj/item/radio/AltClick(mob/user) - if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || !istype(user)) + if(!istype(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) return ToggleBroadcast() - to_chat(user, "You [broadcasting ? "enable" : "disable"] [src]'s hotmic!") + to_chat(user, "You [broadcasting ? "enable" : "disable"] [src]'s hotmic.") + add_fingerprint(user) + +/obj/item/radio/CtrlShiftClick(mob/user) + if(!istype(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) + return + + ToggleReception() + to_chat(user, "You [listening ? "enable" : "disable"] [src]'s speaker.") add_fingerprint(user) /obj/item/radio/ui_state(mob/user) @@ -541,15 +549,25 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) return null +/obj/item/radio/proc/show_examine_hotkeys() + . = list() + . += "Alt-Click to toggle [src]'s hotmic." + . += "Ctrl-Shift-Click to toggle [src]'s speaker." + /obj/item/radio/examine(mob/user) . = ..() - . += "Alt-Click to toggle [src]'s hotmic!" + . += show_examine_hotkeys() + if(in_range(src, user) || loc == user) if(b_stat) . += "\the [src] can be attached and modified!" else . += "\the [src] can not be modified or attached!" +/obj/item/radio/examine_more(mob/user) + . = ..() + . += "You can transmit messages from [src] without the hotmic by using :l or :r whilst holding it in your left or right hand." + /obj/item/radio/screwdriver_act(mob/user, obj/item/I) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 1439b9134c6..7cdd7ebbdf2 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -405,6 +405,15 @@ GLOBAL_LIST_EMPTY(world_uplinks) hidden_uplink = new(src) icon_state = "radio" +/obj/item/radio/uplink/AltClick() + return + +/obj/item/radio/uplink/CtrlShiftClick() + return + +/obj/item/radio/uplink/show_examine_hotkeys() + return list() + /obj/item/radio/uplink/attack_self(mob/user as mob) if(hidden_uplink) hidden_uplink.trigger(user)