diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm index 6e2e2f89736..6a4748e5ee2 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,78 +33,88 @@ #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 + "") - /* 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 + "") @@ -106,7 +122,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 + "") @@ -124,12 +139,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 + "") @@ -147,42 +157,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 + "" @@ -198,9 +220,10 @@ #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/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 56faf42469f..98ece935a6d 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/game/atoms.dm b/code/game/atoms.dm index 4f518c0fd8e..38f066ad7b2 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -698,7 +698,7 @@ return var/list/speech_bubble_hearers = list() for(var/mob/M in get_mobs_in_view(7, src)) - M.show_message(span_npcsay(span_name("[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/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 4938158e158..10db9582742 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 3c3431ecca0..6e8d00404ec 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -104,10 +104,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 52e8111f4ac..57903cd0eeb 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(span_name("[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/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 2e59f8a8d87..3db6a74911b 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 35df8774439..d41689661d8 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 596f46bff3e..12849ad31bc 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -111,7 +111,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 785f64a6791..6232dcc0cde 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 c3e7a4e50a2..86f66f61f09 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 3bcb6bf62df..75754ef1168 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 32943104f03..6715f516116 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 d82f44a80f7..80b790c0766 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 c8763a02379..4c36ed42ec1 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 0f19e4d8612..0435b72c52f 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 494b5eded8c..cf6e542278a 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 3d41a1cf2e3..864a91847bd 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 84bec1bc566..e47db0d36b2 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 ae230169fac..2b7201a5ab3 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 b7d616a5f86..61e1a68670c 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 974febc7847..3d41271d497 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_boldnotice("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 6f818f58979..336a6219d90 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 7291ed70f69..f04cc342cc2 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 8baeebeecd5..42d6e955f4c 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 90519571b34..a6ca3ed1efa 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 ac665ba275b..0ce10c51ddf 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -508,7 +508,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 @@ -635,11 +635,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 @@ -670,7 +670,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 5704821eace..9c04ec836a9 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 5be520308cf..9c8fec6727c 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 3ad5a0efaec..715538ec116 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 1f67efd6ed5..44d2ca1a85f 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 60a80c1ae32..dd15a470d15 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 return ..() @@ -165,7 +165,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 212b06767bb..0b1c57d0853 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -46,10 +46,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) @@ -377,7 +377,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()) @@ -388,10 +388,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() @@ -399,7 +399,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()) @@ -416,24 +416,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")) @@ -457,10 +457,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!")) @@ -556,7 +556,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)) @@ -643,10 +643,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")) @@ -676,12 +676,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) @@ -715,7 +715,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 @@ -727,7 +727,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]" @@ -738,7 +738,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 @@ -752,6 +752,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 5d90f784186..1cac6f4cdf0 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -344,7 +344,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 007edcbf018..1b07b204a52 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 2d4b2790ff7..6860d44c072 100644 --- a/code/modules/client/verbs/advanced_who.dm +++ b/code/modules/client/verbs/advanced_who.dm @@ -54,9 +54,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 += "" @@ -80,11 +80,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 a3ae5cfb6d1..f5690ccdfad 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 7bf7aee1c6c..d763512869a 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 a24e875045b..5fc440faf0b 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 c79ff8e4f02..b632dce0120 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1394,7 +1394,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 9f8822febe1..e7f297b7fde 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -172,7 +172,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 81dbc7350b3..044f2ecd1fb 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -331,7 +331,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 6f00ce1a40e..76967fbf982 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -387,7 +387,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 6b762cc73df..990cbb4780b 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 f4053d2b2b0..6d66533fdac 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 bca9fcab160..10720196949 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 81b259a5210..dbb1f909854 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -619,7 +619,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 60c1d91cfe0..e704bee2f4d 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, }, ];