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

Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

Browse Source
This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
parent c90e3e69b9 179a607a90
commit e59d8ba64b
4642 changed files with 25352 additions and 14167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
+4 -4
View File
@@ -165,7 +165,7 @@
switch(action)
if("PDA_ringSet")
var/mob/living/user = usr
var/new_ringtone = tgui_input_text(user, "Enter a new ringtone", "Ringtone", ringtone, encode = FALSE)
var/new_ringtone = tgui_input_text(user, "Enter a new ringtone", "Ringtone", ringtone, max_length = MAX_MESSAGE_LEN, encode = FALSE)
if(!computer.can_interact(user))
computer.balloon_alert(user, "can't reach!")
return FALSE
@@ -401,7 +401,7 @@
chat.can_reply = FALSE
return
var/target_name = target.computer.saved_identification
var/input_message = tgui_input_text(user, "Enter [mime_mode ? "emojis":"a message"]. Start with # for subtle.", "NT Messaging[target_name ? " ([target_name])" : ""]", encode = FALSE) // BUBBER EDIT CHANGE - SUBTLE MESSAGES
var/input_message = tgui_input_text(user, "Enter [mime_mode ? "emojis":"a message"]. Start with # for subtle.", "NT Messaging[target_name ? " ([target_name])" : ""]", max_length = MAX_MESSAGE_LEN, encode = FALSE) // BUBBER EDIT CHANGE - SUBTLE MESSAGES
send_message(user, input_message, list(chat), subtle = subtle) // BUBBER EDIT CHANGE - SUBTLE MESSAGES - Original: send_message(user, input_message, list(chat))
/// Helper proc that sends a message to everyone
@@ -597,7 +597,7 @@
if(sender)
to_chat(sender, span_notice("ERROR: Network unavailable, please try again later."))
if(alert_able && !alert_silenced)
playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 15, TRUE)
return FALSE
// used for logging
@@ -629,7 +629,7 @@
if(sender)
to_chat(sender, span_notice("ERROR: Server is not responding."))
if(alert_able && !alert_silenced)
playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 15, TRUE)
return FALSE
// SKYRAT EDIT BEGIN - PDA messages show a visible message; again!