diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm index 20d0dd46d3..3c080049fa 100644 --- a/code/__defines/span_vr.dm +++ b/code/__defines/span_vr.dm @@ -3,13 +3,19 @@ // Adds a generic box around whatever message you're sending in chat. Really makes things stand out. #define examine_block(str) ("
" + str + "
") +// Filtered both under OOC! #define span_ooc(str) ("" + str + "") -#define span_looc(str) ("" + str + "") -#define span_rlooc(str) ("" + str + "") #define span_aooc(str) ("" + str + "") -#define span_npcsay(str) ("" + str + "") +// All of those have unique filters, be wary! +#define span_looc(str) ("" + str + "") +#define span_rlooc(str) ("" + str + "") + +// Ghostchat filter #define span_deadsay(str) ("" + str + "") +#define span_ghostalert(str) ("" + str + "") + +// FIltered under radio #define span_radio(str) ("" + str + "") #define span_deptradio(str) ("" + str + "") #define span_newscaster(str) ("" + str + "") @@ -27,80 +33,90 @@ #define span_supradio(str) ("" + str + "") #define span_srvradio(str) ("" + str + "") #define span_expradio(str) ("" + str + "") +// Those are in the radio filter... +#define span_alien(str) ("" + str + "") +#define span_changeling(str) ("" + str + "") +// Stop using alert for anything other than announcements! It's filtered under the radio tab +#define span_alert(str) ("" + str + "") +// Filtered under global languages #define span_binarysay(str) ("" + str + "") #define span_hivemind(str) ("" + str + "") -#define span_name(str) ("" + str + "") +// Filtered under local IC! #define span_say(str) ("" + str + "") -#define span_filter_say(str) ("" + str + "") -#define span_npc_say(str) ("" + str + "") -#define span_multizsay(str) ("" + str + "") -#define span_alert(str) ("" + str + "") -#define span_ghostalert(str) ("" + str + "") - -#define span_game(str) ("" + str + "") - #define span_emote(str) ("" + str + "") #define span_emote_subtle(str) ("" + str + "") + +// Filtered as NPC messages +#define span_npc_say(str) ("" + str + "") #define span_npc_emote(str) ("" + str + "") +// Filtered as messages visible through multiple Z levels +#define span_multizsay(str) ("" + str + "") + +// Unfiltered, only style! +#define span_name(str) ("" + str + "") +#define span_game(str) ("" + str + "") +#define span_filter_say(str) ("" + str + "") #define span_message(str) ("" + str + "") // TODO: This makes no sense, check it! #define span_notify(str) ("" + str + "") // TODO: This makes no sense, check it! #define span_body(str) ("" + str + "") -#define span_suicide(str) ("" + str + "") - -#define span_hear(str) ("" + str + "") +#define span_filter_warning(str) ("" + str + "") +#define span_filter_combat(str) ("" + str + "") +#define span_filter_notice(str) ("" + str + "") +// Filtered under combat! #define span_attack(str) ("" + str + "") #define span_disarm(str) ("" + str + "") #define span_passive(str) ("" + str + "") - -#define span_critical(str) ("" + str + "") #define span_danger(str) ("" + str + "") #define span_bolddanger(str) ("" + str + "") + +// Filtered under warning messages +#define span_critical(str) ("" + str + "") #define span_userdanger(str) ("" + str + "") #define span_warning(str) ("" + str + "") #define span_warningplain(str) ("" + str + "") #define span_boldwarning(str) ("" + str + "") -#define span_filter_warning(str) ("" + str + "") -#define span_filter_combat(str) ("" + str + "") -#define span_unconscious(str) ("" + str + "") +#define span_sinister(str) ("" + str + "") -#define span_rose(str) ("" + str + "") +// FIltered under info #define span_info(str) ("" + str + "") #define span_infoplain(str) ("" + str + "") +#define span_suicide(str) ("" + str + "") +#define span_unconscious(str) ("" + str + "") +#define span_hear(str) ("" + str + "") #define span_notice(str) ("" + str + "") -#define span_filter_notice(str) ("" + str + "") #define span_boldnotice(str) ("" + str + "") +#define span_adminnotice(str) ("" + str + "") #define span_alium(str) ("" + str + "") #define span_cult(str) ("" + str + "") -#define span_sinister(str) ("" + str + "") - #define span_wingdings(str) ("" + str + "") //CHOMPAdd /* Direct communication spans */ - +// Local pred / prey filter #define span_psay(str) ("" + str + "") #define span_pemote(str) ("" + str + "") /* Export spans */ - +// chatexport filter #define span_chatexport(str) ("" + str + "") /* Vore messages */ - +// All of thse are filtered under the Vorgan Messages tab! #define span_valert(str) ("" + str + "") #define span_vdanger(str) ("" + str + "") #define span_vwarning(str) ("" + str + "") #define span_vnotice(str) ("" + str + "") + +// Filtered under nif! #define span_nif(str) ("" + str + "") -#define span_filter_nif(str) ("" + str + "") +#define span_filter_nif(str) ("" + str + "") // Currently not sorted in /* Languages */ - -#define span_alien(str) ("" + str + "") +// No filter! #define span_tajaran(str) ("" + str + "") #define span_tajaran_signlang(str) ("" + str + "") #define span_akhani(str) ("" + str + "") @@ -108,7 +124,6 @@ #define span_skrellfar(str) ("" + str + "") #define span_soghun(str) ("" + str + "") #define span_solcom(str) ("" + str + "") -#define span_changeling(str) ("" + str + "") #define span_sergal(str) ("" + str + "") #define span_birdsongc(str) ("" + str + "") #define span_vulpkanin(str) ("" + str + "") @@ -126,12 +141,7 @@ #define span_blob(str) ("" + str + "") #define span_teppi(str) ("" + str + "") -#define span_debug_error(str) ("" + str + "") -#define span_debug_warning(str) ("" + str + "") -#define span_debug_info(str) ("" + str + "") -#define span_debug_debug(str) ("" + str + "") -#define span_debug_trace(str) ("" + str + "") - +// Colours only! #define span_white(str) ("" + str + "") #define span_black(str) ("" + str + "") #define span_darkgray(str) ("" + str + "") @@ -149,42 +159,54 @@ #define span_brown(str) ("" + str + "") #define span_lightpurple(str) ("" + str + "") #define span_darkpink(str) ("" + str + "") +#define span_rose(str) ("" + str + "") /* System and Debug */ +// System filter +#define span_boldannounce(str) ("" + str + "") +// Unfiltered #define span_prefix(str) ("" + str + "") #define span_admin(str) ("" + str + "") -#define span_adminnotice(str) ("" + str + "") -#define span_boldannounce(str) ("" + str + "") #define span_linkOn(str) ("" + str + "") #define span_linkOff(str) ("" + str + "") -#define span_log_message(str) ("" + str + "") #define span_filter_system(str) ("" + str + "") -#define span_filter_debuglogs(str) ("" + str + "") -#define span_filter_adminlog(str) ("" + str + "") -#define span_pm(str) ("" + str + "") #define span_filter_pm(str) ("" + str + "") -#define span_adminhelp(str) ("" + str + "") -#define span_mentor(str) ("" + str + "") #define span_filter_pray(str) ("" + str + "") -/* Admin only usage */ +// Admin log filters +#define span_log_message(str) ("" + str + "") +#define span_filter_adminlog(str) ("" + str + "") +// Debug filter +#define span_debug_error(str) ("" + str + "") +#define span_debug_warning(str) ("" + str + "") +#define span_debug_info(str) ("" + str + "") +#define span_debug_debug(str) ("" + str + "") +#define span_debug_trace(str) ("" + str + "") +#define span_filter_debuglogs(str) ("" + str + "") + +/* Admin only usage */ +// Admin pm filter +#define span_pm(str) ("" + str + "") +#define span_adminhelp(str) ("" + str + "") #define span_admin_pm_notice(str) ("" + str + "") #define span_admin_pm_warning(str) ("" + str + "") +// Mentor pm filter +#define span_mentor(str) ("" + str + "") #define span_mentor_pm_notice(str) ("" + str + "") #define span_mentor_pm_warning(str) ("" + str + "") /* Adminchat */ - +// All of those have their own filter #define span_admin_channel(str) ("" + str + "") #define span_mod_channel(str) ("" + str + "") #define span_event_channel(str) ("" + str + "") #define span_mentor_channel(str) ("" + str + "") /* Byond Sizes */ - +// Sizes only! #define span_small(str) "" + str + "" #define span_normal(str) "" + str + "" @@ -195,9 +217,15 @@ #define span_giant(str) "" + str + "" -/* Style spans */ +#define span_narsie(str) "" + str + "" +#define span_cascade(str) "" + str + "" + +/* Style spans */ +// text style only #define span_italics(str) ("" + str + "") #define span_bold(str) ("" + str + "") +#define span_underline(str) ("" + str + "") +// Links! #define span_linkify(str) ("" + str + "") diff --git a/code/__defines/tgs.config.dm b/code/__defines/tgs.config.dm index e25041963b..c57439c7e4 100644 --- a/code/__defines/tgs.config.dm +++ b/code/__defines/tgs.config.dm @@ -2,7 +2,7 @@ #define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) GLOBAL_VAR_INIT(##Name, ##Value); GLOBAL_PROTECT(##Name) #define TGS_READ_GLOBAL(Name) GLOB.##Name #define TGS_WRITE_GLOBAL(Name, Value) GLOB.##Name = ##Value -#define TGS_WORLD_ANNOUNCE(message) to_chat(world, "[html_encode(##message)]") +#define TGS_WORLD_ANNOUNCE(message) to_chat(world, span_boldannounce("[html_encode(##message)]")) #define TGS_INFO_LOG(message) log_to_dd("TGS Info: [##message]") #define TGS_WARNING_LOG(message) log_to_dd("TGS Warn: [##message]") #define TGS_ERROR_LOG(message) log_to_dd("TGS Error: [##message]") diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 13f078a6f1..598e8ef237 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -468,7 +468,7 @@ so as to remain in compliance with the most up-to-date laws." return var/paramslist = params2list(params) if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat - to_chat(usr,span_boldnotice("[name] - [desc]")) + to_chat(usr,span_boldnotice(name) + " - " + span_info(desc)) return if(master) return usr.client.Click(master, location, control, params) diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm index bd7cf07b91..a43d60eb85 100644 --- a/code/controllers/subsystems/air.dm +++ b/code/controllers/subsystems/air.dm @@ -45,14 +45,14 @@ SUBSYSTEM_DEF(air) CHECK_TICK // CHOMPEdit - admin_notice({"Geometry initialized in [round(0.1*(REALTIMEOFDAY-start_timeofday),0.1)](?) seconds. - -Total Simulated Turfs: [simulated_turf_count] -Total Zones: [zones.len] -Total Edges: [edges.len] -Total Active Edges: [active_edges.len ? span_danger("[active_edges.len]") : "None"] -Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count] -"}, R_DEBUG) + admin_notice(span_danger("Geometry initialized in [round(0.1*(REALTIMEOFDAY-start_timeofday),0.1)](?) seconds.") + \ +span_info("
\ +Total Simulated Turfs: [simulated_turf_count]
\ +Total Zones: [zones.len]
\ +Total Edges: [edges.len]
\ +Total Active Edges: [active_edges.len ? span_danger("[active_edges.len]") : "None"]
\ +Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]\ +"), R_DEBUG) // Note - Baystation settles the air by running for one tick. We prefer to not have active edges. // Maps should not have active edges on boot. If we've got some, log it so it can get fixed. diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index cb64217679..5283af33fb 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -126,7 +126,7 @@ var/global/datum/controller/subsystem/ticker/ticker var/list/runnable_modes = config.get_runnable_modes() if((master_mode == "random") || (master_mode == "secret")) if(!runnable_modes.len) - to_world(span_danger("Unable to choose playable game mode. Reverting to pregame lobby.")) + to_world(span_danger(span_bold("Unable to choose playable game mode.") + " Reverting to pregame lobby.")) return 0 if(secret_force_mode != "secret") src.mode = config.pick_mode(secret_force_mode) @@ -148,21 +148,21 @@ var/global/datum/controller/subsystem/ticker/ticker job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly. if(!src.mode.can_start()) - to_world(span_danger("Unable to start [mode.name]. Not enough players readied, [CONFIG_GET(keyed_list/player_requirements)[mode.config_tag]] players needed. Reverting to pregame lobby.")) // CHOMPEdit + to_world(span_danger(span_bold("Unable to start [mode.name].") + " Not enough players readied, [CONFIG_GET(keyed_list/player_requirements)[mode.config_tag]] players needed. Reverting to pregame lobby.")) // CHOMPEdit mode.fail_setup() mode = null job_master.ResetOccupations() return 0 if(hide_mode) - to_world(span_notice("The current game mode is - Secret!")) + to_world(span_notice(span_bold("The current game mode is - Secret!"))) if(runnable_modes.len) var/list/tmpmodes = new for (var/datum/game_mode/M in runnable_modes) tmpmodes+=M.name tmpmodes = sortList(tmpmodes) if(tmpmodes.len) - to_world(span_info("Possibilities: [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]")) + to_world(span_info(span_bold("Possibilities:") + " [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]")) else src.mode.announce() return 1 @@ -230,7 +230,6 @@ var/global/datum/controller/subsystem/ticker/ticker //call a transfer shuttle vote to_world(span_danger("The round has ended!")) SSvote.start_vote(new /datum/vote/crew_transfer) - to_world("The round has ended!") // Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME) /datum/controller/subsystem/ticker/proc/post_game_tick() @@ -242,7 +241,7 @@ var/global/datum/controller/subsystem/ticker/ticker feedback_set_details("end_proper", "nuke") restart_timeleft = 1 MINUTE // No point waiting five minutes if everyone's dead. if(!delay_end) - to_world(span_notice("Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.")) + to_world(span_notice(span_bold("Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s."))) last_restart_notify = world.time else feedback_set_details("end_proper", "proper completion") @@ -256,14 +255,14 @@ var/global/datum/controller/subsystem/ticker/ticker if(END_GAME_ENDING) restart_timeleft -= (world.time - last_fire) if(delay_end) - to_world(span_notice("An admin has delayed the round end.")) + to_world(span_notice(span_bold("An admin has delayed the round end."))) end_game_state = END_GAME_DELAYED else if(restart_timeleft <= 0) - to_world(span_warning("Restarting world!")) + to_world(span_warning(span_bold("Restarting world!"))) sleep(5) world.Reboot() else if (world.time - last_restart_notify >= 1 MINUTE) - to_world(span_notice("Restarting in [round(restart_timeleft/600, 1)] minute\s.")) + to_world(span_notice(span_bold("Restarting in [round(restart_timeleft/600, 1)] minute\s."))) last_restart_notify = world.time return if(END_GAME_DELAYED) @@ -467,33 +466,33 @@ var/global/datum/controller/subsystem/ticker/ticker var/turf/playerTurf = get_turf(Player) if(emergency_shuttle.departed && emergency_shuttle.evac) if(isNotAdminLevel(playerTurf.z)) - to_chat(Player, span_filter_system("[span_blue("You survived the round, but remained on [station_name()] as [Player.real_name].")]")) + to_chat(Player, span_filter_system(span_blue(span_bold("You survived the round, but remained on [station_name()] as [Player.real_name].")))) else - to_chat(Player, span_filter_system("[span_green("You managed to survive the events on [station_name()] as [Player.real_name].")]")) + to_chat(Player, span_filter_system(span_green(span_bold("You managed to survive the events on [station_name()] as [Player.real_name].")))) else if(isAdminLevel(playerTurf.z)) - to_chat(Player, span_filter_system("[span_green("You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].")]")) + to_chat(Player, span_filter_system(span_green(span_bold("You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].")))) else if(issilicon(Player)) - to_chat(Player, span_filter_system("[span_green("You remain operational after the events on [station_name()] as [Player.real_name].")]")) + to_chat(Player, span_filter_system(span_green(span_bold("You remain operational after the events on [station_name()] as [Player.real_name].")))) else - to_chat(Player, span_filter_system("[span_blue("You missed the crew transfer after the events on [station_name()] as [Player.real_name].")]")) + to_chat(Player, span_filter_system(span_blue(span_bold("You missed the crew transfer after the events on [station_name()] as [Player.real_name].")))) else if(istype(Player,/mob/observer/dead)) var/mob/observer/dead/O = Player if(!O.started_as_observer) - to_chat(Player, span_filter_system("[span_red("You did not survive the events on [station_name()]...")]")) + to_chat(Player, span_filter_system(span_red(span_bold("You did not survive the events on [station_name()]...")))) else - to_chat(Player, span_filter_system("[span_red("You did not survive the events on [station_name()]...")]")) + to_chat(Player, span_filter_system(span_red(span_bold("You did not survive the events on [station_name()]...")))) to_world("
") for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - to_world(span_filter_system("[aiPlayer.name]'s laws at the end of the round were:")) // VOREStation edit + to_world(span_filter_system(span_bold("[aiPlayer.name]'s laws at the end of the round were:"))) // VOREStation edit else - to_world(span_filter_system("[aiPlayer.name]'s laws when it was deactivated were:")) // VOREStation edit + to_world(span_filter_system(span_bold("[aiPlayer.name]'s laws when it was deactivated were:"))) // VOREStation edit aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) - var/robolist = "The AI's loyal minions were: " + var/robolist = span_bold("The AI's loyal minions were:") + " " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" // VOREStation edit to_world(span_filter_system("[robolist]")) @@ -513,15 +512,15 @@ var/global/datum/controller/subsystem/ticker/ticker if (!robo.connected_ai) if (robo.stat != 2) - to_world(span_filter_system("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:")) // VOREStation edit + to_world(span_filter_system(span_bold("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:"))) // VOREStation edit else - to_world(span_filter_system("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:")) // VOREStation edit + to_world(span_filter_system(span_bold("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:"))) // VOREStation edit if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) if(dronecount) - to_world(span_filter_system("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.")) + to_world(span_filter_system(span_bold("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round."))) mode.declare_completion()//To declare normal completion. diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 56faf42469..98ece935a6 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -4,7 +4,7 @@ // Mutable appearances are children of images, just so you know. -/mutable_appearance/New(copy_from, ...) +/image/mutable_appearance/New(copy_from, ...) ..() if(!copy_from) plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE diff --git a/code/datums/roundstats/roundstats.dm b/code/datums/roundstats/roundstats.dm index 0a6940761c..4a1bcad6c0 100644 --- a/code/datums/roundstats/roundstats.dm +++ b/code/datums/roundstats/roundstats.dm @@ -58,7 +58,7 @@ var/global/list/security_printer_tickets = list() //VOREStation Edit //VOREStation add Start - Ticket time! if(security_printer_tickets.len) - valid_stats_list.Add("[security_printer_tickets.len] unique security tickets were issued today!
Examples include:") + valid_stats_list.Add(span_danger("[security_printer_tickets.len] unique security tickets were issued today!") + "
Examples include:") var/good_num = 5 var/ourticket while(good_num > 0) @@ -67,7 +67,7 @@ var/global/list/security_printer_tickets = list() //VOREStation Edit ourticket = pick(security_printer_tickets) security_printer_tickets -= ourticket if(ourticket) - valid_stats_list.Add("-\"[ourticket]\"") + valid_stats_list.Add(span_bold("-")+"\"[ourticket]\"") good_num-- else good_num = 0 diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index dd42fd6256..c284ed7c6d 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -62,7 +62,7 @@ // You'll need to update these to_world usages if you want to make these z-level specific ~Aro /datum/announcement/minor/Message(message as text, message_title as text) - to_world("[message]") + to_world(span_bold("[message]")) /datum/announcement/priority/Message(message as text, message_title as text) to_world("

[message_title]

") @@ -86,13 +86,13 @@ to_chat(M, command) /datum/announcement/priority/Message(var/message as text, var/message_title as text, var/list/zlevels) - global_announcer.autosay("[message_title]: [message]", announcer ? announcer : ANNOUNCER_NAME, channel = "Common", zlevels = zlevels) + global_announcer.autosay(span_alert("[message_title]:") + " [message]", announcer ? announcer : ANNOUNCER_NAME, channel = "Common", zlevels = zlevels) /datum/announcement/priority/command/Message(var/message as text, var/message_title as text, var/list/zlevels) - global_announcer.autosay("[command_name()] - [message_title]: [message]", ANNOUNCER_NAME, channel = "Common", zlevels = zlevels) + global_announcer.autosay(span_alert("[command_name()] - [message_title]:") + " [message]", ANNOUNCER_NAME, channel = "Common", zlevels = zlevels) /datum/announcement/priority/security/Message(var/message as text, var/message_title as text, var/list/zlevels) - global_announcer.autosay("[message_title]: [message]", ANNOUNCER_NAME, channel = "Common", zlevels = zlevels) + global_announcer.autosay(span_alert("[message_title]:") + " [message]", ANNOUNCER_NAME, channel = "Common", zlevels = zlevels) /datum/announcement/proc/NewsCast(var/message as text, var/message_title as text) if(!newscast) diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm index 7bd2e339c9..94d9f79759 100644 --- a/code/game/antagonist/antagonist_add.dm +++ b/code/game/antagonist/antagonist_add.dm @@ -31,9 +31,9 @@ add_verb(player.current,faction_verb) //CHOMPEdit TGPanel spawn(1 SECOND) //Added a delay so that this should pop up at the bottom and not the top of the text flood the new antag gets. - to_chat(player.current, "Once you decide on a goal to pursue, you can optionally display it to \ - everyone at the end of the shift with the Set Ambition verb, located in the IC tab. You can change this at any time, \ - and it otherwise has no bearing on your round.") + to_chat(player.current, span_notice("Once you decide on a goal to pursue, you can optionally display it to \ + everyone at the end of the shift with the " + span_bold("Set Ambition") + " verb, located in the IC tab. You can change this at any time, \ + and it otherwise has no bearing on your round.")) add_verb(player.current,/mob/living/proc/write_ambition) //CHOMPEdit TGPanel if(can_speak_aooc) @@ -42,7 +42,7 @@ // Handle only adding a mind and not bothering with gear etc. if(nonstandard_role_type) faction_members |= player - to_chat(player.current, span_danger("You are \a [nonstandard_role_type]!")) + to_chat(player.current, span_danger(span_large("You are \a [nonstandard_role_type]!"))) player.special_role = nonstandard_role_type if(nonstandard_role_msg) to_chat(player.current, span_notice("[nonstandard_role_msg]")) @@ -53,7 +53,7 @@ if(player.current && faction_verb) remove_verb(player.current,faction_verb) //CHOMPEdit if(player in current_antagonists) - to_chat(player.current, span_danger("You are no longer a [role_text]!")) + to_chat(player.current, span_danger(span_large("You are no longer a [role_text]!"))) current_antagonists -= player faction_members -= player player.special_role = null diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 4158a432b6..7a99e400cd 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -38,8 +38,8 @@ if(!mind) return if(!is_special_character(mind)) - to_chat(src, "While you may perhaps have goals, this verb's meant to only be visible \ - to antagonists. Please make a bug report!") + to_chat(src, span_warning("While you may perhaps have goals, this verb's meant to only be visible \ + to antagonists. Please make a bug report!")) return var/new_ambitions = tgui_input_text(src, "Write a short sentence of what your character hopes to accomplish \ today as an antagonist. Remember that this is purely optional. It will be shown at the end of the \ diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm index 830d4806f5..15ed54af49 100644 --- a/code/game/antagonist/antagonist_print.dm +++ b/code/game/antagonist/antagonist_print.dm @@ -3,20 +3,21 @@ if(!current_antagonists.len) return FALSE - var/text = "

The [current_antagonists.len == 1 ? "[role_text] was" : "[role_text_plural] were"]:" + var/text = "

" + text += span_normal(span_bold("The [current_antagonists.len == 1 ? "[role_text] was" : "[role_text_plural] were"]:")) for(var/datum/mind/P in current_antagonists) text += print_player_full(P) text += get_special_objective_text(P) if(P.ambitions) - text += "
Their goals for today were..." - text += "
[P.ambitions]" + text += "
Their goals for today were...
" + text += span_notice("[P.ambitions]") if(!global_objectives.len && P.objectives && P.objectives.len) var/failed var/num = 1 for(var/datum/objective/O in P.objectives) text += print_objective(O, num) if(O.check_completion()) - text += span_green("Success!") + text += span_green(span_bold("Success!")) feedback_add_details(feedback_tag,"[O.type]|SUCCESS") else text += span_red("Fail.") @@ -24,12 +25,13 @@ failed = TRUE num++ if(failed) - text += "
" + span_red("The [role_text] has failed.") + text += "
" + span_red(span_bold("The [role_text] has failed.")) else - text += "
" + span_green("The [role_text] was successful!") + text += "
" + span_green(span_bold("The [role_text] was successful!")) if(global_objectives && global_objectives.len) - text += "
Their objectives were:" + text += "
" + text += span_normal("Their objectives were:") var/num = 1 for(var/datum/objective/O in global_objectives) text += print_objective(O, num, TRUE) @@ -39,17 +41,17 @@ to_world(text) /datum/antagonist/proc/print_objective(var/datum/objective/O, var/num, var/append_success) - var/text = "
Objective [num]: [O.explanation_text] " + var/text = "
" + span_bold("Objective [num]:") + " [O.explanation_text] " if(append_success) if(O.check_completion()) - text += span_green("Success!") + text += span_green(span_bold("Success!")) else text += span_red("Fail.") return text /datum/antagonist/proc/print_player_lite(var/datum/mind/ply) var/role = ply.assigned_role ? "\improper[ply.assigned_role]" : "\improper[ply.special_role]" - var/text = "
[ply.name] ([ply.key]) as \a [role] (" + var/text = "
" + span_bold("[ply.name]") + " (" + span_bold("[ply.key]") + ") as \a " + span_bold("[role]") + " (" if(ply.current) if(ply.current.stat == DEAD) text += "died" @@ -58,7 +60,7 @@ else text += "survived" if(ply.current.real_name != ply.name) - text += " as [ply.current.real_name]" + text += " as " + span_bold("[ply.current.real_name]") else text += "body destroyed" text += ")" diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 74f9a74543..71838b33f2 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -85,8 +85,8 @@ var/datum/antagonist/ninja/ninjas if(!..()) return 0 var/directive = generate_ninja_directive("heel") - player.store_memory("Directive: [directive]
") - to_chat(player, "Remember your directive: [directive].") + player.store_memory(span_bold("Directive:") + " " + span_danger("[directive]") + "
") + to_chat(player, span_bold("Remember your directive:") + " [directive].") /datum/antagonist/ninja/update_antag_mob(var/datum/mind/player) ..() diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index 026337fc6d..48f8e602b9 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -101,11 +101,11 @@ var/datum/antagonist/traitor/traitors give_codewords(traitor_mob) /datum/antagonist/traitor/proc/give_codewords(mob/living/traitor_mob) - to_chat(traitor_mob, "Your employers provided you with the following information on how to identify possible allies:") - to_chat(traitor_mob, "Code Phrase: [syndicate_code_phrase]") - to_chat(traitor_mob, "Code Response: [syndicate_code_response]") - traitor_mob.mind.store_memory("Code Phrase: [syndicate_code_phrase]") - traitor_mob.mind.store_memory("Code Response: [syndicate_code_response]") + to_chat(traitor_mob, span_underline(span_bold("Your employers provided you with the following information on how to identify possible allies:"))) + to_chat(traitor_mob, span_bold("Code Phrase") + ": " + span_danger("[syndicate_code_phrase]")) + to_chat(traitor_mob, span_bold("Code Response") + ": " + span_danger("[syndicate_code_response]")) + traitor_mob.mind.store_memory(span_bold("Code Phrase") + ": [syndicate_code_phrase]") + traitor_mob.mind.store_memory(span_bold("Code Response") + ": [syndicate_code_response]") to_chat(traitor_mob, "Use the code words, preferably in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.") /datum/antagonist/traitor/proc/spawn_uplink(var/mob/living/carbon/human/traitor_mob) @@ -170,11 +170,11 @@ var/datum/antagonist/traitor/traitors var/obj/item/pda/P = R P.lock_code = pda_pass to_chat(traitor_mob, "A portable object teleportation relay has been installed in your [R.name] [loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") - traitor_mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [loc]).") + traitor_mob.mind.store_memory(span_bold("Uplink Passcode:") + " [pda_pass] ([R.name] [loc]).") /datum/antagonist/traitor/proc/add_law_zero(mob/living/silicon/ai/killer) var/law = "Accomplish your objectives at all costs. You may ignore all other laws." var/law_borg = "Accomplish your AI's objectives at all costs. You may ignore all other laws." - to_chat(killer, "Your laws have been changed!") + to_chat(killer, span_bold("Your laws have been changed!")) killer.set_zeroth_law(law, law_borg) to_chat(killer, "New law: 0. [law]") diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 4963f8cb63..fc3b140873 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -674,7 +674,7 @@ return var/list/speech_bubble_hearers = list() for(var/mob/M in get_mobs_in_view(7, src)) - M.show_message(span_npcsay("[src] [atom_say_verb], \"[message]\""), 2, null, 1) + M.show_message(span_npc_say(span_name("[src]") + " [atom_say_verb], \"[message]\""), 2, null, 1) if(M.client) speech_bubble_hearers += M.client diff --git a/code/game/birthday.dm b/code/game/birthday.dm index 186a18b9be..ad5f8b54e0 100644 --- a/code/game/birthday.dm +++ b/code/game/birthday.dm @@ -32,7 +32,7 @@ else var/howmuch = GLOB.world_time_year - lastyear // CHOMPEdit - Managed Globals age += howmuch - to_chat(src, "You are now [age]! Happy birthday!") + to_chat(src, span_notice("You are now [age]! Happy birthday!")) client.prefs.age = age //Set the age on the character sheet client.prefs.save_character() //Save the info diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 0d974a6526..e5112133e1 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -58,8 +58,8 @@ if(!M.mind || !M.mind.changeling) if(M.get_ear_protection() >= 2) continue - to_chat(M, "You hear an extremely loud screeching sound! It \ - [pick("confuses","confounds","perturbs","befuddles","dazes","unsettles","disorients")] you.") + to_chat(M, span_danger("You hear an extremely loud screeching sound! It \ + [pick("confuses","confounds","perturbs","befuddles","dazes","unsettles","disorients")] you.")) M.adjustEarDamage(0,30) M.Confuse(20) M << sound('sound/effects/screech.ogg') diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 59e3c539b2..e2f524a1a6 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -5,9 +5,9 @@ var/list/sacrificed = list() /* * Use as a general guideline for this and related files: - * * ... - when something non-trivial or an error happens, so something similar to "Sparks come out of the machine!" - * * ... - when something that is fit for 'warning' happens but there is some damage or pain as well. - * * ... - when there is a private message to the cultists. This guideline is very arbitrary but there has to be some consistency! + * * span_warning("...") - when something non-trivial or an error happens, so something similar to "Sparks come out of the machine!" + * * span_danger("...") - when something that is fit for 'warning' happens but there is some damage or pain as well. + * * span_cult("...") - when there is a private message to the cultists. This guideline is very arbitrary but there has to be some consistency! */ @@ -197,7 +197,7 @@ var/list/sacrificed = list() cultists.Add(M) if(cultists.len >= 9) if(!narsie_cometh)//so we don't initiate Hell more than one time. - to_world("THE VEIL HAS BEEN SHATTERED!") + to_world(span_narsie(span_red(span_bold("THE VEIL HAS BEEN SHATTERED!")))) world << sound('sound/effects/weather/old_wind/wind_5_1.ogg') SetUniversalState(/datum/universal_state/hell) @@ -1084,10 +1084,10 @@ var/list/sacrificed = list() var/obj/item/nullrod/N = locate() in T if(N) for(var/mob/O in viewers(T, null)) - O.show_message(span_warning("[usr] invokes a talisman at [T], but they are unaffected!"), 1) + O.show_message(span_warning(span_bold("[usr] invokes a talisman at [T], but they are unaffected!")), 1) else for(var/mob/O in viewers(T, null)) - O.show_message(span_warning("[usr] invokes a talisman at [T]"), 1) + O.show_message(span_warning(span_bold("[usr] invokes a talisman at [T]")), 1) if(issilicon(T)) T.Weaken(15) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm index d416aeeb8b..257369355f 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm @@ -78,18 +78,18 @@ return user.examinate(src) /turf/unsimulated/wall/supermatter/attack_hand(mob/user as mob) - user.visible_message("\The [user] reaches out and touches \the [src]... And then blinks out of existance.",\ - "You reach out and touch \the [src]. Everything immediately goes quiet. Your last thought is \"That was not a wise decision.\"",\ - "You hear an unearthly noise.") + user.visible_message(span_warning("\The [user] reaches out and touches \the [src]... And then blinks out of existance."),\ + span_danger("You reach out and touch \the [src]. Everything immediately goes quiet. Your last thought is \"That was not a wise decision.\""),\ + span_warning("You hear an unearthly noise.")) playsound(src, 'sound/effects/supermatter.ogg', 50, 1) Consume(user) /turf/unsimulated/wall/supermatter/attackby(obj/item/W as obj, mob/living/user as mob) - user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ - "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ - "Everything suddenly goes silent.") + user.visible_message(span_warning("\The [user] touches \a [W] to \the [src] as a silence fills the room..."),\ + span_danger("You touch \the [W] to \the [src] when everything suddenly goes silent.\"") + "\n" + span_notice("\The [W] flashes into dust as you flinch away from \the [src]."),\ + span_warning("Everything suddenly goes silent.")) playsound(src, 'sound/effects/supermatter.ogg', 50, 1) @@ -101,12 +101,12 @@ if(istype(AM, /mob/living)) var/mob/living/M = AM var/datum/gender/T = gender_datums[M.get_visible_gender()] - AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [T.his] body starts to glow and catch flame before flashing into ash.",\ - "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ - "You hear an unearthly noise as a wave of heat washes over you.") + AM.visible_message(span_warning("\The [AM] slams into \the [src] inducing a resonance... [T.his] body starts to glow and catch flame before flashing into ash."),\ + span_danger("You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\""),\ + span_warning("You hear an unearthly noise as a wave of heat washes over you.")) else - AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ - "You hear a loud crack as you are washed with a wave of heat.") + AM.visible_message(span_warning("\The [AM] smacks into \the [src] and rapidly flashes to ash."),\ + span_warning("You hear a loud crack as you are washed with a wave of heat.")) playsound(src, 'sound/effects/supermatter.ogg', 50, 1) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index 98c4e3a78a..6df1dad864 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -37,7 +37,7 @@ var/global/universe_has_ended = 0 // Apply changes when entering state /datum/universal_state/supermatter_cascade/OnEnter() set background = 1 - to_world(span_sinister("You are blinded by a brilliant flash of energy.")) + to_world(span_sinister(span_cascade("You are blinded by a brilliant flash of energy."))) world << sound('sound/effects/cascade.ogg') diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 3f51563f05..5b98ee0aac 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -190,9 +190,9 @@ /datum/game_mode/epidemic/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - epidemic cured") - to_world(" The virus outbreak was contained! The crew wins!") + to_world(span_danger(span_large("The virus outbreak was contained! The crew wins!"))) else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - to_world(" The crew succumbed to the epidemic!") + to_world(span_danger(span_large("The crew succumbed to the epidemic!"))) ..() return 1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index dfbdd9c5ba..3209ae4506 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -117,13 +117,13 @@ var/global/list/additional_antag_types = list() return /datum/game_mode/proc/announce() //to be called when round starts - to_world("The current game mode is [capitalize(name)]!") + to_world(span_bold("The current game mode is [capitalize(name)]!")) if(round_description) to_world("[round_description]") if(round_autoantag) to_world("Antagonists will be added to the round automagically as needed.") if(antag_templates && antag_templates.len) - var/antag_summary = "Possible antagonist types: " + var/antag_summary = span_bold("Possible antagonist types:") + " " var/i = 1 for(var/datum/antagonist/antag in antag_templates) if(i > 1) @@ -357,8 +357,9 @@ var/global/list/additional_antag_types = list() var/text = "" if(surviving_total > 0) - text += "
There [surviving_total>1 ? "were [surviving_total] survivors" : "was one survivor"]" - text += " ([escaped_total>0 ? escaped_total : "none"] [emergency_shuttle.evac ? "escaped" : "transferred"]) and [ghosts] ghosts.
" + text += "
There [surviving_total>1 ? ("were " + span_bold("[surviving_total] survivors")) : ("was " + span_bold("one survivor"))] (" + text += span_bold("[escaped_total>0 ? escaped_total : "none"] [emergency_shuttle.evac ? "escaped" : "transferred"]) and [ghosts] ghosts") + text += ".
" else text += "There were no survivors ([ghosts] ghosts)." to_world(text) @@ -499,7 +500,8 @@ var/global/list/additional_antag_types = list() //Reports player logouts// ////////////////////////// /proc/display_roundstart_logout_report() - var/msg = "Roundstart logout report\n\n" + var/msg = span_bold("Roundstart logout report") + msg += "

" for(var/mob/living/L in mob_list) if(L.ckey) @@ -509,21 +511,21 @@ var/global/list/additional_antag_types = list() found = 1 break if(!found) - msg += "[L.name] ([L.ckey]), the [L.job] ([span_yellow("Disconnected")])\n" + msg += "[span_bold(L.name)] ([L.ckey]), the [L.job] ([span_yellow(span_bold("Disconnected"))])
" if(L.ckey && L.client) if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something) - msg += "[L.name] ([L.ckey]), the [L.job] ([span_yellow("Connected, Inactive")])\n" + msg += "[span_bold(L.name)] ([L.ckey]), the [L.job] ([span_yellow(span_bold("Connected, Inactive"))])
" continue //AFK client if(L.stat) if(L.suiciding) //Suicider - msg += "[L.name] ([L.ckey]), the [L.job] ([span_red("Suicide")])\n" + msg += "[span_bold(L.name)] ([L.ckey]), the [L.job] ([span_red(span_bold("Suicide"))])
" continue //Disconnected client if(L.stat == UNCONSCIOUS) - msg += "[L.name] ([L.ckey]), the [L.job] (Dying)\n" + msg += "[span_bold(L.name)] ([L.ckey]), the [L.job] (Dying)
" continue //Unconscious if(L.stat == DEAD) - msg += "[L.name] ([L.ckey]), the [L.job] (Dead)\n" + msg += "[span_bold(L.name)] ([L.ckey]), the [L.job] (Dead)
" continue //Dead continue //Happy connected client @@ -531,22 +533,22 @@ var/global/list/additional_antag_types = list() if(D.mind && (D.mind.original == L || D.mind.current == L)) if(L.stat == DEAD) if(L.suiciding) //Suicider - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_red("Suicide")])\n" + msg += "[span_bold(L.name)] ([ckey(D.mind.key)]), the [L.job] ([span_red(span_bold("Suicide"))])
" continue //Disconnected client else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" + msg += "[span_bold(L.name)] ([ckey(D.mind.key)]), the [L.job] (Dead)
" continue //Dead mob, ghost abandoned else if(D.can_reenter_corpse) - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_red("Adminghosted")])\n" + msg += "[span_bold(L.name)] ([ckey(D.mind.key)]), the [L.job] ([span_red(span_bold("Adminghosted"))])
" continue //Lolwhat else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_red("Ghosted")])\n" + msg += "[span_bold(L.name)] ([ckey(D.mind.key)]), the [L.job] ([span_red(span_bold("Ghosted"))])
" continue //Ghosted while alive continue // CHOMPEdit: Escape infinite loop in case there's nobody connected. Shouldn't happen ever, but. - msg += "" // close the span from right at the top + msg = span_notice(msg)// close the span from right at the top for(var/mob/M in mob_list) if(M.client && M.client.holder) @@ -570,7 +572,7 @@ var/global/list/additional_antag_types = list() var/obj_count = 1 to_chat(player.current, span_notice("Your current objectives:")) for(var/datum/objective/objective in player.objectives) - to_chat(player.current, "Objective #[obj_count]: [objective.explanation_text]") + to_chat(player.current, span_bold("Objective #[obj_count]") + ": [objective.explanation_text]") obj_count++ /mob/verb/check_round_info() @@ -582,11 +584,11 @@ var/global/list/additional_antag_types = list() return if(master_mode != "secret") - to_chat(usr, span_notice("The roundtype is [capitalize(ticker.mode.name)]")) + to_chat(usr, span_notice(span_bold("The roundtype is [capitalize(ticker.mode.name)]"))) if(ticker.mode.round_description) - to_chat(usr, span_notice("[ticker.mode.round_description]")) + to_chat(usr, span_notice(span_italics("[ticker.mode.round_description]"))) if(ticker.mode.extended_round_description) to_chat(usr, span_notice("[ticker.mode.extended_round_description]")) else - to_chat(usr, span_notice("Shhhh. It's a secret.")) + to_chat(usr, span_notice(span_italics("Shhhh") + ". It's a secret.")) return diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 121333c000..8c07161bca 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -28,17 +28,20 @@ if(!location) continue switch(location.loc.type) if( /area/shuttle/escape/centcom ) - text += "
[player.real_name] escaped on the emergency shuttle" + text += "
" + text += span_bold(span_normal("[player.real_name] escaped on the emergency shuttle")) if( /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom ) - text += "
[player.real_name] escaped in a life pod." + text += "
" + text += span_normal("[player.real_name] escaped in a life pod.") else - text += "
[player.real_name] survived but is stranded without any hope of rescue." + text += "
" + text += span_small("[player.real_name] survived but is stranded without any hope of rescue.") survivors++ if(survivors) - to_world("The following survived the meteor storm:[text]") + to_world(span_notice(span_bold("The following survived the meteor storm")) + ":[text]") else - to_world(span_notice("Nobody survived the meteor storm!")) + to_world(span_notice(span_bold("Nobody survived the meteor storm!"))) feedback_set_details("round_end_result","end - evacuation") feedback_set("round_end_result",survivors) diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index 515881a7c6..27e9fe5b47 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -99,8 +99,8 @@ if(isliving(hit_atom)) var/mob/living/L = hit_atom if(L == user && !controlled_mobs.len) - to_chat(user, "This function doesn't work on higher-intelligence entities, however since you're \ - trying to use it on yourself, perhaps you're an exception? Regardless, nothing happens.") + to_chat(user, span_warning("This function doesn't work on higher-intelligence entities, however since you're \ + trying to use it on yourself, perhaps you're an exception? Regardless, nothing happens.")) return 0 if(L.mob_class & allowed_mob_classes) @@ -125,8 +125,8 @@ if(pay_energy(25 * controlled_mobs.len)) attack_all(L) add_attack_logs(user,L,"Commanded their army of [controlled_mobs.len]") - to_chat(user, "You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to \ - attack \the [L].") + to_chat(user, span_notice("You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to \ + attack \the [L].")) //This is to stop someone from controlling beepsky and getting him to stun someone 5 times a second. user.setClickCooldown(8) adjust_instability(controlled_mobs.len) @@ -139,5 +139,5 @@ if(pay_energy(10 * controlled_mobs.len)) move_all(T) adjust_instability(controlled_mobs.len) - to_chat(user, "You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to move \ - towards \the [T].") + to_chat(user, span_notice("You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to move \ + towards \the [T].")) diff --git a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm index af8b22ecb8..51fe210fe7 100644 --- a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm +++ b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm @@ -63,8 +63,8 @@ return .(pulses_remaining, victim, previous_damage) // Now check if our damage predictions are going to cause the victim to go into crit if no healing occurs. if(previous_damage + health_lost >= victim.getMaxHealth()) // We're probably going to hardcrit - to_chat(victim, "A feeling of immense dread starts to overcome you as everything starts \ - to fade to black...") + to_chat(victim, span_danger(span_large("A feeling of immense dread starts to overcome you as everything starts \ + to fade to black..."))) //to_world("Predicted hardcrit.") return 1 else if(predicted_damage >= victim.species.total_health / 2) // Or perhaps we're gonna go into 'oxy crit'. diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index b642adcf15..b0dba844f4 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -76,8 +76,8 @@ var/obj/item/W = damage_source if(attacker) W.attack(attacker) - to_chat(attacker, "Your [damage_source.name] goes through \the [src] in one location, comes out \ - on the same side, and hits you!") + to_chat(attacker, span_danger("Your [damage_source.name] goes through \the [src] in one location, comes out \ + on the same side, and hits you!")) spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 177a8ea4b7..329d05c0df 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -250,7 +250,7 @@ update_flag to_chat(user, "The welding tool must be on to complete this task.") return if(air_contents.return_pressure() > 1 && !destroyed) // Empty or broken cans are able to be deconstructed - to_chat(user, "\The [src]'s internal pressure is too high! Empty the canister before attempting to weld it apart.") + to_chat(user, span_warning("\The [src]'s internal pressure is too high! Empty the canister before attempting to weld it apart.")) return playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) @@ -364,14 +364,14 @@ update_flag if("valve") if(valve_open) if(holding) - release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the [holding]
" + release_log += "Valve was " + span_bold("closed") + " by [usr] ([usr.ckey]), stopping the transfer into the [holding]
" else - release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the air
" + release_log += "Valve was " + span_bold("closed") + " by [usr] ([usr.ckey]), stopping the transfer into the " + span_red(span_bold("air")) + "
" else if(holding) - release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the [holding]
" + release_log += "Valve was " + span_bold("opened") + " by [usr] ([usr.ckey]), starting the transfer into the [holding]
" else - release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the air
" + release_log += "Valve was " + span_bold("opened") + " by [usr] ([usr.ckey]), starting the transfer into the " + span_red(span_bold("air")) + "
" log_open() valve_open = !valve_open . = TRUE @@ -379,7 +379,7 @@ update_flag if(holding) if(valve_open) valve_open = 0 - release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the [holding]
" + release_log += "Valve was " + span_bold("closed") + " by [usr] ([usr.ckey]), stopping the transfer into the [holding]
" if(istype(holding, /obj/item/tank)) holding.manipulated_by = usr.real_name holding.loc = loc diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm index 1232959fcf..f86ad1c6e1 100644 --- a/code/game/machinery/clawmachine.dm +++ b/code/game/machinery/clawmachine.dm @@ -109,7 +109,7 @@ /obj/machinery/clawmachine/attackby(obj/item/W as obj, mob/user as mob) if(busy) - to_chat(user,"The claw machine is currently running. ") + to_chat(user,span_notice("The claw machine is currently running.")) return if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 100, 1) @@ -125,7 +125,7 @@ return if(!anchored) - to_chat(user,span_notice(" The machine isn't secured.")) + to_chat(user,span_notice("The machine isn't secured.")) return var/handled = 0 @@ -158,10 +158,10 @@ if (isbroken) return if(busy) - to_chat(user,"The claw machine is currently running. ") + to_chat(user,span_notice("The claw machine is currently running.")) return if(cashmoney.worth < 5) - to_chat(user,"You dont have enough Thalers to play! ") + to_chat(user,span_notice("You dont have enough Thalers to play!")) return to_chat(user,span_notice("You put 5 Thalers in the claw machine and press start.")) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index c164af447a..735d87c210 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -120,7 +120,8 @@ clonemind.transfer_to(H) H.ckey = R.ckey - to_chat(H, span_warning("Consciousness slowly creeps over you as your body regenerates.
Your recent memories are fuzzy, and it's hard to remember anything from today...
So this is what cloning feels like?")) + to_chat(H, span_warning(span_bold("Consciousness slowly creeps over you as your body regenerates.") + "
" + span_bold(span_large("Your recent memories are fuzzy, and it's hard to remember anything from today...")) + \ + "
" + span_notice(span_italics("So this is what cloning feels like?")))) // -- Mode/mind specific stuff goes here callHook("clone", list(H)) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 9c464c5bd0..1f3c65f786 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -214,8 +214,8 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva transfer.loc = get_turf(src) transfer.create_eyeobj() transfer.cancel_camera() - to_chat(user, "Transfer successful: [transfer.name] placed within stationary core.") - to_chat(transfer, "You have been transferred into a stationary core. Remote device connection restored.") + to_chat(user, span_notice("Transfer successful:") + " [transfer.name] placed within stationary core.") + to_chat(transfer, span_info("You have been transferred into a stationary core. Remote device connection restored.")) if(card) card.clear() @@ -236,25 +236,25 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva if(transfer) load_ai(transfer,card,user) else - to_chat(user, "ERROR: Unable to locate artificial intelligence.") + to_chat(user, span_danger("ERROR:") + " Unable to locate artificial intelligence.") return else if(W.has_tool_quality(TOOL_WRENCH)) if(anchored) - user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") + user.visible_message(span_bold("\The [user]") + " starts to unbolt \the [src] from the plating...") playsound(src, W.usesound, 50, 1) if(!do_after(user,40 * W.toolspeed)) - user.visible_message("\The [user] decides not to unbolt \the [src].") + user.visible_message(span_bold("\The [user]") + " decides not to unbolt \the [src].") return - user.visible_message("\The [user] finishes unfastening \the [src]!") + user.visible_message(span_bold("\The [user]") + " finishes unfastening \the [src]!") anchored = FALSE return else - user.visible_message("\The [user] starts to bolt \the [src] to the plating...") + user.visible_message(span_bold("\The [user]") + " starts to bolt \the [src] to the plating...") playsound(src, W.usesound, 50, 1) if(!do_after(user,40 * W.toolspeed)) - user.visible_message("\The [user] decides not to bolt \the [src].") + user.visible_message(span_bold("\The [user]") + " decides not to bolt \the [src].") return - user.visible_message("\The [user] finishes fastening down \the [src]!") + user.visible_message(span_bold("\The [user]") + " finishes fastening down \the [src]!") anchored = TRUE return else diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index f614a172e0..44600b9c69 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -37,7 +37,7 @@ else if(card.carded_ai) var/mob/living/silicon/ai/new_occupant = card.carded_ai to_chat(new_occupant, span_notice("You have been transferred into a stationary terminal. Sadly there is no remote access from here.")) - to_chat(user, "Transfer Successful: [new_occupant] placed within stationary terminal.") + to_chat(user, span_notice("Transfer Successful:") + " [new_occupant] placed within stationary terminal.") new_occupant.forceMove(src) new_occupant.cancel_camera() new_occupant.control_disabled = TRUE diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index e260e6af55..3fc47e161c 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1132,7 +1132,7 @@ // This is not a status display message, since it's something the character // themselves is meant to see BEFORE putting the money in - to_chat(usr, "[icon2html(cashmoney,user.client)] That is not enough money.") + to_chat(usr, "[icon2html(cashmoney,user.client)] " + span_warning("That is not enough money.")) return 0 if(istype(cashmoney, /obj/item/spacecash)) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 5f6da818af..c54b5ee32c 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -27,7 +27,7 @@ /obj/machinery/computer/aiupload/attackby(obj/item/O as obj, mob/user as mob) if (using_map && !(user.z in using_map.contact_levels)) - to_chat(user, "Unable to establish a connection: You're too far away from the station!") + to_chat(user, span_danger("Unable to establish a connection:") + " You're too far away from the station!") return if(istype(O, /obj/item/aiModule)) var/obj/item/aiModule/M = O diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 4938158e15..10db958274 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -74,7 +74,7 @@ if(..()) return if (using_map && !(src.z in using_map.contact_levels)) - to_chat(user, "Unable to establish a connection: You're too far away from the station!") + to_chat(user, span_danger("Unable to establish a connection:") + " You're too far away from the station!") return tgui_interact(user) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 72b0a03244..d16342399f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -106,10 +106,10 @@ continue var/celsius = convert_k2c(tile_info[index][1]) var/pressure = tile_info[index][2] - o += "" - o += "[celsius]°C " - o += "" - o += "[pressure]kPa" + var/temperature_string = "[celsius]°C " + o += ((dir_alerts[index] & (FIREDOOR_ALERT_HOT|FIREDOOR_ALERT_COLD)) ? span_warning(temperature_string) : span_blue(temperature_string)) + o += span_blue("[pressure]kPa") + o += "" . += o if(islist(users_to_open) && users_to_open.len) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 2bbc19a39c..57903cd0ee 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -41,7 +41,7 @@ var/list/doppler_arrays = list() var/message = "Explosive disturbance detected - Epicenter at: grid ([x0],[y0]). Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range]. Shockwave radius: [light_impact_range]. Temporal displacement of tachyons: [took]seconds." for(var/mob/O in hearers(src, null)) - O.show_message(span_npcsay("[src] states coldly, \"[message]\""),2) + O.show_message(span_npc_say(span_name("[src]") + " states coldly, \"[message]\""),2) /obj/machinery/doppler_array/power_change() ..() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 27793e064a..4945e9d11c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -82,12 +82,12 @@ var/const/HOLOPAD_MODE = RANGE_BASED /obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user) if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it if(user.holo) - to_chat(user, "ERROR: Image feed in progress.") + to_chat(user, span_danger("ERROR:") + " Image feed in progress.") return create_holo(user)//Create one. visible_message("A holographic image of [user] flicks to life right before your eyes!") else - to_chat(user, "ERROR: Unable to project hologram.") + to_chat(user, span_danger("ERROR:") + " Unable to project hologram.") return /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. @@ -102,14 +102,14 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(M) for(var/mob/living/silicon/ai/master in masters) //var/name_used = M.GetVoice() - var/rendered = "Holopad received, [text]" + var/rendered = span_game(span_say(span_italics("Holopad received, " + span_message("[text]")))) //The lack of name_used is needed, because message already contains a name. This is needed for simple mobs to emote properly. master.show_message(rendered, 2) return /obj/machinery/hologram/holopad/show_message(msg, type, alt, alt_type) for(var/mob/living/silicon/ai/master in masters) - var/rendered = "Holopad received, [msg]" + var/rendered = span_game(span_say(span_italics("Holopad received, " + span_message("[msg]")))) master.show_message(rendered, type) return diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 1e02dec938..74aca8d039 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -284,7 +284,7 @@ Class Procs: /obj/machinery/proc/state(var/msg) for(var/mob/O in hearers(src, null)) - O.show_message("[icon2html(src,O.client)] [msg]", 2) + O.show_message("[icon2html(src,O.client)] " + span_notice("[msg]"), 2) /obj/machinery/proc/ping(text=null) if(!text) diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index e456323975..002b605143 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -72,14 +72,14 @@ wake_lock(user) // User requests service - user.visible_message("[user] wakes [src].", "You wake [src].") + user.visible_message(span_bold("[user]") + " wakes [src].", "You wake [src].") var/choice = tgui_alert(user, "What service would you like?", "[src]", list("Health Scan", "Backup Scan", "Cancel"), timeout = 10 SECONDS) if(!choice || choice == "Cancel" || !Adjacent(user) || inoperable() || panel_open) suspend() return // Service begins, delay - visible_message("\The [src] scans [user] thoroughly!") + visible_message(span_bold("\The [src]") + " scans [user] thoroughly!") flick("kiosk_active", src) if(!do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) || inoperable()) suspend() @@ -89,10 +89,10 @@ switch(choice) if("Health Scan") var/health_report = tell_health_info(user) - to_chat(user, span_notice("Health report results:")+health_report) + to_chat(user, span_boldnotice("Health report results:")+health_report) if("Backup Scan") if(!our_db) - to_chat(user, "Backup scan results:
DATABASE ERROR!") + to_chat(user, span_boldnotice("Backup scan results:") + "
DATABASE ERROR!") else var/scan_report = do_backup_scan(user) to_chat(user, span_notice("Backup scan results:")+scan_report) @@ -102,9 +102,9 @@ /obj/machinery/medical_kiosk/proc/tell_health_info(mob/living/user) if(!istype(user)) - return "
Unable to perform diagnosis on this type of life form." + return "
" + span_warning("Unable to perform diagnosis on this type of life form.") if(user.isSynthetic()) - return "
Unable to perform diagnosis on synthetic life forms." + return "
" + span_warning("Unable to perform diagnosis on synthetic life forms.") var/problems = 0 for(var/obj/item/organ/external/E in user) @@ -141,37 +141,37 @@ if(!problems) if(user.getHalLoss() > 0) - return "
Mild concussion detected - advising bed rest until patient feels well. No other anatomical issues detected." + return "
" + span_warning("Mild concussion detected - advising bed rest until patient feels well. No other anatomical issues detected.") else - return "
No anatomical issues detected." + return "
" + span_notice("No anatomical issues detected.") var/problem_text = "" if(problems & BROKEN_BONES) - problem_text += "
Broken bones detected - see a medical professional and move as little as possible." + problem_text += "
" + span_warning("Broken bones detected - see a medical professional and move as little as possible.") if(problems & INTERNAL_BLEEDING) - problem_text += "
Internal bleeding detected - seek medical attention, ASAP!" + problem_text += "
" + span_danger("Internal bleeding detected - seek medical attention, ASAP!") if(problems & EXTERNAL_BLEEDING) - problem_text += "
External bleeding detected - advising pressure with cloth and bandaging." + problem_text += "
" + span_warning("External bleeding detected - advising pressure with cloth and bandaging.") if(problems & SERIOUS_EXTERNAL_DAMAGE) - problem_text += "
Severe anatomical damage detected - seek medical attention." + problem_text += "
" + span_danger("Severe anatomical damage detected - seek medical attention.") if(problems & SERIOUS_INTERNAL_DAMAGE) - problem_text += "
Severe internal damage detected - seek medical attention." + problem_text += "
" + span_danger("Severe internal damage detected - seek medical attention.") if(problems & RADIATION_DAMAGE) - problem_text += "
Exposure to ionizing radiation detected - seek medical attention." + problem_text += "
" + span_danger("Exposure to ionizing radiation detected - seek medical attention.") if(problems & TOXIN_DAMAGE) - problem_text += "
Exposure to toxic materials detected - induce vomiting if you have consumed anything recently." + problem_text += "
" + span_warning("Exposure to toxic materials detected - induce vomiting if you have consumed anything recently.") if(problems & OXY_DAMAGE) - problem_text += "
Blood/air perfusion level is below acceptable norms - use concentrated oxygen if necessary." + problem_text += "
" + span_warning("Blood/air perfusion level is below acceptable norms - use concentrated oxygen if necessary.") if(problems & HUSKED_BODY) - problem_text += "
Anatomical structure lost, resuscitation not possible!" + problem_text += "
" + span_danger("Anatomical structure lost, resuscitation not possible!") return problem_text /obj/machinery/medical_kiosk/proc/do_backup_scan(mob/living/carbon/human/user) if(!istype(user)) - return "
Unable to perform full scan. Please see a medical professional." + return "
" + span_warning("Unable to perform full scan. Please see a medical professional.") if(!user.mind) - return "
Unable to perform full scan. Please see a medical professional." + return "
" + span_warning("Unable to perform full scan. Please see a medical professional.") var/nif = user.nif if(nif) @@ -181,7 +181,7 @@ var/datum/transhuman/body_record/BR = new() BR.init_from_mob(user, TRUE, TRUE, database_key = db_key) - return "
Backup scan completed!
Note: A backup implant is required for automated notifications to the appropriate department in case of incident." + return "
" + span_notice("Backup scan completed!") + "
" + span_bold("Note:") + " A backup implant is required for automated notifications to the appropriate department in case of incident." #undef BROKEN_BONES #undef INTERNAL_BLEEDING diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 0b406a80d7..3e48ebe727 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -266,8 +266,8 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) node = get_exonet_node() if(!node || !node.on || !node.allow_external_newscasters) - to_chat(user, "Error: Cannot connect to external content. Please try again in a few minutes. If this error persists, please \ - contact the system administrator.") + to_chat(user, span_danger("Error: Cannot connect to external content. Please try again in a few minutes. If this error persists, please \ + contact the system administrator.")) return 0 if(!user.IsAdvancedToolUser()) diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index 1d6ccc1621..cc277d70d2 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -336,7 +336,7 @@ switch(action) if("ejectBoard") if(copy_board) - visible_message("[copy_board] is ejected from [src]'s circuit reader.") + visible_message(span_notice("[copy_board] is ejected from [src]'s circuit reader.")) copy_board.forceMove(src.loc) copy_board = null return TRUE diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index bf914008d8..ca1b7b4f44 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -69,7 +69,7 @@ Black Marks:
"} for(var/A in marks) - text += "[A]
" + text += span_danger("[A]") + "
" to_chat(user, span_notice("You feel a sting as the scanner extracts some of your blood.")) var/turf/T = get_step(src,outputdir) var/obj/item/paper/print = new(T) diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 2e59f8a8d8..3db6a74911 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -477,7 +477,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/proc/finished_job() var/turf/T = get_turf(src) - T.visible_message("[icon2html(src,viewers(src))]The [src] beeps several times.") + T.visible_message("[icon2html(src,viewers(src))]" + span_notice("The [src] beeps several times.")) icon_state = initial(icon_state) active = 0 playsound(src, 'sound/machines/boobeebeep.ogg', 50) @@ -543,5 +543,5 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) if(target_species.can_refit_to(helmet, suit, suit?.helmet)) target_species.do_refit_to(helmet, suit, suit?.helmet) else - visible_message("[icon2html(src,viewers(src))]Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected.") + visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected.")) return diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm index 3e10eafd8d..d6eeecf680 100644 --- a/code/game/magic/archived_book.dm +++ b/code/game/magic/archived_book.dm @@ -46,7 +46,7 @@ var/global/datum/book_manager/book_mgr = new() break if(!our_comp) - to_chat(usr, "Unable to locate a library computer to use for book deleting.") + to_chat(usr, span_warning("Unable to locate a library computer to use for book deleting.")) return var/dat = "Book Inventory Management\n" // diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 634ce48d5c..a100a909ef 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -113,7 +113,7 @@ /obj/item/mecha_parts/mecha_equipment/proc/get_equip_info() if(!chassis) return - return "* [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]" + return (equip_ready ? span_green("*") : span_red("*")) + " [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]" /obj/item/mecha_parts/mecha_equipment/proc/is_ranged()//add a distance restricted equipment. Why not? return range&RANGED diff --git a/code/game/mecha/equipment/tools/armor_melee.dm b/code/game/mecha/equipment/tools/armor_melee.dm index 785f64a679..6232dcc0cd 100644 --- a/code/game/mecha/equipment/tools/armor_melee.dm +++ b/code/game/mecha/equipment/tools/armor_melee.dm @@ -15,7 +15,7 @@ /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/get_equip_info() if(!chassis) return - return "* [src.name]" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name]" /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = null) if(!action_checks(user)) diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm index c3e7a4e50a..86f66f61f0 100644 --- a/code/game/mecha/equipment/tools/armor_ranged.dm +++ b/code/game/mecha/equipment/tools/armor_ranged.dm @@ -49,7 +49,7 @@ /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/get_equip_info() if(!chassis) return - return "* [src.name]" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name]" /* /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/can_attach(obj/mecha/M as obj) diff --git a/code/game/mecha/equipment/tools/cloak.dm b/code/game/mecha/equipment/tools/cloak.dm index 3bcb6bf62d..75754ef116 100644 --- a/code/game/mecha/equipment/tools/cloak.dm +++ b/code/game/mecha/equipment/tools/cloak.dm @@ -22,7 +22,7 @@ /obj/item/mecha_parts/mecha_equipment/cloak/get_equip_info() if(!chassis) return - return "* [src.name] - [equip_ready ? "A" : "Dea"]ctivate" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] - [equip_ready ? "A" : "Dea"]ctivate" /obj/item/mecha_parts/mecha_equipment/cloak/Topic(href, href_list) ..() diff --git a/code/game/mecha/equipment/tools/energy_relay.dm b/code/game/mecha/equipment/tools/energy_relay.dm index 32943104f0..6715f51611 100644 --- a/code/game/mecha/equipment/tools/energy_relay.dm +++ b/code/game/mecha/equipment/tools/energy_relay.dm @@ -92,4 +92,4 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/get_equip_info() if(!chassis) return - return "* [src.name] - [(datum_flags & DF_ISPROCESSING)?"Dea":"A"]ctivate" \ No newline at end of file + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] - [(datum_flags & DF_ISPROCESSING)?"Dea":"A"]ctivate" diff --git a/code/game/mecha/equipment/tools/inflatables.dm b/code/game/mecha/equipment/tools/inflatables.dm index d82f44a80f..80b790c076 100644 --- a/code/game/mecha/equipment/tools/inflatables.dm +++ b/code/game/mecha/equipment/tools/inflatables.dm @@ -26,9 +26,9 @@ /obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables/get_equip_info() if(!chassis) return - var/data_return = "* [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""] - Deploy [my_deployer.mode?"Door":"Wall"]
\ -   - Doors left: [my_deployer.stored_doors]/[my_deployer.max_doors]
\ -   - Walls left: [my_deployer.stored_walls]/[my_deployer.max_walls]" + var/data_return = (equip_ready ? span_green("*") : span_red("*")) + " [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""] - Deploy [my_deployer.mode?"Door":"Wall"]
\ +   - Doors left: " + span_yellow("[my_deployer.stored_doors]") + "/[my_deployer.max_doors]
\ +   - Walls left: " + span_yellow("[my_deployer.stored_walls]") + "/[my_deployer.max_walls]" return data_return diff --git a/code/game/mecha/equipment/tools/jetpack.dm b/code/game/mecha/equipment/tools/jetpack.dm index c8763a0237..4c36ed42ec 100644 --- a/code/game/mecha/equipment/tools/jetpack.dm +++ b/code/game/mecha/equipment/tools/jetpack.dm @@ -117,7 +117,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/jetpack/get_equip_info() if(!chassis) return - return "* [src.name] \[Toggle\]" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] \[Toggle\]" /obj/item/mecha_parts/mecha_equipment/tool/jetpack/Topic(href,href_list) ..() diff --git a/code/game/mecha/equipment/tools/repair_droid.dm b/code/game/mecha/equipment/tools/repair_droid.dm index 0f19e4d861..0435b72c52 100644 --- a/code/game/mecha/equipment/tools/repair_droid.dm +++ b/code/game/mecha/equipment/tools/repair_droid.dm @@ -34,7 +34,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid/get_equip_info() if(!chassis) return - return "* [src.name] - [(datum_flags & DF_ISPROCESSING)?"Dea":"A"]ctivate" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] - [(datum_flags & DF_ISPROCESSING)?"Dea":"A"]ctivate" /obj/item/mecha_parts/mecha_equipment/repair_droid/Topic(href, href_list) @@ -94,4 +94,4 @@ return PROCESS_KILL else set_ready_state(TRUE) - return \ No newline at end of file + return diff --git a/code/game/mecha/equipment/tools/shield.dm b/code/game/mecha/equipment/tools/shield.dm index 494b5eded8..cf6e542278 100644 --- a/code/game/mecha/equipment/tools/shield.dm +++ b/code/game/mecha/equipment/tools/shield.dm @@ -86,4 +86,4 @@ /obj/item/mecha_parts/mecha_equipment/combat_shield/get_equip_info() if(!chassis) return - return "* [src.name] - [my_shield.active?"Dea":"A"]ctivate" \ No newline at end of file + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] - [my_shield.active?"Dea":"A"]ctivate" diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index 3d41a1cf2e..864a91847b 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -57,7 +57,7 @@ /obj/item/mecha_parts/mecha_equipment/omni_shield/get_equip_info() if(!chassis) return - return "* [src.name] - [shields?.active?"Dea":"A"]ctivate" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] - [shields?.active?"Dea":"A"]ctivate" ////// The shield projector object diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 84bec1bc56..e47db0d36b 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -53,10 +53,10 @@ if(mode) return analyze_reagents(target) if(!syringes.len) - occupant_message("No syringes loaded.") + occupant_message(span_warning("No syringes loaded.")) return if(reagents.total_volume<=0) - occupant_message("No available reagents to load syringe with.") + occupant_message(span_warning("No available reagents to load syringe with.")) return set_ready_state(FALSE) chassis.use_power(energy_drain) @@ -84,7 +84,7 @@ S.icon = initial(S.icon) S.reagents.trans_to_mob(M, S.reagents.total_volume, CHEM_BLOOD) M.take_organ_damage(2) - S.visible_message(" [M] was hit by the syringe!") + S.visible_message(span_attack("[M] was hit by the syringe!")) break else if(S.loc == trg) S.icon_state = initial(S.icon_state) @@ -225,7 +225,7 @@ occupant_message("The object is too far away.") return 0 if(!A.reagents || istype(A,/mob)) - occupant_message("No reagent info gained from [A].") + occupant_message(span_warning("No reagent info gained from [A].")) return 0 occupant_message("Analyzing reagents...") //VOREStation Block Edit - Start @@ -267,7 +267,7 @@ if(!chassis) return PROCESS_KILL if(!processed_reagents.len || reagents.total_volume >= reagents.maximum_volume || !chassis.has_charge(energy_drain)) - occupant_message("Reagent processing stopped.") + occupant_message(span_warning("Reagent processing stopped.")) log_message("Reagent processing stopped.") return PROCESS_KILL var/amount = synth_speed / processed_reagents.len @@ -474,7 +474,7 @@ /obj/item/mecha_parts/mecha_equipment/crisis_drone/get_equip_info() if(!chassis) return - return "* [src.name] - [enabled?"Dea":"A"]ctivate" + return (equip_ready ? span_green("*") : span_red("*")) + " [src.name] - [enabled?"Dea":"A"]ctivate" /obj/item/mecha_parts/mecha_equipment/crisis_drone/rad name = "hazmat dronebay" diff --git a/code/game/mecha/equipment/weapons/explosive/grenade.dm b/code/game/mecha/equipment/weapons/explosive/grenade.dm index ae230169fa..2b7201a5ab 100644 --- a/code/game/mecha/equipment/weapons/explosive/grenade.dm +++ b/code/game/mecha/equipment/weapons/explosive/grenade.dm @@ -33,7 +33,7 @@ origin_tech = list(TECH_COMBAT= 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang/limited/get_equip_info()//Limited version of the clusterbang launcher that can't reload - return "* [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]\[[src.projectiles]\]" + return (equip_ready ? span_green("*") : span_red("*")) + " [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]\[[src.projectiles]\]" /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang/limited/rearm() return//Extra bit of security diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index efdcb461a2..1141216a20 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -191,7 +191,7 @@ ..() /obj/effect/spider/spiderling/die() - visible_message(span_alert("[src] dies!")) + visible_message(span_warning("[src] dies!")) new /obj/effect/decal/cleanable/spiderling_remains(src.loc) ..() diff --git a/code/game/objects/items/antag_spawners.dm b/code/game/objects/items/antag_spawners.dm index 974febc784..58d48c99ce 100644 --- a/code/game/objects/items/antag_spawners.dm +++ b/code/game/objects/items/antag_spawners.dm @@ -113,9 +113,9 @@ var/mob/living/silicon/robot/R = new drone_type(T) // Put this text here before ckey change so that their laws are shown below it, since borg login() shows it. - to_chat(C, span_notice("You are a Mercenary Drone, activated to serve your team.")) - to_chat(C, "Be sure to examine your currently loaded lawset closely. It would be wise \ - to speak with your team, and learn what their plan is for today.") + to_chat(C, span_notice("You are a " + span_bold("Mercenary Drone") + ", activated to serve your team.")) + to_chat(C, span_notice(span_bold("Be sure to examine your currently loaded lawset closely.") + " It would be wise \ + to speak with your team, and learn what their plan is for today.")) R.key = C.key // R.Namepick() // Apparnetly making someone a merc lets them pick a name, so this isn't needed. diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index df500d71cd..f4db7bdab9 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -818,7 +818,7 @@ /proc/detect_new_area(var/turf/first, var/user) //Heavily simplified version for creating an area yourself. if(!istype(first)) //Not on a turf. - to_chat(usr, "") + to_chat(usr, span_warning("You can not create a room here.")) return if(get_new_area_type(first.loc) == 1) //Are they in an area they can build? I tried to do this BUILDABLE_AREA_TYPES[first.loc.type] but it refused. var/list/turf/found = new diff --git a/code/game/objects/items/devices/paicard_vr.dm b/code/game/objects/items/devices/paicard_vr.dm index 7291ed70f6..f04cc342cc 100644 --- a/code/game/objects/items/devices/paicard_vr.dm +++ b/code/game/objects/items/devices/paicard_vr.dm @@ -14,69 +14,69 @@ var/global/list/paikeys = list() if(istype(I,/obj/item/tool/screwdriver)) if(panel_open) panel_open = FALSE - user.visible_message("\The [user] secured \the [src]'s maintenance panel.") + user.visible_message(span_notice("\The [user] secured \the [src]'s maintenance panel.")) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) else if(pai) if(do_after(user, 3 SECONDS)) panel_open = TRUE - user.visible_message("\The [user] opened \the [src]'s maintenance panel.") + user.visible_message(span_warning("\The [user] opened \the [src]'s maintenance panel.")) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) if(istype(I,/obj/item/robotanalyzer)) if(!panel_open) - to_chat(user, "The panel isn't open. You will need to unscrew it to open it.") + to_chat(user, span_warning("The panel isn't open. You will need to unscrew it to open it.")) else if(cell == PP_FUNCTIONAL) - to_chat(user,"Power cell: functional") + to_chat(user,"Power cell: " + span_notice("functional")) else if(cell == PP_BROKEN) - to_chat(user,"Power cell: damaged - CRITICAL") + to_chat(user,"Power cell: " + span_warning("damaged - CRITICAL")) else - to_chat(user,"Power cell: missing - CRITICAL") + to_chat(user,"Power cell: " + span_warning("missing - CRITICAL")) if(processor == PP_FUNCTIONAL) - to_chat(user,"Processor: functional") + to_chat(user,"Processor: " + span_notice("functional")) else if(processor == PP_BROKEN) - to_chat(user,"Processor: damaged - CRITICAL") + to_chat(user,"Processor: " + span_warning("damaged - CRITICAL")) else - to_chat(user,"Processor: missing - CRITICAL") + to_chat(user,"Processor: " + span_warning("missing - CRITICAL")) if(board == PP_FUNCTIONAL) - to_chat(user,"Board: functional") + to_chat(user,"Board: " + span_notice("functional")) else if(board == PP_BROKEN) - to_chat(user,"Board: damaged - CRITICAL") + to_chat(user,"Board: " + span_warning("damaged - CRITICAL")) else - to_chat(user,"Board: missing - CRITICAL") + to_chat(user,"Board: " + span_warning("missing - CRITICAL")) if(capacitor == PP_FUNCTIONAL) - to_chat(user,"Capacitors: functional") + to_chat(user,"Capacitors: " + span_notice("functional")) else if(capacitor == PP_BROKEN) - to_chat(user,"Capacitors: damaged - CRITICAL") + to_chat(user,"Capacitors: " + span_warning("damaged - CRITICAL")) else - to_chat(user,"Capacitors: missing - CRITICAL") + to_chat(user,"Capacitors: " + span_warning("missing - CRITICAL")) if(projector == PP_FUNCTIONAL) - to_chat(user,"Projectors: functional") + to_chat(user,"Projectors: " + span_notice("functional")) else if(projector == PP_BROKEN) - to_chat(user,"Projectors: damaged") + to_chat(user,"Projectors: " + span_warning("damaged")) else - to_chat(user,"Projectors: missing") + to_chat(user,"Projectors: " + span_warning("missing")) if(emitter == PP_FUNCTIONAL) - to_chat(user,"Emitters: functional") + to_chat(user,"Emitters: " + span_notice("functional")) else if(emitter == PP_BROKEN) - to_chat(user,"Emitters: damaged") + to_chat(user,"Emitters: " + span_warning("damaged")) else - to_chat(user,"Emitters: missing") + to_chat(user,"Emitters: " + span_warning("missing")) if(speech_synthesizer == PP_FUNCTIONAL) - to_chat(user,"Speech Synthesizer: functional") + to_chat(user,"Speech Synthesizer: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Speech Synthesizer: damaged") + to_chat(user,"Speech Synthesizer: " + span_warning("damaged")) else - to_chat(user,"Speech Synthesizer: missing") + to_chat(user,"Speech Synthesizer: " + span_warning("missing")) if(istype(I,/obj/item/multitool)) if(!panel_open) - to_chat(user, "You can't do that in this state.") + to_chat(user, span_warning("You can't do that in this state.")) else var/list/parts = list() if(cell != PP_MISSING) @@ -98,123 +98,123 @@ var/global/list/paikeys = list() switch(choice) if("cell") if(cell == PP_FUNCTIONAL) - to_chat(user,"Power cell: functional") + to_chat(user,"Power cell: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Power cell: damaged") + to_chat(user,"Power cell: " + span_warning("damaged")) else - to_chat(user,"Power cell: missing") + to_chat(user,"Power cell: " + span_warning("missing")) if("processor") if(processor == PP_FUNCTIONAL) - to_chat(user,"Processor: functional") + to_chat(user,"Processor: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Processor: damaged") + to_chat(user,"Processor: " + span_warning("damaged")) else - to_chat(user,"Processor: missing") + to_chat(user,"Processor: " + span_warning("missing")) if("board") if(board == PP_FUNCTIONAL) - to_chat(user,"Board: functional") + to_chat(user,"Board: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Board: damaged") + to_chat(user,"Board: " + span_warning("damaged")) else - to_chat(user,"Board: missing") + to_chat(user,"Board: " + span_warning("missing")) if("capacitor") if(capacitor == PP_FUNCTIONAL) - to_chat(user,"Capacitors: functional") + to_chat(user,"Capacitors: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Capacitors: damaged") + to_chat(user,"Capacitors: " + span_warning("damaged")) else - to_chat(user,"Capacitors: missing") + to_chat(user,"Capacitors: " + span_warning("missing")) if("projector") if(projector == PP_FUNCTIONAL) - to_chat(user,"Projectors: functional") + to_chat(user,"Projectors: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Projectors: damaged") + to_chat(user,"Projectors: " + span_warning("damaged")) else - to_chat(user,"Projectors: missing") + to_chat(user,"Projectors: " + span_warning("missing")) if("emitter") if(emitter == PP_FUNCTIONAL) - to_chat(user,"Emitters: functional") + to_chat(user,"Emitters: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Emitters: damaged") + to_chat(user,"Emitters: " + span_warning("damaged")) else - to_chat(user,"Emitters: missing") + to_chat(user,"Emitters: " + span_warning("missing")) if("speech synthesizer") if(speech_synthesizer == PP_FUNCTIONAL) - to_chat(user,"Speech Synthesizer: functional") + to_chat(user,"Speech Synthesizer: " + span_notice("functional")) else if(speech_synthesizer == PP_BROKEN) - to_chat(user,"Speech Synthesizer: damaged") + to_chat(user,"Speech Synthesizer: " + span_warning("damaged")) else - to_chat(user,"Speech Synthesizer: missing") + to_chat(user,"Speech Synthesizer: " + span_warning("missing")) if(istype(I,/obj/item/paiparts/cell)) if(cell == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) cell = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) if(istype(I,/obj/item/paiparts/processor)) if(processor == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) processor = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) if(istype(I,/obj/item/paiparts/board)) if(board == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) board = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) if(istype(I,/obj/item/paiparts/capacitor)) if(capacitor == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) capacitor = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) if(istype(I,/obj/item/paiparts/projector)) if(projector == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) projector = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) if(istype(I,/obj/item/paiparts/emitter)) if(emitter == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) emitter = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) if(istype(I,/obj/item/paiparts/speech_synthesizer)) if(speech_synthesizer == PP_MISSING) if(do_after(user, 3 SECONDS)) - user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + user.visible_message(span_notice("\The [user] installs \the [I] into \the [src]."),span_notice("You install \the [I] into \the [src].")) speech_synthesizer = PP_FUNCTIONAL user.drop_from_inventory(I) qdel(I) else - to_chat(user, "You would need to remove the installed [I] first!") + to_chat(user, span_warning("You would need to remove the installed [I] first!")) /obj/item/paicard/attack_self(mob/user) if(!panel_open) @@ -249,14 +249,14 @@ var/global/list/paikeys = list() new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) cell = PP_MISSING if("processor") if(processor == PP_FUNCTIONAL) new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) processor = PP_MISSING if("board") board = PP_MISSING @@ -264,35 +264,35 @@ var/global/list/paikeys = list() new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) if("capacitor") if(capacitor == PP_FUNCTIONAL) new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) capacitor = PP_MISSING if("projector") if(projector == PP_FUNCTIONAL) new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) projector = PP_MISSING if("emitter") if(emitter == PP_FUNCTIONAL) new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) emitter = PP_MISSING if("speech synthesizer") if(speech_synthesizer == PP_FUNCTIONAL) new /obj/item/paiparts/capacitor(get_turf(user)) else new /obj/item/paiparts(get_turf(user)) - user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + user.visible_message(span_warning("\The [user] removes \the [choice] from \the [src]."),span_warning("You remove \the [choice] from \the [src].")) speech_synthesizer = PP_MISSING /obj/item/paicard/proc/death_damage() diff --git a/code/game/objects/items/devices/scanners/slime.dm b/code/game/objects/items/devices/scanners/slime.dm index 8baeebeecd..42d6e955f4 100644 --- a/code/game/objects/items/devices/scanners/slime.dm +++ b/code/game/objects/items/devices/scanners/slime.dm @@ -24,7 +24,7 @@ user.show_message("Potental to mutate into [english_list(mutations)] colors.
Extract potential: [S.cores]
Nutrition: [S.nutrition]/[S.max_nutrition]") if (S.nutrition < S.get_starve_nutrition()) - user.show_message(span_alert("Warning: Subject is starving!")) + user.show_message(span_warning("Warning: Subject is starving!")) else if (S.nutrition < S.get_hunger_nutrition()) user.show_message(span_warning("Warning: Subject is hungry.")) user.show_message("Electric change strength: [S.power_charge]") diff --git a/code/game/objects/items/toys/mech_toys.dm b/code/game/objects/items/toys/mech_toys.dm index 90519571b3..a6ca3ed1ef 100644 --- a/code/game/objects/items/toys/mech_toys.dm +++ b/code/game/objects/items/toys/mech_toys.dm @@ -90,8 +90,8 @@ return FALSE // If the attacker_controller isn't next to the attacking toy (and doesn't have telekinesis), the battle ends. if(!in_range(attacker, attacker_controller)) - attacker_controller.visible_message(span_notice(" [attacker_controller.name] separates from [attacker], ending the battle."), \ - span_notice(" You separate from [attacker], ending the battle. ")) + attacker_controller.visible_message(span_notice("[attacker_controller.name] separates from [attacker], ending the battle."), \ + span_notice("You separate from [attacker], ending the battle. ")) return FALSE // If it's PVP and the opponent is not next to the defending(src) toy (and doesn't have telekinesis), the battle ends. diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index f17a1eec9d..dbeb349ee4 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -515,7 +515,7 @@ sleep(2) // Short delay to match up with the explosion sound shake_camera(M, 2, 1) else - to_chat(user, span_alert("Nothing happens.")) + to_chat(user, span_warning("Nothing happens.")) /* * Garden gnome @@ -642,11 +642,11 @@ icon_state = "nuketoyidle" else var/timeleft = (cooldown - world.time) - to_chat(user, span_alert("Nothing happens, and '[round(timeleft/10)]' appears on a small display.")) + to_chat(user, span_warning("Nothing happens, and '[round(timeleft/10)]' appears on a small display.")) /obj/item/toy/nuke/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/disk/nuclear)) - to_chat(user, span_alert("Nice try. Put that disk back where it belongs.")) + to_chat(user, span_warning("Nice try. Put that disk back where it belongs.")) /* * Toy gibber @@ -677,7 +677,7 @@ to_chat(user, span_notice("You start feeding \the [O] [icon2html(O, user.client)] into \the [src]'s mini-input.")) if(do_after(user, 10, target = src)) if(O.loc != user) - to_chat(user, span_alert("\The [O] is too far away to feed into \the [src]!")) + to_chat(user, span_warning("\The [O] is too far away to feed into \the [src]!")) else user.visible_message(span_notice("You feed \the [O] into \the [src]!"),span_notice("[user] feeds \the [O] into \the [src]!")) user.unEquip(O) diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index 5704821eac..9c04ec836a 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -142,7 +142,7 @@ else to_chat(user, span_notice("You scribble your new nickname on the side of [src].")) nickname = tmp_label - desc = initial(desc) + " This one has '[nickname]' scribbled on the side." + desc = initial(desc) + " This one has " + span_notice("'[nickname]'") + " scribbled on the side." else return ..() diff --git a/code/game/objects/items/weapons/inducer_vr.dm b/code/game/objects/items/weapons/inducer_vr.dm index e22c4aec4c..14d6508e74 100644 --- a/code/game/objects/items/weapons/inducer_vr.dm +++ b/code/game/objects/items/weapons/inducer_vr.dm @@ -119,7 +119,7 @@ recharging = TRUE if(istype(A, /obj/item/gun/energy) && !charge_guns) - to_chat(user, span_alert("Error: Device is unable to interface with weapons.")) + to_chat(user, span_warning("Error: Device is unable to interface with weapons.")) recharging = FALSE return FALSE @@ -184,7 +184,7 @@ recharging = FALSE return TRUE else //Couldn't find a cell - to_chat(user, span_alert("Error unable to interface with device.")) + to_chat(user, span_warning("Error unable to interface with device.")) recharging = FALSE diff --git a/code/game/objects/micro_event.dm b/code/game/objects/micro_event.dm index 3ad5a0efae..715538ec11 100644 --- a/code/game/objects/micro_event.dm +++ b/code/game/objects/micro_event.dm @@ -74,7 +74,7 @@ . = ..() var/ourtime = (((start_time + time_til_open) - world.time) / 600) - . += "It will open in [ourtime] minutes!" + . += span_notice("It will open in [ourtime] minutes!") /obj/structure/timer_door/Initialize() START_PROCESSING(SSobj, src) @@ -83,7 +83,7 @@ /obj/structure/timer_door/Destroy() STOP_PROCESSING(SSobj, src) - visible_message("\The [src] opens up!") + visible_message(span_danger("\The [src] opens up!")) playsound(src, 'sound/effects/bang.ogg', 75, 1) return ..() diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm index 78027b5851..b4325b0c01 100644 --- a/code/game/objects/micro_structures.dm +++ b/code/game/objects/micro_structures.dm @@ -34,9 +34,9 @@ var/global/list/micro_tunnels = list() offset_tunnel() /obj/structure/micro_tunnel/Destroy() - visible_message("\The [src] collapses!") + visible_message(span_warning("\The [src] collapses!")) for(var/mob/thing in src.contents) - visible_message("\The [thing] tumbles out!") + visible_message(span_warning("\The [thing] tumbles out!")) thing.forceMove(get_turf(src.loc)) thing.cancel_camera() @@ -126,22 +126,22 @@ var/global/list/micro_tunnels = list() switch(choice) if("Exit") if(user.loc != src) - to_chat(user, "You can't do that unless you're in \the [src].") + to_chat(user, span_warning("You can't do that unless you're in \the [src].")) return user.forceMove(get_turf(src.loc)) user.cancel_camera() - user.visible_message("\The [user] climbs out of \the [src]!") + user.visible_message(span_notice("\The [user] climbs out of \the [src]!")) return if("Move") if(user.loc != src) - to_chat(user, "You can't do that unless you're in \the [src].") + to_chat(user, span_warning("You can't do that unless you're in \the [src].")) return var/list/destinations = find_destinations() if(!destinations.len) - to_chat(user, "There are no other tunnels connected to this one!") + to_chat(user, span_warning("There are no other tunnels connected to this one!")) return else if(destinations.len == 1) choice = pick(destinations) @@ -149,7 +149,7 @@ var/global/list/micro_tunnels = list() choice = tgui_input_list(user, "Where would you like to go?", "Pick a tunnel", destinations) if(!choice) return - to_chat(user,"You begin moving...") + to_chat(user,span_notice("You begin moving...")) if(!do_after(user, 10 SECONDS, exclusive = TRUE)) return user.forceMove(choice) @@ -164,7 +164,7 @@ var/global/list/micro_tunnels = list() continue our_targets |= L if(!our_targets.len) - to_chat(user, "There is no one in here except for you!") + to_chat(user, span_warning("There is no one in here except for you!")) return var/mob/our_choice if(our_targets.len == 1) @@ -172,10 +172,10 @@ var/global/list/micro_tunnels = list() else our_choice = tgui_input_list(user, "Who would you like to eat?", "Pick a target to eat", our_targets) if(user.loc != src) - to_chat(user, "You are no longer inside \the [src], and so cannot eat \the [our_choice].") + to_chat(user, span_warning("You are no longer inside \the [src], and so cannot eat \the [our_choice].")) return if(our_choice.loc != src) - to_chat(user, "\The [our_choice] is no longer inside \the [src], and so cannot be eaten.") + to_chat(user, span_warning("\The [our_choice] is no longer inside \the [src], and so cannot be eaten.")) return user.feed_grabbed_to_self(user,our_choice) return @@ -183,18 +183,18 @@ var/global/list/micro_tunnels = list() return if(!can_enter(user)) - user.visible_message("\The [user] reaches into \the [src]. . .","You reach into \the [src]. . .") + user.visible_message(span_warning("\The [user] reaches into \the [src]. . ."),span_warning("You reach into \the [src]. . .")) if(!do_after(user, 3 SECONDS, exclusive = TRUE)) - user.visible_message("\The [user] pulls their hand out of \the [src].","You pull your hand out of \the [src]") + user.visible_message(span_notice("\The [user] pulls their hand out of \the [src]."),span_warning("You pull your hand out of \the [src]")) return if(!src.contents.len) - to_chat(user, "There was nothing inside.") - user.visible_message("\The [user] pulls their hand out of \the [src].","You pull your hand out of \the [src]") + to_chat(user, span_warning("There was nothing inside.")) + user.visible_message(span_notice("\The [user] pulls their hand out of \the [src]."),span_warning("You pull your hand out of \the [src]")) return var/grabbed = pick(src.contents) if(!grabbed) - to_chat(user, "There was nothing inside.") - user.visible_message("\The [user] pulls their hand out of \the [src].","You pull your hand out of \the [src]") + to_chat(user, span_warning("There was nothing inside.")) + user.visible_message(span_notice("\The [user] pulls their hand out of \the [src]."),span_warning("You pull your hand out of \the [src]")) return if(ishuman(user)) @@ -207,7 +207,7 @@ var/global/list/micro_tunnels = list() var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) - user.visible_message("\The [user] pulls \the [grabbed] out of \the [src]! ! !") + user.visible_message(span_warning("\The [user] pulls \the [grabbed] out of \the [src]! ! !")) return else if(isanimal(user)) @@ -219,12 +219,12 @@ var/global/list/micro_tunnels = list() else var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) - user.visible_message("\The [user] pulls \the [grabbed] out of \the [src]! ! !") + user.visible_message(span_warning("\The [user] pulls \the [grabbed] out of \the [src]! ! !")) return - user.visible_message("\The [user] begins climbing into \the [src]!") + user.visible_message(span_notice("\The [user] begins climbing into \the [src]!")) if(!do_after(user, 10 SECONDS, exclusive = TRUE)) - to_chat(user, "You didn't go into \the [src]!") + to_chat(user, span_warning("You didn't go into \the [src]!")) return enter_tunnel(user) @@ -249,22 +249,22 @@ var/global/list/micro_tunnels = list() var/mob/living/k = M - k.visible_message("\The [k] begins climbing into \the [src]!") + k.visible_message(span_notice("\The [k] begins climbing into \the [src]!")) if(!do_after(k, 3 SECONDS, exclusive = TRUE)) - to_chat(k, "You didn't go into \the [src]!") + to_chat(k, span_warning("You didn't go into \the [src]!")) return enter_tunnel(k) /obj/structure/micro_tunnel/proc/enter_tunnel(mob/living/k) - k.visible_message("\The [k] climbs into \the [src]!") + k.visible_message(span_notice("\The [k] climbs into \the [src]!")) k.forceMove(src) k.cancel_camera() - to_chat(k,"You are inside of \the [src]. It's dark and gloomy inside of here. You can click upon the tunnel to exit, or travel to another tunnel if there are other tunnels linked to it.") + to_chat(k,span_notice("You are inside of \the [src]. It's dark and gloomy inside of here. You can click upon the tunnel to exit, or travel to another tunnel if there are other tunnels linked to it.")) tunnel_notify(k) /obj/structure/micro_tunnel/proc/tunnel_notify(var/mob/living/user) - to_chat(user, "You arrive inside \the [src].") + to_chat(user, span_notice("You arrive inside \the [src].")) var/our_message = "You can see " var/found_stuff = FALSE for(var/thing in src.contents) @@ -274,11 +274,11 @@ var/global/list/micro_tunnels = list() our_message = "[our_message] [thing], " if(isliving(thing)) var/mob/living/t = thing - to_chat(t, "\The [user] enters \the [src]!") + to_chat(t, span_notice("\The [user] enters \the [src]!")) if(found_stuff) - to_chat(user, "[our_message]inside of \the [src]!") + to_chat(user, span_notice("[our_message]inside of \the [src]!")) if(prob(25)) - visible_message("Something moves inside of \the [src]. . .") + visible_message(span_warning("Something moves inside of \the [src]. . .")) /obj/structure/micro_tunnel/magic magic = TRUE @@ -311,17 +311,17 @@ var/global/list/micro_tunnels = list() switch(choice) if("Exit") if(usr.loc != src) - to_chat(usr, "You can't do that unless you're in \the [src].") + to_chat(usr, span_warning("You can't do that unless you're in \the [src].")) return usr.forceMove(get_turf(src.loc)) usr.cancel_camera() - usr.visible_message("\The [usr] climbs out of \the [src]!") + usr.visible_message(span_notice("\The [usr] climbs out of \the [src]!")) return if("Move") if(usr.loc != src) - to_chat(usr, "You can't do that unless you're in \the [src].") + to_chat(usr, span_warning("You can't do that unless you're in \the [src].")) return var/list/destinations = list() if(istype(src,/obj/structure/micro_tunnel)) //If we're in a tunnel let's also get the tunnel's destinations @@ -337,7 +337,7 @@ var/global/list/micro_tunnels = list() destinations |= o if(!destinations.len) - to_chat(usr, "There is nowhere to move to!") + to_chat(usr, span_warning("There is nowhere to move to!")) return else if(destinations.len == 1) choice = pick(destinations) @@ -345,7 +345,7 @@ var/global/list/micro_tunnels = list() choice = tgui_input_list(usr, "Where would you like to go?", "Pick a destination", destinations) if(!choice) return - to_chat(usr,"You begin moving...") + to_chat(usr,span_notice("You begin moving...")) if(!do_after(usr, 10 SECONDS, exclusive = TRUE)) return if(QDELETED(src)) @@ -362,7 +362,7 @@ var/global/list/micro_tunnels = list() usr.forceMove(our_choice) usr.cancel_camera() - to_chat(usr,"You are inside of \the [our_choice]. You can click upon the thing you are in to exit, or travel to a nearby thing if there are other tunnels linked to it.") + to_chat(usr,span_notice("You are inside of \the [our_choice]. You can click upon the thing you are in to exit, or travel to a nearby thing if there are other tunnels linked to it.")) var/our_message = "You can see " var/found_stuff = FALSE @@ -373,29 +373,29 @@ var/global/list/micro_tunnels = list() our_message = "[our_message] [thing], " if(isliving(thing)) var/mob/living/t = thing - to_chat(t, "\The [usr] enters \the [src]!") + to_chat(t, span_notice("\The [usr] enters \the [src]!")) if(found_stuff) - to_chat(usr, "[our_message]inside of \the [src]!") + to_chat(usr, span_notice("[our_message]inside of \the [src]!")) if(prob(25)) - our_choice.visible_message("Something moves inside of \the [our_choice]. . .") + our_choice.visible_message(span_warning("Something moves inside of \the [our_choice]. . .")) return if("Cancel") return if(!(usr.mob_size <= MOB_TINY || usr.get_effective_size(TRUE) <= micro_accepted_scale)) - usr.visible_message("\The [usr] reaches into \the [src]. . .","You reach into \the [src]. . .") + usr.visible_message(span_warning("\The [usr] reaches into \the [src]. . ."),span_warning("You reach into \the [src]. . .")) if(!do_after(usr, 3 SECONDS, exclusive = TRUE)) - usr.visible_message("\The [usr] pulls their hand out of \the [src].","You pull your hand out of \the [src]") + usr.visible_message(span_notice("\The [usr] pulls their hand out of \the [src]."),span_warning("You pull your hand out of \the [src]")) return if(!contained_mobs.len) - to_chat(usr, "There was nothing inside.") - usr.visible_message("\The [usr] pulls their hand out of \the [src].","You pull your hand out of \the [src]") + to_chat(usr, span_warning("There was nothing inside.")) + usr.visible_message(span_notice("\The [usr] pulls their hand out of \the [src]."),span_warning("You pull your hand out of \the [src]")) return var/grabbed = pick(contained_mobs) if(!grabbed) - to_chat(usr, "There was nothing inside.") - usr.visible_message("\The [usr] pulls their hand out of \the [src].","You pull your hand out of \the [src]") + to_chat(usr, span_warning("There was nothing inside.")) + usr.visible_message(span_notice("\The [usr] pulls their hand out of \the [src]."),span_warning("You pull your hand out of \the [src]")) return if(ishuman(usr)) @@ -409,7 +409,7 @@ var/global/list/micro_tunnels = list() var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) - usr.visible_message("\The [usr] pulls \the [grabbed] out of \the [src]! ! !") + usr.visible_message(span_warning("\The [usr] pulls \the [grabbed] out of \the [src]! ! !")) return else if(isanimal(usr)) @@ -421,18 +421,18 @@ var/global/list/micro_tunnels = list() else var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) - usr.visible_message("\The [usr] pulls \the [grabbed] out of \the [src]! ! !") + usr.visible_message(span_warning("\The [usr] pulls \the [grabbed] out of \the [src]! ! !")) return - usr.visible_message("\The [usr] begins climbing into \the [src]!") + usr.visible_message(span_notice("\The [usr] begins climbing into \the [src]!")) if(!do_after(usr, 10 SECONDS, exclusive = TRUE)) - to_chat(usr, "You didn't go into \the [src]!") + to_chat(usr, span_warning("You didn't go into \the [src]!")) return - usr.visible_message("\The [usr] climbs into \the [src]!") + usr.visible_message(span_notice("\The [usr] climbs into \the [src]!")) usr.forceMove(src) usr.cancel_camera() - to_chat(usr,"You are inside of \the [src]. You can click upon the tunnel to exit, or travel to another tunnel if there are other tunnels linked to it.") + to_chat(usr,span_notice("You are inside of \the [src]. You can click upon the tunnel to exit, or travel to another tunnel if there are other tunnels linked to it.")) var/our_message = "You can see " var/found_stuff = FALSE @@ -443,11 +443,11 @@ var/global/list/micro_tunnels = list() our_message = "[our_message] [thing], " if(isliving(thing)) var/mob/living/t = thing - to_chat(t, "\The [usr] enters \the [src]!") + to_chat(t, span_notice("\The [usr] enters \the [src]!")) if(found_stuff) - to_chat(usr, "[our_message]inside of \the [src]!") + to_chat(usr, span_notice("[our_message]inside of \the [src]!")) if(prob(25)) - visible_message("Something moves inside of \the [src]. . .") + visible_message(span_warning("Something moves inside of \the [src]. . .")) /obj/effect/mouse_hole_spawner name = "mouse hole spawner" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d182dc0405..86d53e7ff0 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -36,7 +36,7 @@ m.forceMove(src.loc) else m.forceMove(get_turf(src.loc)) - m.visible_message("\The [m] tumbles out of \the [src]!") + m.visible_message(span_notice("\The [m] tumbles out of \the [src]!")) //VOREStation Add End //CHOMPAdd Start possessed item cleanup @@ -176,7 +176,7 @@ /* var/mob/mo = locate(/mob) in src if(mo) - var/rendered = span_game say(span_name("[M.name]: [text]")) + var/rendered = span_game(span_say(span_name("[M.name]:") + " " + span_message("[text]")))) mo.show_message(rendered, 2) */ return diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index 979671539e..a102be1a2f 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -49,10 +49,10 @@ /obj/structure/casino_table/roulette_table/attack_hand(mob/user as mob) if(busy) - to_chat(user,"You cannot spin now! The roulette is already spinning. ") + to_chat(user,span_notice("You cannot spin now! The roulette is already spinning.")) return if(!ball) - to_chat(user,"This roulette wheel has no ball! ") + to_chat(user,span_notice("This roulette wheel has no ball!")) return visible_message(span_notice("\The [user] spins the roulette and throws [ball.get_ball_desc()] into it.")) playsound(src.loc, 'sound/machines/roulette.ogg', 40, 1) @@ -396,7 +396,7 @@ /obj/machinery/wheel_of_fortune/attack_hand(mob/user as mob) if (busy) - to_chat(user,"The wheel of fortune is already spinning! ") + to_chat(user,span_notice("The wheel of fortune is already spinning!")) return if(usr.incapacitated()) @@ -407,10 +407,10 @@ return if("Spin the Wheel! (Not Lottery)") if(public_spin == 0) - to_chat(user,"The Wheel makes a sad beep, public spins are not enabled right now.. ") + to_chat(user,span_notice("The Wheel makes a sad beep, public spins are not enabled right now...")) return else - to_chat(user,"You spin the wheel! ") + to_chat(user,span_notice("You spin the wheel!")) spin_the_wheel("not_lottery") if("Set the interval") setinterval() @@ -418,7 +418,7 @@ /obj/machinery/wheel_of_fortune/attackby(obj/item/W as obj, mob/user as mob) if (busy) - to_chat(user,"The wheel of fortune is already spinning! ") + to_chat(user,span_notice("The wheel of fortune is already spinning!")) return if(usr.incapacitated()) @@ -435,24 +435,24 @@ if("Cancel") return if("Spin the Lottery Wheel!") - to_chat(user,"You spin the wheel for the lottery! ") + to_chat(user,span_notice("You spin the wheel for the lottery!")) spin_the_wheel("lottery") if("Toggle Lottery Sales") if(lottery_sale == "disabled") lottery_sale = "enabled" - to_chat(user,"Public Lottery sale has been enabled. ") + to_chat(user,span_notice("Public Lottery sale has been enabled.")) else lottery_sale = "disabled" - to_chat(user,"Public Lottery sale has been disabled. ") + to_chat(user,span_notice("Public Lottery sale has been disabled.")) if("Toggle Public Spins") if(public_spin == 0) public_spin = 1 - to_chat(user,"Public spins has been enabled. ") + to_chat(user,span_notice("Public spins has been enabled.")) else public_spin = 0 - to_chat(user,"Public spins has been disabled. ") + to_chat(user,span_notice("Public spins has been disabled.")) if("Reset Lottery") var/confirm = tgui_alert(usr, "Are you sure you want to reset Lottery?", "Confirm Lottery Reset", list("Yes", "No")) @@ -476,10 +476,10 @@ /obj/machinery/wheel_of_fortune/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user) if (busy) - to_chat(user,"The Wheel of Fortune is busy, wait for it to be done to buy a lottery ticket. ") + to_chat(user,span_notice("The Wheel of Fortune is busy, wait for it to be done to buy a lottery ticket.")) return if(cashmoney.worth < lottery_price) - to_chat(user,"You dont have enough chips to buy a lottery ticket! ") + to_chat(user,span_notice("You dont have enough chips to buy a lottery ticket!")) return to_chat(user,span_notice("You put [lottery_price] credits worth of chips into the Wheel of Fortune and it pings to notify of your lottery ticket registered!")) @@ -575,7 +575,7 @@ if(usr.incapacitated()) return if(casinosentientprize_sale == "disabled") - to_chat(user,"The SPASM is disabled. ") + to_chat(user,span_notice("The SPASM is disabled.")) return if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) @@ -668,10 +668,10 @@ return if(user.name == C.sentientprizename) if(!C.ownername) - to_chat(user,"If collar isn't disabled and entry removed, please select your entry and insert chips. Or contact staff if you need assistance. ") + to_chat(user,span_notice("If collar isn't disabled and entry removed, please select your entry and insert chips. Or contact staff if you need assistance.")) return else - to_chat(user,"If collar isn't disabled and entry removed, please ask your owner to free you with collar swipe on the SPASM, or contact staff if you need assistance. ") + to_chat(user,span_notice("If collar isn't disabled and entry removed, please ask your owner to free you with collar swipe on the SPASM, or contact staff if you need assistance.")) return if(user.name == C.ownername) var/confirm = tgui_alert(usr, "Are you sure you want to wipe [C.sentientprizename] entry?", "Confirm Sentient Prize Release", list("Yes", "No")) @@ -701,12 +701,12 @@ casinosentientprize_sale = "enabled" icon_state = "casinoslave_hub_on" update_icon() - to_chat(user,"Prize sale has been enabled. ") + to_chat(user,span_notice("Prize sale has been enabled.")) else casinosentientprize_sale = "disabled" icon_state = "casinoslave_hub_off" update_icon() - to_chat(user,"Prize sale has been disabled. ") + to_chat(user,span_notice("Prize sale has been disabled.")) if("Wipe Selected Prize Entry") if(!selected_collar) @@ -740,7 +740,7 @@ /obj/machinery/casinosentientprize_handler/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user, var/buystate) if(cashmoney.worth < casinosentientprize_price) - to_chat(user,"You dont have enough chips to pay for the sentient prize! ") + to_chat(user,span_notice("You dont have enough chips to pay for the sentient prize!")) return cashmoney.worth -= casinosentientprize_price @@ -752,7 +752,7 @@ cashmoney.update_icon() if(buystate == "selfbuy") - to_chat(user,"You put [casinosentientprize_price] credits worth of chips into the SPASM and nullify your collar! ") + to_chat(user,span_notice("You put [casinosentientprize_price] credits worth of chips into the SPASM and nullify your collar!")) selected_collar.icon_state = "casinoslave" selected_collar.update_icon() selected_collar.name = "disabled Sentient Prize Collar: [selected_collar.sentientprizename]" @@ -763,7 +763,7 @@ selected_collar = null if(buystate == "buy") - to_chat(user,"You put [casinosentientprize_price] credits worth of chips into the SPASM and it pings to inform you bought [selected_collar.sentientprizename]! ") + to_chat(user,span_notice("You put [casinosentientprize_price] credits worth of chips into the SPASM and it pings to inform you bought [selected_collar.sentientprizename]!")) selected_collar.icon_state = "casinoslave_owned" selected_collar.update_icon() selected_collar.ownername = user.name @@ -777,6 +777,6 @@ if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) casinosentientprize_price = tgui_input_number(usr, "Select the desired price (1-1000)", "Set Price", null, null, 1000, 1) if(casinosentientprize_price>1000 || casinosentientprize_price<1) - to_chat(user,"Invalid price. ") + to_chat(user,span_notice("Invalid price.")) return - to_chat(user,"You set the price to [casinosentientprize_price] ") + to_chat(user,span_notice("You set the price to [casinosentientprize_price]")) diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm index 5a734f6c4d..4fb59e6fcc 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -404,7 +404,7 @@ return for(var/mob/O in hearers(src, null)) - O.show_message(span_npcsay("\The [src] beeps, \"[message]\""),2) + O.show_message(span_npc_say("\The [src] beeps, \"[message]\""),2) return /obj/machinery/casino_prize_dispenser/process() //Might not need this, but just to be safe for now diff --git a/code/modules/client/preference_setup/volume_sliders/02_media.dm b/code/modules/client/preference_setup/volume_sliders/02_media.dm index 039c656452..74a40db453 100644 --- a/code/modules/client/preference_setup/volume_sliders/02_media.dm +++ b/code/modules/client/preference_setup/volume_sliders/02_media.dm @@ -25,9 +25,9 @@ . += "Use HTML5 if it works for you. If neither HTML5 nor WMP work, you'll have to fall back to using VLC, " . += "but this requires you have the VLC client installed on your comptuer." . += "Try the others if you want but you'll probably just get no music.
" - . += (pref.media_player == 2) ? "HTML5 " : "HTML5 " - . += (pref.media_player == 1) ? "WMP " : "WMP " - . += (pref.media_player == 0) ? "VLC " : "VLC " + . += (pref.media_player == 2) ? (span_linkOn(span_bold("HTML5")) + " ") : "HTML5 " + . += (pref.media_player == 1) ? (span_linkOn(span_bold("WMP")) + " ") : "WMP " + . += (pref.media_player == 0) ? (span_linkOn(span_bold("VLC")) + " ") : "VLC " . += "
" /datum/category_item/player_setup_item/volume_sliders/media/OnTopic(var/href, var/list/href_list, var/mob/user) diff --git a/code/modules/client/verbs/advanced_who.dm b/code/modules/client/verbs/advanced_who.dm index 8d6372ca52..3c57bcf51f 100644 --- a/code/modules/client/verbs/advanced_who.dm +++ b/code/modules/client/verbs/advanced_who.dm @@ -55,9 +55,9 @@ if(is_special_character(C.mob)) if(C.mob?.mind?.special_role) - entry += "[C.mob.mind.special_role]" + entry += span_red(span_bold("[C.mob.mind.special_role]")) else - entry += "Antagonist" + entry += span_red(span_bold("Antagonist")) entry += "" @@ -81,11 +81,11 @@ entry += "[C.key]" var/mob/observer/dead/O = C.mob if(isobserver(O)) - entry += " - Observing
" + entry += " - " + span_gray("Observing") + "
" else if(istype(O,/mob/new_player)) - entry += " - In Lobby
" + entry += " - " + span_blue("In Lobby") + "
" else - entry += " - Playing
" + entry += " - "+ span_green("Playing") + "
" Lines += entry diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index a3ae5cfb6d..f5690ccdfa 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -140,10 +140,10 @@ log transactions dat += "Card: [held_card ? held_card.name : "------"]

" if(ticks_left_locked_down > 0) - dat += span_alert("Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled.") + dat += span_warning("Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled.") else if(authenticated_account) if(authenticated_account.suspended) - dat += "Access to this account has been suspended, and the funds within frozen." + dat += span_red(span_bold("Access to this account has been suspended, and the funds within frozen.")) else switch(view_screen) if(CHANGE_SECURITY_LEVEL) diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index e78ad3fb4f..fdda35896e 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -754,7 +754,7 @@ GLOBAL_LIST_EMPTY(vending_products) return for(var/mob/O in hearers(src, null)) - O.show_message(span_npcsay("\The [src] beeps, \"[message]\""),2) + O.show_message(span_npc_say("\The [src] beeps, \"[message]\""),2) return /obj/machinery/vending/power_change() diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index db8c90ea2f..7770e1e2c0 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -144,7 +144,7 @@ message = "[time] [message]" message = span_game(span_say(message)) if(speaker && !speaker.client) - message = span_npcsay(message) + message = span_npc_say(message) else if(speaker && !(get_z(src) == get_z(speaker))) message = span_multizsay(message) to_chat(src, message) @@ -160,7 +160,7 @@ message = "[time] [message]" message = span_game(span_say(message)) if(speaker && !speaker.client) - message = span_npcsay(message) + message = span_npc_say(message) else if(speaker && !(get_z(src) == get_z(speaker))) message = span_multizsay(message) to_chat(src, message) @@ -336,7 +336,7 @@ var/rendered = span_game(span_say(span_name(name) + " [message]")) if(!speaker.client) - rendered = span_npcsay(rendered) + rendered = span_npc_say(rendered) else if(istype(speaker, /mob/living/silicon/ai)) var/mob/living/silicon/ai/source = speaker diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 595386e3ca..ed8126e191 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1401,7 +1401,7 @@ if(!. && error_msg && user) if(!fail_msg) fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into." - to_chat(user, span_alert("[fail_msg]")) + to_chat(user, span_warning("[fail_msg]")) /mob/living/carbon/human/print_flavor_text(var/shrink = 1) var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f187896b48..646c221e73 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -178,7 +178,7 @@ //can't inject synths /mob/living/silicon/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) if(error_msg) - to_chat(user, span_alert("The armoured plating is too tough.")) + to_chat(user, span_warning("The armoured plating is too tough.")) return 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 0ff0363801..991dcd39a6 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -328,7 +328,7 @@ /mob/proc/warn_flavor_changed() if(flavor_text && flavor_text != "") // don't spam people that don't use it! to_chat(src, span_filter_notice("

OOC Warning:

")) - to_chat(src, span_filter_notice(span_alert("Your flavor text is likely out of date! Change"))) + to_chat(src, span_filter_notice(span_warning("Your flavor text is likely out of date! Change"))) /mob/proc/print_flavor_text() if (flavor_text && flavor_text != "") diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 101f96ebec..b54518019b 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -391,7 +391,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable last_notification = message // TGUI Hook - to_chat(human,span_filter_nif("\[[icon2html(src.big_icon, human.client)]NIF\] displays, " + (alert ? span_danger(message) : span_notice(message)))) + to_chat(human,span_filter_nif(span_bold("\[[icon2html(src.big_icon, human.client)]NIF\]") + " displays, " + (alert ? span_danger(message) : span_notice(message)))) if(prob(1)) human.visible_message(span_notice("\The [human] [pick(look_messages)].")) if(alert) human << bad_sound diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 6b762cc73d..990cbb4780 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -202,7 +202,7 @@ /obj/machinery/particle_accelerator/control_box/proc/is_interactive(mob/user) if(!interface_control) - to_chat(user, span_alert("ERROR: Request timed out. Check wire contacts.")) + to_chat(user, span_warning("ERROR: Request timed out. Check wire contacts.")) return FALSE if(construction_state != 3) return FALSE diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index f4053d2b2b..6d66533fda 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -141,7 +141,7 @@ to_chat(user, span_notice("Turbine connected.")) stat &= ~BROKEN else - to_chat(user, span_alert("Turbine not connected.")) + to_chat(user, span_warning("Turbine not connected.")) stat |= BROKEN /obj/machinery/compressor/process() @@ -239,7 +239,7 @@ to_chat(user, span_notice("Compressor connected.")) stat &= ~BROKEN else - to_chat(user, span_alert("Compressor not connected.")) + to_chat(user, span_warning("Compressor not connected.")) stat |= BROKEN /obj/machinery/power/turbine/process() diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index a1fa46e909..2adae80619 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -378,7 +378,7 @@ for(var/obj/item/gun/energy/kinetic_accelerator/H in R.module.modules) if(install(H, R)) //It worked return - to_chat(R, span_alert("Upgrade error - Aborting Kinetic Accelerator linking.")) //No applicable KA found, insufficient capacity, or some other problem. + to_chat(R, span_warning("Upgrade error - Aborting Kinetic Accelerator linking.")) //No applicable KA found, insufficient capacity, or some other problem. */ /obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 45e261c76b..0580f6dfd2 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -708,7 +708,7 @@ //Don't appear to be in a vore situation else - to_chat(src,span_alert("You aren't inside anyone, though, is the thing.")) + to_chat(src,span_warning("You aren't inside anyone, though, is the thing.")) // // Eating procs depending on who clicked what diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts index 60c1d91cfe..e704bee2f4 100644 --- a/tgui/packages/tgui-panel/chat/constants.ts +++ b/tgui/packages/tgui-panel/chat/constants.ts @@ -113,14 +113,14 @@ export const MESSAGE_TYPES = [ name: 'Info', description: 'Non-urgent messages from the game and items', selector: - '.notice:not(.pm):not(.mentor), .adminnotice:not(.pm), .info, .sinister, .cult, .infoplain, .announce, .hear, .smallnotice, .holoparasite, .boldnotice', + '.notice:not(.pm):not(.mentor), .adminnotice:not(.pm), .info, .sinister, .cult, .alium, .infoplain, .announce, .hear, .smallnotice, .holoparasite, .boldnotice, .suicide, .unconscious', }, { type: MESSAGE_TYPE_WARNING, name: 'Warnings', description: 'Urgent messages from the game and items', selector: - '.warning:not(.pm):not(.mentor), .critical, .userdanger, .alertsyndie, .warningplain', + '.warning:not(.pm):not(.mentor), .boldwarning:not(.pm):not(.mentor), .critical, .userdanger, .alertsyndie, .warningplain, .sinister', }, { type: MESSAGE_TYPE_DEADCHAT, @@ -132,7 +132,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_OOC, name: 'OOC', description: 'The bluewall of global OOC messages', - selector: '.ooc, .adminooc, .adminobserverooc, .oocplain', + selector: '.ooc, .adminooc, .adminobserverooc, .oocplain, .aooc', }, { type: MESSAGE_TYPE_LOOC, @@ -157,7 +157,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_COMBAT, name: 'Combat Log', description: 'Urist McTraitor has stabbed you with a knife!', - selector: '.danger', + selector: '.danger, .attack, .disarm, .passive, .bolddanger', }, { type: MESSAGE_TYPE_CHATPRINT, @@ -222,7 +222,8 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_DEBUG, name: 'Debug Log', description: 'DEBUG: SSPlanets subsystem Recover().', - selector: '.filter_debuglogs', + selector: + '.filter_debuglogs, .debug_error, .debug_warning, .debug_info, .debug_debug, .debug_trace', admin: true, }, ]; diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 5d939d353d..672e1a3653 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -222,6 +222,10 @@ a.popt { color: #a4bad6; } +.underline { + text-decoration: underline; +} + /* ADD HERE FOR BOLD */ .bold, diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 3df4d5f046..daadf91684 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -240,6 +240,10 @@ a.popt { color: #638500; } +.underline { + text-decoration: underline; +} + /* ADD HERE FOR BOLD */ .bold, diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-vchatdark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-vchatdark.scss index 0e31a72a54..baaa61420f 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-vchatdark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-vchatdark.scss @@ -222,6 +222,10 @@ a.popt { color: #638500; } +.underline { + text-decoration: underline; +} + /* ADD HERE FOR BOLD */ .bold, diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-vchatlight.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-vchatlight.scss index b57a5fe73b..217b19da8e 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-vchatlight.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-vchatlight.scss @@ -240,6 +240,10 @@ a.popt { color: #638500; } +.underline { + text-decoration: underline; +} + /* ADD HERE FOR BOLD */ .bold,