PDA ringtone input is now trimmed (#23579)

* bam

* oops
This commit is contained in:
Contrabang
2024-01-06 16:43:48 -05:00
committed by GitHub
parent 1267ad92f0
commit c1a37d4868
2 changed files with 18 additions and 17 deletions
+15 -14
View File
@@ -378,20 +378,21 @@ GLOBAL_LIST_EMPTY(PDAs)
for(var/mob/O in hearers(3, loc))
O.show_message(text("[bicon(src)] *[ttone]*"))
/obj/item/pda/proc/set_ringtone()
var/t = input("Please enter new ringtone", name, ttone) as text
if(in_range(src, usr) && loc == usr)
if(t)
if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code)))
to_chat(usr, "The PDA softly beeps.")
close(usr)
else
t = sanitize(copytext(t, 1, 20))
ttone = t
return 1
else
close(usr)
return 0
/obj/item/pda/proc/set_ringtone(mob/user)
var/new_tone = input("Please enter new ringtone", name, ttone) as text
new_tone = trim(new_tone)
if(!in_range(src, user) || loc != user)
close(user)
return FALSE
if(!new_tone)
return FALSE
if(hidden_uplink && hidden_uplink.check_trigger(user, lowertext(new_tone), lowertext(lock_code)))
to_chat(user, "The PDA softly beeps.")
close(user)
return TRUE
ttone = sanitize(copytext(new_tone, 1, 20))
return TRUE
/obj/item/pda/process()
if(current_app)
+3 -3
View File
@@ -62,7 +62,7 @@
if(..())
return
add_fingerprint(usr)
add_fingerprint(ui.user)
. = TRUE
switch(action)
@@ -93,13 +93,13 @@
update_shortcuts()
playsound(src, 'sound/machines/terminal_eject.ogg', 50, TRUE)
if("Authenticate") //Checks for ID
id_check(usr, 1)
id_check(ui.user, 1)
if("Available_Ringtones")
ttone = params["selected_ringtone"]
if("Ringtone")
if(!silent)
playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE)
return set_ringtone()
return set_ringtone(ui.user)
else
if(current_app)
. = current_app.ui_act(action, params, ui, state) // It needs proxying through down here so apps actually have their interacts called