Chat Filtering Tweaks

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, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
+		to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>", MESSAGE_TYPE_LOCALCHAT)
 		return
 	if(turfs.len > BP_MAX_ROOM_SIZE)
-		to_chat(creator, "<span class='warning'>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.</span>")
+		to_chat(creator, "<span class='warning'>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.</span>", MESSAGE_TYPE_LOCALCHAT)
 		return
 	var/list/areas = list("New Area" = /area)
 	for(var/i in 1 to turfs.len)
@@ -62,15 +62,15 @@
 	area_choice = areas[area_choice]
 
 	if(!area_choice)
-		to_chat(creator, "<span class='warning'>No choice selected. The area remains undefined.</span>")
+		to_chat(creator, "<span class='warning'>No choice selected. The area remains undefined.</span>", MESSAGE_TYPE_LOCALCHAT)
 		return
 	var/area/newA
 	if(!isarea(area_choice))
 		var/str = stripped_input(creator,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN)
 		if(!str || !length(str)) //cancel
 			return
 		if(length(str) > 50)
-			to_chat(creator, "<span class='warning'>The given name is too long. The area remains undefined.</span>")
+			to_chat(creator, "<span class='warning'>The given name is too long. The area remains undefined.</span>", MESSAGE_TYPE_LOCALCHAT)
 			return
 		newA = new area_choice
 		newA.setup(str)
@@ -86,7 +86,7 @@
 
 	newA.reg_in_areas_in_z()
 
-	to_chat(creator, "<span class='notice'>I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
+	to_chat(creator, "<span class='notice'>I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>", MESSAGE_TYPE_LOCALCHAT)
 	return TRUE
 
 #undef BP_MAX_ROOM_SIZE

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))

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

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)

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, "<span class='big bold'><font color = purple>[html_encode(title)]</font color><BR>[html_encode(message)]</span><BR>")
+			to_chat(M, "<span class='big bold'><font color = purple>[html_encode(title)]</font color><BR>[html_encode(message)]</span><BR>", MESSAGE_TYPE_LOCALCHAT)
 			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
 				if(alert)
 					M.playsound_local(M, 'sound/misc/alert.ogg', 100)

code/__HELPERS/roundend.dm

@@ -128,7 +128,7 @@
 
 	log_game("The round has ended.")
 
-	to_chat(world, "<BR><BR><BR><span class='reallybig'>So ends this tale on [realm_name].</span>")
+	to_chat(world, "<BR><BR><BR><span class='reallybig'>So ends this tale on [realm_name].</span>", 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<font color='purple'><b>[job.round_contrib_points]</b> ROUND CONTRIBUTOR POINTS AWARDED. Thank you for playing!</font>")
+					to_chat(H, "\n<font color='purple'><b>[job.round_contrib_points]</b> ROUND CONTRIBUTOR POINTS AWARDED. Thank you for playing!</font>", 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, "<BR><b><i>[roundend_epilogue]</i></b>")
+		to_chat(world, "<BR><b><i>[roundend_epilogue]</i></b>", MESSAGE_TYPE_LOCALCHAT)
 
 /datum/controller/subsystem/ticker/proc/gamemode_report()
 	var/list/all_teams = list()
@@ -278,7 +278,7 @@
 		header_parts += "<br>"
 		header_parts += "<div style='text-align: center; font-size: 1.2em;'>VILLAINS:</div>"
 		header_parts += "<hr class='paneldivider'>"
-		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,"<a href='?src=[REF(R)];report=1'>Show roundend report again</a>")
+	to_chat(C,"<a href='?src=[REF(R)];report=1'>Show roundend report again</a>", MESSAGE_TYPE_INFO)
 
 /datum/controller/subsystem/ticker/proc/give_show_playerlist_button(client/C)
 	set waitfor = 0
-	to_chat(C,"<a href='?src=[C];playerlistrogue=1'>* SHOW PLAYER LIST *</a>")
-	to_chat(C,"<a href='byond://?src=[C];viewstats=1'>* View Statistics *</a>")
+	to_chat(C,"<a href='?src=[C];playerlistrogue=1'>* SHOW PLAYER LIST *</a>", MESSAGE_TYPE_INFO)
+	to_chat(C,"<a href='byond://?src=[C];viewstats=1'>* View Statistics *</a>", 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

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("<b>[time_change_tips_random]</b>"))
+		to_chat(client, span_notice("<b>[time_change_tips_random]</b>"), MESSAGE_TYPE_INFO)
 	else if(GLOB.tod == "day")
 		playsound_local(src, 'sound/misc/midday.ogg', 100, FALSE)
 	else if(GLOB.tod == "night")

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

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("<b>[special.name]</b>"))
-	to_chat(user, special.greet_text)
+	to_chat(user, span_notice("<b>[special.name]</b>"), 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)

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)
 
 
 /*

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)

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 += "<a href='?src=[REF(H)];embedded_object=[REF(I)];embedded_limb=[REF(BP)]' class='warning'>[I] - [BP.name]</a>\n"
 			msg += "***"
-			to_chat(H, "[msg.Join()]")
+			to_chat(H, "[msg.Join()]", MESSAGE_TYPE_INFO)
 
 /atom/movable/screen/alert/weightless
 	name = "Weightless"