Adds Ctrl Shift Click to radio, fixes issue with uplink (#25637)

* Adds Ctrl Shift Click to radio, fixes issues with uplink & beacon

+ Review updates

* Review update 1
This commit is contained in:
dj-34
2024-05-28 01:22:37 +00:00
committed by GitHub
parent 094d7bd13b
commit 1508292b61
2 changed files with 30 additions and 3 deletions
@@ -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, "<span class='notice'>You <b>[broadcasting ? "enable" : "disable"]</b> [src]'s hotmic!</span>")
to_chat(user, "<span class='notice'>You <b>[broadcasting ? "enable" : "disable"]</b> [src]'s hotmic.</span>")
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, "<span class='notice'>You <b>[listening ? "enable" : "disable"]</b> [src]'s speaker.</span>")
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()
. += "<span class='notice'><b>Alt-Click</b> to toggle [src]'s hotmic.</span>"
. += "<span class='notice'><b>Ctrl-Shift-Click</b> to toggle [src]'s speaker.</span>"
/obj/item/radio/examine(mob/user)
. = ..()
. += "<span class='notice'><b>Alt-Click</b> to toggle [src]'s hotmic!</span>"
. += show_examine_hotkeys()
if(in_range(src, user) || loc == user)
if(b_stat)
. += "<span class='notice'>\the [src] can be attached and modified!</span>"
else
. += "<span class='notice'>\the [src] can not be modified or attached!</span>"
/obj/item/radio/examine_more(mob/user)
. = ..()
. += "<span class='notice'>You can transmit messages from [src] without the hotmic by using <b>:l</b> or <b>:r</b> whilst holding it in your left or right hand.</span>"
/obj/item/radio/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
@@ -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)