From 98cd4e28a407dd7708c40f91fef271b64b33ffdb Mon Sep 17 00:00:00 2001
From: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Date: Sat, 22 Feb 2025 18:58:49 -0800
Subject: [PATCH] fix examine_block to boxed_message
---
code/controllers/subsystem/vote.dm | 2 +-
code/modules/mob/mob.dm | 4 ++--
.../client/preferences/tgui_prefs_migration.dm | 2 +-
.../code/modules/client/preferences_savefile.dm | 8 ++++----
.../death_consequences_trauma.dm | 2 +-
.../modules/opposing_force/code/admin_procs.dm | 2 +-
.../opposing_force/code/opposing_force_datum.dm | 14 +++++++-------
.../code/controllers/subsystem/map_vote.dm | 2 +-
.../code/datums/components/vore/belly.dm | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 7f831074347..f84edca49fb 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -119,7 +119,7 @@ SUBSYSTEM_DEF(vote)
)
log_vote("vote finalized", vote_log_data)
if(to_display)
- to_chat(world, examine_block(vote_font("[to_display]"))) // BUBBER EDIT CHANGE - span_infoplain changed to examine_block
+ to_chat(world, custom_boxed_message("purple_box", vote_font("[to_display]"))) // BUBBER EDIT CHANGE - span_infoplain changed to examine_block
// Finally, doing any effects on vote completion
current_vote.finalize_vote(final_winner)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index fc8a21cc4df..fa7debeda84 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -581,8 +581,8 @@
var/list/result = examinify.examine(src)
var/atom_title = examinify.examine_title(src, thats = TRUE)
SEND_SIGNAL(src, COMSIG_MOB_EXAMINING, examinify, result)
- result_combined = (atom_title ? "[span_slightly_larger("[atom_title][ismob(examinify) ? "!" :"."][EXAMINE_SECTION_BREAK]")]" : "") + jointext(result, "
") // BUBBER EDIT CHANGE - No centered title + exclamation point for mobs - ORIGINAL: result_combined = (atom_title ? fieldset_block("[span_slightly_larger(atom_title)].", jointext(result, "
"), "examine_block") : examine_block(jointext(result, "
")))
- result_combined = examine_block(replacetext(result_combined, "
", "
")) // BUBBER EDIT ADDITION - bit of a hack here to make sure we don't get linebreaks coming after headers, as well as properly adding the examine_block
+ result_combined = (atom_title ? fieldset_block("[atom_title]", jointext(result, "
"), "boxed_message") : boxed_message(jointext(result, "
")))
+ result_combined = replacetext(result_combined, "
", "
") // BUBBER EDIT ADDITION - bit of a hack here to make sure we don't get linebreaks coming after headers, as well as properly adding the examine_block
to_chat(src, span_infoplain(result_combined))
SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify)
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/tgui_prefs_migration.dm b/modular_skyrat/master_files/code/modules/client/preferences/tgui_prefs_migration.dm
index 2f0f7cbced4..fcbe4efb010 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/tgui_prefs_migration.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/tgui_prefs_migration.dm
@@ -94,7 +94,7 @@ MUTANT_SYNTH_CHASSIS, \
write_preference(preference, colors)
continue
- to_chat(parent, examine_block(span_greentext("Preference migration successful! You may safely interact with the preferences menu.")))
+ to_chat(parent, custom_boxed_message("green_box", span_greentext("Preference migration successful! You may safely interact with the preferences menu.")))
tgui_prefs_migration = TRUE
skyrat_data["tgui_prefs_migration"] = tgui_prefs_migration
diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
index 4b5402ea9ab..079bf68db4f 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
@@ -80,7 +80,7 @@
tgui_prefs_migration = save_data["tgui_prefs_migration"]
if(!tgui_prefs_migration && save_data.len) // If save_data is empty, this is definitely a new character
- to_chat(parent, examine_block(span_redtext("PREFERENCE MIGRATION BEGINNING.\
+ to_chat(parent, custom_boxed_message("red_box", span_bolddanger("PREFERENCE MIGRATION BEGINNING.\
\nDO NOT INTERACT WITH YOUR PREFERENCES UNTIL THIS PROCESS HAS BEEN COMPLETED.\
\nDO NOT DISCONNECT UNTIL THIS PROCESS HAS BEEN COMPLETED.\
")))
@@ -96,7 +96,7 @@
/// Brings a savefile up to date with modular preferences. Called if savefile_needs_update_skyrat() returned a value higher than 0
/datum/preferences/proc/update_character_skyrat(current_version, list/save_data)
- to_chat(parent, examine_block(span_redtext("Updating preference values, if you don't see the second half of this message, ahelp immediately!")))
+ to_chat(parent, custom_boxed_message("red_box", span_bolddanger("Updating preference values, if you don't see the second half of this message, ahelp immediately!")))
if(current_version < VERSION_GENITAL_TOGGLES)
// removed genital toggles, with the new choiced prefs paths as assoc
var/static/list/old_toggles
@@ -264,11 +264,11 @@
if(current_version < VERSION_LOADOUT_PRESETS)
write_preference(GLOB.preference_entries[/datum/preference/loadout], list("Default" = save_data["loadout_list"])) // So easy. I wish the synth refactor was this easy.
- to_chat(parent, examine_block(span_greentext("Updated preferences!")))
+ to_chat(parent, custom_boxed_message("green_box", span_greentext("Updated preferences!")))
/datum/preferences/proc/check_migration()
if(!tgui_prefs_migration)
- to_chat(parent, examine_block(span_redtext("CRITICAL FAILURE IN PREFERENCE MIGRATION, REPORT THIS IMMEDIATELY.")))
+ to_chat(parent, custom_boxed_message("red_box", span_redtext("CRITICAL FAILURE IN PREFERENCE MIGRATION, REPORT THIS IMMEDIATELY.")))
message_admins("PREFERENCE MIGRATION: [ADMIN_LOOKUPFLW(parent)] has failed the process for migrating PREFERENCES. Check runtimes.")
diff --git a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm
index 9ce5d2b8f5d..0e6045eb285 100644
--- a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm
+++ b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm
@@ -434,7 +434,7 @@
if (href_list[DEATH_CONSEQUENCES_SHOW_HEALTH_ANALYZER_DATA])
if (world.time <= time_til_scan_expires[usr])
- to_chat(usr, examine_block(get_specific_data()), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO)
+ to_chat(usr, boxed_message(get_specific_data()), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO)
else
to_chat(usr, span_warning("Your scan has expired! Try scanning again!"))
diff --git a/modular_skyrat/modules/opposing_force/code/admin_procs.dm b/modular_skyrat/modules/opposing_force/code/admin_procs.dm
index 9ce7da7c459..c9207b412d5 100644
--- a/modular_skyrat/modules/opposing_force/code/admin_procs.dm
+++ b/modular_skyrat/modules/opposing_force/code/admin_procs.dm
@@ -2,7 +2,7 @@ ADMIN_VERB(request_more_opfor, R_FUN, "Request OPFOR", "Request players sign up
var/asked = 0
for(var/mob/living/carbon/human/human in GLOB.alive_player_list)
if(human.client?.prefs?.read_preference(/datum/preference/toggle/be_antag))
- to_chat(human, examine_block(span_greentext("The admins are looking for OPFOR players, if you're interested, sign up in the OOC tab!")))
+ to_chat(human, custom_boxed_message("green_box", span_greentext("The admins are looking for OPFOR players, if you're interested, sign up in the OOC tab!")))
asked++
message_admins("[ADMIN_LOOKUP(user)] has requested more OPFOR players! (Asked: [asked] players)")
diff --git a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm
index d86011d0636..50b6a192c88 100644
--- a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm
+++ b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm
@@ -296,11 +296,11 @@
return
for(var/datum/opposing_force_objective/objective as anything in objectives)
if(objective.status == OPFOR_OBJECTIVE_STATUS_NOT_REVIEWED)
- to_chat(usr, examine_block(span_command_headset(span_pink("OPFOR: ERROR, some objectives have not been reviewed. Please approve/deny all objectives."))))
+ to_chat(usr, custom_boxed_message("purple_box", span_command_headset(span_pink("OPFOR: ERROR, some objectives have not been reviewed. Please approve/deny all objectives."))))
return
for(var/datum/opposing_force_selected_equipment/equipment as anything in selected_equipment)
if(equipment.status == OPFOR_EQUIPMENT_STATUS_NOT_REVIEWED)
- to_chat(usr, examine_block(span_command_headset(span_pink("OPFOR: ERROR, some equipment requests have not been reviewed. Please approve/deny all equipment requests."))))
+ to_chat(usr, custom_boxed_message("purple_box", span_command_headset(span_pink("OPFOR: ERROR, some equipment requests have not been reviewed. Please approve/deny all equipment requests."))))
return
SSopposing_force.approve(src, usr)
if("approve_all")
@@ -376,7 +376,7 @@
if(choice == "No")
return
handling_admin = get_admin_ckey(user)
- to_chat(mind_reference.current, examine_block(span_nicegreen("Your OPFOR application is now being handled by [handling_admin].")))
+ to_chat(mind_reference.current, custom_boxed_message("green_box", span_nicegreen("Your OPFOR application is now being handled by [handling_admin].")))
send_admins_opfor_message("HANDLE: [ADMIN_LOOKUPFLW(user)] is handling [mind_reference.key]'s OPFOR application.")
send_system_message("[handling_admin] has assigned themselves to this application")
add_log(user.ckey, "Assigned self to application")
@@ -507,7 +507,7 @@
add_log(user.ckey, "Submitted to the OPFOR subsystem")
send_system_message("[user ? get_admin_ckey(user) : "The OPFOR subsystem"] has submitted the application for review")
send_admins_opfor_message(span_command_headset("SUBMISSION: [ADMIN_LOOKUPFLW(user)] has submitted their OPFOR application. They are number [queue_position] in the queue."))
- to_chat(usr, examine_block(span_nicegreen(("You have been added to the queue for the OPFOR subsystem. You are number [queue_position] in line."))))
+ to_chat(usr, custom_boxed_message("green_box", span_nicegreen(("You have been added to the queue for the OPFOR subsystem. You are number [queue_position] in line."))))
/datum/opposing_force/proc/modify_request(mob/user)
if(status == OPFOR_STATUS_CHANGES_REQUESTED)
@@ -540,7 +540,7 @@
opfor.status = OPFOR_OBJECTIVE_STATUS_DENIED
SEND_SOUND(mind_reference.current, sound('modular_skyrat/modules/opposing_force/sound/denied.ogg'))
add_log(denier.ckey, "Denied application")
- to_chat(mind_reference.current, examine_block(span_redtext("Your OPFOR application has been denied by [denier ? get_admin_ckey(denier) : "the OPFOR subsystem"]!")))
+ to_chat(mind_reference.current, custom_boxed_message("red_box", span_redtext("Your OPFOR application has been denied by [denier ? get_admin_ckey(denier) : "the OPFOR subsystem"]!")))
send_system_message(get_admin_ckey(denier) + " has denied the application with the following reason: [reason]")
send_admins_opfor_message("[span_red("DENIED")]: [ADMIN_LOOKUPFLW(denier)] has denied [ckey]'s application([reason ? reason : "No reason specified"])")
ticket_counter_add_handled(denier.key, 1)
@@ -559,7 +559,7 @@
continue
objective_denied = TRUE
break
- to_chat(mind_reference.current, examine_block(span_greentext("Your OPFOR application has been [objective_denied ? span_bold("partially approved (please view your OPFOR for details)") : span_bold("fully approved")] by [approver ? get_admin_ckey(approver) : "the OPFOR subsystem"]!")))
+ to_chat(mind_reference.current, custom_boxed_message("green_box", span_greentext("Your OPFOR application has been [objective_denied ? span_bold("partially approved (please view your OPFOR for details)") : span_bold("fully approved")] by [approver ? get_admin_ckey(approver) : "the OPFOR subsystem"]!")))
send_system_message("[approver ? get_admin_ckey(approver) : "The OPFOR subsystem"] has approved the application")
send_admins_opfor_message("[span_green("APPROVED")]: [ADMIN_LOOKUPFLW(approver)] has approved [ckey]'s application")
ticket_counter_add_handled(approver.key, 1)
@@ -732,7 +732,7 @@
/datum/opposing_force/proc/broadcast_queue_change()
var/queue_number = SSopposing_force.get_queue_position(src)
- to_chat(mind_reference.current, examine_block(span_nicegreen("Your OPFOR application is now number [queue_number] in the queue.")))
+ to_chat(mind_reference.current, custom_boxed_message("green_box", span_nicegreen("Your OPFOR application is now number [queue_number] in the queue.")))
send_system_message("Application is now number [queue_number] in the queue")
/datum/opposing_force/proc/send_message(mob/user, message)
diff --git a/modular_zubbers/code/controllers/subsystem/map_vote.dm b/modular_zubbers/code/controllers/subsystem/map_vote.dm
index f50db5089f1..4010e824b9c 100644
--- a/modular_zubbers/code/controllers/subsystem/map_vote.dm
+++ b/modular_zubbers/code/controllers/subsystem/map_vote.dm
@@ -58,7 +58,7 @@
last_message_at = world.time
var/list/messages = args.Copy()
- to_chat(world, examine_block(vote_font("[span_bold("Map Vote")]\n
[messages.Join("\n")]")))
+ to_chat(world, custom_boxed_message("purple_box", vote_font("[span_bold("Map Vote")]\n
[messages.Join("\n")]")))
/datum/controller/subsystem/map_vote/update_tally_printout()
var/list/data = list()
diff --git a/modular_zubbers/code/datums/components/vore/belly.dm b/modular_zubbers/code/datums/components/vore/belly.dm
index 7d83b670f18..2839317bd1f 100644
--- a/modular_zubbers/code/datums/components/vore/belly.dm
+++ b/modular_zubbers/code/datums/components/vore/belly.dm
@@ -312,7 +312,7 @@
RegisterSignal(M, COMSIG_MOVABLE_USING_RADIO, PROC_REF(try_deny_radio))
ADD_TRAIT(M, TRAIT_SOFTSPOKEN, TRAIT_SOURCE_VORE)
deep_search_prey(M)
- to_chat(M, examine_block("You slide into [span_notice("[owner.parent]")]'s [span_green(lowertext(name))]!\n[EXAMINE_SECTION_BREAK][format_message(desc, M)]"))
+ to_chat(M, boxed_message("You slide into [span_notice("[owner.parent]")]'s [span_green(lowertext(name))]!\n[EXAMINE_SECTION_BREAK][format_message(desc, M)]"))
// Add the appearance_holder to prey so they can see fellow prey
if(can_taste && iscarbon(M))
var/mob/living/carbon/H = M