From 5d584088e4e3c02e583683ab02bdf1ef73be85fe Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 22 Jun 2026 18:49:19 -0400 Subject: [PATCH 1/8] Started at the to_chat() filtering additions. AP why did you not do any :< --- code/__HELPERS/areas.dm | 10 +-- code/__HELPERS/game.dm | 10 +-- code/__HELPERS/mobs.dm | 8 +-- code/__HELPERS/player_helpers.dm | 2 +- code/__HELPERS/priority_announce.dm | 4 +- code/__HELPERS/roundend.dm | 24 +++---- code/__HELPERS/time.dm | 2 +- code/__HELPERS/typelists.dm | 2 +- code/_globalvars/special_traits.dm | 18 ++--- code/_onclick/click.dm | 6 +- code/_onclick/hud/action_button.dm | 14 ++-- code/_onclick/hud/alert.dm | 4 +- code/_onclick/hud/hud.dm | 4 +- code/_onclick/hud/screen_objects.dm | 66 +++++++++---------- code/_onclick/item_attack.dm | 28 ++++---- code/_onclick/other_mobs.dm | 26 ++++---- code/_onclick/telekinesis.dm | 2 +- code/controllers/failsafe.dm | 10 +-- code/controllers/master.dm | 8 +-- code/controllers/subsystem.dm | 2 +- code/controllers/subsystem/dbcore.dm | 2 +- code/controllers/subsystem/garbage.dm | 2 +- code/controllers/subsystem/job.dm | 6 +- code/controllers/subsystem/mapping.dm | 6 +- code/controllers/subsystem/migrants.dm | 10 +-- code/controllers/subsystem/nightshift.dm | 12 ++-- .../subsystem/rogue/economy/banditry_drain.dm | 6 +- .../subsystem/rogue/economy/economy.dm | 22 +++---- .../rogue/fog_event/fog_component.dm | 2 +- .../subsystem/rogue/fog_event/fog_cross.dm | 16 ++--- .../rogue/fog_event/fog_grace_effect.dm | 4 +- .../subsystem/rogue/fog_event/fog_lamptern.dm | 16 ++--- .../rogue/fog_event/fog_ward_effect.dm | 8 +-- code/controllers/subsystem/rogue/miscprocs.dm | 22 +++---- .../role_class_handler/class_register.dm | 4 +- .../rogue/scheduled_event_subsytem.dm | 4 +- code/controllers/subsystem/rogue/treasury.dm | 28 ++++---- .../rogue/triumphs/triumph_adjust_procs.dm | 12 ++-- .../triumph_buy_datums/misc/wipe_triumphs.dm | 2 +- .../subsystem/rogue/triumphs/triumphs.dm | 6 +- code/controllers/subsystem/server_maint.dm | 2 +- code/controllers/subsystem/storyteller.dm | 18 ++--- code/controllers/subsystem/ticker.dm | 26 ++++---- code/controllers/subsystem/vote.dm | 14 ++-- code/datums/achievements/_awards.dm | 2 +- code/datums/actions/action_innate.dm | 4 +- code/datums/browser.dm | 2 +- code/datums/datumvars.dm | 2 +- code/datums/laws.dm | 2 +- code/datums/mind.dm | 24 +++---- code/datums/mindlink.dm | 4 +- code/datums/mindlink_hag.dm | 2 +- code/datums/pollution.dm | 4 +- code/datums/skill_holder.dm | 12 ++-- code/datums/slapcrafting.dm | 14 ++-- code/modules/admin/admin.dm | 6 +- 56 files changed, 289 insertions(+), 289 deletions(-) diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 52d7c54dabe..9d0a8021cfb 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -45,10 +45,10 @@ )) var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) if(!turfs) - to_chat(creator, "The new area must be completely airtight and not a part of a shuttle.") + to_chat(creator, "The new area must be completely airtight and not a part of a shuttle.", MESSAGE_TYPE_LOCALCHAT) return if(turfs.len > BP_MAX_ROOM_SIZE) - to_chat(creator, "The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.") + to_chat(creator, "The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.", MESSAGE_TYPE_LOCALCHAT) return var/list/areas = list("New Area" = /area) for(var/i in 1 to turfs.len) @@ -62,7 +62,7 @@ area_choice = areas[area_choice] if(!area_choice) - to_chat(creator, "No choice selected. The area remains undefined.") + to_chat(creator, "No choice selected. The area remains undefined.", MESSAGE_TYPE_LOCALCHAT) return var/area/newA if(!isarea(area_choice)) @@ -70,7 +70,7 @@ if(!str || !length(str)) //cancel return if(length(str) > 50) - to_chat(creator, "The given name is too long. The area remains undefined.") + to_chat(creator, "The given name is too long. The area remains undefined.", MESSAGE_TYPE_LOCALCHAT) return newA = new area_choice newA.setup(str) @@ -86,7 +86,7 @@ newA.reg_in_areas_in_z() - to_chat(creator, "I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.") + to_chat(creator, "I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.", MESSAGE_TYPE_LOCALCHAT) return TRUE #undef BP_MAX_ROOM_SIZE diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 92e102600be..e83676c446f 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -367,22 +367,22 @@ window_flash(M.client) switch(ignore_category ? askuser(M,Question,"Please answer in [DisplayTimeText(poll_time)]!","Yes","No","Never for this round", StealFocus=0, Timeout=poll_time) : askuser(M,Question,"Please answer in [DisplayTimeText(poll_time)]!","Yes","No", StealFocus=0, Timeout=poll_time)) if(1) - to_chat(M, span_notice("Choice registered: Yes.")) + to_chat(M, span_notice("Choice registered: Yes."), MESSAGE_TYPE_INFO) if(time_passed + poll_time <= world.time) - to_chat(M, span_danger("Sorry, you answered too late to be considered!")) + to_chat(M, span_danger("Sorry, you answered too late to be considered!"), MESSAGE_TYPE_INFO) SEND_SOUND(M, 'sound/blank.ogg') candidates -= M else candidates += M if(2) - to_chat(M, span_danger("Choice registered: No.")) + to_chat(M, span_danger("Choice registered: No."), MESSAGE_TYPE_INFO) candidates -= M if(3) var/list/L = GLOB.poll_ignore[ignore_category] if(!L) GLOB.poll_ignore[ignore_category] = list() GLOB.poll_ignore[ignore_category] += M.ckey - to_chat(M, span_danger("Choice registered: Never for this round.")) + to_chat(M, span_danger("Choice registered: Never for this round."), MESSAGE_TYPE_INFO) candidates -= M else candidates -= M @@ -465,7 +465,7 @@ /proc/send_to_playing_players(thing) //sends a whatever to all playing players; use instead of to_chat(world, where needed) for(var/M in GLOB.player_list) if(M && !isnewplayer(M)) - to_chat(M, thing) + to_chat(M, thing, MESSAGE_TYPE_INFO) /proc/window_flash(client/C, ignorepref = FALSE) if(ismob(C)) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index fc99b71358c..53b53565883 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -576,9 +576,9 @@ GLOBAL_LIST_EMPTY(species_list) // rendered_message = "[turf_link] [message]" rendered_message = "[message]" - to_chat(M, rendered_message) + to_chat(M, rendered_message, MESSAGE_TYPE_INFO) else - to_chat(M, message) + to_chat(M, message, MESSAGE_TYPE_INFO) //Used in chemical_mob_spawn. Generates a random mob based on a given gold_core_spawnable value. /proc/create_random_mob(spawn_location, mob_class = HOSTILE_SPAWN) @@ -658,11 +658,11 @@ GLOBAL_LIST_EMPTY(species_list) if(!existing) lobbyer.close_spawn_windows() var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list - to_chat(src, span_notice("Now teleporting.")) + to_chat(src, span_notice("Now teleporting."), MESSAGE_TYPE_INFO) if (O) observer.forceMove(O.loc) else - to_chat(src, span_notice("Teleporting failed. Ahelp an admin please")) + to_chat(src, span_notice("Teleporting failed. Ahelp an admin please"), MESSAGE_TYPE_INFO) stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised") observer.key = key diff --git a/code/__HELPERS/player_helpers.dm b/code/__HELPERS/player_helpers.dm index 21f66ef6c0d..828400bfb08 100644 --- a/code/__HELPERS/player_helpers.dm +++ b/code/__HELPERS/player_helpers.dm @@ -83,4 +83,4 @@ for (var/C in GLOB.admins) - to_chat(C, msg.Join()) + to_chat(C, msg.Join(), MESSAGE_TYPE_ADMINLOG) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index a8453aceae3..1450179947c 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -22,7 +22,7 @@ if (receiver && !(istype(M, receiver) || (sender && M == sender))) return - to_chat(M, announcement) + to_chat(M, announcement, MESSAGE_TYPE_LOCALCHAT) if (M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) if (!sound) return @@ -34,7 +34,7 @@ for(var/mob/M in GLOB.player_list) if(M.can_hear()) - to_chat(M, "[html_encode(title)]
[html_encode(message)]
") + to_chat(M, "[html_encode(title)]
[html_encode(message)]
", MESSAGE_TYPE_LOCALCHAT) if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) if(alert) M.playsound_local(M, 'sound/misc/alert.ogg', 100) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 5d72817e002..e7cdd78ddb3 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -128,7 +128,7 @@ log_game("The round has ended.") - to_chat(world, "


So ends this tale on [realm_name].") + to_chat(world, "


So ends this tale on [realm_name].", MESSAGE_TYPE_LOCALCHAT) get_end_reason() var/list/key_list = list() @@ -149,7 +149,7 @@ if((GLOB.round_join_times[H.ckey] + 45 MINUTES) < world.time) var/datum/job/job = SSjob.GetJob(H.job) if(job && job.round_contrib_points) - to_chat(H, "\n[job.round_contrib_points] ROUND CONTRIBUTOR POINTS AWARDED. Thank you for playing!") + to_chat(H, "\n[job.round_contrib_points] ROUND CONTRIBUTOR POINTS AWARDED. Thank you for playing!", MESSAGE_TYPE_LOCALCHAT) add_roundpoints(job.round_contrib_points, H.ckey) add_roundplayed(key_list) @@ -163,13 +163,13 @@ cb.InvokeAsync() LAZYCLEARLIST(round_end_events) - to_chat(world, "Round ID: [GLOB.rogue_round_id]") + to_chat(world, "Round ID: [GLOB.rogue_round_id]", MESSAGE_TYPE_INFO) sleep(5 SECONDS) gamemode_report() - to_chat(world, personal_objectives_report()) + to_chat(world, personal_objectives_report(), MESSAGE_TYPE_INFO) sleep(10 SECONDS) @@ -251,7 +251,7 @@ if(end_reason) - to_chat(world, span_bigbold("[end_reason].")) + to_chat(world, span_bigbold("[end_reason]."), MESSAGE_TYPE_LOCALCHAT) else var/mob/living/ruler = rulermob var/ruler_name = ruler?.real_name || "an unknown sovereign" @@ -263,11 +263,11 @@ "[title] [ruler_name] has kept the realm together for another week.", \ "The rule of [title] [ruler_name] holds firm. [realm_name] endures.", \ "Through strife and struggle, [title] [ruler_name] has held [realm_name] together.") - to_chat(world, span_bigbold("[good_ending]")) + to_chat(world, span_bigbold("[good_ending]"), MESSAGE_TYPE_LOCALCHAT) // Epilogue — additional flavor text set by usurpation rites if(roundend_epilogue) - to_chat(world, "
[roundend_epilogue]") + to_chat(world, "
[roundend_epilogue]", MESSAGE_TYPE_LOCALCHAT) /datum/controller/subsystem/ticker/proc/gamemode_report() var/list/all_teams = list() @@ -278,7 +278,7 @@ header_parts += "
" header_parts += "
VILLAINS:
" header_parts += "
" - to_chat(world, header_parts) + to_chat(world, header_parts, MESSAGE_TYPE_INFO) for(var/datum/team/A in GLOB.antagonist_teams) if(!A.members) @@ -559,12 +559,12 @@ var/datum/action/report/R = new C.player_details.player_actions += R R.Grant(C.mob) - to_chat(C,"Show roundend report again") + to_chat(C,"Show roundend report again", MESSAGE_TYPE_INFO) /datum/controller/subsystem/ticker/proc/give_show_playerlist_button(client/C) set waitfor = 0 - to_chat(C,"* SHOW PLAYER LIST *") - to_chat(C,"* View Statistics *") + to_chat(C,"* SHOW PLAYER LIST *", MESSAGE_TYPE_INFO) + to_chat(C,"* View Statistics *", MESSAGE_TYPE_INFO) C.show_round_stats(pick_assoc(GLOB.featured_stats)) C.commendsomeone(forced = TRUE) @@ -630,7 +630,7 @@ /datum/controller/subsystem/ticker/proc/save_admin_data() if(IsAdminAdvancedProcCall()) - to_chat(usr, span_adminprefix("Admin rank DB Sync blocked: Advanced ProcCall detected.")) + to_chat(usr, span_adminprefix("Admin rank DB Sync blocked: Advanced ProcCall detected."), MESSAGE_TYPE_ADMINLOG) return if(CONFIG_GET(flag/admin_legacy_system)) //we're already using legacy system so there's nothing to save return diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index b9d0df73e66..bb72fc279bf 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -212,7 +212,7 @@ GLOBAL_VAR_INIT(date_override_offset, 0) animate(T, alpha = 255, time = 10, easing = EASE_IN) addtimer(CALLBACK(src, PROC_REF(clear_area_text), T), 35) var/time_change_tips_random = pick(GLOB.time_change_tips) - to_chat(client, span_notice("[time_change_tips_random]")) + to_chat(client, span_notice("[time_change_tips_random]"), MESSAGE_TYPE_INFO) else if(GLOB.tod == "day") playsound_local(src, 'sound/misc/midday.ogg', 100, FALSE) else if(GLOB.tod == "night") diff --git a/code/__HELPERS/typelists.dm b/code/__HELPERS/typelists.dm index 3519eb60f3a..a0576facfb5 100644 --- a/code/__HELPERS/typelists.dm +++ b/code/__HELPERS/typelists.dm @@ -39,5 +39,5 @@ GLOBAL_LIST_EMPTY(typelistkeys) saveditems[saving] += (GLOB.typelists[type]["[saving]-saved"] * length(GLOB.typelists[type][saving])) for (var/saving in savings) - to_chat(world, "Savings for [saving]: [savings[saving]] lists, [saveditems[saving]] items") + to_chat(world, "Savings for [saving]: [savings[saving]] lists, [saveditems[saving]] items", MESSAGE_TYPE_INFO) #endif diff --git a/code/_globalvars/special_traits.dm b/code/_globalvars/special_traits.dm index 10e00ebb445..b2959f9d6c5 100644 --- a/code/_globalvars/special_traits.dm +++ b/code/_globalvars/special_traits.dm @@ -12,10 +12,10 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits()) /proc/print_special_text(mob/user, trait_type) var/datum/special_trait/special = SPECIAL_TRAIT(trait_type) - to_chat(user, span_notice("[special.name]")) - to_chat(user, special.greet_text) + to_chat(user, span_notice("[special.name]"), MESSAGE_TYPE_INFO) + to_chat(user, special.greet_text, MESSAGE_TYPE_INFO) if(special.req_text) - to_chat(user, span_boldwarning("Requirements: [special.req_text]")) + to_chat(user, span_boldwarning("Requirements: [special.req_text]"), MESSAGE_TYPE_INFO) /proc/try_apply_character_post_equipment(mob/living/carbon/human/character, client/player) apply_prefs_sizecat(character,player) //CC Edit @@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits()) if(HAS_TRAIT(H, TRAIT_EASYDISMEMBER) && HAS_TRAIT(H, TRAIT_CRITICAL_RESISTANCE)) REMOVE_TRAIT(H, TRAIT_EASYDISMEMBER, null) // Doesn't care for source, they ARE getting canceled REMOVE_TRAIT(H, TRAIT_CRITICAL_RESISTANCE, null) - to_chat(H, span_warning("My limbs are too frail and my body too tough... the contradiction leaves me unable to resist critical wounds.")) + to_chat(H, span_warning("My limbs are too frail and my body too tough... the contradiction leaves me unable to resist critical wounds."), MESSAGE_TYPE_INFO) if((H.advjob != "Knight Banneret" && H.mind.assigned_role != "Court Agent" && H.mind.assigned_role != "Adventurer" && H.mind.assigned_role != "Prince" && H.mind.assigned_role != "Court Magician" && H.mind.assigned_role != "Inquisitor")) if(!H.mind.has_antag_datum(/datum/antagonist/skeleton) && !H.mind.has_antag_datum(/datum/antagonist/lich) && !H.mind.has_antag_datum(/datum/antagonist/vampire) && !H.mind.has_antag_datum(/datum/antagonist/vampire/lord)) @@ -113,17 +113,17 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits()) if(virtue_check(virtue_type, heretic, species)) apply_virtue(character, virtue_type) else - to_chat(character, "Incorrect Virtue parameters! It will not be applied.") + to_chat(character, "Incorrect Virtue parameters! It will not be applied.", MESSAGE_TYPE_INFO) if(virtuetwo_type && virtuous) if(virtue_check(virtuetwo_type, heretic, species)) apply_virtue(character, virtuetwo_type) else - to_chat(character, "Incorrect Second Virtue parameters! It will not be applied.") + to_chat(character, "Incorrect Second Virtue parameters! It will not be applied.", MESSAGE_TYPE_INFO) if(extravirtue_type) if(virtue_check(extravirtue_type, heretic, species)) apply_virtue(character, extravirtue_type) else - to_chat(character, "Incorrect Extra Virtue parameters! It will not be applied.") + to_chat(character, "Incorrect Extra Virtue parameters! It will not be applied.", MESSAGE_TYPE_INFO) //Caustic Edit End if(origin_type) @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits()) if(origin_check(origin_type, species)) apply_virtue(character, origin_type) else - to_chat(character, "Incorrect Origin parameters! Resetting to default.") + to_chat(character, "Incorrect Origin parameters! Resetting to default.", MESSAGE_TYPE_INFO) origin_type = new character.dna.species.origin_default apply_virtue(character, origin_type) @@ -306,4 +306,4 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits()) var/datum/special_trait/special = SPECIAL_TRAIT(trait_type) special.on_apply(character, silent) if(!silent && special.greet_text) - to_chat(character, special.greet_text) + to_chat(character, special.greet_text, MESSAGE_TYPE_INFO) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index e40f47da6f5..20ee9ab8e02 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -126,7 +126,7 @@ var/mob/living/L = src if(L?.wallpressed && L.m_intent == MOVE_INTENT_SNEAK && !istype(L.loc, /turf/open/transparent/openspace)) - to_chat(src, span_warning("You need to step away from the wall first.")) + to_chat(src, span_warning("You need to step away from the wall first."), MESSAGE_TYPE_INFO) return if(modifiers["right"] && !modifiers["shift"] && !modifiers["alt"] && !modifiers["ctrl"]) @@ -437,7 +437,7 @@ L.dualwieldpitystacks = 0 if(L.stamina_add(3)) L.last_used_double_attack = world.time + 2.5 SECONDS - to_chat(L, span_warning("An opening! I strike with my off-hand.")) + to_chat(L, span_warning("An opening! I strike with my off-hand."), MESSAGE_TYPE_COMBAT) offh.melee_attack_chain(src, A, params) else L.dualwieldpitystacks++ @@ -709,7 +709,7 @@ GLOBAL_LIST_EMPTY(reach_dummy_pool) return // A.AltClick(src) // else -// to_chat(src, span_warning("I need an empty hand to sort through the items here.")) +// to_chat(src, span_warning("I need an empty hand to sort through the items here."), MESSAGE_TYPE_INFO) /* diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index e3f40302daf..bdf98854cba 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -51,7 +51,7 @@ return if((istype(over_object, /atom/movable/screen/movable/action_button) && !istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle))) if(locked) - to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first.")) + to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first."), MESSAGE_TYPE_INFO) return var/atom/movable/screen/movable/action_button/B = over_object var/list/actions = usr.actions @@ -71,14 +71,14 @@ var/list/modifiers = params2list(params) if(modifiers["alt"]) if(locked) - to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first.")) + to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first."), MESSAGE_TYPE_INFO) return TRUE moved = 0 usr.update_action_buttons() //redraw buttons that are no longer considered "moved" return TRUE if(modifiers["ctrl"]) locked = !locked - to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked.")) + to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked."), MESSAGE_TYPE_INFO) if(id && usr.client) //try to (un)remember position usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null return TRUE @@ -138,14 +138,14 @@ var/list/modifiers = params2list(params) if(modifiers["shift"]) if(locked) - to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first.")) + to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first."), MESSAGE_TYPE_INFO) return TRUE moved = FALSE usr.update_action_buttons(TRUE) return TRUE if(modifiers["ctrl"]) locked = !locked - to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked.")) + to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked."), MESSAGE_TYPE_INFO) if(id && usr.client) //try to (un)remember position usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null return TRUE @@ -164,7 +164,7 @@ if(id && usr.client) usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = null usr.update_action_buttons(TRUE) - to_chat(usr, span_notice("Action button positions have been reset.")) + to_chat(usr, span_notice("Action button positions have been reset."), MESSAGE_TYPE_INFO) return TRUE usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden @@ -186,7 +186,7 @@ if(moved) moved = FALSE user.update_action_buttons(TRUE) - to_chat(user, span_notice("Action button positions have been reset.")) + to_chat(user, span_notice("Action button positions have been reset."), MESSAGE_TYPE_INFO) /atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index ccc17903f16..4ed2c597475 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -238,7 +238,7 @@ /atom/movable/screen/alert/mind_control/Click() ..() var/mob/living/L = usr - to_chat(L, span_mind_control("[command]")) + to_chat(L, span_mind_control("[command]"), MESSAGE_TYPE_LOCALCHAT) /atom/movable/screen/alert/drunk //Not implemented name = "Drunk" @@ -259,7 +259,7 @@ for(var/obj/item/I as anything in BP.embedded_objects) msg += "[I] - [BP.name]\n" msg += "***" - to_chat(H, "[msg.Join()]") + to_chat(H, "[msg.Join()]", MESSAGE_TYPE_INFO) /atom/movable/screen/alert/weightless name = "Weightless" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index b72eb16076a..4461662a6a7 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -289,9 +289,9 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( if(hud_used && client) hud_used.show_hud() //Shows the next hud preset - to_chat(usr, span_info("Switched HUD mode. Press F12 to toggle.")) + to_chat(usr, span_info("Switched HUD mode. Press F12 to toggle."), MESSAGE_TYPE_INFO) else - to_chat(usr, span_warning("This mob type does not use a HUD.")) + to_chat(usr, span_warning("This mob type does not use a HUD."), MESSAGE_TYPE_INFO) //(re)builds the hand ui slots, throwing away old ones diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index bfa89f38d43..2976f876940 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -38,7 +38,7 @@ inspec += "
[desc]" inspec += "
----------------------" - to_chat(user, "[inspec.Join()]") + to_chat(user, "[inspec.Join()]", MESSAGE_TYPE_INFO) /atom/movable/screen/orbit() @@ -82,7 +82,7 @@ if(modifiers["right"]) var/ht var/mob/living/L = usr - to_chat(L, "*----*") + to_chat(L, "*----*", MESSAGE_TYPE_INFO) if(ishuman(usr)) var/mob/living/carbon/human/M = usr if(M.charflaws.len) @@ -90,9 +90,9 @@ var/datum/charflaw/addiction/ad_cf = null if(istype(cf, /datum/charflaw/addiction)) ad_cf = cf - to_chat(M, span_danger("[cf.name] [ad_cf ? ad_cf.sated ? span_purple("SATED") : "" : ""]")) - to_chat(M, span_info("[cf.desc]")) - to_chat(M, "*----*") + to_chat(M, span_danger("[cf.name] [ad_cf ? ad_cf.sated ? span_purple("SATED") : "" : ""]"), MESSAGE_TYPE_INFO) + to_chat(M, span_info("[cf.desc]"), MESSAGE_TYPE_INFO) + to_chat(M, "*----*", MESSAGE_TYPE_INFO) if(M.mind) if(M.mind.language_holder) var/finn @@ -101,17 +101,17 @@ continue var/datum/language/LA = new X() finn = TRUE - to_chat(M, "[LA.name] - ,[LA.key]") + to_chat(M, "[LA.name] - ,[LA.key]", MESSAGE_TYPE_INFO) if(!finn) - to_chat(M, "I don't know any languages.") - to_chat(M, "*----*") + to_chat(M, "I don't know any languages.", MESSAGE_TYPE_INFO) + to_chat(M, "*----*", MESSAGE_TYPE_INFO) for(var/X in GLOB.roguetraits) if(HAS_TRAIT(L, X)) - to_chat(L, "[X] - [GLOB.roguetraits[X]]") + to_chat(L, "[X] - [GLOB.roguetraits[X]]", MESSAGE_TYPE_INFO) ht = TRUE if(!ht) - to_chat(L, "I have no special traits.") - to_chat(L, "*----*") + to_chat(L, "I have no special traits.", MESSAGE_TYPE_INFO) + to_chat(L, "*----*", MESSAGE_TYPE_INFO) return if(ishuman(usr)) @@ -138,12 +138,12 @@ if(modifiers["right"]) var/area/A = get_area(H) if(!A.can_craft_here()) - to_chat(H, span_warning("You cannot craft here.")) + to_chat(H, span_warning("You cannot craft here."), MESSAGE_TYPE_INFO) return if(H.craftingthing && (H.mind?.lastrecipe != null)) last_craft = world.time var/datum/component/personal_crafting/C = H.craftingthing - to_chat(H, span_warning("I am crafting \a [H.mind?.lastrecipe] again.")) + to_chat(H, span_warning("I am crafting \a [H.mind?.lastrecipe] again."), MESSAGE_TYPE_INFO) C.construct_item(H, H.mind?.lastrecipe) else H.playsound_local(H, 'sound/misc/click.ogg', 100) @@ -167,7 +167,7 @@ return TRUE var/area/A = get_area(usr) if(!A.outdoors) - to_chat(usr, "There is already a defined structure here.") + to_chat(usr, "There is already a defined structure here.", MESSAGE_TYPE_INFO) return TRUE create_area(usr) @@ -742,7 +742,7 @@ Left click: toggles combat mode at-will, allowing you to parry or dodge attacks. Usually costs energy (blue stamina) to keep active. Also allows some more destructive interactions with objects.\n\ Right click: makes you visibly surrender, showing a white flag above your head and rendering you temporarily unable to move or fight.\n\ Middle click: toggles compliance mode at-will, removing your defense against grapples and tackles. Also makes it faster to restrain and strip you.\n\ - All of these have configurable keybinds; see the Keybinds settings in your preferences window.")) + All of these have configurable keybinds; see the Keybinds settings in your preferences window."), MESSAGE_TYPE_INFO) else L.playsound_local(L, 'sound/misc/click.ogg', 100) L.toggle_cmode() @@ -1693,7 +1693,7 @@ if(length(H.mind.known_people)) H.mind.display_known_people(H) else - to_chat(H, "I don't know anyone.") + to_chat(H, "I don't know anyone.", MESSAGE_TYPE_INFO) //CC Edit Begin if(modifiers["middle"]) H.mind.display_dietary_information(H) @@ -1930,10 +1930,10 @@ var/mob/living/carbon/human/M = usr if(modifiers["left"]) if(M.charflaws.len) - to_chat(M, "*----*") + to_chat(M, "*----*", MESSAGE_TYPE_INFO) for(var/datum/charflaw/cf in M.charflaws) - to_chat(M, span_info("[cf.desc]")) - to_chat(M, "*--------*") + to_chat(M, span_info("[cf.desc]"), MESSAGE_TYPE_INFO) + to_chat(M, "*--------*", MESSAGE_TYPE_INFO) var/list/already_printed = list() var/list/pos_stressors = M.get_positive_stressors() for(var/datum/stressevent/S in pos_stressors) @@ -1950,9 +1950,9 @@ if(islist(S.desc)) ddesc = pick(S.desc) if(cnt > 1) - to_chat(M, "[ddesc] (x[cnt])") + to_chat(M, "[ddesc] (x[cnt])", MESSAGE_TYPE_INFO) else - to_chat(M, "[ddesc]") + to_chat(M, "[ddesc]", MESSAGE_TYPE_INFO) var/list/neg_stressors = M.get_negative_stressors() for(var/datum/stressevent/S in neg_stressors) if(S in already_printed) @@ -1968,14 +1968,14 @@ if(islist(S.desc)) ddesc = pick(S.desc) if(cnt > 1) - to_chat(M, "[ddesc] (x[cnt])") + to_chat(M, "[ddesc] (x[cnt])", MESSAGE_TYPE_INFO) else - to_chat(M, "[ddesc]") + to_chat(M, "[ddesc]", MESSAGE_TYPE_INFO) already_printed = list() - to_chat(M, "*--------*") + to_chat(M, "*--------*", MESSAGE_TYPE_INFO) if(modifiers["right"]) if(M.get_triumphs() <= 0) - to_chat(M, span_warning("I haven't TRIUMPHED.")) + to_chat(M, span_warning("I haven't TRIUMPHED."), MESSAGE_TYPE_INFO) return if(alert("Do you want to remember a TRIUMPH?", "", "Yes (-3 TRI)", "No") == "Yes (-3 TRI)") if(!M.has_stress_event(/datum/stressevent/triumph)) @@ -2030,9 +2030,9 @@ show_intents(M) if(modifiers["right"]) if(M.rmb_intent) - to_chat(M, "* --- *") - to_chat(M, "[name]: [desc]") - to_chat(M, "* --- *") + to_chat(M, "* --- *", MESSAGE_TYPE_INFO) + to_chat(M, "[name]: [desc]", MESSAGE_TYPE_INFO) + to_chat(M, "* --- *", MESSAGE_TYPE_INFO) /atom/movable/screen/rmbintent/proc/collapse_intents() if(!showing) @@ -2102,9 +2102,9 @@ if(stored_intent) M.swap_rmb_intent(type = stored_intent) if(modifiers["right"]) - to_chat(M, "* --- *") - to_chat(M, "[name]: [desc]") - to_chat(M, "* --- *") + to_chat(M, "* --- *", MESSAGE_TYPE_INFO) + to_chat(M, "[name]: [desc]", MESSAGE_TYPE_INFO) + to_chat(M, "* --- *", MESSAGE_TYPE_INFO) /mob/living/proc/swap_rmb_intent(type, num) if(QDELETED(src)) @@ -2174,7 +2174,7 @@ if(isliving(user)) var/mob/living/L = user var/remaining = max(L.max_stamina - L.stamina, 0) - to_chat(user, span_info("Stamina: [round(remaining, 0.1)] / [round(L.max_stamina, 0.1)]")) + to_chat(user, span_info("Stamina: [round(remaining, 0.1)] / [round(L.max_stamina, 0.1)]"), MESSAGE_TYPE_INFO) else ..() @@ -2187,7 +2187,7 @@ /atom/movable/screen/energy/examine_ui(mob/user) if(isliving(user)) var/mob/living/L = user - to_chat(user, span_info("Energy: [round(L.energy, 0.1)] / [round(L.max_energy, 0.1)]")) + to_chat(user, span_info("Energy: [round(L.energy, 0.1)] / [round(L.max_energy, 0.1)]"), MESSAGE_TYPE_INFO) else ..() diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 0e1ed0899b7..91ce25ea278 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -11,25 +11,25 @@ */ /obj/item/proc/melee_attack_chain(mob/user, atom/target, params) if(user.check_arm_grabbed(user.active_hand_index)) - to_chat(user, span_notice("I can't move my arm!")) + to_chat(user, span_notice("I can't move my arm!"), MESSAGE_TYPE_INFO) return if(!user.has_hand_for_held_index(user.active_hand_index, TRUE)) //we obviously have a hadn, but we need to check for fingers/prosthetics - to_chat(user, span_warning("I can't move the fingers.")) + to_chat(user, span_warning("I can't move the fingers."), MESSAGE_TYPE_INFO) return if(!istype(src, /obj/item/grabbing) && !istype(src, /obj/item/rogueweapon/werewolf_claw)) if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) - to_chat(user, span_warning("...What?")) + to_chat(user, span_warning("...What?"), MESSAGE_TYPE_INFO) return // FAR less aggressive version of chunkyfingers, designed to be used with nudist. Shrimply lets the user still use neat stuff like orison without letting them weaponize. if(HAS_TRAIT(user, TRAIT_GNARLYDIGITS)) if(istype(src, /obj/item/rogueweapon) && !istype(src, /obj/item/rogueweapon/werewolf_claw)) - to_chat(user, span_warning("My fingers are too misshapen to use this puny implement.")) + to_chat(user, span_warning("My fingers are too misshapen to use this puny implement."), MESSAGE_TYPE_INFO) return // even less aggressive; allows use of tools but not weapons if(HAS_TRAIT(user, TRAIT_TINYPAWS)) var/obj/item/rogueweapon/weapon = src if(istype(weapon) && !weapon.is_tool) - to_chat(user, span_warning("I am too small to properly wield a weapon.")) + to_chat(user, span_warning("I am too small to properly wield a weapon."), MESSAGE_TYPE_INFO) return if(tool_behaviour && target.tool_act(user, src, tool_behaviour)) return @@ -130,7 +130,7 @@ return FALSE if(force && HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, span_warning("I don't want to harm other living beings!")) + to_chat(user, span_warning("I don't want to harm other living beings!"), MESSAGE_TYPE_INFO) return if(force && user.rogue_sneaking) @@ -203,7 +203,7 @@ user.ignite_mob() else if(prob(30)) - to_chat(M, span_warning("The foul blessing of the Undermaiden hurts us!")) + to_chat(M, span_warning("The foul blessing of the Undermaiden hurts us!"), MESSAGE_TYPE_COMBAT) user.adjust_blurriness(3) user.adjustBruteLoss(5) user.apply_status_effect(/datum/status_effect/churned, M) @@ -389,9 +389,9 @@ newforce = max(newforce*0.3, 1) if(prob(33)) if(I.wielded) - to_chat(user, span_info("I am too weak to wield this weapon properly with both hands.")) + to_chat(user, span_info("I am too weak to wield this weapon properly with both hands."), MESSAGE_TYPE_INFO) else - to_chat(user, span_info("I am too weak to wield this weapon properly with one hand.")) + to_chat(user, span_info("I am too weak to wield this weapon properly with one hand."), MESSAGE_TYPE_INFO) switch(blade_dulling) if(DULLING_CUT) //wooden that can't be attacked by clubs (trees, bushes, grass) @@ -470,7 +470,7 @@ return 0 if(DULLING_PICK) //cannot deal damage if not a pick item. aka rock walls if(!(user.mobility_flags & MOBILITY_STAND)) - to_chat(user, span_warning("I need to stand up to get a proper swing.")) + to_chat(user, span_warning("I need to stand up to get a proper swing."), MESSAGE_TYPE_INFO) return 0 if(user.used_intent.blade_class != BCLASS_PICK && user.used_intent.blade_class != BCLASS_DRILL) return 0 @@ -504,7 +504,7 @@ if(dullness_ratio < SHARPNESS_TIER2_THRESHOLD) var/lerpratio = LERP(0, SHARPNESS_TIER2_THRESHOLD, (dullness_ratio / SHARPNESS_TIER2_THRESHOLD)) //Yes, it's meant to LERP between 0 and 0.x using ratio / tier2. The damage falls off a cliff. Intended! if(prob(33)) - to_chat(user, span_info("The blade is dull...")) + to_chat(user, span_info("The blade is dull..."), MESSAGE_TYPE_INFO) newforce *= (lerpratio * 2) if(istype(user.rmb_intent, /datum/rmb_intent/strong)) @@ -687,11 +687,11 @@ var/datum/component/silverbless/blesscomp = GetComponent(/datum/component/silverbless) if(blesscomp?.is_blessed) if(!victim.has_status_effect(/datum/status_effect/fire_handler/fire_stacks/sunder)) - to_chat(victim, span_danger("Silver rebukes my presence! My vitae smolders, and my powers wane!")) + to_chat(victim, span_danger("Silver rebukes my presence! My vitae smolders, and my powers wane!"), MESSAGE_TYPE_COMBAT) victim.adjust_fire_stacks(thrown ? 1 : 3, /datum/status_effect/fire_handler/fire_stacks/sunder/blessed) else if(!victim.has_status_effect(/datum/status_effect/fire_handler/fire_stacks/sunder/blessed)) - to_chat(victim, span_danger("Blessed silver rebukes my presence! These fires are lashing at my very soul!")) + to_chat(victim, span_danger("Blessed silver rebukes my presence! These fires are lashing at my very soul!"), MESSAGE_TYPE_COMBAT) victim.adjust_fire_stacks(thrown ? 1 : 3, /datum/status_effect/fire_handler/fire_stacks/sunder) victim.ignite_mob() @@ -808,7 +808,7 @@ //Janky, but you'll see BIG TEXT for both the hits you make and take. if(src != user) var/attack_message_self = span_combatprimary("[user] [message_verb] [src] in the [span_combatsecondarybp(message_hit_area)] with [I]!") - to_chat(user, "[attack_message_self][next_attack_msg.Join()]") + to_chat(user, "[attack_message_self][next_attack_msg.Join()]", MESSAGE_TYPE_COMBAT) visible_message("[attack_message][span_combatsecondarysmall(next_attack_msg.Join())]",\ "[attack_message_local][next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE, user) //We try not to show this to the user (attacker) next_attack_msg.Cut() diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index c5d577aaf92..5c9da0d3557 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -7,15 +7,15 @@ /mob/living/carbon/UnarmedAttack(atom/A, proximity, params) if(!has_active_hand()) //can't attack without a hand. - to_chat(src, span_warning("I lack working hands.")) + to_chat(src, span_warning("I lack working hands."), MESSAGE_TYPE_INFO) return if(!has_hand_for_held_index(used_hand)) //can't attack without a hand. - to_chat(src, span_warning("I can't move this hand.")) + to_chat(src, span_warning("I can't move this hand."), MESSAGE_TYPE_INFO) return if(check_arm_grabbed(used_hand)) - to_chat(src, span_warning("Someone is grabbing my arm!")) + to_chat(src, span_warning("Someone is grabbing my arm!"), MESSAGE_TYPE_INFO) return // Special glove functions: @@ -54,8 +54,8 @@ ignite_mob() else if(prob(30)) - to_chat(src, span_warning("The Undermaiden protects me!")) - to_chat(L, span_warning("The foul blessing of the Undermaiden hurts us!")) + to_chat(src, span_warning("The Undermaiden protects me!"), MESSAGE_TYPE_COMBAT) + to_chat(L, span_warning("The foul blessing of the Undermaiden hurts us!"), MESSAGE_TYPE_COMBAT) adjust_blurriness(2) adjustBruteLoss(rand(5, 10)) apply_status_effect(/datum/status_effect/churned, L) @@ -100,15 +100,15 @@ return if(!has_active_hand()) //can't attack without a hand. - to_chat(src, span_warning("I lack working hands.")) + to_chat(src, span_warning("I lack working hands."), MESSAGE_TYPE_INFO) return if(!has_hand_for_held_index(used_hand)) //can't attack without a hand. - to_chat(src, span_warning("I can't move this hand.")) + to_chat(src, span_warning("I can't move this hand."), MESSAGE_TYPE_INFO) return if(check_arm_grabbed(used_hand)) - to_chat(src, span_warning("[pulledby] is restraining my arm!")) + to_chat(src, span_warning("[pulledby] is restraining my arm!"), MESSAGE_TYPE_INFO) return A.attack_right(src, params) @@ -154,11 +154,11 @@ if(offered_item == item_to_offer) user.cancel_offering_item() else - to_chat(user, span_notice("I'm already offering \the [item_to_offer]!")) + to_chat(user, span_notice("I'm already offering \the [item_to_offer]!"), MESSAGE_TYPE_INFO) return if(HAS_TRAIT(item_to_offer, TRAIT_NODROP)) - to_chat(user, span_warning("I can't offer this.")) + to_chat(user, span_warning("I can't offer this."), MESSAGE_TYPE_INFO) return user.offer_item(src, item_to_offer) @@ -203,7 +203,7 @@ if(!user.can_interact_with(src)) return FALSE if((interaction_flags_atom & INTERACT_ATOM_REQUIRES_DEXTERITY) && !user.IsAdvancedToolUser()) - to_chat(user, span_warning("I don't have the dexterity to do this!")) + to_chat(user, span_warning("I don't have the dexterity to do this!"), MESSAGE_TYPE_INFO) return FALSE if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED) && user.incapacitated((interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED), !(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB))) return FALSE @@ -325,13 +325,13 @@ ML.apply_damage(bite_damage, BRUTE, affecting, armor) ML.visible_message(span_danger("[name] bites [ML]!"), \ span_danger("[name] bites you!"), span_hear("I hear a chomp!"), COMBAT_MESSAGE_RANGE, name) - to_chat(name, span_danger("I bite [ML]!")) + to_chat(name, span_danger("I bite [ML]!"), MESSAGE_TYPE_COMBAT) if(armor >= 2) return else ML.visible_message(span_danger("[src]'s bite misses [ML]!"), \ span_danger("I avoid [src]'s bite!"), span_hear("I hear jaws snapping shut!"), COMBAT_MESSAGE_RANGE, src) - to_chat(src, span_danger("My bite misses [ML]!")) + to_chat(src, span_danger("My bite misses [ML]!"), MESSAGE_TYPE_COMBAT) /* Brain diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 254c6d5bf2c..e2e7b84c750 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -153,7 +153,7 @@ /proc/tkMaxRangeCheck(mob/user, atom/target) var/d = get_dist(user, target) if(d > TK_MAXRANGE) - to_chat(user, span_warning("My mind won't reach that far.")) + to_chat(user, span_warning("My mind won't reach that far."), MESSAGE_TYPE_INFO) return return TRUE diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 20cd2c36e38..84b114e310f 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -59,20 +59,20 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) message_admins(span_adminnotice("Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.")) --defcon if(2) - to_chat(GLOB.admins, span_boldannounce("Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.")) + to_chat(GLOB.admins, span_boldannounce("Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks."), MESSAGE_TYPE_ADMINLOG) --defcon if(1) - to_chat(GLOB.admins, span_boldannounce("Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...")) + to_chat(GLOB.admins, span_boldannounce("Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting..."), MESSAGE_TYPE_ADMINLOG) --defcon var/rtn = Recreate_MC() if(rtn > 0) defcon = 4 master_iteration = 0 - to_chat(GLOB.admins, span_adminnotice("MC restarted successfully")) + to_chat(GLOB.admins, span_adminnotice("MC restarted successfully"), MESSAGE_TYPE_ADMINLOG) else if(rtn < 0) log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") - to_chat(GLOB.admins, span_boldannounce("ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.")) + to_chat(GLOB.admins, span_boldannounce("ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying."), MESSAGE_TYPE_ADMINLOG) //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again //no need to handle that specially when defcon 0 can handle it if(0) //DEFCON 0! (mc failed to restart) @@ -80,7 +80,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) if(rtn > 0) defcon = 4 master_iteration = 0 - to_chat(GLOB.admins, span_adminnotice("MC restarted successfully")) + to_chat(GLOB.admins, span_adminnotice("MC restarted successfully"), MESSAGE_TYPE_ADMINLOG) else defcon = min(defcon + 1,5) master_iteration = Master.iteration diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 4ae9ed1d663..1fa7007dcf7 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -161,7 +161,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined." BadBoy.flags |= SS_NO_FIRE if(msg) - to_chat(GLOB.admins, "[msg]") + to_chat(GLOB.admins, "[msg]", MESSAGE_TYPE_ADMINLOG) log_world(msg) if (istype(Master.subsystems)) @@ -171,7 +171,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new current_runlevel = Master.current_runlevel StartProcessing(10) else - to_chat(world, "The Master Controller is having some issues, we will need to re-initialize EVERYTHING") + to_chat(world, "The Master Controller is having some issues, we will need to re-initialize EVERYTHING", MESSAGE_TYPE_OOC) Initialize(20, TRUE) // Please don't stuff random bullshit here, @@ -188,7 +188,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(init_sss) init_subtypes(/datum/controller/subsystem, subsystems) #ifdef TESTING - to_chat(world, "Initializing subsystems...") + to_chat(world, "Initializing subsystems...", MESSAGE_TYPE_OOC) #endif // Sort subsystems by init_order, so they initialize in the correct order. sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) @@ -211,7 +211,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" #ifdef TESTING - to_chat(world, "[msg]") + to_chat(world, "[msg]", MESSAGE_TYPE_OOC) #endif log_world(msg) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 97271188538..a6ca3e011ec 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -173,7 +173,7 @@ var/time = (REALTIMEOFDAY - start_timeofday) / 10 var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!" #ifdef LOCALTEST - to_chat(world, span_boldannounce("[msg]")) + to_chat(world, span_boldannounce("[msg]"), MESSAGE_TYPE_OOC) #endif log_world(msg) return time diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 5d97df36370..27945dabe7a 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -321,7 +321,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table /datum/DBQuery/proc/warn_execute(async = TRUE) . = Execute(async) if(!.) - to_chat(usr, span_danger("A SQL error occurred during this operation, check the server logs.")) + to_chat(usr, span_danger("A SQL error occurred during this operation, check the server logs."), MESSAGE_TYPE_INFO) /datum/DBQuery/proc/Execute(async = TRUE, log_error = TRUE) Activity("Execute") diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index e5d1b659576..a545b23305f 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -194,7 +194,7 @@ SUBSYSTEM_DEF(garbage) var/client/admin = c if(!check_rights_for(admin, R_ADMIN)) continue - to_chat(admin, "## TESTING: GC: -- [ADMIN_VV(D)] | [type] was unable to be GC'd --") + to_chat(admin, "## TESTING: GC: -- [ADMIN_VV(D)] | [type] was unable to be GC'd --", MESSAGE_TYPE_ADMINLOG) #endif #ifdef REFERENCE_TRACKING GLOB.deletion_failures += D //It should no longer be bothered by the GC, manual deletion only. diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 6735b14b3a3..dcc92f70c34 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(job) occupations = list() var/list/all_jobs = subtypesof(/datum/job/roguetown) if(!all_jobs.len) - to_chat(world, span_boldannounce("Error setting up jobs, no job datums found")) + to_chat(world, span_boldannounce("Error setting up jobs, no job datums found"), MESSAGE_TYPE_INFO) return 0 for(var/J in all_jobs) @@ -767,7 +767,7 @@ SUBSYSTEM_DEF(job) // to_chat(M, job.tutorial) var/related_policy = get_policy(rank) if(related_policy) - to_chat(M,related_policy) + to_chat(M,related_policy, MESSAGE_TYPE_INFO) if(job && H) job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not. @@ -848,7 +848,7 @@ SUBSYSTEM_DEF(job) if(PopcapReached()) JobDebug("Popcap overflow Check observer located, Player: [player]") JobDebug("Player rejected :[player]") - to_chat(player, "I couldn't find a job to be..") + to_chat(player, "I couldn't find a job to be..", MESSAGE_TYPE_INFO) unassigned -= player player.ready = PLAYER_NOT_READY diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 9d792474216..982d70b2436 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -77,7 +77,7 @@ SUBSYSTEM_DEF(mapping) var/old_config = config config = global.config.defaultmap if(!config || config.defaulted) - to_chat(world, "Unable to load next or default map config, defaulting to Vanderlin") + to_chat(world, "Unable to load next or default map config, defaulting to Vanderlin", MESSAGE_TYPE_OOC) config = old_config if(map_adjustment) map_adjustment.on_mapping_init() @@ -130,7 +130,7 @@ SUBSYSTEM_DEF(mapping) z_list = SSmapping.z_list -#define INIT_ANNOUNCE(X) to_chat(world, "[X]"); log_world(X) +#define INIT_ANNOUNCE(X) to_chat(world, "[X]", MESSAGE_TYPE_OOC); log_world(X) /datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) . = list() var/start_time = REALTIMEOFDAY @@ -289,7 +289,7 @@ SUBSYSTEM_DEF(mapping) message_admins("Randomly rotating map to [VM.map_name]") . = changemap(VM) if (. && VM.map_name != config.map_name) - to_chat(world, "Map rotation has chosen [VM.map_name] for next round!") + to_chat(world, "Map rotation has chosen [VM.map_name] for next round!", MESSAGE_TYPE_OOC) /datum/controller/subsystem/mapping/proc/changemap(datum/map_config/VM) if(!VM.MakeNextMap()) diff --git a/code/controllers/subsystem/migrants.dm b/code/controllers/subsystem/migrants.dm index 9210d246201..431ef475b18 100644 --- a/code/controllers/subsystem/migrants.dm +++ b/code/controllers/subsystem/migrants.dm @@ -285,9 +285,9 @@ SUBSYSTEM_DEF(migrants) if(spawn_on_location) character.forceMove(assignment.spawn_location) - to_chat(character, span_alertsyndie("I am a [role.name]!")) - to_chat(character, span_notice(wave.greet_text)) - to_chat(character, span_notice(role.greet_text)) + to_chat(character, span_alertsyndie("I am a [role.name]!"), MESSAGE_TYPE_INFO) + to_chat(character, span_notice(wave.greet_text), MESSAGE_TYPE_INFO) + to_chat(character, span_notice(role.greet_text), MESSAGE_TYPE_INFO) if(role.outfit) var/datum/outfit/outfit = new role.outfit() @@ -490,7 +490,7 @@ SUBSYSTEM_DEF(migrants) // Check if player has enough triumph var/current_triumph = SStriumphs.get_triumphs(player.ckey) if(current_triumph < amount) - to_chat(player, span_warning("You don't have enough triumph! You have [current_triumph], need [amount].")) + to_chat(player, span_warning("You don't have enough triumph! You have [current_triumph], need [amount]."), MESSAGE_TYPE_OOC) return FALSE // Deduct triumph from player @@ -509,7 +509,7 @@ SUBSYSTEM_DEF(migrants) global_triumph_contributions[player.ckey][wave_type] = 0 global_triumph_contributions[player.ckey][wave_type] += amount - to_chat(player, span_notice("You've contributed [amount] triumph to '[wave.name]'. Total: [wave.triumph_total]/[wave.triumph_threshold]")) + to_chat(player, span_notice("You've contributed [amount] triumph to '[wave.name]'. Total: [wave.triumph_total]/[wave.triumph_threshold]"), MESSAGE_TYPE_OOC) // Announce if threshold reached if(wave.triumph_total >= wave.triumph_threshold) diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 3c2b6a4444a..d3b7f4ddc30 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -134,24 +134,24 @@ SUBSYSTEM_DEF(nightshift) triumphs_to_add++ //CC Edit End adjust_triumphs(triumphs_to_add) - to_chat(src, span_notice("An another dae passes in Azuria...\nNights Survived: \Roman[allmig_reward]. \n")) + to_chat(src, span_notice("An another dae passes in Azuria...\nNights Survived: \Roman[allmig_reward]. \n"), MESSAGE_TYPE_INFO) var/int = mind.current.STAINT if(int < 10) - to_chat(src, span_boldwarning("I'm trying my best to learn, even if it is a little difficult...")) + to_chat(src, span_boldwarning("I'm trying my best to learn, even if it is a little difficult..."), MESSAGE_TYPE_INFO) else - to_chat(src, span_notice("I reflect on my journey, my experiences, and the lessons others, and lyfe has taught me...")) + to_chat(src, span_notice("I reflect on my journey, my experiences, and the lessons others, and lyfe has taught me..."), MESSAGE_TYPE_INFO) if(mind.sleep_adv) mind.sleep_adv.retained_dust += mind.current.STAINT * DREAM_DUST_PER_INT //25% dream points for each int switch(mind.sleep_adv.retained_dust) if(0 to 500) - to_chat(src, span_notice("I managed to focus on learning a thing or two lately, but to really solidify the lessons, I think I'll need to meditate and dream on it...")) + to_chat(src, span_notice("I managed to focus on learning a thing or two lately, but to really solidify the lessons, I think I'll need to meditate and dream on it..."), MESSAGE_TYPE_INFO) else - to_chat(src, span_notice("My mind has been absorbing knoweledge like a sponge... whatever that is. Curiosity drives me forwards, but reality holds me back... I really should reflect on my lessons now, if I want to realize my potential")) + to_chat(src, span_notice("My mind has been absorbing knoweledge like a sponge... whatever that is. Curiosity drives me forwards, but reality holds me back... I really should reflect on my lessons now, if I want to realize my potential"), MESSAGE_TYPE_INFO) if(!stat) - to_chat(src, span_warning("Staying alive in these uncertain times is it's own achievement. With the spark of my mind intact, and the embers of my heart and soul burning bright, at least at the moment, I feel slightly better about todae.")) + to_chat(src, span_warning("Staying alive in these uncertain times is it's own achievement. With the spark of my mind intact, and the embers of my heart and soul burning bright, at least at the moment, I feel slightly better about todae."), MESSAGE_TYPE_INFO) mind.sleep_adv.retained_dust += 100 //Free skillpoint for you <3 diff --git a/code/controllers/subsystem/rogue/economy/banditry_drain.dm b/code/controllers/subsystem/rogue/economy/banditry_drain.dm index 35e48debf54..42b6cf4cf80 100644 --- a/code/controllers/subsystem/rogue/economy/banditry_drain.dm +++ b/code/controllers/subsystem/rogue/economy/banditry_drain.dm @@ -87,9 +87,9 @@ continue if(H.client) if(outpost_reduction > 0) - to_chat(H, span_notice("Your troops at the outpost helped reduce losses from banditry by [outpost_reduction] mammon.")) + to_chat(H, span_notice("Your troops at the outpost helped reduce losses from banditry by [outpost_reduction] mammon."), MESSAGE_TYPE_INFO) else - to_chat(H, span_notice("Your troops at the outpose were mobilized, but failed to influence the situation due to high banditry.")) + to_chat(H, span_notice("Your troops at the outpose were mobilized, but failed to influence the situation due to high banditry."), MESSAGE_TYPE_INFO) var/list/outpost_candidates = list() var/outpost_info = get_outpost_banditry_support() @@ -107,4 +107,4 @@ daily_report_diff["outpost_threat_reduction_amount"] = reduction_amount for(var/mob/living/carbon/human/H in outpost_info["owners"]) if(H.client) - to_chat(H, span_notice("Your troops at the outpost helped reducing the danger of [TR.region_name].")) //СС + TA EDIT END + to_chat(H, span_notice("Your troops at the outpost helped reducing the danger of [TR.region_name]."), MESSAGE_TYPE_INFO) //СС + TA EDIT END diff --git a/code/controllers/subsystem/rogue/economy/economy.dm b/code/controllers/subsystem/rogue/economy/economy.dm index 53b9b262478..a1148588bc1 100644 --- a/code/controllers/subsystem/rogue/economy/economy.dm +++ b/code/controllers/subsystem/rogue/economy/economy.dm @@ -480,7 +480,7 @@ SUBSYSTEM_DEF(economy) var/datum/economic_region/ER = GLOB.economic_regions[order.region_id] if(ER?.is_region_blockaded) if(user) - to_chat(user, span_warning("[ER.name] is blockaded — the order cannot be delivered until the road is cleared.")) + to_chat(user, span_warning("[ER.name] is blockaded — the order cannot be delivered until the road is cleared."), MESSAGE_TYPE_INFO) return FALSE var/list/equip_goods = list() @@ -497,7 +497,7 @@ SUBSYSTEM_DEF(economy) if((length(equip_goods) || length(potion_goods)) && !length(GLOB.steward_export_machines)) if(user) - to_chat(user, span_warning("No warehouse dock manifest is registered. Cannot fulfill warehouse orders.")) + to_chat(user, span_warning("No warehouse dock manifest is registered. Cannot fulfill warehouse orders."), MESSAGE_TYPE_INFO) return FALSE var/list/equip_avail = length(equip_goods) ? scan_equipment_availability(order, equip_goods) : list() @@ -527,7 +527,7 @@ SUBSYSTEM_DEF(economy) order.is_fulfilled = TRUE GLOB.standing_order_pool -= order if(user) - to_chat(user, span_notice("Order Fulfilled: [full_payout]m paid to the Crown's Purse.")) + to_chat(user, span_notice("Order Fulfilled: [full_payout]m paid to the Crown's Purse."), MESSAGE_TYPE_INFO) log_game("STANDING ORDER FULFILLED by [user.ckey]: [order.name] (+[full_payout]m)") return list("status" = "full", "payout" = full_payout) @@ -537,7 +537,7 @@ SUBSYSTEM_DEF(economy) if(coverage < STANDING_ORDER_PARTIAL_THRESHOLD) if(user) - to_chat(user, span_warning("Coverage [round(coverage * 100)]% - below the [round(STANDING_ORDER_PARTIAL_THRESHOLD * 100)]% partial threshold. Short on: [english_list(missing_labels)].")) + to_chat(user, span_warning("Coverage [round(coverage * 100)]% - below the [round(STANDING_ORDER_PARTIAL_THRESHOLD * 100)]% partial threshold. Short on: [english_list(missing_labels)]."), MESSAGE_TYPE_INFO) return FALSE if(!partial) @@ -553,7 +553,7 @@ SUBSYSTEM_DEF(economy) order.is_fulfilled = TRUE GLOB.standing_order_pool -= order if(user) - to_chat(user, span_notice("Order Settled (Partial): [round(coverage * 100)]% coverage, [payout]m paid to the Crown's Purse ([round(STANDING_ORDER_PARTIAL_PAYOUT_MULT * 100)]% of the delivered share).")) + to_chat(user, span_notice("Order Settled (Partial): [round(coverage * 100)]% coverage, [payout]m paid to the Crown's Purse ([round(STANDING_ORDER_PARTIAL_PAYOUT_MULT * 100)]% of the delivered share)."), MESSAGE_TYPE_INFO) log_game("STANDING ORDER PARTIAL FULFILLED by [user.ckey]: [order.name] (+[payout]m, [round(coverage * 100)]% coverage)") return list("status" = "partial", "payout" = payout, "coverage_pct" = round(coverage * 100)) @@ -735,7 +735,7 @@ SUBSYSTEM_DEF(economy) var/datum/trade_good/tg = GLOB.trade_goods[good_id] if(!tg || !tg.importable) if(user) - to_chat(user, span_warning("[good_id] is not importable.")) + to_chat(user, span_warning("[good_id] is not importable."), MESSAGE_TYPE_INFO) return 0 if(quantity <= 0) return 0 @@ -743,7 +743,7 @@ SUBSYSTEM_DEF(economy) var/daily_pace = region.produces[good_id] || 0 if(daily_pace <= 0) if(user) - to_chat(user, span_warning("[region.name] does not produce [tg.name].")) + to_chat(user, span_warning("[region.name] does not produce [tg.name]."), MESSAGE_TYPE_INFO) return 0 var/produces_today = region.produces_today[good_id] || 0 @@ -755,7 +755,7 @@ SUBSYSTEM_DEF(economy) if(SStreasury.discretionary_fund.balance < total_cost) if(user) - to_chat(user, span_warning("Crown's Purse insufficient: [SStreasury.discretionary_fund.balance]m < [total_cost]m.")) + to_chat(user, span_warning("Crown's Purse insufficient: [SStreasury.discretionary_fund.balance]m < [total_cost]m."), MESSAGE_TYPE_INFO) return 0 SStreasury.burn(SStreasury.discretionary_fund, total_cost, "Manual Import: [quantity] [tg.name] from [region.name]") @@ -777,7 +777,7 @@ SUBSYSTEM_DEF(economy) var/datum/trade_good/tg = GLOB.trade_goods[good_id] if(!tg) if(user) - to_chat(user, span_warning("[good_id] is not a known trade good.")) + to_chat(user, span_warning("[good_id] is not a known trade good."), MESSAGE_TYPE_INFO) return 0 if(quantity <= 0) return 0 @@ -785,13 +785,13 @@ SUBSYSTEM_DEF(economy) var/daily_pace = region.demands[good_id] || 0 if(daily_pace <= 0) if(user) - to_chat(user, span_warning("[region.name] does not demand [tg.name].")) + to_chat(user, span_warning("[region.name] does not demand [tg.name]."), MESSAGE_TYPE_INFO) return 0 var/datum/roguestock/stockpile_entry = find_stockpile_by_trade_good(good_id) if(!stockpile_entry || stockpile_entry.stockpile_amount < quantity) if(user) - to_chat(user, span_warning("Insufficient [tg.name] in stockpile: have [stockpile_entry?.stockpile_amount || 0], need [quantity].")) + to_chat(user, span_warning("Insufficient [tg.name] in stockpile: have [stockpile_entry?.stockpile_amount || 0], need [quantity]."), MESSAGE_TYPE_INFO) return 0 var/demands_today = region.demands_today[good_id] || 0 diff --git a/code/controllers/subsystem/rogue/fog_event/fog_component.dm b/code/controllers/subsystem/rogue/fog_event/fog_component.dm index c6c32dc8650..473fc91258d 100644 --- a/code/controllers/subsystem/rogue/fog_event/fog_component.dm +++ b/code/controllers/subsystem/rogue/fog_event/fog_component.dm @@ -115,7 +115,7 @@ for(var/mob/living/V in valid_victims) V.mob_timers["ambush_cooldown"] = world.time + final_cooldown - to_chat(V, span_userdanger("The fog churns violently... something has found you!")) + to_chat(V, span_userdanger("The fog churns violently... something has found you!"), MESSAGE_TYPE_INFO) shake_camera(V, 2, 2) ambush_in_progress = FALSE diff --git a/code/controllers/subsystem/rogue/fog_event/fog_cross.dm b/code/controllers/subsystem/rogue/fog_event/fog_cross.dm index eb2501661da..622d50ca852 100644 --- a/code/controllers/subsystem/rogue/fog_event/fog_cross.dm +++ b/code/controllers/subsystem/rogue/fog_event/fog_cross.dm @@ -9,13 +9,13 @@ for(var/turf/T in range(4, user)) var/area/A = get_area(T) if(A.fog_protected) - to_chat(user, span_warning("The holy energies here are already saturated. You must find a place further from existing sanctuaries to plant this cross.")) + to_chat(user, span_warning("The holy energies here are already saturated. You must find a place further from existing sanctuaries to plant this cross."), MESSAGE_TYPE_INFO) return - to_chat(user, span_notice("You begin assembling the cross...")) + to_chat(user, span_notice("You begin assembling the cross..."), MESSAGE_TYPE_INFO) if(do_after(user, 5 SECONDS, target = user)) new /obj/structure/fluff/psycross/fog(get_turf(user)) - to_chat(user, span_notice("You finish the cross. It stands tall, ready to receive a light.")) + to_chat(user, span_notice("You finish the cross. It stands tall, ready to receive a light."), MESSAGE_TYPE_INFO) qdel(src) /obj/structure/fluff/psycross/fog @@ -34,12 +34,12 @@ /obj/structure/fluff/psycross/fog/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/flashlight/flare/torch/lantern)) if(inserted_lantern) - to_chat(user, span_warning("There is already a lantern on [src].")) + to_chat(user, span_warning("There is already a lantern on [src]."), MESSAGE_TYPE_INFO) return if(!I.forceMove(src)) return inserted_lantern = I - to_chat(user, span_notice("You hang the lantern on the cross.")) + to_chat(user, span_notice("You hang the lantern on the cross."), MESSAGE_TYPE_INFO) icon_state = "cross_fog0" update_icon() return @@ -47,19 +47,19 @@ /obj/structure/fluff/psycross/fog/attack_hand(mob/user) if(!inserted_lantern) - to_chat(user, span_warning("[src] needs a lantern to be activated!")) + to_chat(user, span_warning("[src] needs a lantern to be activated!"), MESSAGE_TYPE_INFO) return if(do_after(user, 5 SECONDS, target = src)) active = !active if(active) activate_sanctuary() - to_chat(user, span_notice("You light the lantern. The cross begins to hum with a protective aura.")) + to_chat(user, span_notice("You light the lantern. The cross begins to hum with a protective aura."), MESSAGE_TYPE_INFO) icon_state = "cross_fog1" set_light(5, 2, "#fff2aa") else deactivate_sanctuary() - to_chat(user, span_warning("You extinguish the lantern. The aura fades.")) + to_chat(user, span_warning("You extinguish the lantern. The aura fades."), MESSAGE_TYPE_INFO) icon_state = "cross_fog0" set_light(0) update_icon() diff --git a/code/controllers/subsystem/rogue/fog_event/fog_grace_effect.dm b/code/controllers/subsystem/rogue/fog_event/fog_grace_effect.dm index 0b08358e7e3..48cd8ab9ccf 100644 --- a/code/controllers/subsystem/rogue/fog_event/fog_grace_effect.dm +++ b/code/controllers/subsystem/rogue/fog_event/fog_grace_effect.dm @@ -1,7 +1,7 @@ /datum/status_effect/buff/fog_grace/on_remove() REMOVE_TRAIT(owner, TRAIT_FOG_WARDED, TRAIT_STATUS_EFFECT) SEND_SIGNAL(owner, COMSIG_WARDED_TRAIT_CHANGE) - to_chat(owner, span_userdanger("The protective warmth fades. You feel the fog's hunger turning toward you...")) + to_chat(owner, span_userdanger("The protective warmth fades. You feel the fog's hunger turning toward you..."), MESSAGE_TYPE_INFO) . = ..() /atom/movable/screen/alert/status_effect/fog_grace @@ -19,4 +19,4 @@ . = ..() ADD_TRAIT(owner, TRAIT_FOG_WARDED, TRAIT_STATUS_EFFECT) SEND_SIGNAL(owner, COMSIG_WARDED_TRAIT_CHANGE) - to_chat(owner, span_userdanger("You cannot fall prey to the fog yet, but it won't be long until the spirits find you...")) + to_chat(owner, span_userdanger("You cannot fall prey to the fog yet, but it won't be long until the spirits find you..."), MESSAGE_TYPE_INFO) diff --git a/code/controllers/subsystem/rogue/fog_event/fog_lamptern.dm b/code/controllers/subsystem/rogue/fog_event/fog_lamptern.dm index dc00157a825..51110c74fc0 100644 --- a/code/controllers/subsystem/rogue/fog_event/fog_lamptern.dm +++ b/code/controllers/subsystem/rogue/fog_event/fog_lamptern.dm @@ -37,21 +37,21 @@ /obj/item/lantern/fog_repelling/attack_self(mob/living/user) if(fuel <= 0) - to_chat(user, span_warning("[src] refuses to light, it needs more sanctified oil.")) + to_chat(user, span_warning("[src] refuses to light, it needs more sanctified oil."), MESSAGE_TYPE_INFO) return if(!isliving(user)) - to_chat(user, span_warning("[src] refuses to light, you have no soul.")) + to_chat(user, span_warning("[src] refuses to light, you have no soul."), MESSAGE_TYPE_INFO) return active = !active if(active) - to_chat(user, span_notice("You light the [src]. A soft, protective glow surrounds you.")) + to_chat(user, span_notice("You light the [src]. A soft, protective glow surrounds you."), MESSAGE_TYPE_INFO) set_light(l_outer_range = range, l_power = 2, l_color = "#fff2aa") icon_state = "[initial(icon_state)]-on" // Ensure you have this state user.apply_status_effect(/datum/status_effect/buff/fog_ward_caster, range, -1, FALSE) start_tracking(user) else - to_chat(user, span_notice("You extinguish the [src].")) + to_chat(user, span_notice("You extinguish the [src]."), MESSAGE_TYPE_INFO) set_light(0) icon_state = initial(icon_state) user.remove_status_effect(/datum/status_effect/buff/fog_ward_caster) @@ -76,7 +76,7 @@ set_light(0) icon_state = initial(icon_state) if(isliving(user)) - to_chat(user, span_warning("The [src] flickers once and goes cold as the fuel runs out.")) + to_chat(user, span_warning("The [src] flickers once and goes cold as the fuel runs out."), MESSAGE_TYPE_INFO) user.remove_status_effect(/datum/status_effect/buff/fog_ward_caster) stop_tracking() update_icon() @@ -112,7 +112,7 @@ if(holder) if(loc != holder || istype(loc, /obj/item/storage/backpack) || istype(loc, /obj/structure/closet)) - to_chat(holder, span_warning("The protective light of [src] fades as it leaves your person!")) + to_chat(holder, span_warning("The protective light of [src] fades as it leaves your person!"), MESSAGE_TYPE_INFO) holder.remove_status_effect(/datum/status_effect/buff/fog_ward_caster) extinguish() stop_tracking() @@ -133,10 +133,10 @@ if(istype(I, /obj/item/reagent_containers)) var/obj/item/reagent_containers/container = I if(!container.reagents.has_reagent(/datum/reagent/sanctified_oil)) - to_chat(user, span_warning("[container] doesn't contain sanctified oil!")) + to_chat(user, span_warning("[container] doesn't contain sanctified oil!"), MESSAGE_TYPE_INFO) return if(fuel >= max_fuel) - to_chat(user, span_warning("[src] is already full!")) + to_chat(user, span_warning("[src] is already full!"), MESSAGE_TYPE_INFO) return // 1 unit of reagent = 25 units of fuel diff --git a/code/controllers/subsystem/rogue/fog_event/fog_ward_effect.dm b/code/controllers/subsystem/rogue/fog_event/fog_ward_effect.dm index 4fe6ea06de4..10eddde8f98 100644 --- a/code/controllers/subsystem/rogue/fog_event/fog_ward_effect.dm +++ b/code/controllers/subsystem/rogue/fog_event/fog_ward_effect.dm @@ -22,22 +22,22 @@ /datum/status_effect/buff/fog_ward/process() . = ..() if(QDELETED(caster) || caster.stat == DEAD || !caster.has_status_effect(/datum/status_effect/buff/fog_ward_caster)) - to_chat(owner, span_warning("Woe! The ward fades!")) + to_chat(owner, span_warning("Woe! The ward fades!"), MESSAGE_TYPE_INFO) owner.remove_status_effect(/datum/status_effect/buff/fog_ward) return // should this cause lag, remind me to make this component based instead. if(get_dist(owner, caster) > range) if(!grace_period) - to_chat(owner, span_warning("You have stepped out of the holy ward! Return to the light!")) + to_chat(owner, span_warning("You have stepped out of the holy ward! Return to the light!"), MESSAGE_TYPE_INFO) grace_period = world.time + 5 SECONDS if(world.time > grace_period) - to_chat(owner, span_danger("The holy protection fades as you wander too far from the caster for too long.")) + to_chat(owner, span_danger("The holy protection fades as you wander too far from the caster for too long."), MESSAGE_TYPE_INFO) owner.remove_status_effect(/datum/status_effect/buff/fog_ward) else if(grace_period) - to_chat(owner, span_notice("You are back within the safety of the ward.")) + to_chat(owner, span_notice("You are back within the safety of the ward."), MESSAGE_TYPE_INFO) grace_period = 0 /datum/status_effect/buff/fog_ward/on_remove() diff --git a/code/controllers/subsystem/rogue/miscprocs.dm b/code/controllers/subsystem/rogue/miscprocs.dm index ac347f915c4..72238a559f5 100644 --- a/code/controllers/subsystem/rogue/miscprocs.dm +++ b/code/controllers/subsystem/rogue/miscprocs.dm @@ -69,7 +69,7 @@ holder?.hud_used?.bloodpool?.set_value((100 / (max_devotion / devotion)) / 100, 1 SECONDS) //Max devotion limit if((devotion >= max_devotion) && !silent) - to_chat(holder, span_warning("I have reached the limit of my devotion...")) + to_chat(holder, span_warning("I have reached the limit of my devotion..."), MESSAGE_TYPE_INFO) if(!prog_amt) // no point in the rest if it's just an expenditure return TRUE progression = clamp(progression + prog_amt, 0, max_progression) @@ -116,7 +116,7 @@ //CC Edit var/obj/effect/proc_holder/spell/newspell = new spell_type if(!silent) - to_chat(holder, span_boldnotice("I have unlocked a new spell: [newspell]")) + to_chat(holder, span_boldnotice("I have unlocked a new spell: [newspell]"), MESSAGE_TYPE_INFO) if(!is_npc) holder.mind.AddSpell(newspell, holder) LAZYADD(granted_spells, newspell) @@ -128,7 +128,7 @@ var/required_tier = patron.traits_tier[trait] if(required_tier <= level) if(!silent) - to_chat(holder, span_boldnotice("I have unlocked a new trait: [trait]")) + to_chat(holder, span_boldnotice("I have unlocked a new trait: [trait]"), MESSAGE_TYPE_INFO) ADD_TRAIT(holder, trait, ROUNDSTART_TRAIT) @@ -178,7 +178,7 @@ if(!devotion) return FALSE - to_chat(src,"My devotion is [devotion.devotion].") + to_chat(src,"My devotion is [devotion.devotion].", MESSAGE_TYPE_INFO) return TRUE /mob/living/carbon/human/proc/clericpray() @@ -190,7 +190,7 @@ //CC Edit Begin //Witch's all have a god complex. Their patron still loves them however. if(HAS_TRAIT(src, TRAIT_WITCH)) - to_chat(src, span_warning("My patron has blessed me enough as is, I can do things on my own.")) + to_chat(src, span_warning("My patron has blessed me enough as is, I can do things on my own."), MESSAGE_TYPE_INFO) return FALSE //CC Edit End @@ -198,7 +198,7 @@ visible_message("[src] kneels their head in prayer to the Gods.", "I kneel my head in prayer to [devotion.patron.name].") for(var/i in 1 to 50) if(devotion.devotion >= devotion.max_devotion) - to_chat(src, span_warning("I have reached the limit of my devotion...")) + to_chat(src, span_warning("I have reached the limit of my devotion..."), MESSAGE_TYPE_INFO) break if(!do_after(src, 30)) break @@ -209,7 +209,7 @@ devotion.update_devotion(prayer_effectiveness, prayer_effectiveness) prayersesh += prayer_effectiveness visible_message("[src] concludes their prayer.", "I conclude my prayer.") - to_chat(src, "I gained [prayersesh] devotion!") + to_chat(src, "I gained [prayersesh] devotion!", MESSAGE_TYPE_INFO) return TRUE /mob/living/carbon/human/proc/changevoice() @@ -235,7 +235,7 @@ return FALSE V.second_color = sanitize_hexcolor(newcolor) V.second_desc_path = voice_options[picked_name] - to_chat(src, span_notice("Second voice configured: Color [V.second_color] with the '[picked_name]' description.")) + to_chat(src, span_notice("Second voice configured: Color [V.second_color] with the '[picked_name]' description."), MESSAGE_TYPE_INFO) src.verbs -= /mob/living/carbon/human/proc/changevoice return TRUE @@ -263,7 +263,7 @@ REMOVE_TRAIT(src, TRAIT_COMBAT_AWARE, TRAIT_VIRTUE) else ADD_TRAIT(src, TRAIT_COMBAT_AWARE, TRAIT_VIRTUE) - to_chat(src, "I will see [HAS_TRAIT(src, TRAIT_COMBAT_AWARE) ? "more" : "less"] combat information now.") + to_chat(src, "I will see [HAS_TRAIT(src, TRAIT_COMBAT_AWARE) ? "more" : "less"] combat information now.", MESSAGE_TYPE_INFO) /mob/living/carbon/human/proc/toggle_descriptors() @@ -271,7 +271,7 @@ set category = "Virtue" show_descriptors = !show_descriptors - to_chat(src, "My identifying features are [show_descriptors ? "no longer " : ""]obscured.") + to_chat(src, "My identifying features are [show_descriptors ? "no longer " : ""]obscured.", MESSAGE_TYPE_INFO) if(show_descriptors) voicecolor_override = null else @@ -285,4 +285,4 @@ REMOVE_TRAIT(src, TRAIT_DECEIVING_MEEKNESS, TRAIT_VIRTUE) else ADD_TRAIT(src, TRAIT_DECEIVING_MEEKNESS, TRAIT_VIRTUE) - to_chat(src, "I have [HAS_TRAIT(src, TRAIT_DECEIVING_MEEKNESS) ? "raised" : "lowered"] my guard around others.") + to_chat(src, "I have [HAS_TRAIT(src, TRAIT_DECEIVING_MEEKNESS) ? "raised" : "lowered"] my guard around others.", MESSAGE_TYPE_INFO) diff --git a/code/controllers/subsystem/rogue/role_class_handler/class_register.dm b/code/controllers/subsystem/rogue/role_class_handler/class_register.dm index 4c13d7684b8..58a6278e43b 100644 --- a/code/controllers/subsystem/rogue/role_class_handler/class_register.dm +++ b/code/controllers/subsystem/rogue/role_class_handler/class_register.dm @@ -5,7 +5,7 @@ /datum/class_register/proc/add_listener(mob/listener) for(var/msg in registered_messages) - to_chat(listener, span_notice(msg)) + to_chat(listener, span_notice(msg), MESSAGE_TYPE_INFO) listening_mobs += listener /datum/class_register/proc/remove_listener(mob/listener) @@ -15,5 +15,5 @@ for(var/mob/listener as anything in listening_mobs) if(listener == invoker) continue - to_chat(listener, span_notice(msg)) + to_chat(listener, span_notice(msg), MESSAGE_TYPE_INFO) registered_messages += msg diff --git a/code/controllers/subsystem/rogue/scheduled_event_subsytem.dm b/code/controllers/subsystem/rogue/scheduled_event_subsytem.dm index f7b7a88e600..aa8d701cba4 100644 --- a/code/controllers/subsystem/rogue/scheduled_event_subsytem.dm +++ b/code/controllers/subsystem/rogue/scheduled_event_subsytem.dm @@ -50,7 +50,7 @@ SUBSYSTEM_DEF(event_scheduler) var/min = text2num(time2text(world.timeofday, "mm")) var/weekday = time2text(world.timeofday, "Day") // Full day name - to_chat(world, span_userdanger("Today is [weekday], [mm]/[dd]/20[yy] at [hh]:[min]")) + to_chat(world, span_userdanger("Today is [weekday], [mm]/[dd]/20[yy] at [hh]:[min]"), MESSAGE_TYPE_OOC) /datum/controller/subsystem/event_scheduler/proc/update_mob_fog_status(atom/movable/AM, area_is_safe) if(!ishuman(AM)) @@ -173,7 +173,7 @@ SUBSYSTEM_DEF(event_scheduler) var/new_time = input(usr, "Enter new time for [uppertext(day)] (HH:MM format):", "Fog Schedule", fog_schedule[day]) as text|null if(!isnull(new_time)) if(new_time != "" && !findtext(new_time, ":")) - to_chat(usr, span_warning("Invalid format! Use HH:MM.")) + to_chat(usr, span_warning("Invalid format! Use HH:MM."), MESSAGE_TYPE_OOC) else fog_schedule[day] = new_time save_fog_schedule() diff --git a/code/controllers/subsystem/rogue/treasury.dm b/code/controllers/subsystem/rogue/treasury.dm index 789265c5635..61bcee3f36e 100644 --- a/code/controllers/subsystem/rogue/treasury.dm +++ b/code/controllers/subsystem/rogue/treasury.dm @@ -17,7 +17,7 @@ for(var/mob/living/carbon/human/X in GLOB.human_list) if(X.real_name in names_to) if(!X.stat) - to_chat(X, span_biginfo("[msg]")) + to_chat(X, span_biginfo("[msg]"), MESSAGE_TYPE_INFO) SUBSYSTEM_DEF(treasury) name = "treasury" @@ -597,7 +597,7 @@ SUBSYSTEM_DEF(treasury) /datum/controller/subsystem/treasury/proc/apply_rate_adjustments(list/adjustments, good_announcement_text, bad_announcement_text) if(GLOB.dayspassed <= levy_rates_changed_day) - to_chat(usr, span_warning("Crown levies have already been adjusted today - come back tomorrow.")) + to_chat(usr, span_warning("Crown levies have already been adjusted today - come back tomorrow."), MESSAGE_TYPE_INFO) return var/list/lines = list() var/bad_guy = FALSE @@ -648,7 +648,7 @@ SUBSYSTEM_DEF(treasury) /datum/controller/subsystem/treasury/proc/apply_poll_rate_adjustments(list/adjustments, good_announcement_text, bad_announcement_text) if(GLOB.dayspassed <= poll_rates_changed_day) - to_chat(usr, span_warning("Poll tax rates have already been adjusted today - come back tomorrow.")) + to_chat(usr, span_warning("Poll tax rates have already been adjusted today - come back tomorrow."), MESSAGE_TYPE_INFO) return if(!islist(adjustments)) return @@ -907,40 +907,40 @@ SUBSYSTEM_DEF(treasury) if(!H || days <= 0) return FALSE if(SSticker?.round_start_time && (world.time - SSticker.round_start_time) < POLL_TAX_ADVANCE_LOCKOUT) - to_chat(H, span_warning("The Crown's ledgers have not yet opened for the day. Try again later.")) + to_chat(H, span_warning("The Crown's ledgers have not yet opened for the day. Try again later."), MESSAGE_TYPE_INFO) return FALSE var/datum/fund/account = get_account(H) if(!account) return FALSE var/category = get_poll_tax_category(H) if(!category) - to_chat(H, span_warning("The Crown does not tax your class.")) + to_chat(H, span_warning("The Crown does not tax your class."), MESSAGE_TYPE_INFO) return FALSE if(is_poll_tax_charter_exempt(H, category)) - to_chat(H, span_warning("Your class is exempt from poll tax by decree.")) + to_chat(H, span_warning("Your class is exempt from poll tax by decree."), MESSAGE_TYPE_INFO) return FALSE var/rate = get_poll_tax_rate_for(H, category) if(rate < 0) - to_chat(H, span_warning("Your class currently receives a Crown subsidy - there is nothing to advance.")) + to_chat(H, span_warning("Your class currently receives a Crown subsidy - there is nothing to advance."), MESSAGE_TYPE_INFO) return FALSE if(rate == 0) rate = POLL_TAX_ADVANCE_FALLBACK_RATE var/existing_advance = poll_tax_advance_days[H] || 0 var/room = POLL_TAX_MAX_ADVANCE_DAYS - existing_advance if(room <= 0) - to_chat(H, span_warning("You already hold the maximum of [POLL_TAX_MAX_ADVANCE_DAYS] days of Poll Tax advance.")) + to_chat(H, span_warning("You already hold the maximum of [POLL_TAX_MAX_ADVANCE_DAYS] days of Poll Tax advance."), MESSAGE_TYPE_INFO) return FALSE if(days > room) days = room var/total_cost = rate * days if(account.balance < total_cost) - to_chat(H, span_warning("Insufficient balance. Need [total_cost]m for [days] days.")) + to_chat(H, span_warning("Insufficient balance. Need [total_cost]m for [days] days."), MESSAGE_TYPE_INFO) return FALSE if(!transfer(account, discretionary_fund, total_cost, "Poll Tax advance ([days] days)")) return FALSE record_poll_tax_by_category(category, total_cost) poll_tax_advance_days[H] = existing_advance + days - to_chat(H, span_notice("You have advanced [days] day[days == 1 ? "" : "s"] of Poll Tax ([total_cost]m total). Advance held: [poll_tax_advance_days[H]] day[poll_tax_advance_days[H] == 1 ? "" : "s"].")) + to_chat(H, span_notice("You have advanced [days] day[days == 1 ? "" : "s"] of Poll Tax ([total_cost]m total). Advance held: [poll_tax_advance_days[H]] day[poll_tax_advance_days[H] == 1 ? "" : "s"]."), MESSAGE_TYPE_INFO) log_game("POLL TAX ADVANCE: [key_name(H)] prepaid [days] days ([total_cost]m) of poll tax as [category]") return TRUE @@ -988,7 +988,7 @@ SUBSYSTEM_DEF(treasury) continue // Record as a negative against the category - the breakdown shows net Crown intake. record_poll_tax_by_category(category, -subsidy) - to_chat(owner, span_notice("POLL SUBSIDY: [subsidy]m granted by the Crown.")) + to_chat(owner, span_notice("POLL SUBSIDY: [subsidy]m granted by the Crown."), MESSAGE_TYPE_INFO) continue var/advance = poll_tax_advance_days[owner] || 0 @@ -998,7 +998,7 @@ SUBSYSTEM_DEF(treasury) poll_tax_advance_days -= owner else poll_tax_advance_days[owner] = advance - to_chat(owner, span_notice("POLL TAX: Covered by advance. [advance] day[advance == 1 ? "" : "s"] remaining.")) + to_chat(owner, span_notice("POLL TAX: Covered by advance. [advance] day[advance == 1 ? "" : "s"] remaining."), MESSAGE_TYPE_INFO) continue var/owed_this_tick = rate + (poll_tax_owed[owner] || 0) @@ -1016,12 +1016,12 @@ SUBSYSTEM_DEF(treasury) if(paid > 0) record_poll_tax_by_category(category, paid) - to_chat(owner, span_notice("POLL TAX: [paid]m collected.")) + to_chat(owner, span_notice("POLL TAX: [paid]m collected."), MESSAGE_TYPE_INFO) if(owed_this_tick > 0) poll_tax_owed[owner] = owed_this_tick poll_tax_debt_days[owner] = (poll_tax_debt_days[owner] || 0) + 1 - to_chat(owner, span_danger("POLL TAX: You owe the Crown [owed_this_tick]m. [poll_tax_debt_days[owner]] day\s overdue.")) + to_chat(owner, span_danger("POLL TAX: You owe the Crown [owed_this_tick]m. [poll_tax_debt_days[owner]] day\s overdue."), MESSAGE_TYPE_INFO) if(poll_tax_debt_days[owner] >= POLL_TAX_DEBT_DAYS_TO_DEBTOR && !HAS_TRAIT(owner, TRAIT_ARREARS)) ADD_TRAIT(owner, TRAIT_ARREARS, TRAIT_GENERIC) else diff --git a/code/controllers/subsystem/rogue/triumphs/triumph_adjust_procs.dm b/code/controllers/subsystem/rogue/triumphs/triumph_adjust_procs.dm index 1112f82d1ca..145d50a4143 100644 --- a/code/controllers/subsystem/rogue/triumphs/triumph_adjust_procs.dm +++ b/code/controllers/subsystem/rogue/triumphs/triumph_adjust_procs.dm @@ -13,12 +13,12 @@ if(counted) record_round_statistic(STATS_TRIUMPHS_AWARDED, amt) if(current) - to_chat(current, "\n[amt] TRIUMPH(S) awarded.") + to_chat(current, "\n[amt] TRIUMPH(S) awarded.", MESSAGE_TYPE_INFO) else if(amt < 0) if(counted) record_round_statistic(STATS_TRIUMPHS_STOLEN, amt) if(current) - to_chat(current, "\n[amt*-1] TRIUMPH(S) lost.") + to_chat(current, "\n[amt*-1] TRIUMPH(S) lost.", MESSAGE_TYPE_INFO) @@ -36,11 +36,11 @@ if(amt > 0) if(counted) record_round_statistic(STATS_TRIUMPHS_AWARDED, amt) - to_chat(src, "\n[amt] TRIUMPH(S) awarded.") + to_chat(src, "\n[amt] TRIUMPH(S) awarded.", MESSAGE_TYPE_INFO) else if(amt < 0) if(counted) record_round_statistic(STATS_TRIUMPHS_STOLEN, amt) - to_chat(src, "\n[amt*-1] TRIUMPH(S) lost.") + to_chat(src, "\n[amt*-1] TRIUMPH(S) lost.", MESSAGE_TYPE_INFO) /* mobs also got ckeys p simple @@ -55,8 +55,8 @@ if(amt > 0) if(counted) record_round_statistic(STATS_TRIUMPHS_AWARDED, amt) - to_chat(src, "\n[amt] TRIUMPH(S) awarded.") + to_chat(src, "\n[amt] TRIUMPH(S) awarded.", MESSAGE_TYPE_INFO) else if(amt < 0) if(counted) record_round_statistic(STATS_TRIUMPHS_STOLEN, amt) - to_chat(src, "\n[amt*-1] TRIUMPH(S) lost.") + to_chat(src, "\n[amt*-1] TRIUMPH(S) lost.", MESSAGE_TYPE_INFO) diff --git a/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm b/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm index 3e3ca0fd657..8884dc01725 100644 --- a/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm +++ b/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm @@ -9,4 +9,4 @@ // We fire this on activate /datum/triumph_buy/wipe_triumphs/on_activate() SStriumphs.wipe_all_triumphs(ckey_of_buyer) // ha haha .... woops guys - to_chat(world, span_redtext("[key_of_buyer] burns the hall of triumphs to the ground!")) + to_chat(world, span_redtext("[key_of_buyer] burns the hall of triumphs to the ground!"), MESSAGE_TYPE_INFO) diff --git a/code/controllers/subsystem/rogue/triumphs/triumphs.dm b/code/controllers/subsystem/rogue/triumphs/triumphs.dm index 00deab3f4c7..0eb5a9ff5d3 100644 --- a/code/controllers/subsystem/rogue/triumphs/triumphs.dm +++ b/code/controllers/subsystem/rogue/triumphs/triumphs.dm @@ -142,7 +142,7 @@ SUBSYSTEM_DEF(triumphs) triumph_adjust(refund_amount, ckey_cur_owna) if(GLOB.directory[ckey_cur_owna]) // If they are still logged into the game, inform them they got refunded - to_chat(GLOB.directory[ckey_cur_owna], span_redtext("You were refunded [refund_amount] triumphs due to CONFLICTS.")) + to_chat(GLOB.directory[ckey_cur_owna], span_redtext("You were refunded [refund_amount] triumphs due to CONFLICTS."), MESSAGE_TYPE_INFO) // Cleanup Time active_datum.on_removal() @@ -165,7 +165,7 @@ SUBSYSTEM_DEF(triumphs) triumph_adjust(refund_amount, ckey_prev_owna) if(GLOB.directory[ckey_prev_owna]) // If they are still logged into the game, inform them they got refunded - to_chat(GLOB.directory[ckey_prev_owna], span_redtext("You were refunded [refund_amount] triumphs due to a UNBUY.")) + to_chat(GLOB.directory[ckey_prev_owna], span_redtext("You were refunded [refund_amount] triumphs due to a UNBUY."), MESSAGE_TYPE_INFO) pull_it_out.on_removal() @@ -221,7 +221,7 @@ SUBSYSTEM_DEF(triumphs) We save everything when its time for reboot */ /datum/controller/subsystem/triumphs/proc/end_triumph_saving_time() - to_chat(world, span_boldannounce(" Recording VICTORIES to the WORLD END MACHINE. ")) + to_chat(world, span_boldannounce(" Recording VICTORIES to the WORLD END MACHINE. "), MESSAGE_TYPE_OOC) //for(var/target_ckey in triumph_amount_cache) // var/list/saving_data = list() // // this will be for example "data/player_saves/a/ass/triumphs.json" if their ckey was ass diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index b81ccdcb017..1ba3861e6e4 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -64,7 +64,7 @@ SUBSYSTEM_DEF(server_maint) var/cmob = C.mob if (!isnewplayer(cmob) || !SSticker.queued_players.Find(cmob)) log_access("AFK: [key_name(C)]") - to_chat(C, span_danger("I have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.
I may reconnect via the button in the file menu or by clicking here to reconnect.")) + to_chat(C, span_danger("I have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.
I may reconnect via the button in the file menu or by clicking here to reconnect."), MESSAGE_TYPE_OOC) QDEL_IN(C, 1) //to ensure they get our message before getting disconnected continue diff --git a/code/controllers/subsystem/storyteller.dm b/code/controllers/subsystem/storyteller.dm index aaf7f4ee7df..ccf91709a29 100644 --- a/code/controllers/subsystem/storyteller.dm +++ b/code/controllers/subsystem/storyteller.dm @@ -656,9 +656,9 @@ SUBSYSTEM_DEF(gamemode) for(var/storyteller_name in storytellers) var/datum/storyteller/initialized_storyteller = storytellers[storyteller_name] if(initialized_storyteller?.ascendant) - to_chat(world, "
") - to_chat(world, span_reallybig("[initialized_storyteller.name] is ascendant!")) - to_chat(world, "
") + to_chat(world, "
", MESSAGE_TYPE_INFO) + to_chat(world, span_reallybig("[initialized_storyteller.name] is ascendant!"), MESSAGE_TYPE_INFO) + to_chat(world, "
", MESSAGE_TYPE_INFO) // If an admin force-starts the round while the storyteller vote is still running, // resolve it now so selected_storyteller reflects votes cast so far (or falls back @@ -729,13 +729,13 @@ SUBSYSTEM_DEF(gamemode) return TRUE if(SSmapping.retainer.head_rebel_decree) if(reb_end_time == 0) - to_chat(world, span_boldannounce("The peasant rebels took control of the throne, hail the new community!")) + to_chat(world, span_boldannounce("The peasant rebels took control of the throne, hail the new community!"), MESSAGE_TYPE_INFO) if(ttime >= INITIAL_ROUND_TIMER) reb_end_time = ttime + 15 MINUTES - to_chat(world, span_boldwarning("The round will end in 15 minutes.")) + to_chat(world, span_boldwarning("The round will end in 15 minutes."), MESSAGE_TYPE_INFO) else reb_end_time = INITIAL_ROUND_TIMER - to_chat(world, span_boldwarning("The round will end at the 2:30 hour mark.")) + to_chat(world, span_boldwarning("The round will end at the 2:30 hour mark."), MESSAGE_TYPE_INFO) if(ttime >= reb_end_time) return TRUE @@ -928,8 +928,8 @@ SUBSYSTEM_DEF(gamemode) get_gnoll_scaling() var/datum/storyteller/storytypecasted = selected_storyteller - to_chat(world, span_notice("Storyteller is [initial(storytypecasted.name)]!")) - to_chat(world, span_notice("[initial(storytypecasted.vote_desc)]")) + to_chat(world, span_notice("Storyteller is [initial(storytypecasted.name)]!"), MESSAGE_TYPE_INFO) + to_chat(world, span_notice("[initial(storytypecasted.vote_desc)]"), MESSAGE_TYPE_INFO) /datum/controller/subsystem/gamemode/proc/get_last_storyteller_vote() var/json_file = file(LAST_ROUND_STATS_FILE) @@ -1776,7 +1776,7 @@ SUBSYSTEM_DEF(gamemode) switch(href_list["action"]) if("set_storyteller") if(storyteller_locked()) - to_chat(usr, span_warning("The round storyteller is locked after roundstart and cannot be forced midround.")) + to_chat(usr, span_warning("The round storyteller is locked after roundstart and cannot be forced midround."), MESSAGE_TYPE_INFO) message_admins("[key_name_admin(usr)] attempted to force the storyteller after roundstart, but the round storyteller is locked.") return message_admins("[key_name_admin(usr)] is picking a new Storyteller.") diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 3b32a5b1106..15df9cbe149 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -275,7 +275,7 @@ SUBSYSTEM_DEF(ticker) if(player.ready == PLAYER_READY_TO_PLAY) if(player.client.prefs.lastclass == V) if(player.IsJobUnavailable(V) != JOB_AVAILABLE) - to_chat(player, span_warning("You cannot be [V] and thus are not considered.")) + to_chat(player, span_warning("You cannot be [V] and thus are not considered."), MESSAGE_TYPE_OOC) continue readied_jobs.Add(V) /* @@ -538,7 +538,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_tip_of_the_round(input) if(!input) return - to_chat(world, fieldset_block(span_purple("Tip of the Round"), span_purple("[html_encode(input)]"), "tipoftheround")) + to_chat(world, fieldset_block(span_purple("Tip of the Round"), span_purple("[html_encode(input)]"), "tipoftheround"), MESSAGE_TYPE_OOC) /datum/controller/subsystem/ticker/proc/check_queue() if(!queued_players.len) @@ -547,7 +547,7 @@ SUBSYSTEM_DEF(ticker) if(!hpc) listclearnulls(queued_players) for (var/mob/dead/new_player/NP in queued_players) - to_chat(NP, span_danger("The alive players limit has been released!
[html_encode(">>Join Game<<")]")) + to_chat(NP, span_danger("The alive players limit has been released!
[html_encode(">>Join Game<<")]"), MESSAGE_TYPE_OOC) SEND_SOUND(NP, sound('sound/blank.ogg')) NP.LateChoices() queued_players.len = 0 @@ -562,14 +562,14 @@ SUBSYSTEM_DEF(ticker) listclearnulls(queued_players) if(living_player_count() < hpc) if(next_in_line && next_in_line.client) - to_chat(next_in_line, span_danger("A slot has opened! You have approximately 20 seconds to join. \>\>Join Game\<\<")) + to_chat(next_in_line, span_danger("A slot has opened! You have approximately 20 seconds to join. \>\>Join Game\<\<"), MESSAGE_TYPE_OOC) SEND_SOUND(next_in_line, sound('sound/blank.ogg')) next_in_line.LateChoices() return queued_players -= next_in_line //Client disconnected, remove he queue_delay = 0 //No vacancy: restart timer if(25 to INFINITY) //No response from the next in line when a vacancy exists, remove he - to_chat(next_in_line, span_danger("No response received. You have been removed from the line.")) + to_chat(next_in_line, span_danger("No response received. You have been removed from the line."), MESSAGE_TYPE_OOC) queued_players -= next_in_line queue_delay = 0 @@ -731,18 +731,18 @@ SUBSYSTEM_DEF(ticker) var/skip_delay = check_rights() if(delay_end && !skip_delay) - to_chat(world, span_boldannounce("A game master has delayed the round end.")) + to_chat(world, span_boldannounce("A game master has delayed the round end."), MESSAGE_TYPE_OOC) return SStriumphs.end_triumph_saving_time() - to_chat(world, span_boldannounce("Rebooting World in [DisplayTimeText(delay)]. [reason]")) + to_chat(world, span_boldannounce("Rebooting World in [DisplayTimeText(delay)]. [reason]"), MESSAGE_TYPE_OOC) var/start_wait = world.time UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever sleep(delay - (world.time - start_wait)) if(delay_end && !skip_delay) - to_chat(world, span_boldannounce("Reboot was cancelled by an admin.")) + to_chat(world, span_boldannounce("Reboot was cancelled by an admin."), MESSAGE_TYPE_OOC) return if(end_string) end_state = end_string @@ -750,14 +750,14 @@ SUBSYSTEM_DEF(ticker) var/statspage = CONFIG_GET(string/roundstatsurl) var/gamelogloc = CONFIG_GET(string/gamelogurl) if(statspage) - to_chat(world, span_info("Round statistics and logs can be viewed at this website!")) + to_chat(world, span_info("Round statistics and logs can be viewed at this website!"), MESSAGE_TYPE_OOC) else if(gamelogloc) - to_chat(world, span_info("Round logs can be located at this website!")) + to_chat(world, span_info("Round logs can be located at this website!"), MESSAGE_TYPE_OOC) - log_game(span_boldannounce("Rebooting World. [reason]")) + log_game(span_boldannounce("Rebooting World. [reason]"), MESSAGE_TYPE_OOC) if(end_party) - to_chat(world, span_boldannounce("It's over!")) + to_chat(world, span_boldannounce("It's over!"), MESSAGE_TYPE_OOC) world.Del() else world.Reboot() @@ -795,7 +795,7 @@ SUBSYSTEM_DEF(ticker) for(var/mob/living/carbon/human/astrater as anything in GLOB.human_list) if(!istype(astrater.patron, /datum/patron/divine/astrata)) continue - to_chat(astrater, span_userdanger("You feel the pain of [astrater.patron]!")) + to_chat(astrater, span_userdanger("You feel the pain of [astrater.patron]!"), MESSAGE_TYPE_INFO) astrater.playsound_local(get_turf(astrater), 'sound/misc/astratascream.ogg', 60, FALSE, pressure_affected = FALSE) //Only Astratians can hear their godess scream in agony. astrater.emote("painscream", intentional = FALSE) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 5469afe5afe..6f97a51762a 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -314,7 +314,7 @@ SUBSYSTEM_DEF(vote) text += "Vote Result: Inconclusive - No Votes!" log_vote(text) remove_action_buttons() - to_chat(world, "\n[text]") + to_chat(world, "\n[text]", MESSAGE_TYPE_OOC) return . /datum/controller/subsystem/vote/proc/result() @@ -342,7 +342,7 @@ SUBSYSTEM_DEF(vote) else log_game("LOG VOTE: ELSE [REALTIMEOFDAY]") log_game("LOG VOTE: ROUNDVOTEEND [REALTIMEOFDAY]") - to_chat(world, "\n[ROUND_END_TIME_VERBAL]") + to_chat(world, "\n[ROUND_END_TIME_VERBAL]", MESSAGE_TYPE_OOC) SSgamemode.roundvoteend = TRUE SSgamemode.round_ends_at = world.time + ROUND_END_TIME if("storyteller") @@ -364,7 +364,7 @@ SUBSYSTEM_DEF(vote) if(!active_admins) SSticker.Reboot("Restart vote successful.", "restart vote") else - to_chat(world, "Notice:Restart vote will not restart the server automatically because there are active gamemasters on.") + to_chat(world, "Notice:Restart vote will not restart the server automatically because there are active gamemasters on.", MESSAGE_TYPE_OOC) message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.") return . @@ -534,7 +534,7 @@ SUBSYSTEM_DEF(vote) if(started_time && initiator_key) var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay)) if(mode) - to_chat(usr, span_warning("There is already a vote in progress! please wait for it to finish.")) + to_chat(usr, span_warning("There is already a vote in progress! please wait for it to finish."), MESSAGE_TYPE_OOC) return FALSE var/admin = FALSE @@ -543,7 +543,7 @@ SUBSYSTEM_DEF(vote) admin = TRUE if(next_allowed_time > world.time && !admin) - to_chat(usr, span_warning("A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!")) + to_chat(usr, span_warning("A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!"), MESSAGE_TYPE_OOC) return FALSE reset() @@ -605,7 +605,7 @@ SUBSYSTEM_DEF(vote) SEND_SOUND(M, vote_alert) if(mode == "storyteller") save_storyteller_vote_log(null, "active") - to_chat(world, "\n[text]\nClick here to place your vote.\nYou have [DisplayTimeText(vp)] to vote.") + to_chat(world, "\n[text]\nClick here to place your vote.\nYou have [DisplayTimeText(vp)] to vote.", MESSAGE_TYPE_OOC) for(var/client/C in GLOB.clients) if(!isliving(C.mob)) show_vote(C) @@ -622,7 +622,7 @@ SUBSYSTEM_DEF(vote) if(mode == "custom") text += "\n[question]" var/remaining_time = time_remaining * 10 - to_chat(C, "\n[text]\nClick here to place your vote.\nYou have [DisplayTimeText(remaining_time)] to vote.") + to_chat(C, "\n[text]\nClick here to place your vote.\nYou have [DisplayTimeText(remaining_time)] to vote.", MESSAGE_TYPE_OOC) if(!isliving(C.mob)) show_vote(C) diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm index 4a7d9c91dc2..59e60f8d855 100644 --- a/code/datums/achievements/_awards.dm +++ b/code/datums/achievements/_awards.dm @@ -50,7 +50,7 @@ /datum/award/achievement/on_unlock(mob/user) . = ..() - to_chat(user, span_greenannounce("Achievement unlocked: [name]!")) + to_chat(user, span_greenannounce("Achievement unlocked: [name]!"), MESSAGE_TYPE_OOC) ///Scores are for leaderboarded things, such as killcount of a specific boss /datum/award/score diff --git a/code/datums/actions/action_innate.dm b/code/datums/actions/action_innate.dm index 8db12a66c34..98fabe9b273 100644 --- a/code/datums/actions/action_innate.dm +++ b/code/datums/actions/action_innate.dm @@ -62,7 +62,7 @@ if(ranged_mousepointer) on_who.client?.mouse_pointer_icon = ranged_mousepointer if(text_to_show) - to_chat(on_who, text_to_show) + to_chat(on_who, text_to_show, MESSAGE_TYPE_INFO) on_who.click_intercept = src /// Removes this action as the active ability of the passed mob @@ -71,7 +71,7 @@ on_who.client?.mouse_pointer_icon = initial(on_who.client?.mouse_pointer_icon) on_who.update_mouse_pointer() if(text_to_show) - to_chat(on_who, text_to_show) + to_chat(on_who, text_to_show, MESSAGE_TYPE_INFO) on_who.click_intercept = null /// Handles whenever a mob clicks on something diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 01d2982d04a..1ca6a826e83 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -135,7 +135,7 @@ return if(isnull(window_id)) //null check because this can potentially nuke goonchat WARNING("Browser [title] tried to open with a null ID") - to_chat(user, span_danger("The [title] browser you tried to open failed a sanity check! Please report this on github!")) + to_chat(user, span_danger("The [title] browser you tried to open failed a sanity check! Please report this on github!"), MESSAGE_TYPE_OOC) return var/window_size = "" if (width && height) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 5fb0ec70ed3..52ab3d61c90 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -46,7 +46,7 @@ if(href_list[VV_HK_ADD_ABITRARY_TRAIT]) var/arbitrary_input = input("What is the trait's string?", "Adding abitrary trait") as null|text if(!arbitrary_input) - to_chat(usr,span_info("Input empty, cancelling")) + to_chat(usr,span_info("Input empty, cancelling"), MESSAGE_TYPE_INFO) return TRUE ADD_TRAIT(src,arbitrary_input,TRAIT_GENERIC) message_admins("Admin [key_name_admin(usr)] add trait [arbitrary_input] to [src]!") diff --git a/code/datums/laws.dm b/code/datums/laws.dm index a14890ee655..3f7c861f960 100644 --- a/code/datums/laws.dm +++ b/code/datums/laws.dm @@ -64,7 +64,7 @@ // Check if anything actually changed if(lists_equal(clean_laws, GLOB.laws_of_the_land)) - to_chat(usr, span_notice("The laws remain unchanged.")) + to_chat(usr, span_notice("The laws remain unchanged."), MESSAGE_TYPE_INFO) return FALSE GLOB.laws_of_the_land = clean_laws diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 4ab23e1629b..03b8ba9d824 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -428,13 +428,13 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) if(ASPECT_MAJOR) if(LAZYLEN(major_aspects) >= max_majors) if(current) - to_chat(current, span_warning("I cannot attune to another major aspect.")) + to_chat(current, span_warning("I cannot attune to another major aspect."), MESSAGE_TYPE_INFO) return FALSE LAZYADD(major_aspects, aspect) if(ASPECT_MINOR) if(LAZYLEN(minor_aspects) >= max_minors) if(current) - to_chat(current, span_warning("I cannot attune to another minor aspect.")) + to_chat(current, span_warning("I cannot attune to another minor aspect."), MESSAGE_TYPE_INFO) return FALSE LAZYADD(minor_aspects, aspect) // Grant choice spell first so it appears first on the action bar @@ -611,7 +611,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) if(creator.mind.special_role) message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.") - to_chat(current, span_danger("Despite my creators current allegiances, my true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless my creator's body is destroyed.")) + to_chat(current, span_danger("Despite my creators current allegiances, my true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless my creator's body is destroyed."), MESSAGE_TYPE_INFO) /datum/mind/proc/show_memory(mob/recipient, window=1) if(!recipient) @@ -642,7 +642,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) if(window) recipient << browse(output,"window=memory") else if(all_objectives.len || memory || personal_objectives.len) - to_chat(recipient, "[output]") + to_chat(recipient, "[output]", MESSAGE_TYPE_INFO) /// output current targets to the player /datum/mind/proc/recall_targets(mob/recipient, window=1) @@ -731,7 +731,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) if(href_list["remove_antag"]) var/datum/antagonist/A = locate(href_list["remove_antag"]) in antag_datums if(!istype(A)) - to_chat(usr,span_warning("Invalid antagonist ref to be removed.")) + to_chat(usr,span_warning("Invalid antagonist ref to be removed."), MESSAGE_TYPE_ADMINLOG) return A.admin_remove(usr) @@ -762,7 +762,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) objective_pos = A.objectives.Find(old_objective) break if(!old_objective) - to_chat(usr,"Invalid objective.") + to_chat(usr,"Invalid objective.", MESSAGE_TYPE_ADMINLOG) return else if(href_list["target_antag"]) @@ -827,7 +827,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) A.objectives -= objective break if(!objective) - to_chat(usr,"Invalid objective.") + to_chat(usr,"Invalid objective.", MESSAGE_TYPE_ADMINLOG) return //qdel(objective) Needs cleaning objective destroys message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]") @@ -841,7 +841,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) objective = objective break if(!objective) - to_chat(usr,"Invalid objective.") + to_chat(usr,"Invalid objective.", MESSAGE_TYPE_ADMINLOG) return objective.completed = !objective.completed log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]") @@ -879,10 +879,10 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) var/obj_count = 1 for(var/datum/antagonist/antag_datum_ref in antag_datums) if(length(antag_datum_ref.objectives)) - to_chat(current, span_notice("Your [antag_datum_ref.name] objectives:")) + to_chat(current, span_notice("Your [antag_datum_ref.name] objectives:"), MESSAGE_TYPE_INFO) for(var/datum/objective/O in antag_datum_ref.objectives) O.update_explanation_text() - to_chat(current, "[O.flavor] #[obj_count]: [O.explanation_text]") + to_chat(current, "[O.flavor] #[obj_count]: [O.explanation_text]", MESSAGE_TYPE_INFO) obj_count++ /// Announces only personal objectives @@ -891,7 +891,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) var/personal_count = 1 for(var/datum/objective/O in personal_objectives) O.update_explanation_text() - to_chat(current, "Personal Goal #[personal_count]: [O.explanation_text]") + to_chat(current, "Personal Goal #[personal_count]: [O.explanation_text]", MESSAGE_TYPE_INFO) personal_count++ /// Announce all objectives (both types) @@ -985,7 +985,7 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) /datum/mind/proc/show_spell_tip() if(current) - to_chat(current, span_nicegreen("Tip: You can Ctrl-Click your hotkey bar to unlock it, then drag to rearrange your spells. Re-arranging them change which hotkeys they are bound to in order from left to right (Alt 1 to Alt 9 default). You can shift click your spells to learn more about them.")) + to_chat(current, span_nicegreen("Tip: You can Ctrl-Click your hotkey bar to unlock it, then drag to rearrange your spells. Re-arranging them change which hotkeys they are bound to in order from left to right (Alt 1 to Alt 9 default). You can shift click your spells to learn more about them."), MESSAGE_TYPE_INFO) /datum/mind/proc/setup_mage_aspects(list/config) mage_aspect_config = config diff --git a/code/datums/mindlink.dm b/code/datums/mindlink.dm index 9bc797f556d..f9f2d481895 100644 --- a/code/datums/mindlink.dm +++ b/code/datums/mindlink.dm @@ -33,8 +33,8 @@ GLOBAL_LIST_EMPTY(mindlinks) var/mob/living/recipient = (speaker == owner ? target : owner) speaker.playsound_local(speaker, 'sound/magic/message.ogg', 75, TRUE) recipient.playsound_local(recipient, 'sound/magic/message.ogg', 75, TRUE) - to_chat(recipient, span_notice("The bond is broken by one of the parties.")) - to_chat(speaker, span_notice("The bond is broken by one of the parties.")) + to_chat(recipient, span_notice("The bond is broken by one of the parties."), MESSAGE_TYPE_INFO) + to_chat(speaker, span_notice("The bond is broken by one of the parties."), MESSAGE_TYPE_INFO) active = FALSE GLOB.mindlinks -= src speech_args[SPEECH_MESSAGE] = null diff --git a/code/datums/mindlink_hag.dm b/code/datums/mindlink_hag.dm index f433201fb8b..8f7ca16d4ad 100644 --- a/code/datums/mindlink_hag.dm +++ b/code/datums/mindlink_hag.dm @@ -18,7 +18,7 @@ // Break logic if(findtext(message, ",mst", 1, 5)) - to_chat(members, span_notice("The coven web is severed by [speaker].")) + to_chat(members, span_notice("The coven web is severed by [speaker]."), MESSAGE_TYPE_INFO) speech_args[SPEECH_MESSAGE] = null qdel(src) return diff --git a/code/datums/pollution.dm b/code/datums/pollution.dm index 597fce22f23..b2401ddc246 100644 --- a/code/datums/pollution.dm +++ b/code/datums/pollution.dm @@ -111,9 +111,9 @@ smell_string = "The unmistakable [dominant_pollutant.descriptor] of [dominant_pollutant.scent] bombards your nostrils." if(dominant_pollutant.descriptor == SCENT_DESC_ODOR) - to_chat(sniffer, span_warning(smell_string)) + to_chat(sniffer, span_warning(smell_string), MESSAGE_TYPE_INFO) else - to_chat(sniffer, span_notice(smell_string)) + to_chat(sniffer, span_notice(smell_string), MESSAGE_TYPE_INFO) dominant_pollutant.on_smell(sniffer) diff --git a/code/datums/skill_holder.dm b/code/datums/skill_holder.dm index a53fde8942f..8edb187b990 100644 --- a/code/datums/skill_holder.dm +++ b/code/datums/skill_holder.dm @@ -110,7 +110,7 @@ //TODO add some bar hud or something, i think i seen a request like that somewhere if(known_skills[S] >= old_level) if(known_skills[S] > old_level) - to_chat(current, span_nicegreen("My [S.name] grows to [SSskills.level_names[known_skills[S]]]!")) + to_chat(current, span_nicegreen("My [S.name] grows to [SSskills.level_names[known_skills[S]]]!"), MESSAGE_TYPE_INFO) if(!COOLDOWN_FINISHED(src, level_up)) if(current.client?.prefs.combat_toggles & XP_TEXT) current.balloon_alert(current, "Level up...") @@ -124,7 +124,7 @@ if(istype(known_skills, /datum/skill/craft)) record_round_statistic(STATS_CRAFT_SKILLS) else - to_chat(current, span_warning("My [S.name] has weakened to [SSskills.level_names[known_skills[S]]]!")) + to_chat(current, span_warning("My [S.name] has weakened to [SSskills.level_names[known_skills[S]]]!"), MESSAGE_TYPE_INFO) /datum/skill_holder/proc/adjust_skillrank_up_to(skill, amt, silent = FALSE) var/proper_amt = amt - get_skill_level(skill) @@ -212,7 +212,7 @@ return if(known_skills[skill_ref] >= old_level) SEND_SIGNAL(current, COMSIG_SKILL_RANK_INCREASED, skill_ref, known_skills[skill_ref], old_level) - to_chat(current, span_nicegreen("I feel like I've become more proficient at [skill_ref.name]!")) + to_chat(current, span_nicegreen("I feel like I've become more proficient at [skill_ref.name]!"), MESSAGE_TYPE_INFO) record_round_statistic(STATS_SKILLS_LEARNED) if(istype(skill_ref, /datum/skill/combat)) record_round_statistic(STATS_COMBAT_SKILLS) @@ -221,7 +221,7 @@ if(skill == /datum/skill/misc/reading && old_level == SKILL_LEVEL_NONE && current.is_literate()) record_round_statistic(STATS_LITERACY_TAUGHT) else - to_chat(current, span_warning("I feel like I've become worse at [skill_ref.name]!")) + to_chat(current, span_warning("I feel like I've become worse at [skill_ref.name]!"), MESSAGE_TYPE_INFO) if(ishuman(current)) var/mob/living/carbon/human/H = current @@ -306,7 +306,7 @@ if(known_skills[i]) //Do we actually have a level in this? shown_skills += i if(!length(shown_skills)) - to_chat(user, span_warning("I don't have any skills.")) + to_chat(user, span_warning("I don't have any skills."), MESSAGE_TYPE_INFO) return var/list/sorted_skills = sortList(shown_skills, GLOBAL_PROC_REF(cmp_skills_for_display)) @@ -364,7 +364,7 @@ msg += "" msg += "" - to_chat(user, msg) + to_chat(user, msg, MESSAGE_TYPE_INFO) /mob/proc/get_inspirational_bonus() return 0 diff --git a/code/datums/slapcrafting.dm b/code/datums/slapcrafting.dm index abc6431733d..8e92fc51880 100644 --- a/code/datums/slapcrafting.dm +++ b/code/datums/slapcrafting.dm @@ -107,12 +107,12 @@ with edits to work for roguecode */ var/atom/final_result = initial(actual_recipe.result) - to_chat(user, span_notice("You start crafting \a [initial(final_result.name)]...")) + to_chat(user, span_notice("You start crafting \a [initial(final_result.name)]..."), MESSAGE_TYPE_INFO) var/error_string = craft_sheet.construct_item_repeatable(user, actual_recipe) if(istext(error_string)) - to_chat(user, span_warning("Crafting failed[error_string]")) + to_chat(user, span_warning("Crafting failed[error_string]"), MESSAGE_TYPE_INFO) /// Alerts any examiners to the recipe, if they wish to know more. /datum/element/slapcrafting/proc/get_examine_info(atom/source, mob/user, list/examine_list) @@ -152,7 +152,7 @@ with edits to work for roguecode */ var/atom/result = initial(cur_recipe.result) - to_chat(user, span_notice("You could craft \a [initial(result.name)] by applying one of these items to it!")) + to_chat(user, span_notice("You could craft \a [initial(result.name)] by applying one of these items to it!"), MESSAGE_TYPE_INFO) // Gotta instance it to copy the lists over. cur_recipe = new cur_recipe() @@ -182,8 +182,8 @@ with edits to work for roguecode */ // If we did find ingredients then add them onto the list. if(length(string_ingredient_list)) - to_chat(user, span_boldnotice("Extra Ingredients:")) - to_chat(user, span_danger(span_notice(string_ingredient_list))) + to_chat(user, span_boldnotice("Extra Ingredients:"), MESSAGE_TYPE_INFO) + to_chat(user, span_danger(span_notice(string_ingredient_list)), MESSAGE_TYPE_INFO) var/list/tool_list = "" @@ -196,7 +196,7 @@ with edits to work for roguecode */ tool_list += "\a [string]\n" if(length(tool_list)) - to_chat(user, span_boldnotice("Required Tools:")) - to_chat(user, span_danger(span_notice(tool_list))) + to_chat(user, span_boldnotice("Required Tools:"), MESSAGE_TYPE_INFO) + to_chat(user, span_danger(span_notice(tool_list)), MESSAGE_TYPE_INFO) qdel(cur_recipe) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index bc5ef8e3104..a7b1ce83a04 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -3,17 +3,17 @@ msg = "ADMIN LOG: [msg]" for(var/client/C in GLOB.admins) if(check_rights_for(C, R_ADMIN)) - to_chat(C, msg) + to_chat(C, msg, MESSAGE_TYPE_ADMINLOG) /proc/spawn_message_admins(msg) msg = "ADMIN LOG: [msg]" for(var/client/C in GLOB.admins) if(check_rights_for(C, R_ADMIN) && (C.prefs.admin_chat_toggles & CHAT_ADMINSPAWN)) - to_chat(C, msg) + to_chat(C, msg, MESSAGE_TYPE_ADMINLOG) /proc/relay_msg_admins(msg) msg = "RELAY: [msg]" - to_chat(GLOB.admins, msg) + to_chat(GLOB.admins, msg, MESSAGE_TYPE_ADMINLOG) ///////////////////////////////////////////////////////////////////////////////////////////////Panels From d525ba06a9c590a41089e09ec864fc48e4fd6deb Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 22 Jun 2026 20:25:08 -0400 Subject: [PATCH 2/8] Hopefully got all the Admin Log messages so they can be filtered. --- code/modules/admin/admin.dm | 58 ++++++++++----------- code/modules/admin/playerquality.dm | 10 ++-- code/modules/admin/topic.dm | 78 ++++++++++++++--------------- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a7b1ce83a04..5bd25d553d2 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -22,7 +22,7 @@ log_admin("[key_name(usr)] checked the individual player panel for [key_name(M)][isobserver(usr)?"":" while in game"].") if(!M) - to_chat(usr, "I seem to be selecting a mob that doesn't exist anymore.") + to_chat(usr, "I seem to be selecting a mob that doesn't exist anymore.", MESSAGE_TYPE_ADMINLOG) return var/body = "Options for [M.key]