| [antag.role_text]: | "
var/ban_reason = jobban_isbanned(preference_mob(), antag.bantype)
if(ban_reason == "AGE WHITELISTED")
- dat += "\[IN [player_old_enough_for_role(preference_mob(), antag.bantype)] DAYS\] " + dat += SPAN_DANGER("\[IN [player_old_enough_for_role(preference_mob(), antag.bantype)] DAYS\] ") else if(is_global_banned || ban_reason) - dat += "\[BANNED\] " + dat += SPAN_DANGER("\[BANNED\] ") else if(establish_db_connection(GLOB.dbcon) && antag.required_age && antag.required_age > user.client?.player_age) dat += "ACC TOO YOUNG " else if(antag.role_type in pref.be_special_role) diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 93a1c1f0a97..805699cdf45 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -57,7 +57,7 @@ if (pref.alternate_languages.len > S.num_alternate_languages) if(pref.client) - to_chat(pref.client, "You have too many languages saved for [pref.species]. The list has been reset. Please check your languages in character creation!") + to_chat(pref.client, SPAN_WARNING("You have too many languages saved for [pref.species]. The list has been reset. Please check your languages in character creation!")) pref.alternate_languages.Cut() return @@ -70,11 +70,11 @@ var/list/bad_langs = pref.alternate_languages - langs if (bad_langs.len) if(pref.client) - to_chat(pref.client, "[bad_langs.len] invalid language\s were found in your character setup! Please save your character again to stop this error from repeating!") + to_chat(pref.client, SPAN_WARNING("[bad_langs.len] invalid language\s were found in your character setup! Please save your character again to stop this error from repeating!")) for (var/L in bad_langs) if(pref.client) - to_chat(pref.client, "Removing the language \"[L]\" from your character.") + to_chat(pref.client, SPAN_NOTICE("Removing the language \"[L]\" from your character.")) pref.alternate_languages -= L var/datum/category_group/player_setup_category/cat = category diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index d9345f5b73d..31a7e5d562c 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -765,7 +765,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O limb = BP_HEAD carries_organs = 1 else - to_chat(user, "Cancelled.") + to_chat(user, SPAN_NOTICE("Cancelled.")) return TOPIC_NOACTION var/list/available_states = mob_species.possible_external_organs_modifications @@ -965,9 +965,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(restricted) if(restricted == 1) - dat += "You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums." + dat += SPAN_WARNING("You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums.") else if(restricted == 2) - dat += "You cannot play as this species.This species is not available for play as a station race." + dat += SPAN_WARNING("You cannot play as this species.This species is not available for play as a station race.") if(!restricted || check_rights(R_ADMIN, 0)) dat += "\[select\]" dat += "" diff --git a/code/modules/client/preference_setup/general/05_background.dm b/code/modules/client/preference_setup/general/05_background.dm index 2f18a92bdc7..104f731cd22 100644 --- a/code/modules/client/preference_setup/general/05_background.dm +++ b/code/modules/client/preference_setup/general/05_background.dm @@ -53,7 +53,7 @@ var/list/dat = list(" Records: ") if(jobban_isbanned(user, "Records")) - dat += "You are banned from using character records. " + dat += SPAN_DANGER("You are banned from using character records. ") else dat += "Medical Records: " dat += "[TextPreview(pref.med_record,40)]Clear " diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 70a117eb999..3c2e7934307 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -159,16 +159,16 @@ var/list/gear_datums = list() var/list/player_valid_gear_choices = valid_gear_choices() for(var/gear_name in pref.gear) if(!gear_datums[gear_name]) - to_chat(preference_mob, "You cannot have more than one of the \the [gear_name]") + to_chat(preference_mob, SPAN_WARNING("You cannot have more than one of the \the [gear_name]")) pref.gear -= gear_name else if(!(gear_name in player_valid_gear_choices)) - to_chat(preference_mob, "You cannot take \the [gear_name] as you are not whitelisted for the species.") + to_chat(preference_mob, SPAN_WARNING("You cannot take \the [gear_name] as you are not whitelisted for the species.")) pref.gear -= gear_name else var/datum/gear/G = gear_datums[gear_name] if(total_cost + G.cost > GLOB.config.loadout_cost) pref.gear -= gear_name - to_chat(preference_mob, "You cannot afford to take \the [gear_name]") + to_chat(preference_mob, SPAN_WARNING("You cannot afford to take \the [gear_name]")) else total_cost += G.cost diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 737dfaaa791..bd86e08925c 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -501,14 +501,14 @@ var/datum/faction/faction = SSjobs.name_factions[selected_faction] if (!faction) - to_client_chat("Invalid faction chosen. Resetting to default.") + to_client_chat(SPAN_DANGER("Invalid faction chosen. Resetting to default.")) selected_faction = SSjobs.default_faction.name ResetJobs() // How to be horribly lazy. pref.faction = selected_faction - to_client_chat("New faction chosen. Job preferences reset.") + to_client_chat(SPAN_NOTICE("New faction chosen. Job preferences reset.")) /datum/preferences/proc/GetPlayerAltTitle(datum/job/job) return player_alt_titles[job.title] || job.title diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 06c22aa1d30..9e9b63d82f0 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -337,7 +337,7 @@ var/list/preferences_datums = list() if(GLOB.config.forumurl) send_link(user, GLOB.config.forumurl) else - to_chat(user, "The forum URL is not set in the server configuration.") + to_chat(user, SPAN_DANGER("The forum URL is not set in the server configuration.")) return return 1 @@ -363,7 +363,7 @@ var/list/preferences_datums = list() close_load_dialog(usr) else if(href_list["new_character_sql"]) new_setup(1) - to_chat(usr, "Your setup has been refreshed.") + to_chat(usr, SPAN_NOTICE("Your setup has been refreshed.")) usr.client.prefs.update_preview_icon() close_load_dialog(usr) else if(href_list["close_load_dialog"]) @@ -687,11 +687,11 @@ var/list/preferences_datums = list() return if (!current_character) - to_chat(C, "You do not have a character loaded.") + to_chat(C, SPAN_NOTICE("You do not have a character loaded.")) return if (!establish_db_connection(GLOB.dbcon)) - to_chat(C, "Unable to establish database connection.") + to_chat(C, SPAN_NOTICE("Unable to establish database connection.")) return var/DBQuery/query = GLOB.dbcon.NewQuery("UPDATE ss13_characters SET deleted_at = NOW(), deleted_by = \"player\" WHERE id = :char_id:") @@ -700,7 +700,7 @@ var/list/preferences_datums = list() // Create a new character. new_setup(1) - to_chat(C, "Character successfully deleted! Please make a new one or load an existing setup.") + to_chat(C, SPAN_WARNING("Character successfully deleted! Please make a new one or load an existing setup.")) /datum/preferences/proc/get_species_datum() if (species) diff --git a/code/modules/client/preferences_notification.dm b/code/modules/client/preferences_notification.dm index 003671849b6..dfe9c02f1f0 100644 --- a/code/modules/client/preferences_notification.dm +++ b/code/modules/client/preferences_notification.dm @@ -205,7 +205,7 @@ if(panel_notification) new_notification("warning","You have [notification_count] unread notifications! Click here to review and acknowledge them!") if(chat_notification) - to_chat(user,"You have unacknowledged notifications. Click here to review and acknowledge them!") + to_chat(user,SPAN_WARNING("You have unacknowledged notifications. Click here to review and acknowledge them!")) /* * Helper proc for getting a count of active CCIA actions against the player's characters. diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm index a5691b8417b..073b0515a86 100644 --- a/code/modules/client/ui_style.dm +++ b/code/modules/client/ui_style.dm @@ -26,7 +26,7 @@ var/all_tooltip_styles = list( set desc = "Configure your user interface" if(!ishuman(usr)) - to_chat(usr, "You must be human to use this verb.") + to_chat(usr, SPAN_WARNING("You must be human to use this verb.")) return var/UI_style_new = input(usr, "Select a style. White is recommended for customization") as null|anything in all_ui_styles diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 6ee7efaf1e2..8b0b9649831 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -18,7 +18,7 @@ else if(istype(attacking_item, /obj/item/clothing/accessory)) if(!valid_accessory_slots || !valid_accessory_slots.len) - to_chat(usr, "You cannot attach accessories of any kind to \the [src].") + to_chat(usr, SPAN_WARNING("You cannot attach accessories of any kind to \the [src].")) return var/obj/item/clothing/accessory/A = attacking_item @@ -27,7 +27,7 @@ attach_accessory(user, A) return else - to_chat(user, "You cannot attach more accessories of this type to [src].") + to_chat(user, SPAN_WARNING("You cannot attach more accessories of this type to [src].")) return if(LAZYLEN(accessories)) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b0ff0de5b93..2f590a9e4e8 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1037,7 +1037,7 @@ BLIND // can't see anything if(istype(src.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/M = src.loc - to_chat(M, "\The [src] overloads and blinds you!") + to_chat(M, SPAN_DANGER("\The [src] overloads and blinds you!")) if(M.glasses == src) M.eye_blind = 3 M.eye_blurry = 5 diff --git a/code/modules/clothing/gloves/attackby.dm b/code/modules/clothing/gloves/attackby.dm index 1dd126cbb04..8872d9a7f83 100644 --- a/code/modules/clothing/gloves/attackby.dm +++ b/code/modules/clothing/gloves/attackby.dm @@ -24,11 +24,11 @@ return if(istype(src, /obj/item/clothing/gloves/boxing)) //quick fix for stunglove overlay not working nicely with boxing gloves. - to_chat(user, "That won't work.") //i'm not putting my lips on that!) + to_chat(user, SPAN_NOTICE("That won't work.")) //i'm not putting my lips on that!) ..() return else if(istype(src, /obj/item/clothing/gloves/force)) - to_chat(user, "That seems like a terrible idea.") + to_chat(user, SPAN_NOTICE("That seems like a terrible idea.")) ..() return @@ -36,33 +36,33 @@ if(attacking_item.iscoil()) var/obj/item/stack/cable_coil/C = attacking_item if (clipped) - to_chat(user, "The [src] are too badly mangled for wiring.") + to_chat(user, SPAN_NOTICE("The [src] are too badly mangled for wiring.")) return if(wired) - to_chat(user, "The [src] are already wired.") + to_chat(user, SPAN_NOTICE("The [src] are already wired.")) return if(C.amount < 2) - to_chat(user, "There is not enough wire to cover the [src].") + to_chat(user, SPAN_NOTICE("There is not enough wire to cover the [src].")) return C.use(2) wired = 1 siemens_coefficient = 3.0 - to_chat(user, "You wrap some wires around the [src].") + to_chat(user, SPAN_NOTICE("You wrap some wires around the [src].")) update_icon() return //add cell else if(wired && istype(attacking_item, /obj/item/cell)) if(cell) - to_chat(user, "\A [cell] is already attached to the [src].") + to_chat(user, SPAN_NOTICE("\A [cell] is already attached to the [src].")) return user.drop_from_inventory(attacking_item, src) cell = attacking_item w_class = ITEMSIZE_NORMAL - to_chat(user, "You attach \the [cell] to the [src].") + to_chat(user, SPAN_NOTICE("You attach \the [cell] to the [src].")) update_icon() return @@ -71,7 +71,7 @@ //stunglove stuff if(cell) cell.update_icon() - to_chat(user, "You cut \the [cell] away from the [src].") + to_chat(user, SPAN_NOTICE("You cut \the [cell] away from the [src].")) cell.forceMove(get_turf(src.loc)) cell = null w_class = ITEMSIZE_SMALL @@ -80,7 +80,7 @@ if(wired) //wires disappear into the void because fuck that shit wired = 0 siemens_coefficient = initial(siemens_coefficient) - to_chat(user, "You cut the wires away from the [src].") + to_chat(user, SPAN_NOTICE("You cut the wires away from the [src].")) update_icon() return diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index 74ef5141f70..9843c4395d7 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -7,7 +7,7 @@ /obj/item/clothing/gloves/boxing/attackby(obj/item/attacking_item, mob/user) if(attacking_item.iswirecutter() || istype(attacking_item, /obj/item/surgery/scalpel)) - to_chat(user, "That won't work.") //Nope) + to_chat(user, SPAN_NOTICE("That won't work.")) //Nope) return ..() diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index a120dd56646..3e72ec0c2ff 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -73,10 +73,10 @@ if(C.use(1)) var/obj/item/L = new src.balloon user.drop_from_inventory(L,get_turf(src)) - to_chat(user, "You make a balloon.") + to_chat(user, SPAN_NOTICE("You make a balloon.")) qdel(src) else - to_chat(user, "You need one length of cable to finish the balloon!") + to_chat(user, SPAN_WARNING("You need one length of cable to finish the balloon!")) . = ..() /obj/item/clothing/gloves/latex/nitrile @@ -245,7 +245,7 @@ if(prob(50) && (user.a_intent == I_HURT)) playsound(user, 'sound/weapons/beartrap_shut.ogg', 50, 1, -1) - user.visible_message("\The [user] slams \the [L] away with \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] slams \the [L] away with \the [src]!")) var/T = get_turf(user) spark(T, 3, GLOB.alldirs) L.throw_at(get_edge_target_turf(loc, loc.dir), 5, 1) diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index fbc9748ddd0..48b812a014d 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -9,7 +9,7 @@ if(!proximity) return if(ishuman(A) && user != A) - user.visible_message("\The [user] gets down on one knee, presenting \the [src] to [A].","You get down on one knee, presenting \the [src] to [A].") + user.visible_message(SPAN_WARNING("\The [user] gets down on one knee, presenting \the [src] to [A]."), SPAN_WARNING("You get down on one knee, presenting \the [src] to [A].")) //Reagent Rings @@ -27,7 +27,7 @@ if(istype(H) && H.gloves==src) if(reagents.total_volume) - to_chat(H, "You feel a prick as you slip on \the [src].") + to_chat(H, SPAN_DANGER("You feel a prick as you slip on \the [src].")) if(H.reagents) var/contained_reagents = reagents.get_reagents() var/trans = reagents.trans_to_mob(H, 15, CHEM_BLOOD) @@ -58,10 +58,10 @@ /obj/item/clothing/ring/seal/signet/attack_self(mob/user) if(nameset) - to_chat(user, "\The [src] has already been claimed!") + to_chat(user, SPAN_NOTICE("\The [src] has already been claimed!")) return - to_chat(user, "You claim \the [src] as your own!") + to_chat(user, SPAN_NOTICE("You claim \the [src] as your own!")) change_name(user) nameset = 1 diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index b1cc6c452aa..453f2cd8bec 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -186,7 +186,7 @@ var/global/list/breach_burn_descriptors = list( return if(istype(src.loc,/mob/living)) - to_chat(user, "How do you intend to patch a voidsuit while someone is wearing it?") + to_chat(user, SPAN_WARNING("How do you intend to patch a voidsuit while someone is wearing it?")) return if(!damage || !burn_damage) @@ -202,7 +202,7 @@ var/global/list/breach_burn_descriptors = list( else if(attacking_item.iswelder()) if(istype(src.loc,/mob/living)) - to_chat(user, "How do you intend to patch a voidsuit while someone is wearing it?") + to_chat(user, SPAN_WARNING("How do you intend to patch a voidsuit while someone is wearing it?")) return if (!damage || ! brute_damage) @@ -211,7 +211,7 @@ var/global/list/breach_burn_descriptors = list( var/obj/item/weldingtool/WT = attacking_item if(!WT.use(5)) - to_chat(user, "You need more welding fuel to repair this suit.") + to_chat(user, SPAN_WARNING("You need more welding fuel to repair this suit.")) return repair_breaches(DAMAGE_BRUTE, 3, user) @@ -223,7 +223,7 @@ var/global/list/breach_burn_descriptors = list( . = ..() if(can_breach && breaches && breaches.len) for(var/datum/breach/B in breaches) - . += "It has \a [B.descriptor]." + . += SPAN_DANGER("It has \a [B.descriptor].") /obj/item/clothing/suit/space/get_pressure_weakness(pressure) . = ..() diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 2f1496f8682..833260b19d3 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -208,8 +208,8 @@ else user.drop_from_inventory(ai,src) ai_card = ai - to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") - to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") + to_chat(ai_mob, SPAN_NOTICE("You have been transferred to \the [holder]'s [src].")) + to_chat(user, SPAN_NOTICE("You load [ai_mob] into \the [holder]'s [src].")) integrated_ai = ai_mob diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 7a55dcc371a..6d71d102c5a 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -113,7 +113,7 @@ if(src.loc == usr) . += "The maintenance panel is [open ? "open" : "closed"]." - . += "Hardsuit systems are [offline ? "offline" : "online"]." + . += "Hardsuit systems are [offline ? SPAN_WARNING("offline") : SPAN_GOOD("online")]." /obj/item/rig/Initialize() . = ..() @@ -235,7 +235,7 @@ // Seal toggling can be initiated by the suit AI, too if(!wearer) - to_chat(initiator, "Cannot toggle suit: The suit is currently not being worn by anyone.") + to_chat(initiator, SPAN_DANGER("Cannot toggle suit: The suit is currently not being worn by anyone.")) return 0 if(!check_power_cost(wearer)) @@ -269,9 +269,11 @@ if(!failed_to_seal) if(!instant) - wearer.visible_message("[wearer]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") + wearer.visible_message(SPAN_NOTICE("[wearer]'s suit emits a quiet hum as it begins to adjust its seals."), + SPAN_NOTICE("With a quiet hum, the suit begins running checks and adjusting components.")) + if(seal_delay && !do_after(wearer, seal_delay, src, do_flags = DO_DEFAULT & ~DO_USER_SAME_HAND)) - if(wearer) to_chat(wearer, "You must remain still while the suit is adjusting the components.") + if(wearer) to_chat(wearer, SPAN_WARNING("You must remain still while the suit is adjusting the components.")) playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) failed_to_seal = 1 @@ -293,7 +295,7 @@ continue if(!istype(wearer) || !istype(piece) || !istype(compare_piece) || !msg_type) - if(wearer) to_chat(wearer, "You must remain still while the suit is adjusting the components.") + if(wearer) to_chat(wearer, SPAN_WARNING("You must remain still while the suit is adjusting the components.")) playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) failed_to_seal = 1 break @@ -307,13 +309,13 @@ piece.item_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - to_chat(wearer, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") + to_chat(wearer, SPAN_NOTICE("\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].")) wearer.update_inv_shoes() if("gloves") - to_chat(wearer, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") + to_chat(wearer, SPAN_NOTICE("\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].")) wearer.update_inv_gloves() if("chest") - to_chat(wearer, "\The [piece] [!seal_target ? "cinches your chest tightly" : "releases your chest"].") + to_chat(wearer, SPAN_NOTICE("\The [piece] [!seal_target ? "cinches your chest tightly" : "releases your chest"].")) if(has_hidden_jumpsuit) if(!seal_target) piece.flags_inv |= HIDEJUMPSUIT @@ -321,7 +323,7 @@ piece.flags_inv &= ~HIDEJUMPSUIT wearer.update_inv_wear_suit() if("helmet") - to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].") + to_chat(wearer, SPAN_NOTICE("\The [piece] hisses [!seal_target ? "closed" : "open"].")) wearer.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -355,7 +357,7 @@ // Success! canremove = seal_target - to_chat(wearer, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + to_chat(wearer, SPAN_NOTICE("Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].")) playsound(src, 'sound/items/rped.ogg', 20, FALSE) if (has_sealed_state) icon_state = canremove ? initial(icon_state) : "[initial(icon_state)]_sealed" @@ -365,7 +367,7 @@ crushing = TRUE if(wearer != initiator) - to_chat(initiator, "Suit adjustment complete. Suit is now [canremove ? "unsealed" : "sealed"].") + to_chat(initiator, SPAN_NOTICE("Suit adjustment complete. Suit is now [canremove ? "unsealed" : "sealed"].")) if(canremove) for(var/obj/item/rig_module/module in installed_modules) @@ -410,13 +412,13 @@ playsound(src, 'sound/machines/rig/rig_shutdown.ogg', 20, FALSE) if(!canremove) if (offline_slowdown < 3) - to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") + to_chat(wearer, SPAN_DANGER("Your suit beeps stridently, and suddenly goes dead.")) else - to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.") + to_chat(wearer, SPAN_DANGER("Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.")) if(offline_vision_restriction == 1) - to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.") + to_chat(wearer, SPAN_DANGER("The suit optics flicker and die, leaving you with restricted vision.")) else if(offline_vision_restriction == 2) - to_chat(wearer, "The suit optics drop out completely, drowning you in darkness.") + to_chat(wearer, SPAN_DANGER("The suit optics drop out completely, drowning you in darkness.")) if(!offline) offline = 1 else @@ -464,17 +466,17 @@ if(!user_is_ai) var/mob/living/carbon/human/H = user if(istype(H) && H.back != src) - fail_msg = "You must be wearing \the [src] to do this." + fail_msg = SPAN_WARNING("You must be wearing \the [src] to do this.") else if(user.incorporeal_move) - fail_msg = "You must be solid to do this." + fail_msg = SPAN_WARNING("You must be solid to do this.") if(sealing) - fail_msg = "The hardsuit is in the process of adjusting seals and cannot be activated." + fail_msg = SPAN_WARNING("The hardsuit is in the process of adjusting seals and cannot be activated.") else if(!fail_msg && ((use_unconcious && user.stat > 1) || (!use_unconcious && user.stat))) - fail_msg = "You are in no fit state to do that." + fail_msg = SPAN_WARNING("You are in no fit state to do that.") else if(!cell) - fail_msg = "There is no cell installed in the suit." + fail_msg = SPAN_WARNING("There is no cell installed in the suit.") else if(cost && cell.charge < cost * 10) //TODO: Cellrate? - fail_msg = "Not enough stored power." + fail_msg = SPAN_WARNING("Not enough stored power.") if(fail_msg) to_chat(user, "[fail_msg]") @@ -606,11 +608,11 @@ if(user.back != src) return 0 else if(!src.allowed(user)) - to_chat(user, "Unauthorized user. Access denied.") + to_chat(user, SPAN_DANGER("Unauthorized user. Access denied.")) return 0 else if(!ai_override_enabled) - to_chat(user, "Synthetic access disabled. Please consult hardware provider.") + to_chat(user, SPAN_DANGER("Synthetic access disabled. Please consult hardware provider.")) return 0 return 1 @@ -747,11 +749,11 @@ if(!wearer.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) use_obj.forceMove(src) if(check_slot) - to_chat(initiator, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") + to_chat(initiator, SPAN_DANGER("You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.")) playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) return else - to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") + to_chat(wearer, SPAN_NOTICE("Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.")) playsound(src, 'sound/machines/rig/rig_deploy.ogg', 20, FALSE) if(piece == "helmet" && helmet) @@ -888,17 +890,17 @@ if(wearer) if(dam_module.damage >= 2) - to_chat(wearer, "The [source] has disabled your [dam_module.interface_name]!") + to_chat(wearer, SPAN_DANGER("The [source] has disabled your [dam_module.interface_name]!")) else - to_chat(wearer, "The [source] has damaged your [dam_module.interface_name]!") + to_chat(wearer, SPAN_WARNING("The [source] has damaged your [dam_module.interface_name]!")) dam_module.deactivate() /obj/item/rig/proc/malfunction_check(var/mob/living/carbon/human/user) if(malfunction_delay) if(offline) - to_chat(user, "The suit is completely unresponsive.") + to_chat(user, SPAN_DANGER("The suit is completely unresponsive.")) else - to_chat(user, "ERROR: Hardware fault. Rebooting interface...") + to_chat(user, SPAN_DANGER("ERROR: Hardware fault. Rebooting interface...")) return 1 return 0 @@ -922,17 +924,17 @@ return 0 var/obj/item/rig_module/ai_container/module = user.loc.loc if(!istype(module) || module.damage >= 2) - to_chat(user, "Your host module is unable to interface with the suit.") + to_chat(user, SPAN_WARNING("Your host module is unable to interface with the suit.")) return 0 if(offline || !cell || !cell.charge || locked_down) - if(user) to_chat(user, "Your host rig is unpowered and unresponsive.") + if(user) to_chat(user, SPAN_WARNING("Your host rig is unpowered and unresponsive.")) return 0 if(!wearer || wearer.back != src) - if(user) to_chat(user, "Your host rig is not being worn.") + if(user) to_chat(user, SPAN_WARNING("Your host rig is not being worn.")) return 0 if(!wearer.stat && !control_overridden && !ai_override_enabled) - if(user) to_chat(user, "You are locked out of the suit servo controller.") + if(user) to_chat(user, SPAN_WARNING("You are locked out of the suit servo controller.")) return 0 return 1 @@ -940,7 +942,7 @@ if(!ai_can_move_suit(user, check_user_module = 1)) return wearer.lay_down() - to_chat(user, "\The [wearer] is now [wearer.resting ? "resting" : "getting up"].") + to_chat(user, SPAN_NOTICE("\The [wearer] is now [wearer.resting ? "resting" : "getting up"].")) /obj/item/rig/proc/forced_move(var/direction, var/mob/user) // Why is all this shit in client/Move()? Who knows? @@ -982,7 +984,7 @@ for(var/mob/M in range(wearer, 1)) if(M.pulling == wearer) if(!M.restrained() && M.stat == 0 && M.canmove && wearer.Adjacent(M)) - to_chat(user, "Your host is restrained! They can't move!") + to_chat(user, SPAN_NOTICE("Your host is restrained! They can't move!")) return 0 else M.stop_pulling() diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index 022b877a5cc..de51c7cb4d4 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -14,16 +14,16 @@ if(attacking_item.GetID()) if(subverted) locked = 0 - to_chat(user, "It looks like the locking system has been shorted out.") + to_chat(user, SPAN_DANGER("It looks like the locking system has been shorted out.")) return if((!req_access || !req_access.len) && (!req_one_access || !req_one_access.len)) locked = 0 - to_chat(user, "\The [src] doesn't seem to have a locking mechanism.") + to_chat(user, SPAN_DANGER("\The [src] doesn't seem to have a locking mechanism.")) return if(security_check_enabled && locked && !src.allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, SPAN_DANGER("Access denied.")) return locked = !locked @@ -71,7 +71,7 @@ if(istype(src.loc,/mob/living/carbon/human)) var/mob/living/carbon/human/H = src.loc if(H.back == src) - to_chat(user, "You can't install a hardsuit module while the suit is being worn.") + to_chat(user, SPAN_DANGER("You can't install a hardsuit module while the suit is being worn.")) return 1 if(!installed_modules) installed_modules = list() @@ -215,7 +215,7 @@ req_one_access.Cut() locked = 0 subverted = 1 - to_chat(user, "You short out the access protocol for the suit.") + to_chat(user, SPAN_DANGER("You short out the access protocol for the suit.")) return 1 /obj/item/rig/proc/get_module_category(var/category) diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 620a7949763..7e69f45b2ad 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -192,13 +192,13 @@ if(H.wear_suit != src) return if(H.head == helmet) - to_chat(H, "You retract your suit helmet.") + to_chat(H, SPAN_NOTICE("You retract your suit helmet.")) playsound(loc, helmet_retract_sound, 30) helmet.canremove = 1 H.drop_from_inventory(helmet,src) else if(H.head) - to_chat(H, "You cannot deploy your helmet while wearing \the [H.head].") + to_chat(H, SPAN_DANGER("You cannot deploy your helmet while wearing \the [H.head].")) return if(H.equip_to_slot_if_possible(helmet, slot_head)) helmet.pickup(H) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0f38038ddc8..7bdfeee8071 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -152,7 +152,7 @@ /obj/item/clothing/suit/armor/reactive/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(prob(50)) - user.visible_message("The reactive teleport system flings [user] clear of the attack!") + user.visible_message(SPAN_DANGER("The reactive teleport system flings [user] clear of the attack!")) var/list/turfs = new/list() for(var/turf/T in orange(6, user)) if(istype(T,/turf/space)) continue @@ -174,11 +174,11 @@ /obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - to_chat(user, "The reactive armor is now active.") + to_chat(user, SPAN_NOTICE("The reactive armor is now active.")) src.icon_state = "reactive" src.item_state = "reactive" else - to_chat(user, "The reactive armor is now inactive.") + to_chat(user, SPAN_NOTICE("The reactive armor is now inactive.")) src.icon_state = "reactiveoff" src.item_state = "reactiveoff" src.add_fingerprint(user) @@ -238,17 +238,17 @@ if(!holster.holstered) var/obj/item/W = usr.get_active_hand() if(!istype(W, /obj/item)) - to_chat(usr, "You need your gun equiped to holster it.") + to_chat(usr, SPAN_WARNING("You need your gun equiped to holster it.")) return holster.holster(W, usr) else - to_chat(usr, "There's already a gun in the holster, you need an empty hand to draw it.") + to_chat(usr, SPAN_WARNING("There's already a gun in the holster, you need an empty hand to draw it.")) return else if(holster.holstered) holster.unholster(usr) else - to_chat(usr, "There's no gun in the holster to draw.") + to_chat(usr, SPAN_WARNING("There's no gun in the holster to draw.")) //Non-hardsuit ERT armor. diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 0840315cdb1..8e6673f5ab9 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -120,7 +120,9 @@ /obj/item/clothing/suit/bomb_suit/equipped(var/mob/user, var/slot) if (slot == slot_wear_suit) var/mob/living/carbon/human/H = user - H.visible_message("[H] starts putting on \the [src]...", "You start putting on \the [src]...") + H.visible_message(SPAN_NOTICE("[H] starts putting on \the [src]..."), + SPAN_NOTICE("You start putting on \the [src]...")) + if(!do_after(H,50)) if(H && H.wear_suit == src) H.wear_suit = null @@ -130,7 +132,7 @@ return wearer = user - to_chat(wearer, "You struggle into the [src]. It feels hot, heavy and uncomfortable") + to_chat(wearer, SPAN_NOTICE("You struggle into the [src]. It feels hot, heavy and uncomfortable")) START_PROCESSING(SSprocessing, src) else wearer = null diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 6994c64735e..11a4d91bd0c 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -90,7 +90,7 @@ loc = has_suit has_suit.AddOverlays(get_inv_overlay()) if(user) - to_chat(user, "You attach \the [src] to \the [has_suit].") + to_chat(user, SPAN_NOTICE("You attach \the [src] to \the [has_suit].")) src.add_fingerprint(user) update_light() @@ -396,7 +396,7 @@ if(allow_tail_hiding) flags_inv ^= HIDETAIL - to_chat(usr, "[src] will now [flags_inv & HIDETAIL ? "hide" : "show"] your tail.") + to_chat(usr, SPAN_NOTICE("[src] will now [flags_inv & HIDETAIL ? "hide" : "show"] your tail.")) /obj/item/clothing/accessory/poncho/big name = "large poncho" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 9b86cdb9032..50d2452365e 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -66,18 +66,23 @@ if(isliving(user)) if(badge_string) if(stored_name) - user.visible_message("[user] displays their [src.name].\nIt reads: [stored_name], [badge_string].","You display your [src.name].\nIt reads: [stored_name], [badge_string].") + user.visible_message(SPAN_NOTICE("[user] displays their [src.name].\nIt reads: [stored_name], [badge_string]."), + SPAN_NOTICE("You display your [src.name].\nIt reads: [stored_name], [badge_string].")) else - user.visible_message("[user] displays their [src.name].\nIt reads: [badge_string].","You display your [src.name]. It reads: [badge_string].") + user.visible_message(SPAN_NOTICE("[user] displays their [src.name].\nIt reads: [badge_string]."), + SPAN_NOTICE("You display your [src.name]. It reads: [badge_string].")) else if(stored_name) - user.visible_message("[user] displays their [src.name].\nIt reads: [stored_name].","You display your [src.name].\nIt reads: [stored_name].") + user.visible_message(SPAN_NOTICE("[user] displays their [src.name].\nIt reads: [stored_name]."), + SPAN_NOTICE("You display your [src.name].\nIt reads: [stored_name].")) else - user.visible_message("[user] displays their [src.name].","You display your [src.name].") + user.visible_message(SPAN_NOTICE("[user] displays their [src.name]."), + SPAN_NOTICE("You display your [src.name].")) /obj/item/clothing/accessory/badge/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) - user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") + user.visible_message(SPAN_DANGER("[user] invades [M]'s personal space, thrusting [src] into their face insistently."), + SPAN_DANGER("You invade [M]'s personal space, thrusting [src] into their face insistently.")) /obj/item/clothing/accessory/badge/verb/flip_side() set category = "Object" @@ -134,11 +139,11 @@ /obj/item/clothing/accessory/badge/holo/emag_act(var/remaining_charges, var/mob/user) if (emagged) - to_chat(user, "\The [src] is already cracked.") + to_chat(user, SPAN_DANGER("\The [src] is already cracked.")) return else emagged = 1 - to_chat(user, "You crack the holobadge security checks.") + to_chat(user, SPAN_DANGER("You crack the holobadge security checks.")) return 1 /obj/item/clothing/accessory/badge/holo/attackby(obj/item/attacking_item, mob/user) diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 74b34112af5..61c322b9301 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -29,11 +29,11 @@ /obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user) if(holstered && istype(user)) - to_chat(user, "There is already \a [holstered] holstered here!") + to_chat(user, SPAN_WARNING("There is already \a [holstered] holstered here!")) return if (!(I.slot_flags & SLOT_HOLSTER)) - to_chat(user, "[I] won't fit in [src]!") + to_chat(user, SPAN_WARNING("[I] won't fit in [src]!")) return if(sound_in) @@ -45,7 +45,8 @@ user.drop_from_inventory(holstered, src) holstered.add_fingerprint(user) w_class = max(w_class, holstered.w_class) - user.visible_message("[user] holsters \the [holstered].", "You holster \the [holstered].") + user.visible_message(SPAN_NOTICE("[user] holsters \the [holstered]."), + SPAN_NOTICE("You holster \the [holstered].")) update_name() /obj/item/clothing/accessory/holster/proc/clear_holster() @@ -57,21 +58,21 @@ return if(istype(user.get_active_hand(), /obj) && istype(user.get_inactive_hand(), /obj)) - to_chat(user, "You need an empty hand to draw \the [holstered]!") + to_chat(user, SPAN_WARNING("You need an empty hand to draw \the [holstered]!")) else if (use_check(user)) - to_chat(user, "You can't draw \the [holstered] in your current state!") + to_chat(user, SPAN_WARNING("You can't draw \the [holstered] in your current state!")) else var/sound_vol = 25 if(user.a_intent == I_HURT) sound_vol = 50 user.visible_message( - "[user] draws \the [holstered], ready to shoot!", - "You draw \the [holstered], ready to shoot!" + SPAN_DANGER("[user] draws \the [holstered], ready to shoot!"), + SPAN_WARNING("You draw \the [holstered], ready to shoot!") ) else user.visible_message( - "[user] draws \the [holstered], pointing it at the ground.", - "You draw \the [holstered], pointing it at the ground." + SPAN_NOTICE("[user] draws \the [holstered], pointing it at the ground."), + SPAN_NOTICE("You draw \the [holstered], pointing it at the ground.") ) if(sound_out) @@ -137,12 +138,12 @@ H = tacticool.holster if (!H) - to_chat(usr, "Something is very wrong.") + to_chat(usr, SPAN_WARNING("Something is very wrong.")) if(!H.holstered) var/obj/item/W = usr.get_active_hand() if(!istype(W, /obj/item)) - to_chat(usr, "You need your gun equipped to holster it.") + to_chat(usr, SPAN_WARNING("You need your gun equipped to holster it.")) return H.holster(W, usr) else diff --git a/code/modules/custom_ka/cells.dm b/code/modules/custom_ka/cells.dm index 23c54c3b10d..aa99a42c660 100644 --- a/code/modules/custom_ka/cells.dm +++ b/code/modules/custom_ka/cells.dm @@ -212,16 +212,16 @@ var/amount_to_take = 1 if(stored_charge + charge_per_sheet > cell_increase) - to_chat(user,"You can't put any more [attacking_item] into \the [src].") + to_chat(user,SPAN_NOTICE("You can't put any more [attacking_item] into \the [src].")) return amount_to_take = min(amount_to_take,the_sheet.amount) the_sheet.amount -= amount_to_take stored_charge += amount_to_take*charge_per_sheet - user.visible_message("\The [user] inserts a sheet [attacking_item] into \the [src].", \ - "You insert a sheet of [attacking_item]s into \the [src].", \ - "You hear mechanical whirring.") + user.visible_message(SPAN_NOTICE("\The [user] inserts a sheet [attacking_item] into \the [src]."), \ + SPAN_NOTICE("You insert a sheet of [attacking_item]s into \the [src]."), \ + SPAN_NOTICE("You hear mechanical whirring.")) if(the_sheet.amount <= 0) diff --git a/code/modules/custom_ka/core.dm b/code/modules/custom_ka/core.dm index bd11466cec3..5cbff55856b 100644 --- a/code/modules/custom_ka/core.dm +++ b/code/modules/custom_ka/core.dm @@ -103,7 +103,7 @@ return round(installed_cell.stored_charge / cost_increase) /obj/item/gun/custom_ka/emag_act(var/remaining_charges, var/mob/user, var/emag_source) - to_chat(user,"You override the safeties on the [src]...") + to_chat(user,SPAN_WARNING("You override the safeties on the [src]...")) is_emagged = 1 return 1 @@ -116,7 +116,7 @@ /obj/item/gun/custom_ka/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) if(require_wield && !wielded) - to_chat(user,"\The [src] is too heavy to fire with one hand!") + to_chat(user,SPAN_WARNING("\The [src] is too heavy to fire with one hand!")) return if(!fire_checks(target,user,clickparams,pointblank,reflex)) @@ -181,13 +181,13 @@ else switch(disaster) if("spark") - to_chat(user,"\The [src] sparks!") + to_chat(user,SPAN_DANGER("\The [src] sparks!")) spark(src.loc, 3, GLOB.alldirs) if("overheat") - to_chat(user,"\The [src] turns red hot!") + to_chat(user,SPAN_DANGER("\The [src] turns red hot!")) user.IgniteMob() if("explode") - to_chat(user,"\The [src] violently explodes!") + to_chat(user,SPAN_DANGER("\The [src] violently explodes!")) explosion(get_turf(src.loc), 0, 1, 2, 4) qdel(src) @@ -389,7 +389,7 @@ . = ..() if(!wielded) - to_chat(user,"You must be holding \the [src] with two hands to do this!") + to_chat(user,SPAN_WARNING("You must be holding \the [src] with two hands to do this!")) return if(installed_cell) @@ -577,8 +577,8 @@ /obj/item/device/kinetic_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity, params) user.visible_message( - "\The [user] scans \the [target] with \the [src].", - "You scan \the [target] with \the [src].") + SPAN_WARNING("\The [user] scans \the [target] with \the [src]."), + SPAN_ALERT("You scan \the [target] with \the [src].")) if(istype(target,/obj/item/gun/custom_ka)) playsound(src, 'sound/machines/ping.ogg', 10, 1) @@ -596,8 +596,8 @@ Software Version: [ka.mod_limit_increase].[ka.mod_limit_increase*32 % 10].[ka.mod_limit_increase*64 % 324] \ Available Power Flow: [ka.capacity_increase*10]kW " - to_chat(user,"[total_message]") + to_chat(user,SPAN_NOTICE("[total_message]")) else - to_chat(user,"Nothing happens.") + to_chat(user,SPAN_NOTICE("Nothing happens.")) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index a2daeecad01..26a6f584b32 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -146,9 +146,9 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/mask/fluff/corvo_cigarette/attack_self(mob/user) active= !active if(active) - to_chat(user, "You turn \the [src] on.") + to_chat(user, SPAN_NOTICE("You turn \the [src] on.")) else - to_chat(user, "You turn \the [src] off.") + to_chat(user, SPAN_NOTICE("You turn \the [src] off.")) update_icon() user.update_inv_l_hand(FALSE) @@ -379,12 +379,12 @@ All custom items with worn sprites must follow the contained sprite system: http active= !active if(active) playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - to_chat(user, "\The [src] is now energised.") + to_chat(user, SPAN_NOTICE("\The [src] is now energised.")) item_state = icon_state w_class = ITEMSIZE_LARGE else playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - to_chat(user, "\The [src] is now de-energised..") + to_chat(user, SPAN_NOTICE("\The [src] is now de-energised..")) w_class = initial(w_class) update_icon() @@ -495,7 +495,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/fluff/tokash_spear/attackby(var/obj/item/W, var/mob/user) if(!has_spear && istype(W, /obj/item/fluff/tokash_spearhead)) - to_chat(user, "You place \the [W] on the [src].") + to_chat(user, SPAN_NOTICE("You place \the [W] on the [src].")) user.drop_from_inventory(W,src) qdel(W) has_spear = TRUE @@ -582,7 +582,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette/AltClick(var/mob/user) deployed = !deployed - to_chat(user, "You [deployed ? "expand" : "collapse"] \the [src].") + to_chat(user, SPAN_NOTICE("You [deployed ? "expand" : "collapse"] \the [src].")) update_icon() user.update_inv_l_hand() user.update_inv_r_hand() @@ -832,7 +832,7 @@ All custom items with worn sprites must follow the contained sprite system: http if(!proximity) return if (istype(A, /turf/simulated/floor)) - user.visible_message("[user] loudly taps their [src.name] against the floor.") + user.visible_message(SPAN_NOTICE("[user] loudly taps their [src.name] against the floor.")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) return @@ -860,9 +860,9 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/fluff/cress_book/attack_self(mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message("[user] begins searching through \the [src]'s pages...") + user.visible_message(SPAN_NOTICE("[user] begins searching through \the [src]'s pages...")) if(do_after(user, 25)) - to_chat(user, "You pick out a song in the folder and read the lyrics: [pick(lyrics)]") + to_chat(user, SPAN_NOTICE("You pick out a song in the folder and read the lyrics: [pick(lyrics)]")) /obj/item/clothing/accessory/poncho/fluff/ozuha_cape //Victory Cape - Skavoss Ozuha - dronzthewolf diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index ebc303ab0a4..70c1e4fc7e2 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -18,11 +18,11 @@ /obj/machinery/dnaforensics/attackby(obj/item/attacking_item, mob/user) if(bloodsamp) - to_chat(user, "There is already a sample in the machine.") + to_chat(user, SPAN_WARNING("There is already a sample in the machine.")) return if(closed) - to_chat(user, "Open the cover before inserting the sample.") + to_chat(user, SPAN_WARNING("Open the cover before inserting the sample.")) return var/obj/item/forensics/swab/swab = attacking_item @@ -30,9 +30,9 @@ user.unEquip(attacking_item) src.bloodsamp = swab swab.forceMove(src) - to_chat(user, "You insert \the [attacking_item] into \the [src].") + to_chat(user, SPAN_NOTICE("You insert \the [attacking_item] into \the [src].")) else - to_chat(user, "\The [src] only accepts used swabs.") + to_chat(user, SPAN_WARNING("\The [src] only accepts used swabs.")) return /obj/machinery/dnaforensics/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null) @@ -67,12 +67,12 @@ if(closed == 1) scanner_progress = 0 scanning = 1 - to_chat(usr, "Scan initiated.") + to_chat(usr, SPAN_NOTICE("Scan initiated.")) update_icon() else - to_chat(usr, "Please close sample lid before initiating scan.") + to_chat(usr, SPAN_NOTICE("Please close sample lid before initiating scan.")) else - to_chat(usr, "Insert an item to scan.") + to_chat(usr, SPAN_WARNING("Insert an item to scan.")) if(href_list["ejectItem"]) if(bloodsamp) @@ -142,7 +142,7 @@ return if(scanning) - to_chat(usr, "You can't do that while [src] is scanning!") + to_chat(usr, SPAN_WARNING("You can't do that while [src] is scanning!")) return closed = !closed diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm index 84b06e6e09b..bc46cc4b06b 100644 --- a/code/modules/detectivework/tools/evidencebag.dm +++ b/code/modules/detectivework/tools/evidencebag.dm @@ -48,15 +48,15 @@ return if(istype(I, /obj/item/evidencebag)) - to_chat(user, "You find putting a plastic bag in another plastic bag to be slightly absurd and think better of it.") + to_chat(user, SPAN_NOTICE("You find putting a plastic bag in another plastic bag to be slightly absurd and think better of it.")) return if(I.w_class > 3) - to_chat(user, "[I] won't fit in [src].") + to_chat(user, SPAN_NOTICE("[I] won't fit in [src].")) return if(contents.len) - to_chat(user, "[src] already has something inside it.") + to_chat(user, SPAN_NOTICE("[src] already has something inside it.")) return user.visible_message("[user] puts \the [I] into \the [src].", SPAN_NOTICE("You put \the [I] inside \the [src]."),\ @@ -106,7 +106,7 @@ if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, SPAN_NOTICE("The label can be at most [MAX_NAME_LEN] characters long.")) else - to_chat(user, "You set the label to \"[tmp_label]\".") + to_chat(user, SPAN_NOTICE("You set the label to \"[tmp_label]\".")) label_text = tmp_label update_name_label() return diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index eef5655309f..12dd5bc7251 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -38,7 +38,7 @@ h_user.drop_from_inventory(src) h_user.drop_from_inventory(bundle) h_user.put_in_hands(bundle) - to_chat(user, "You add [src.worth] credits worth of money to the bundles. It holds [bundle.worth] credits now.") + to_chat(user, SPAN_NOTICE("You add [src.worth] credits worth of money to the bundles. It holds [bundle.worth] credits now.")) qdel(src) /obj/item/spacecash/bundle @@ -202,16 +202,16 @@ /obj/item/spacecash/ewallet/lotto/attack_self(mob/user) if(scratches_remaining <= 0) - to_chat(user, "The card flashes: \"No scratches remaining!\"") + to_chat(user, SPAN_WARNING("The card flashes: \"No scratches remaining!\"")) return if(next_scratch > world.time) - to_chat(user, "The card flashes: \"Please wait!\"") + to_chat(user, SPAN_WARNING("The card flashes: \"Please wait!\"")) return next_scratch = world.time + 6 SECONDS - to_chat(user, "You initiate the simulated scratch action process on the [src]...") + to_chat(user, SPAN_NOTICE("You initiate the simulated scratch action process on the [src]...")) playsound(src.loc, 'sound/items/drumroll.ogg', 20, 0, -4) if(do_after(user,4.5 SECONDS)) var/won = 0 @@ -252,9 +252,9 @@ worth += won sleep(1 SECONDS) if(scratches_remaining > 0) - to_chat(user, "The card flashes: You have: [scratches_remaining] SCRATCHES remaining! Scratch again!") + to_chat(user, SPAN_NOTICE("The card flashes: You have: [scratches_remaining] SCRATCHES remaining! Scratch again!")) else - to_chat(user, "The card flashes: You have: [scratches_remaining] SCRATCHES remaining! You won a total of: [worth] CREDITS. Thanks for playing the space lottery!") + to_chat(user, SPAN_NOTICE("The card flashes: You have: [scratches_remaining] SCRATCHES remaining! You won a total of: [worth] CREDITS. Thanks for playing the space lottery!")) owner_name = user.name diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 5f98e5c617e..67c3c8ed6de 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -200,9 +200,9 @@ /singleton/emote/audible/slap key = "slap" - emote_message_1p_target = "You slap TARGET across the face!" + emote_message_1p_target = SPAN_WARNING("You slap TARGET across the face!") emote_message_1p = "You slap yourself across the face!" - emote_message_3p_target = "USER slaps TARGET across the face!" + emote_message_3p_target = SPAN_WARNING("USER slaps TARGET across the face!") emote_message_3p = "USER slaps USER_SELF across the face!" emote_sound = 'sound/effects/snap.ogg' diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index c87c7beaf95..0803b2d5a75 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -39,7 +39,7 @@ if(ismob(user) && check_restraints) var/mob/M = user if(M.restrained()) - to_chat(user, "You are restrained and cannot do that.") + to_chat(user, SPAN_WARNING("You are restrained and cannot do that.")) return var/atom/target diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 14ae2f3fc57..b3e8da95d48 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -57,7 +57,7 @@ if(usr == src) //client-called emote if (client && (client.prefs.muted & MUTE_IC)) - to_chat(src, "You cannot send IC messages (muted).") + to_chat(src, SPAN_WARNING("You cannot send IC messages (muted).")) return if(act == "help") @@ -74,7 +74,7 @@ return if(!can_emote(m_type)) - to_chat(src, "You cannot currently [m_type == AUDIBLE_MESSAGE ? "audibly" : "visually"] emote!") + to_chat(src, SPAN_WARNING("You cannot currently [m_type == AUDIBLE_MESSAGE ? "audibly" : "visually"] emote!")) return if(act == "me") @@ -118,7 +118,7 @@ // Oh shit, we got this far! Let's see... did the user attempt to use more than one token? if(findtext(subtext, anchor_char)) // abort abort! - to_chat(emoter, "You may use only one \"[anchor_char]\" symbol in your emote.") + to_chat(emoter, SPAN_WARNING("You may use only one \"[anchor_char]\" symbol in your emote.")) return if(pretext) @@ -190,7 +190,7 @@ if(src.client) if(src.client.prefs.muted & (MUTE_DEADCHAT|MUTE_IC)) - to_chat(src, "You cannot emote in deadchat (muted).") + to_chat(src, SPAN_WARNING("You cannot emote in deadchat (muted).")) return . = src.emote_dead(message) diff --git a/code/modules/events/comms_blackout.dm b/code/modules/events/comms_blackout.dm index 6aaad221dce..d2e4ed3a712 100644 --- a/code/modules/events/comms_blackout.dm +++ b/code/modules/events/comms_blackout.dm @@ -6,7 +6,7 @@ else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in GLOB.player_list) to_chat(A, " ") - to_chat(A, "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") + to_chat(A, SPAN_WARNING("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")) to_chat(A, " ") for(var/obj/machinery/telecomms/T in SSmachinery.all_telecomms) T.emp_act(EMP_HEAVY) diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index cf824d15305..84d2d90439c 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -12,7 +12,7 @@ for(var/mob/living/silicon/ai/A in GLOB.player_list) //AIs are always aware of communication blackouts. if(A.z in affecting_z) to_chat(A, " ") - to_chat(A, "[alert]") + to_chat(A, SPAN_WARNING("[alert]")) to_chat(A, " ") if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 5c2e5550c93..5b449e0a56f 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -55,7 +55,7 @@ for(var/obj/machinery/telecomms/message_server/MS in SSmachinery.all_telecomms) MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2) for(var/mob/living/silicon/ai/A in GLOB.player_list) - to_chat(A, "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].") + to_chat(A, SPAN_DANGER("Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].")) else log_world("ERROR: Could not initate grey-tide. Unable to find suitable containment area.") diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index ca8126b41b9..7a1a4488214 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -19,7 +19,7 @@ var/list/dreams = list( spawn(0) for(var/i = rand(1,4),i > 0, i--) - to_chat(src, "... [pick(dreams)] ...") + to_chat(src, SPAN_NOTICE("... [pick(dreams)] ...")) sleep(rand(40,70)) if(paralysis <= 0) break diff --git a/code/modules/ghostroles/spawner/human/responseteams/response_team.dm b/code/modules/ghostroles/spawner/human/responseteams/response_team.dm index ae3f965264b..5f01f9ff3a1 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/response_team.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/response_team.dm @@ -21,5 +21,5 @@ /datum/ghostspawner/human/ert/post_spawn(mob/user) if(name) - to_chat(user, "You are [max_count > 1 ? "a" : "the"] [name]!") + to_chat(user, SPAN_DANGER("You are [max_count > 1 ? "a" : "the"] [name]!")) return ..() diff --git a/code/modules/ghostroles/spawner/simplemob/maintdrone.dm b/code/modules/ghostroles/spawner/simplemob/maintdrone.dm index 8e178cf9f6f..c1d29b1e405 100644 --- a/code/modules/ghostroles/spawner/simplemob/maintdrone.dm +++ b/code/modules/ghostroles/spawner/simplemob/maintdrone.dm @@ -46,7 +46,7 @@ all_fabricators[DF.fabricator_tag] = DF if(!all_fabricators.len) - to_chat(user, "There are no available drone spawn points, sorry.") + to_chat(user, SPAN_DANGER("There are no available drone spawn points, sorry.")) return FALSE var/choice = tgui_input_list(user, "Which fabricator do you wish to use?", "Fabricator Selection", all_fabricators) diff --git a/code/modules/ghostroles/spawner/simplemob/simplemob.dm b/code/modules/ghostroles/spawner/simplemob/simplemob.dm index 5ee662bdc21..72278b1c290 100644 --- a/code/modules/ghostroles/spawner/simplemob/simplemob.dm +++ b/code/modules/ghostroles/spawner/simplemob/simplemob.dm @@ -6,7 +6,7 @@ if (T) S = new spawn_mob(T) else - to_chat(user, "Unable to find any spawn point. ") + to_chat(user, SPAN_WARNING("Unable to find any spawn point. ")) return if(S) @@ -17,7 +17,7 @@ else var/mob/living/simple_animal/S = select_spawnatom() if(!S) - to_chat(user, "Unable to find any spawn mob. ") + to_chat(user, SPAN_WARNING("Unable to find any spawn mob. ")) return announce_ghost_joinleave(user, 0, "They are now a [name].") diff --git a/code/modules/ghostroles/spawnpoint/spawnpoint.dm b/code/modules/ghostroles/spawnpoint/spawnpoint.dm index dc8b76ff707..414595eb802 100644 --- a/code/modules/ghostroles/spawnpoint/spawnpoint.dm +++ b/code/modules/ghostroles/spawnpoint/spawnpoint.dm @@ -51,13 +51,13 @@ /obj/effect/ghostspawpoint/attack_ghost(mob/user) if(!ROUND_IS_STARTED) - to_chat(usr, "The round hasn't started yet!") + to_chat(usr, SPAN_DANGER("The round hasn't started yet!")) return ui_interact(user) /obj/effect/ghostspawpoint/attack_hand(mob/user) if(!ROUND_IS_STARTED) - to_chat(usr, "The round hasn't started yet!") + to_chat(usr, SPAN_DANGER("The round hasn't started yet!")) return ui_interact(user) diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm index 8d4cc7b3f86..2c364248a05 100644 --- a/code/modules/hallucinations/types/basic.dm +++ b/code/modules/hallucinations/types/basic.dm @@ -266,7 +266,7 @@ "[pal] will keep you safe.", "You feel captivated by [pal]'s charisma.", "[pal] might as well be family to you.") - to_chat(holder, "[pick(halpal_emotes)]") + to_chat(holder, SPAN_DANGER("[pick(halpal_emotes)]")) /datum/hallucination/passive duration = 600 //minute fallback diff --git a/code/modules/heavy_vehicle/equipment/_equipment.dm b/code/modules/heavy_vehicle/equipment/_equipment.dm index cc6a1f26e14..f7ad42b91f5 100644 --- a/code/modules/heavy_vehicle/equipment/_equipment.dm +++ b/code/modules/heavy_vehicle/equipment/_equipment.dm @@ -45,7 +45,7 @@ return 0 if(!(owner.get_cell()?.check_charge(active_power_use * CELLRATE))) - to_chat(user, "The power indicator flashes briefly as you attempt to use \the [src].") + to_chat(user, SPAN_WARNING("The power indicator flashes briefly as you attempt to use \the [src].")) return 0 return 1 else @@ -54,7 +54,7 @@ /obj/item/mecha_equipment/attack_self(var/mob/user) if (owner && loc == owner && ((user in owner.pilots) || user == owner)) if(!(owner.get_cell()?.check_charge(active_power_use * CELLRATE))) - to_chat(user, "The power indicator flashes briefly as you attempt to use \the [src].") + to_chat(user, SPAN_WARNING("The power indicator flashes briefly as you attempt to use \the [src].")) return 0 return 1 else diff --git a/code/modules/heavy_vehicle/equipment/medical.dm b/code/modules/heavy_vehicle/equipment/medical.dm index f6d487a2f98..5e069b3762c 100644 --- a/code/modules/heavy_vehicle/equipment/medical.dm +++ b/code/modules/heavy_vehicle/equipment/medical.dm @@ -56,7 +56,7 @@ return //All good, load the person - visible_message("\The [src] begins loading \the [target] into \the [src].") + visible_message(SPAN_NOTICE("\The [src] begins loading \the [target] into \the [src].")) sleeper.go_in(person_to_load, user) /obj/item/mecha_equipment/sleeper/get_hardpoint_maptext() @@ -94,9 +94,13 @@ if(beaker) beaker.forceMove(get_turf(src)) - user.visible_message("\The [user] removes \the [beaker] from \the [src].", "You remove \the [beaker] from \the [src].") + user.visible_message(SPAN_NOTICE("\The [user] removes \the [beaker] from \the [src]."), + SPAN_NOTICE("You remove \the [beaker] from \the [src].")) + beaker = attacking_item - user.visible_message("\The [user] adds \a [attacking_item] to \the [src].", "You add \a [attacking_item] to \the [src].") + user.visible_message(SPAN_NOTICE("\The [user] adds \a [attacking_item] to \the [src]."), + SPAN_NOTICE("You add \a [attacking_item] to \the [src].")) + return TRUE /obj/item/mecha_equipment/crisis_drone @@ -225,7 +229,7 @@ /obj/item/mecha_equipment/crisis_drone/proc/shut_down() if(enabled) - owner.visible_message("\The [owner]'s [src] buzzes as its drone returns to port.") + owner.visible_message(SPAN_NOTICE("\The [owner]'s [src] buzzes as its drone returns to port.")) toggle_drone() if(!isnull(Target)) Target = null diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm index e7cb579383e..ac5c0d27bee 100644 --- a/code/modules/heavy_vehicle/equipment/utility.dm +++ b/code/modules/heavy_vehicle/equipment/utility.dm @@ -299,7 +299,7 @@ . = ..() if(.) mode = mode == CATAPULT_SINGLE ? CATAPULT_AREA : CATAPULT_SINGLE - to_chat(user, "You set \the [src] to [mode == CATAPULT_SINGLE ? "single" : "multi"]-target mode.") + to_chat(user, SPAN_NOTICE("You set \the [src] to [mode == CATAPULT_SINGLE ? "single" : "multi"]-target mode.")) update_icon() /obj/item/mecha_equipment/catapult/afterattack(var/atom/target, var/mob/living/user, var/inrange, var/params) @@ -412,7 +412,7 @@ . = ..() if(.) if(drill_head) - owner.visible_message("[owner] revs the [drill_head], menacingly.") + owner.visible_message(SPAN_WARNING("[owner] revs the [drill_head], menacingly.")) playsound(get_turf(src), 'sound/mecha/mechdrill.ogg', 50, 1) /obj/item/mecha_equipment/drill/get_hardpoint_maptext() @@ -430,19 +430,19 @@ if(istype(target,/obj/item/material/drill_head)) var/obj/item/material/drill_head/DH = target if(drill_head) - owner.visible_message("\The [owner] detaches the [drill_head] mounted on the [src].") + owner.visible_message(SPAN_NOTICE("\The [owner] detaches the [drill_head] mounted on the [src].")) drill_head.forceMove(owner.loc) DH.forceMove(src) drill_head = DH - owner.visible_message("\The [owner] mounts the [drill_head] on the [src].") + owner.visible_message(SPAN_NOTICE("\The [owner] mounts the [drill_head] on the [src].")) return if(drill_head == null) - to_chat(user, "Your drill doesn't have a head!") + to_chat(user, SPAN_WARNING("Your drill doesn't have a head!")) return owner.use_cell_power(active_power_use * CELLRATE) - owner.visible_message("\The [owner] starts to drill \the [target]", "You hear a large drill.") + owner.visible_message(SPAN_DANGER("\The [owner] starts to drill \the [target]"), SPAN_WARNING("You hear a large drill.")) var/T = target.loc @@ -458,7 +458,7 @@ if(istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target if(max(W.material.hardness, W.reinf_material ? W.reinf_material.hardness : 0) > drill_head.material.hardness) - to_chat(user, "\The [target] is too hard to drill through with this drill head.") + to_chat(user, SPAN_WARNING("\The [target] is too hard to drill through with this drill head.")) target.ex_act(2) drill_head.durability -= 1 log_and_message_admins("used [src] on the wall [W].", user, owner.loc) diff --git a/code/modules/heavy_vehicle/mech_construction.dm b/code/modules/heavy_vehicle/mech_construction.dm index f86d23156e8..ff23673e472 100644 --- a/code/modules/heavy_vehicle/mech_construction.dm +++ b/code/modules/heavy_vehicle/mech_construction.dm @@ -119,12 +119,12 @@ if(user) var/delay = 30 if(delay > 0) - user.visible_message("\The [user] begins trying to install \the [system] into \the [src].") + user.visible_message(SPAN_NOTICE("\The [user] begins trying to install \the [system] into \the [src].")) if(!do_after(user, delay, src) || user.get_active_hand() != system) return FALSE if(user.unEquip(system)) - to_chat(user, "You install \the [system] in \the [src]'s [system_hardpoint].") + to_chat(user, SPAN_NOTICE("You install \the [system] in \the [src]'s [system_hardpoint].")) playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) else return FALSE var/obj/item/mecha_equipment/ME = system @@ -168,7 +168,7 @@ if(user) var/delay = 30 if(delay > 0) - user.visible_message("\The [user] begins trying to remove \the [system] from \the [src].") + user.visible_message(SPAN_NOTICE("\The [user] begins trying to remove \the [system] from \the [src].")) if(!do_after(user, delay, src) || hardpoints[system_hardpoint] != system) return FALSE @@ -177,7 +177,7 @@ if(user) system.forceMove(get_turf(user)) user.put_in_hands(system) - to_chat(user, "You remove \the [system] in \the [src]'s [system_hardpoint].") + to_chat(user, SPAN_NOTICE("You remove \the [system] in \the [src]'s [system_hardpoint].")) playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) /mob/living/heavy_vehicle/proc/remove_system(var/system_hardpoint, var/force) diff --git a/code/modules/heavy_vehicle/mech_helpers.dm b/code/modules/heavy_vehicle/mech_helpers.dm index 78a624c1754..71d26009650 100644 --- a/code/modules/heavy_vehicle/mech_helpers.dm +++ b/code/modules/heavy_vehicle/mech_helpers.dm @@ -8,13 +8,13 @@ if(!legs) if(user) - to_chat(user, "\The [src] has no means of propulsion!") + to_chat(user, SPAN_WARNING("\The [src] has no means of propulsion!")) next_mecha_move = world.time + 3 // Just to stop them from getting spammed with messages. return if(!legs.motivator || legs.total_damage > 45) if(user) - to_chat(user, "Your motivators are damaged! You can't move!") + to_chat(user, SPAN_WARNING("Your motivators are damaged! You can't move!")) next_mecha_move = world.time + 15 return @@ -22,13 +22,13 @@ if(maintenance_protocols) if(user) - to_chat(user, "Maintenance protocols are in effect.") + to_chat(user, SPAN_WARNING("Maintenance protocols are in effect.")) return var/obj/item/cell/C = get_cell() if(!C || !C.check_charge(legs.power_use * CELLRATE)) if(user) - to_chat(user, "The power indicator flashes briefly.") + to_chat(user, SPAN_WARNING("The power indicator flashes briefly.")) return return TRUE diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm index 7de648a2581..ac04c662f05 100644 --- a/code/modules/heavy_vehicle/mech_interaction.dm +++ b/code/modules/heavy_vehicle/mech_interaction.dm @@ -6,7 +6,7 @@ if(M.enter(src)) return else - to_chat(usr, "You cannot pilot a mech of this size.") + to_chat(usr, SPAN_WARNING("You cannot pilot a mech of this size.")) return return ..() @@ -54,12 +54,12 @@ return if(!arms) - to_chat(user, "\The [src] has no manipulators!") + to_chat(user, SPAN_WARNING("\The [src] has no manipulators!")) setClickCooldown(3) return if(!arms.motivator || !arms.motivator.is_functional()) - to_chat(user, "Your motivators are damaged! You can't use your manipulators!") + to_chat(user, SPAN_WARNING("Your motivators are damaged! You can't use your manipulators!")) setClickCooldown(15) return @@ -77,7 +77,7 @@ // You may attack the target with your exosuit FIST if you're malfunctioning. var/failed = FALSE if(emp_damage > EMP_ATTACK_DISRUPT && prob(emp_damage*2)) - to_chat(user, "The wiring sparks as you attempt to control the exosuit!") + to_chat(user, SPAN_WARNING("The wiring sparks as you attempt to control the exosuit!")) failed = TRUE if(!failed) @@ -201,30 +201,30 @@ if(!user.Adjacent(src)) return if(hatch_locked) - to_chat(user, "The [body.hatch_descriptor] is locked.") + to_chat(user, SPAN_WARNING("The [body.hatch_descriptor] is locked.")) return if(hatch_closed) - to_chat(user, "The [body.hatch_descriptor] is closed.") + to_chat(user, SPAN_WARNING("The [body.hatch_descriptor] is closed.")) return if(LAZYLEN(pilots) >= LAZYLEN(body.pilot_positions)) - to_chat(user, "\The [src] is occupied.") + to_chat(user, SPAN_WARNING("\The [src] is occupied.")) return if(!instant) - to_chat(user, "You start climbing into \the [src]...") + to_chat(user, SPAN_NOTICE("You start climbing into \the [src]...")) if(!do_after(user, entry_speed)) return if(!user || user.incapacitated()) return if(hatch_locked) - to_chat(user, "The [body.hatch_descriptor] is locked.") + to_chat(user, SPAN_WARNING("The [body.hatch_descriptor] is locked.")) return if(hatch_closed) - to_chat(user, "The [body.hatch_descriptor] is closed.") + to_chat(user, SPAN_WARNING("The [body.hatch_descriptor] is closed.")) return if(LAZYLEN(pilots) >= LAZYLEN(body.pilot_positions)) - to_chat(user, "\The [src] is occupied.") + to_chat(user, SPAN_WARNING("\The [src] is occupied.")) return - to_chat(user, "You climb into \the [src].") + to_chat(user, SPAN_NOTICE("You climb into \the [src].")) user.forceMove(src) LAZYDISTINCTADD(pilots, user) RegisterSignal(user, COMSIG_MOB_FACEDIR, PROC_REF(handle_user_turn)) @@ -240,14 +240,14 @@ return if(hatch_closed) if(hatch_locked) - if(!silent) to_chat(user, "The [body.hatch_descriptor] is locked.") + if(!silent) to_chat(user, SPAN_WARNING("The [body.hatch_descriptor] is locked.")) return hud_open.toggled(FALSE) if(!silent) - to_chat(user, "You open the hatch and climb out of \the [src].") + to_chat(user, SPAN_NOTICE("You open the hatch and climb out of \the [src].")) else if(!silent) - to_chat(user, "You climb out of \the [src].") + to_chat(user, SPAN_NOTICE("You climb out of \the [src].")) user.forceMove(get_turf(src)) LAZYREMOVE(user.additional_vision_handlers, src) @@ -321,7 +321,7 @@ /mob/living/heavy_vehicle/attackby(obj/item/attacking_item, mob/user) if(user.a_intent != I_HURT && istype(attacking_item, /obj/item/mecha_equipment)) if(hardpoints_locked) - to_chat(user, "Hardpoint system access is disabled.") + to_chat(user, SPAN_WARNING("Hardpoint system access is disabled.")) return var/obj/item/mecha_equipment/realThing = attacking_item @@ -335,7 +335,7 @@ var/to_place = tgui_input_list(user, "Where would you like to install it?", "Install Hardpoint", (realThing.restricted_hardpoints & free_hardpoints)) if(install_system(attacking_item, to_place, user)) return - to_chat(user, "\The [attacking_item] could not be installed in that hardpoint.") + to_chat(user, SPAN_WARNING("\The [attacking_item] could not be installed in that hardpoint.")) return else @@ -365,7 +365,7 @@ qdel(attacking_item) else if(attacking_item.ismultitool()) if(hardpoints_locked) - to_chat(user, "Hardpoint system access is disabled.") + to_chat(user, SPAN_WARNING("Hardpoint system access is disabled.")) return var/list/parts = list() @@ -377,7 +377,7 @@ if(remove_system_interact(to_remove, user)) return - to_chat(user, "\The [src] has no hardpoint systems to remove.") + to_chat(user, SPAN_WARNING("\The [src] has no hardpoint systems to remove.")) return else if(attacking_item.iswrench()) @@ -430,37 +430,37 @@ return else if(attacking_item.iscrowbar()) if(!maintenance_protocols) - to_chat(user, "The cell compartment remains locked while maintenance protocols are disabled.") + to_chat(user, SPAN_WARNING("The cell compartment remains locked while maintenance protocols are disabled.")) return if(!body || !body.cell) - to_chat(user, "There is no cell here for you to remove!") + to_chat(user, SPAN_WARNING("There is no cell here for you to remove!")) return var/delay = 10 if(!do_after(user, delay) || !maintenance_protocols || !body || !body.cell) return user.put_in_hands(body.cell) - to_chat(user, "You remove \the [body.cell] from \the [src].") + to_chat(user, SPAN_NOTICE("You remove \the [body.cell] from \the [src].")) attacking_item.play_tool_sound(get_turf(src), 50) - visible_message("\The [user] pries out \the [body.cell] using the \the [attacking_item].") + visible_message(SPAN_NOTICE("\The [user] pries out \the [body.cell] using the \the [attacking_item].")) power = MECH_POWER_OFF hud_power_control.update_icon() body.cell = null return else if(istype(attacking_item, /obj/item/cell)) if(!maintenance_protocols) - to_chat(user, "The cell compartment remains locked while maintenance protocols are disabled.") + to_chat(user, SPAN_WARNING("The cell compartment remains locked while maintenance protocols are disabled.")) return if(!body || body.cell) - to_chat(user, "There is already a cell in there!") + to_chat(user, SPAN_WARNING("There is already a cell in there!")) return if(user.unEquip(attacking_item)) attacking_item.forceMove(body) body.cell = attacking_item - to_chat(user, "You install \the [body.cell] into \the [src].") + to_chat(user, SPAN_NOTICE("You install \the [body.cell] into \the [src].")) playsound(user.loc, 'sound/items/Screwdriver.ogg', 50, 1) - visible_message("\The [user] installs \the [body.cell] into \the [src].") + visible_message(SPAN_NOTICE("\The [user] installs \the [body.cell] into \the [src].")) return else if(istype(attacking_item, /obj/item/device/robotanalyzer)) to_chat(user, SPAN_NOTICE("Diagnostic Report for \the [src]:")) @@ -475,12 +475,12 @@ // Drag the pilot out if possible. if(user.a_intent == I_GRAB) if(!LAZYLEN(pilots)) - to_chat(user, "There is nobody inside \the [src].") + to_chat(user, SPAN_WARNING("There is nobody inside \the [src].")) else if(!hatch_closed) var/mob/pilot = pick(pilots) - user.visible_message("\The [user] is trying to pull \the [pilot] out of \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] is trying to pull \the [pilot] out of \the [src]!")) if(do_after(user, 30) && user.Adjacent(src) && (pilot in pilots) && !hatch_closed) - user.visible_message("\The [user] drags \the [pilot] out of \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] drags \the [pilot] out of \the [src]!")) eject(pilot, silent=1) return @@ -491,10 +491,10 @@ // Otherwise toggle the hatch. if(hatch_locked) - to_chat(user, "The [body.hatch_descriptor] is locked.") + to_chat(user, SPAN_WARNING("The [body.hatch_descriptor] is locked.")) return hatch_closed = !hatch_closed - to_chat(user, "You [hatch_closed ? "close" : "open"] the [body.hatch_descriptor].") + to_chat(user, SPAN_NOTICE("You [hatch_closed ? "close" : "open"] the [body.hatch_descriptor].")) hud_open.update_icon() update_icon() return @@ -539,7 +539,7 @@ if(!new_name || new_name == name || (user != src && !(user in pilots))) return name = new_name - to_chat(user, "You have redesignated this exosuit as \the [name].") + to_chat(user, SPAN_NOTICE("You have redesignated this exosuit as \the [name].")) /mob/living/heavy_vehicle/proc/trample(var/mob/living/H) if(!LAZYLEN(pilots)) @@ -554,13 +554,13 @@ D.attack_log += "\[[time_stamp()]\] Was trampled by [src]" attack_log += text("\[[time_stamp()]\] trampled [D.name] ([D.ckey]) with \the [src].") msg_admin_attack("[src] trampled [key_name(D)] at (JMP)" ) - src.visible_message("\The [src] runs over \the [D]!") + src.visible_message(SPAN_DANGER("\The [src] runs over \the [D]!")) D.apply_damage(legs.trample_damage, DAMAGE_BRUTE) return TRUE else var/mob/living/L = H - src.visible_message("\The [src] runs over \the [L]!") + src.visible_message(SPAN_DANGER("\The [src] runs over \the [L]!")) if(isanimal(L)) if(issmall(L) && (L.stat == DEAD)) L.gib() @@ -571,9 +571,9 @@ /mob/living/heavy_vehicle/proc/ToggleLockdown() lockdown = !lockdown if(lockdown) - src.visible_message("\The [src] beeps loudly as its servos sieze up, and it enters lockdown mode!") + src.visible_message(SPAN_WARNING("\The [src] beeps loudly as its servos sieze up, and it enters lockdown mode!")) else - src.visible_message("\The [src] hums with life as it is released from its lockdown mode!") + src.visible_message(SPAN_WARNING("\The [src] hums with life as it is released from its lockdown mode!")) /mob/living/heavy_vehicle/get_floating_chat_x_offset() return -offset_x // reverse the offset diff --git a/code/modules/heavy_vehicle/mech_life.dm b/code/modules/heavy_vehicle/mech_life.dm index 5bd0df9264c..4980d15fa0c 100644 --- a/code/modules/heavy_vehicle/mech_life.dm +++ b/code/modules/heavy_vehicle/mech_life.dm @@ -106,7 +106,7 @@ apply_damage(damage = environment.temperature /5 , damagetype = DAMAGE_BURN) //A possibility is to hook up interface icons here. But this works pretty well in my experience if(prob(5)) - visible_message("\The [src]'s hull bends and buckles under the intense heat!") + visible_message(SPAN_DANGER("\The [src]'s hull bends and buckles under the intense heat!")) /mob/living/heavy_vehicle/death(var/gibbed) // Salvage moves into the wreck unless we're exploding violently. diff --git a/code/modules/heavy_vehicle/mech_wreckage.dm b/code/modules/heavy_vehicle/mech_wreckage.dm index 9b2b0e63ca1..84031390b41 100644 --- a/code/modules/heavy_vehicle/mech_wreckage.dm +++ b/code/modules/heavy_vehicle/mech_wreckage.dm @@ -49,7 +49,7 @@ if(WT.isOn()) cutting = TRUE else - to_chat(user, "Turn the torch on, first.") + to_chat(user, SPAN_WARNING("Turn the torch on, first.")) return else if(istype(attacking_item, /obj/item/gun/energy/plasmacutter)) cutting = TRUE @@ -57,21 +57,21 @@ if(cutting) if(!prepared) prepared = 1 - to_chat(user, "You partially dismantle \the [src].") + to_chat(user, SPAN_NOTICE("You partially dismantle \the [src].")) else - to_chat(user, "\The [src] has already been weakened.") + to_chat(user, SPAN_WARNING("\The [src] has already been weakened.")) return 1 else if(attacking_item.iswrench()) if(prepared) - to_chat(user, "You finish dismantling \the [src].") + to_chat(user, SPAN_NOTICE("You finish dismantling \the [src].")) new /obj/item/stack/material/steel(get_turf(src),rand(5,10)) qdel(src) else - to_chat(user, "It's too solid to dismantle. Try cutting through some of the bigger bits.") + to_chat(user, SPAN_WARNING("It's too solid to dismantle. Try cutting through some of the bigger bits.")) return 1 else if(istype(attacking_item) && attacking_item.force > 20) - visible_message("\The [src] has been smashed with \the [attacking_item] by \the [user]!") + visible_message(SPAN_DANGER("\The [src] has been smashed with \the [attacking_item] by \the [user]!")) if(prob(20)) new /obj/item/stack/material/steel(get_turf(src),rand(1,3)) qdel(src) diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm index cede65cd8da..2d8e63375bd 100644 --- a/code/modules/heavy_vehicle/mecha.dm +++ b/code/modules/heavy_vehicle/mecha.dm @@ -151,10 +151,10 @@ else . += "It is being piloted by [pilot]." if(hardpoints.len) - . += "It has the following hardpoints:" + . += SPAN_NOTICE("It has the following hardpoints:") for(var/hardpoint in hardpoints) var/obj/item/I = hardpoints[hardpoint] - . += "- [hardpoint]: [istype(I) ? "[I]" : "nothing"]." + . += "- [hardpoint]: [istype(I) ? SPAN_NOTICE("[I]") : "nothing"]." else . += "It has no visible hardpoints." @@ -166,11 +166,11 @@ if(1) damage_string = "undamaged" if(2) - damage_string = "damaged" + damage_string = SPAN_WARNING("damaged") if(3) - damage_string = "badly damaged" + damage_string = SPAN_WARNING("badly damaged") if(4) - damage_string = "destroyed" + damage_string = SPAN_DANGER("destroyed") . += "Its [thing.name] [thing.gender == PLURAL ? "are" : "is"] [damage_string]." /mob/living/heavy_vehicle/Topic(href,href_list[]) @@ -289,7 +289,7 @@ user.set_machine(src) interact(user) else - to_chat(user, "The radio is too damaged to function.") + to_chat(user, SPAN_WARNING("The radio is too damaged to function.")) /obj/item/device/radio/exosuit/CanUseTopic() . = ..() diff --git a/code/modules/holidays/christmas/props.dm b/code/modules/holidays/christmas/props.dm index e59155ff82d..c190cd40133 100644 --- a/code/modules/holidays/christmas/props.dm +++ b/code/modules/holidays/christmas/props.dm @@ -10,7 +10,10 @@ /obj/item/toy/xmas_cracker/attack(mob/target, mob/user, var/target_zone) if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() ) - target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.") + target.visible_message(SPAN_NOTICE("[user] and [target] pop \an [src]! *pop*"), + SPAN_NOTICE("You pull \an [src] with [target]! *pop*"), + SPAN_NOTICE("You hear a *pop*.")) + var/obj/item/paper/Joke = new /obj/item/paper(user.loc) var/title = "[pick("awful","terrible","unfunny")] joke" var/content = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'", @@ -65,7 +68,7 @@ user.put_in_hands(gift) src.gift.add_fingerprint(user) else - to_chat(user, "The gift was empty!") + to_chat(user, SPAN_WARNING("The gift was empty!")) qdel(src) return @@ -76,16 +79,16 @@ /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return - to_chat(user, "You can't move.") + to_chat(user, SPAN_WARNING("You can't move.")) /obj/effect/spresent/attackby(obj/item/attacking_item, mob/user) ..() if (!attacking_item.iswirecutter()) - to_chat(user, "I need wirecutters for that.") + to_chat(user, SPAN_WARNING("I need wirecutters for that.")) return - to_chat(user, "You cut open the present.") + to_chat(user, SPAN_NOTICE("You cut open the present.")) for(var/mob/M in src) //Should only be one but whatever. M.forceMove(src.loc) @@ -170,7 +173,7 @@ "Lord-Regent Not'zar","Jesus Christ","Santa Claus","Mrs. Claus","Sandy Claws","Buddha","Gary","Jesus Christ!","the True Queen of Biesel, God-Lady Seon-rin von Illdenberg, First of Her Name", "Admiral Frost","Pirate King Frost", "The Secret NanoTrasen Cabal of Duty Officers", "The Society for the Preservation of Rats", "Officer Beepsky","Lieutenant Columbo","Crew of the NSS Upsilon","Runtime", "Bones","Chauncey","Ian","Pun Pun","Nup Nup","Waldo","Odlaw","Crew of the NSS Exodus", "Custodial Staff of the NTCC Odin","ERT Phoenix","grey slime (357)","Bob the Blob","People for the Ethical Treatment of Bluespace Bears", - "Mr. Clown and Mrs. Mime from New Puerto Rico","the Grinch","the Krampus","Satan","Mega-Satan","\[BENEFACTOR REDACTED]\","Bluespace Cat","Union of Bluespace Technicians Tau Ceti","the New Kingdom of Adhomai", + "Mr. Clown and Mrs. Mime from New Puerto Rico","the Grinch","the Krampus","Satan","Mega-Satan","Bluespace Cat","Union of Bluespace Technicians Tau Ceti","the New Kingdom of Adhomai", "Ginny", "Boleslaw Keesler", "The Queen in Blue", "Cuban Pete", "Ceres' Lance", "the real Odin Killer (Still out here, guys!)", "the K'lax Hive", "the C'thur Hive") var/pick_emotion = pick("love","platonic admiration","approval","love (not in a sexual way or anything, though)","apathy", "schadenfreude","love","God's blessing","Santa's blessing","Non-demoninational deity's blessing","love","compassion","appreciation", "respect","begrudging respect","love", "seasonal obligation") diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 449a60321f9..179b1d808a0 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -49,13 +49,13 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont dat += " Current Loaded Programs: " if(!linkedholodeck) - dat += "Warning: Unable to locate holodeck. " + dat += SPAN_DANGER("Warning: Unable to locate holodeck. ") user << browse(dat, "window=computer;size=400x500") onclose(user, "computer") return if(!SSatlas.current_map.holodeck_supported_programs.len) - dat += "Warning: No supported holo-programs loaded. " + dat += SPAN_DANGER("Warning: No supported holo-programs loaded. ") user << browse(dat, "window=computer;size=400x500") onclose(user, "computer") return @@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont safety_disabled = 1 req_one_access = list() update_projections() - to_chat(user, "You vastly increase projector power and override the safety and security protocols.") + to_chat(user, SPAN_NOTICE("You vastly increase projector power and override the safety and security protocols.")) to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [SSatlas.current_map.company_name] maintenance and do not use the simulator.") log_game("[key_name(usr)] emagged the Holodeck Control Computer",ckey=key_name(usr)) src.updateUsrDialog() @@ -370,10 +370,10 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont /obj/machinery/computer/holodeck_control/proc/togglelock(var/mob/user) if(allowed(user)) locked = !locked - visible_message("\The [src] emits a series of beeps to announce it has been [locked ? null : "un"]locked.", range = 3) + visible_message(SPAN_NOTICE("\The [src] emits a series of beeps to announce it has been [locked ? null : "un"]locked."), range = 3) return FALSE else - to_chat(user, "Access denied.") + to_chat(user, SPAN_WARNING("Access denied.")) return TRUE /obj/machinery/computer/holodeck_control/proc/load_random_program() diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 9fa6d1c613a..d5fead03d73 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -174,11 +174,11 @@ if(attacking_item.item_flags & ITEM_FLAG_NO_BLUDGEON) return if(attacking_item.isscrewdriver()) - to_chat(user, ("It's a holowindow, you can't unfasten it!")) + to_chat(user, (SPAN_NOTICE("It's a holowindow, you can't unfasten it!"))) else if(attacking_item.iscrowbar() && reinf && state <= 1) - to_chat(user, ("It's a holowindow, you can't pry it!")) + to_chat(user, (SPAN_NOTICE("It's a holowindow, you can't pry it!"))) else if(attacking_item.iswrench() && !anchored && (!state || !reinf)) - to_chat(user, ("It's a holowindow, you can't dismantle it!")) + to_chat(user, (SPAN_NOTICE("It's a holowindow, you can't dismantle it!"))) else if(attacking_item.damtype == DAMAGE_BRUTE || attacking_item.damtype == DAMAGE_BURN) hit(attacking_item.force) @@ -212,7 +212,7 @@ if(src.density && istype(attacking_item, /obj/item) && !istype(attacking_item, /obj/item/card)) var/aforce = attacking_item.force playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1) - visible_message("[src] was hit by [attacking_item].") + visible_message(SPAN_DANGER("[src] was hit by [attacking_item].")) if(attacking_item.damtype == DAMAGE_BRUTE || attacking_item.damtype == DAMAGE_BURN) take_damage(aforce) return @@ -247,7 +247,7 @@ /obj/structure/bed/stool/chair/holochair/attackby(obj/item/attacking_item, mob/user) if(attacking_item.iswrench()) - to_chat(user, ("It's a holochair, you can't dismantle it!")) + to_chat(user, (SPAN_NOTICE("It's a holochair, you can't dismantle it!"))) return /obj/item/holo @@ -280,7 +280,7 @@ /obj/item/holo/esword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] parries [attack_text] with \the [src]!")) spark(user.loc, 5) playsound(user.loc, 'sound/weapons/blade.ogg', 50, 1) @@ -298,13 +298,13 @@ icon_state = "sword[item_color]" w_class = ITEMSIZE_LARGE playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - to_chat(user, "[src] is now active.") + to_chat(user, SPAN_NOTICE("[src] is now active.")) else force = 3 icon_state = "sword0" w_class = ITEMSIZE_SMALL playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - to_chat(user, "[src] can now be concealed.") + to_chat(user, SPAN_NOTICE("[src] can now be concealed.")) if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -339,16 +339,16 @@ if (istype(attacking_item, /obj/item/grab) && get_dist(src,user)<2) var/obj/item/grab/G = attacking_item if(G.state<2) - to_chat(user, "You need a better grip to do that!") + to_chat(user, SPAN_WARNING("You need a better grip to do that!")) return G.affecting.forceMove(src.loc) G.affecting.Weaken(5) - visible_message("[G.assailant] dunks [G.affecting] into the [src]!", range = 3) + visible_message(SPAN_WARNING("[G.assailant] dunks [G.affecting] into the [src]!"), range = 3) qdel(attacking_item) return else if (istype(attacking_item, /obj/item) && get_dist(src,user)<2) user.drop_from_inventory(attacking_item, get_turf(src)) - visible_message("[user] dunks [attacking_item] into the [src]!", range = 3) + visible_message(SPAN_NOTICE("[user] dunks [attacking_item] into the [src]!"), range = 3) return /obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) @@ -358,9 +358,9 @@ return if(prob(50)) I.forceMove(src.loc) - visible_message("Swish! \the [I] lands in \the [src].", range = 3) + visible_message(SPAN_NOTICE("Swish! \the [I] lands in \the [src]."), range = 3) else - visible_message("\The [I] bounces off of \the [src]'s rim!", range = 3) + visible_message(SPAN_WARNING("\The [I] bounces off of \the [src]'s rim!"), range = 3) return 0 else return ..(mover, target, height, air_group) @@ -467,7 +467,7 @@ derez() /mob/living/simple_animal/hostile/carp/holodeck/proc/derez() - visible_message("\The [src] fades away!") + visible_message(SPAN_NOTICE("\The [src] fades away!")) qdel(src) //Holo-penguin @@ -505,5 +505,5 @@ derez() /mob/living/simple_animal/penguin/holodeck/proc/derez() - visible_message("\The [src] fades away!") + visible_message(SPAN_NOTICE("\The [src] fades away!")) qdel(src) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 4af24c1e788..b6f1dee9f9a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -28,7 +28,7 @@ return if(!SSplants) - to_world("Plant controller does not exist and [src] requires it. Aborting.") + to_world(SPAN_DANGER("Plant controller does not exist and [src] requires it. Aborting.")) qdel(src) return @@ -66,7 +66,7 @@ if(!seed) return if(!SSplants) - to_world("Plant controller does not exist and [src] requires it. Aborting.") + to_world(SPAN_DANGER("Plant controller does not exist and [src] requires it. Aborting.")) qdel(src) return @@ -159,7 +159,7 @@ return M.stop_pulling() - to_chat(M, "You slipped on the [name]!") + to_chat(M, SPAN_NOTICE("You slipped on the [name]!")) playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) @@ -195,7 +195,7 @@ var/obj/item/stack/cable_coil/C = attacking_item if(C.use(5)) //TODO: generalize this. - to_chat(user, "You add some cable to the [src.name] and slide it inside the battery casing.") + to_chat(user, SPAN_NOTICE("You add some cable to the [src.name] and slide it inside the battery casing.")) var/obj/item/cell/potato/pocell = new /obj/item/cell/potato(get_turf(user)) if(src.loc == user && !(user.l_hand && user.r_hand) && istype(user,/mob/living/carbon/human)) user.put_in_hands(pocell) @@ -205,13 +205,13 @@ return else if(attacking_item.sharp && !attacking_item.noslice) if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. - user.show_message("You carve a face into [src]!", 1) + user.show_message(SPAN_NOTICE("You carve a face into [src]!"), 1) user.put_in_hands(new /obj/item/clothing/head/pumpkin) qdel(src) return else if(seed.chems) if(istype(attacking_item,/obj/item/material/hatchet) && !isnull(seed.chems[/singleton/reagent/woodpulp])) - user.show_message("You make planks out of \the [src]!", 1) + user.show_message(SPAN_NOTICE("You make planks out of \the [src]!"), 1) playsound(loc, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) @@ -274,7 +274,7 @@ return if(prob(35)) if(user) - to_chat(user, "\The [src] has fallen to bits.") + to_chat(user, SPAN_DANGER("\The [src] has fallen to bits.")) qdel(src) /obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user as mob) @@ -286,14 +286,14 @@ return if(user.a_intent == I_HURT) - user.visible_message("\The [user] squashes \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] squashes \the [src]!")) seed.thrown_at(src,user) sleep(-1) if(src) qdel(src) return if(seed.kitchen_tag == "grass") - user.show_message("You make a grass tile out of \the [src]!", 1) + user.show_message(SPAN_NOTICE("You make a grass tile out of \the [src]!"), 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) for(var/i=0,i<2,i++) @@ -311,7 +311,7 @@ return if(seed.get_trait(TRAIT_SPREAD) > 0) - to_chat(user, "You plant the [src.name].") + to_chat(user, SPAN_NOTICE("You plant the [src.name].")) new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) qdel(src) return @@ -322,13 +322,13 @@ if("shand") var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc) poultice.heal_brute = potency - to_chat(user, "You mash the leaves into a poultice.") + to_chat(user, SPAN_NOTICE("You mash the leaves into a poultice.")) qdel(src) return if("mtear") var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc) poultice.heal_burn = potency - to_chat(user, "You mash the petals into a poultice.") + to_chat(user, SPAN_NOTICE("You mash the petals into a poultice.")) qdel(src) return */ diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index 3070209ce8f..06b2f9e78ec 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -51,7 +51,7 @@ if(istype(attacking_item, /obj/item/surgery/circular_saw) || istype(attacking_item, /obj/item/material/hatchet) || \ istype(attacking_item, /obj/item/material/kitchen/utensil/knife) || istype(attacking_item, /obj/item/material/knife) || \ istype(attacking_item, /obj/item/material/knife/ritual)) - to_chat(user, "You use [attacking_item] to fashion a pipe out of the corn cob!") + to_chat(user, SPAN_NOTICE("You use [attacking_item] to fashion a pipe out of the corn cob!")) new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc) qdel(src) return diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 9300f58a8fe..a9f68e6661b 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -125,15 +125,15 @@ if(get_trait(TRAIT_CARNIVOROUS)) if(get_trait(TRAIT_CARNIVOROUS) == 2) if(affecting) - to_chat(target, "\The [fruit]'s thorns pierce your [affecting.name] greedily!") + to_chat(target, SPAN_DANGER("\The [fruit]'s thorns pierce your [affecting.name] greedily!")) else - to_chat(target, "\The [fruit]'s thorns pierce your flesh greedily!") + to_chat(target, SPAN_DANGER("\The [fruit]'s thorns pierce your flesh greedily!")) damage = get_trait(TRAIT_POTENCY)/2 else if(affecting) - to_chat(target, "\The [fruit]'s thorns dig deeply into your [affecting.name]!") + to_chat(target, SPAN_DANGER("\The [fruit]'s thorns dig deeply into your [affecting.name]!")) else - to_chat(target, "\The [fruit]'s thorns dig deeply into your flesh!") + to_chat(target, SPAN_DANGER("\The [fruit]'s thorns dig deeply into your flesh!")) damage = get_trait(TRAIT_POTENCY)/5 else return @@ -162,7 +162,7 @@ if(!body_coverage) return - to_chat(target, "You are stung by \the [fruit]!") + to_chat(target, SPAN_DANGER("You are stung by \the [fruit]!")) for(var/rid in chems) var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5)) target.reagents.add_reagent(rid,injecting) @@ -246,7 +246,7 @@ apply_special_effect(M) splatter(T,thrown) if(origin_turf) - origin_turf.visible_message("The [thrown.name] explodes!") + origin_turf.visible_message(SPAN_DANGER("The [thrown.name] explodes!")) qdel(thrown) return @@ -260,7 +260,7 @@ if(get_trait(TRAIT_JUICY) && splatted) splatter(origin_turf,thrown) if(origin_turf) - origin_turf.visible_message("The [thrown.name] splatters against [target]!") + origin_turf.visible_message(SPAN_DANGER("The [thrown.name] splatters against [target]!")) qdel(thrown) if(get_trait(TRAIT_TELEPORTING)) @@ -539,7 +539,7 @@ if(!degree || get_trait(TRAIT_IMMUTABLE) > 0) return - source_turf.visible_message("\The [display_name] quivers!") + source_turf.visible_message(SPAN_NOTICE("\The [display_name] quivers!")) //This looks like shit, but it's a lot easier to read/change this way. var/total_mutations = rand(1,1+degree) @@ -547,7 +547,7 @@ switch(rand(0,11)) if(0) //Plant cancer! set_trait(TRAIT_ENDURANCE,get_trait(TRAIT_ENDURANCE)-rand(10,20),null,0) - source_turf.visible_message("\The [display_name] withers rapidly!") + source_turf.visible_message(SPAN_DANGER("\The [display_name] withers rapidly!")) if(1) set_trait(TRAIT_NUTRIENT_CONSUMPTION,get_trait(TRAIT_NUTRIENT_CONSUMPTION)+rand(-(degree*0.1),(degree*0.1)),5,0) set_trait(TRAIT_WATER_CONSUMPTION, get_trait(TRAIT_WATER_CONSUMPTION) +rand(-degree,degree),50,0) @@ -569,7 +569,7 @@ if(prob(degree*5)) set_trait(TRAIT_CARNIVOROUS, get_trait(TRAIT_CARNIVOROUS)+rand(-degree,degree),2, 0) if(get_trait(TRAIT_CARNIVOROUS)) - source_turf.visible_message("\The [display_name] shudders hungrily.") + source_turf.visible_message(SPAN_NOTICE("\The [display_name] shudders hungrily.")) if(6) set_trait(TRAIT_WEED_TOLERANCE, get_trait(TRAIT_WEED_TOLERANCE)+(rand(-2,2)*degree),10, 0) if(prob(degree*5)) @@ -583,7 +583,7 @@ set_trait(TRAIT_POTENCY, get_trait(TRAIT_POTENCY)+(rand(-20,20)*degree),200, 0) if(prob(degree*5)) set_trait(TRAIT_SPREAD, get_trait(TRAIT_SPREAD)+rand(-1,1),2, 0) - source_turf.visible_message("\The [display_name] spasms visibly, shifting in the tray.") + source_turf.visible_message(SPAN_NOTICE("\The [display_name] spasms visibly, shifting in the tray.")) if(prob(degree*5)) set_trait(TRAIT_SPOROUS, !get_trait(TRAIT_SPOROUS)) if(9) @@ -594,12 +594,12 @@ if(prob(degree*2)) set_trait(TRAIT_BIOLUM, !get_trait(TRAIT_BIOLUM)) if(get_trait(TRAIT_BIOLUM)) - source_turf.visible_message("\The [display_name] begins to glow!") + source_turf.visible_message(SPAN_NOTICE("\The [display_name] begins to glow!")) if(prob(degree*2)) set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) source_turf.visible_message("\The [display_name]'s glow changes colour!") else - source_turf.visible_message("\The [display_name]'s glow dims...") + source_turf.visible_message(SPAN_NOTICE("\The [display_name]'s glow dims...")) if(11) set_trait(TRAIT_TELEPORTING,1) @@ -711,7 +711,7 @@ return if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample) - if(istype(user)) to_chat(user, "You fail to harvest anything useful.") + if(istype(user)) to_chat(user, SPAN_DANGER("You fail to harvest anything useful.")) else if(istype(user)) to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].") @@ -768,7 +768,7 @@ //Handle spawning in living, mobile products (like dionaea). if(istype(product,/mob/living)) - product.visible_message("The pod disgorges [product]!") + product.visible_message(SPAN_NOTICE("The pod disgorges [product]!")) handle_living_product(product) if(istype(product,/mob/living/simple_animal/mushroom)) // Gross. var/mob/living/simple_animal/mushroom/mush = product diff --git a/code/modules/hydroponics/seed_gene_mut.dm b/code/modules/hydroponics/seed_gene_mut.dm index 68bc9cfadcd..06344fe28c6 100644 --- a/code/modules/hydroponics/seed_gene_mut.dm +++ b/code/modules/hydroponics/seed_gene_mut.dm @@ -4,7 +4,7 @@ return src var/datum/seed/S = diverge() //Let's not modify all of the seeds. - T.visible_message("\The [S.display_name] quivers!") //Mimicks the normal mutation. + T.visible_message(SPAN_NOTICE("\The [S.display_name] quivers!")) //Mimicks the normal mutation. G.mutate(S, T) return S @@ -95,12 +95,12 @@ if(prob(50)) S.set_trait(TRAIT_BIOLUM, !S.get_trait(TRAIT_BIOLUM)) if(S.get_trait(TRAIT_BIOLUM)) - T.visible_message("\The [S.display_name] begins to glow!") + T.visible_message(SPAN_NOTICE("\The [S.display_name] begins to glow!")) if(prob(50)) S.set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) T.visible_message("\The [S.display_name]'s glow changes colour!") else - T.visible_message("\The [S.display_name]'s glow dims...") + T.visible_message(SPAN_NOTICE("\The [S.display_name]'s glow dims...")) if(prob(60)) S.set_trait(TRAIT_PRODUCES_POWER, !S.get_trait(TRAIT_PRODUCES_POWER)) @@ -121,7 +121,7 @@ S.set_trait(TRAIT_MATURATION, S.get_trait(TRAIT_MATURATION)+rand(-1,1),30,0) if(prob(55)) S.set_trait(TRAIT_SPREAD, S.get_trait(TRAIT_SPREAD)+rand(-1,1),2,0) - T.visible_message("\The [S.display_name] spasms visibly, shifting in the tray.") + T.visible_message(SPAN_NOTICE("\The [S.display_name] spasms visibly, shifting in the tray.")) /singleton/plantgene/fruit/mutate(var/datum/seed/S) if(prob(65)) diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 56a6273492a..ef91a4a45b5 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -96,7 +96,7 @@ if(attacking_item.isscrewdriver()) open = !open - to_chat(user, "You [open ? "open" : "close"] the maintenance panel.") + to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] the maintenance panel.")) return if(open) diff --git a/code/modules/hydroponics/seed_mobs.dm b/code/modules/hydroponics/seed_mobs.dm index d3752e6c770..c8e25ff1885 100644 --- a/code/modules/hydroponics/seed_mobs.dm +++ b/code/modules/hydroponics/seed_mobs.dm @@ -16,7 +16,7 @@ SSghostroles.remove_spawn_atom(product_spawner_type, host) host.death() // This seems redundant, but a lot of mobs don't host.stat = DEAD // handle death() properly. Better safe than etc. - host.visible_message("[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.") + host.visible_message(SPAN_DANGER("[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.")) var/total_yield = rand(1,3) for(var/j = 0;j<=total_yield;j++) diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 4f77f821cd2..801eeb81749 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -19,7 +19,7 @@ log_and_message_admins("Spacevines spawned at \the [get_area(T)]", location = T) return - log_and_message_admins("Event: Spacevines failed to find a viable turf.") + log_and_message_admins(SPAN_NOTICE("Event: Spacevines failed to find a viable turf.")) /obj/effect/dead_plant anchored = 1 @@ -88,7 +88,7 @@ parent = newparent if(!SSplants) - to_world("Plant controller does not exist and [src] requires it. Aborting.") + to_world(SPAN_DANGER("Plant controller does not exist and [src] requires it. Aborting.")) qdel(src) return @@ -244,16 +244,16 @@ if(attacking_item.iswirecutter() || istype(attacking_item, /obj/item/surgery/scalpel)) if(sampled) - to_chat(user, "\The [src] has already been sampled recently.") + to_chat(user, SPAN_WARNING("\The [src] has already been sampled recently.")) return if(!is_mature()) - to_chat(user, "\The [src] is not mature enough to yield a sample yet.") + to_chat(user, SPAN_WARNING("\The [src] is not mature enough to yield a sample yet.")) return if(!seed) - to_chat(user, "There is nothing to take a sample from.") + to_chat(user, SPAN_WARNING("There is nothing to take a sample from.")) return if(sampled) - to_chat(user, "You cannot take another sample from \the [src].") + to_chat(user, SPAN_DANGER("You cannot take another sample from \the [src].")) return if(prob(70)) sampled = 1 diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index 3e47f51c2db..7854826d5c5 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -44,21 +44,21 @@ if(buckled.buckled_to == src) if(buckled != user) buckled.visible_message(\ - "[user.name] frees [buckled.name] from \the [src].",\ - "[user.name] frees you from \the [src].",\ - "You hear shredding and ripping.") + SPAN_NOTICE("[user.name] frees [buckled.name] from \the [src]."),\ + SPAN_NOTICE("[user.name] frees you from \the [src]."),\ + SPAN_WARNING("You hear shredding and ripping.")) else buckled.visible_message(\ - "[buckled.name] struggles free of \the [src].",\ - "You untangle \the [src] from around yourself.",\ - "You hear shredding and ripping.") + SPAN_NOTICE("[buckled.name] struggles free of \the [src]."),\ + SPAN_NOTICE("You untangle \the [src] from around yourself."),\ + SPAN_WARNING("You hear shredding and ripping.")) unbuckle() else var/text = pick("rip","tear","pull") user.visible_message(\ - "[user.name] [text]s at \the [src].",\ - "You [text] at \the [src].",\ - "You hear shredding and ripping.") + SPAN_NOTICE("[user.name] [text]s at \the [src]."),\ + SPAN_NOTICE("You [text] at \the [src]."),\ + SPAN_WARNING("You hear shredding and ripping.")) return /obj/effect/plant/proc/entangle(var/mob/living/victim) @@ -77,11 +77,11 @@ if(H.Check_Shoegrip(FALSE)) can_grab = 0 if(can_grab) - src.visible_message("Tendrils lash out from \the [src] and drag \the [victim] in!") + src.visible_message(SPAN_DANGER("Tendrils lash out from \the [src] and drag \the [victim] in!")) victim.forceMove(src.loc) //entangling people if(victim.loc == src.loc) buckle(victim) victim.set_dir(pick(GLOB.cardinal)) - to_chat(victim, "Tendrils tighten around you!") + to_chat(victim, SPAN_DANGER("Tendrils tighten around you!")) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 22947091ebd..448fcedbb4d 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -145,7 +145,8 @@ if(nymph.nutrition > 100 && nutrilevel < 10) nymph.adjustNutritionLoss((10-nutrilevel)*5) nutrilevel = 10 - nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") + nymph.visible_message(SPAN_NOTICE("[nymph] secretes a trickle of green liquid, refilling [src]."), + SPAN_NOTICE("You secrete a trickle of green liquid, refilling [src].")) return//Nymphs cant open and close lids if(mechanical && !usr.incapacitated() && Adjacent(usr)) close_lid(usr) @@ -180,18 +181,21 @@ if(weedlevel > 0) nymph.ingested.add_reagent(/singleton/reagent/nutriment, weedlevel/6) weedlevel = 0 - nymph.visible_message("[nymph] roots through [src], ripping out weeds and eating them noisily.","You root through [src], ripping out weeds and eating them noisily.") + nymph.visible_message(SPAN_NOTICE("[nymph] roots through [src], ripping out weeds and eating them noisily."), + SPAN_NOTICE("You root through [src], ripping out weeds and eating them noisily.")) return if (dead)//Let nymphs eat dead plants nymph.ingested.add_reagent(/singleton/reagent/nutriment, 1) - nymph.visible_message("[nymph] rips out the dead plants from [src], and loudly munches them.","You root out the dead plants in [src], eating them with loud chewing sounds.") + nymph.visible_message(SPAN_NOTICE("[nymph] rips out the dead plants from [src], and loudly munches them."), + SPAN_NOTICE("You root out the dead plants in [src], eating them with loud chewing sounds.")) remove_dead(user) return if (harvest) harvest(user) return else - nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") + nymph.visible_message(SPAN_NOTICE("[nymph] rolls around in [src] for a bit."), + SPAN_NOTICE("You roll around in [src] for a bit.")) return /obj/machinery/portable_atmospherics/hydroponics/New() @@ -248,7 +252,7 @@ if(prob(min(25,max(1,seed.get_trait(TRAIT_POTENCY/2))))) if(seed.get_trait(TRAIT_SPOROUS) && !closed_system) seed.create_spores(get_turf(src)) - visible_message("\The [src] releases its spores!") + visible_message(SPAN_DANGER("\The [src] releases its spores!")) //Process reagents being input into the tray. /obj/machinery/portable_atmospherics/hydroponics/proc/process_reagents() @@ -319,7 +323,7 @@ // Reset values. if(seed.get_trait(TRAIT_SPOROUS)) seed.create_spores(get_turf(src)) - visible_message("\The [src] releases its spores!") + visible_message(SPAN_DANGER("\The [src] releases its spores!")) harvest = 0 lastproduce = age @@ -372,7 +376,7 @@ pestlevel = 0 sampled = 0 update_icon() - visible_message("[src] has been overtaken by [seed.display_name].") + visible_message(SPAN_NOTICE("[src] has been overtaken by [seed.display_name].")) return @@ -450,7 +454,7 @@ weedlevel = 0 update_icon() - visible_message("The [previous_plant] has suddenly mutated into [seed.display_name]!") + visible_message(SPAN_DANGER("The [previous_plant] has suddenly mutated into [seed.display_name]!")) return @@ -552,16 +556,18 @@ check_health() else - to_chat(user, "\The [src] already has seeds in it!") + to_chat(user, SPAN_DANGER("\The [src] already has seeds in it!")) else if (istype(attacking_item, /obj/item/material/minihoe)) // The minihoe if(weedlevel > 0) - user.visible_message("[user] starts uprooting the weeds.", "You remove the weeds from the [src].") + user.visible_message(SPAN_DANGER("[user] starts uprooting the weeds."), + SPAN_DANGER("You remove the weeds from the [src].")) + weedlevel = 0 update_icon() else - to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.") + to_chat(user, SPAN_DANGER("This plot is completely devoid of weeds. It doesn't need uprooting.")) else if (istype(attacking_item, /obj/item/storage/bag/plants)) @@ -597,7 +603,7 @@ else if(attacking_item.force && seed) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message("\The [seed.display_name] has been attacked by [user] with \the [attacking_item]!") + user.visible_message(SPAN_DANGER("\The [seed.display_name] has been attacked by [user] with \the [attacking_item]!")) if(!dead) var/total_damage = attacking_item.force if ((attacking_item.sharp) || (attacking_item.damtype == "fire")) //fire and sharp things are more effective when dealing with plants @@ -628,7 +634,7 @@ . += "[src] is empty." return - . += "[seed.display_name] are growing here." + . += SPAN_NOTICE("[seed.display_name] are growing here.") if(!is_adjacent) return @@ -642,7 +648,7 @@ . += "\The [src] is infested with tiny worms!" if(dead) - . += "The plant is dead." + . += SPAN_DANGER("The plant is dead.") else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2)) . += "The plant looks unhealthy." diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm index 1d78868aa8b..94289260199 100644 --- a/code/modules/hydroponics/trays/tray_process.dm +++ b/code/modules/hydroponics/trays/tray_process.dm @@ -120,7 +120,7 @@ lastproduce = age if(seed.get_trait(TRAIT_SPOROUS) && !closed_system) seed.create_spores(get_turf(src)) - visible_message("\The [src] releases its spores!") + visible_message(SPAN_DANGER("\The [src] releases its spores!")) // If we're a vine which is not in a closed tray and is at least half mature, and there's no vine currently on our turf: make one (maybe) if(!closed_system && seed.get_trait(TRAIT_SPREAD) == 2 && 2 * age >= seed.get_trait(TRAIT_MATURATION) && !(locate(/obj/effect/plant) in get_turf(src)) && \ diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm index f8e50f417e7..4d55086b2fb 100644 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ b/code/modules/hydroponics/trays/tray_soil.dm @@ -30,7 +30,7 @@ if(istype(attacking_item, /obj/item/shovel)) if(attacking_item.use_tool(src, user, 50, volume = 50)) new /obj/item/stack/material/sandstone{amount = 3}(loc) - to_chat(user, "You remove the soil from the bed and dismantle the sandstone base.") + to_chat(user, SPAN_NOTICE("You remove the soil from the bed and dismantle the sandstone base.")) playsound(src, 'sound/effects/stonedoor_openclose.ogg', 40, 1) qdel(src) else diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index 50a90e82bd5..a77064e75a5 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -92,12 +92,12 @@ grown_reagents = H.reagents if(!grown_seed) - to_chat(user, "[src] can tell you nothing about \the [target].") + to_chat(user, SPAN_DANGER("[src] can tell you nothing about \the [target].")) return form_title = "[grown_seed.seed_name] (#[grown_seed.uid])" var/dat = " Plant data for [form_title]" - user.visible_message("[user] runs the scanner over \the [target].") + user.visible_message(SPAN_NOTICE("[user] runs the scanner over \the [target].")) dat += "General Data" diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm index 01477ed9592..710607e484c 100644 --- a/code/modules/hydroponics/trays/tray_update_icons.dm +++ b/code/modules/hydroponics/trays/tray_update_icons.dm @@ -30,7 +30,7 @@ if(!seed.growth_stages) seed.update_growth_stages() if(!seed.growth_stages) - to_world("Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.") + to_world(SPAN_DANGER("Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.")) return var/overlay_stage = 1 if(age >= seed.get_trait(TRAIT_MATURATION)) diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index a916df22211..ef31f5c2ac7 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -92,7 +92,7 @@ if(battery) HTML += "[round(battery.charge, 0.1)]/[battery.maxcharge] ([round(battery.percent(), 0.1)]%) cell charge. Remove" else - HTML += "No powercell detected!" + HTML += SPAN_DANGER("No powercell detected!") HTML += "" HTML += "Components: " HTML += "Built in: " @@ -127,7 +127,7 @@ if(..()) return 1 if(!opened) - to_chat(usr, "\The [src] is not open!") + to_chat(usr, SPAN_WARNING("\The [src] is not open!")) return if(href_list["rename"]) @@ -135,12 +135,12 @@ if(href_list["remove_cell"]) if(!battery) - to_chat(usr, "There's no power cell to remove from \the [src].") + to_chat(usr, SPAN_WARNING("There's no power cell to remove from \the [src].")) else var/turf/T = get_turf(src) battery.forceMove(T) playsound(T, 'sound/items/crowbar_pry.ogg', 50, 1) - to_chat(usr, "You pull \the [battery] out of \the [src]'s power supply.") + to_chat(usr, SPAN_NOTICE("You pull \the [battery] out of \the [src]'s power supply.")) battery = null interact(usr) // To refresh the UI. @@ -157,7 +157,7 @@ var/input = sanitizeSafe(input("What do you want to name this?", "Rename", src.name) as null|text, MAX_NAME_LEN) if(src && input) - to_chat(M, "The machine now has a label reading '[input]'.") + to_chat(M, SPAN_NOTICE("The machine now has a label reading '[input]'.")) name = input return input return null @@ -203,21 +203,21 @@ // Returns true if the circuit made it inside. /obj/item/device/electronic_assembly/proc/add_circuit(obj/item/integrated_circuit/IC, mob/user) if(!opened) - to_chat(user, "\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.") + to_chat(user, SPAN_WARNING("\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.")) return FALSE if(IC.w_class > w_class) - to_chat(user, "\The [IC] is way too big to fit into \the [src].") + to_chat(user, SPAN_WARNING("\The [IC] is way too big to fit into \the [src].")) return FALSE var/total_part_size = get_part_size() var/total_complexity = get_part_complexity() if((total_part_size + IC.size) > max_components) - to_chat(user, "You can't seem to add the '[IC.name]', as there's insufficient space.") + to_chat(user, SPAN_WARNING("You can't seem to add the '[IC.name]', as there's insufficient space.")) return FALSE if((total_complexity + IC.complexity) > max_complexity) - to_chat(user, "You can't seem to add the '[IC.name]', since this setup's too complicated for the case.") + to_chat(user, SPAN_WARNING("You can't seem to add the '[IC.name]', since this setup's too complicated for the case.")) return FALSE if(!IC.forceMove(src)) @@ -242,7 +242,7 @@ return FALSE if(add_circuit(attacking_item, user)) - to_chat(user, "You slide \the [attacking_item] inside \the [src].") + to_chat(user, SPAN_NOTICE("You slide \the [attacking_item] inside \the [src].")) playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) interact(user) return TRUE @@ -260,7 +260,7 @@ else if(attacking_item.iscrowbar()) attacking_item.play_tool_sound(get_turf(src), 50) opened = !opened - to_chat(user, "You [opened ? "open" : "close"] \the [src].") + to_chat(user, SPAN_NOTICE("You [opened ? "open" : "close"] \the [src].")) update_icon() return TRUE @@ -268,19 +268,20 @@ if(opened) interact(user) else - to_chat(user, "\The [src] isn't open, so you can't fiddle with the internal components. \ - Try using a crowbar.") + to_chat(user, SPAN_WARNING("\The [src] isn't open, so you can't fiddle with the internal components. \ + Try using a crowbar.")) + return TRUE else if(istype(attacking_item, /obj/item/cell/device)) if(!opened) - to_chat(user, "\The [src] isn't open, so you can't put anything inside. Try using a crowbar.") + to_chat(user, SPAN_WARNING("\The [src] isn't open, so you can't put anything inside. Try using a crowbar.")) for(var/obj/item/integrated_circuit/input/S in contents) S.attackby_react(attacking_item,user,user.a_intent) return FALSE if(battery) - to_chat(user, "\The [src] already has \a [battery] inside. Remove it first if you want to replace it.") + to_chat(user, SPAN_WARNING("\The [src] already has \a [battery] inside. Remove it first if you want to replace it.")) for(var/obj/item/integrated_circuit/input/S in contents) S.attackby_react(attacking_item,user,user.a_intent) return FALSE @@ -289,7 +290,7 @@ user.drop_from_inventory(cell,src) battery = cell playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You slot \the [cell] inside \the [src]'s power supply.") + to_chat(user, SPAN_NOTICE("You slot \the [cell] inside \the [src]'s power supply.")) interact(user) return TRUE else if(istype(attacking_item, /obj/item/device/integrated_electronics/detailer)) diff --git a/code/modules/integrated_electronics/core/assemblies/generic.dm b/code/modules/integrated_electronics/core/assemblies/generic.dm index bb534befdd8..aef4d75da68 100644 --- a/code/modules/integrated_electronics/core/assemblies/generic.dm +++ b/code/modules/integrated_electronics/core/assemblies/generic.dm @@ -199,11 +199,11 @@ return var/turf/T = get_turf(user) if(!istype(T, /turf/simulated/floor)) - to_chat(user, "You cannot place \the [src] on this spot!") + to_chat(user, SPAN_WARNING("You cannot place \the [src] on this spot!")) return playsound(src.loc, 'sound/machines/click.ogg', 75, 1) user.visible_message("\The [user] attaches \the [src] to the wall.", - "You attach \the [src] to the wall.", + SPAN_NOTICE("You attach \the [src] to the wall."), "You hear clicking.") if(isrobot(user)) //Robots cannot unequip/drop items, for Safety Reasons. forceMove(T) diff --git a/code/modules/integrated_electronics/core/device.dm b/code/modules/integrated_electronics/core/device.dm index 2b3c6ee55d6..c7051265018 100644 --- a/code/modules/integrated_electronics/core/device.dm +++ b/code/modules/integrated_electronics/core/device.dm @@ -29,7 +29,7 @@ playsound(get_turf(src), 'sound/items/crowbar_pry.ogg', 50, 1) opened = !opened EA.opened = opened - to_chat(user, "You [opened ? "open" : "close"] \the [src].") + to_chat(user, SPAN_NOTICE("You [opened ? "open" : "close"] \the [src].")) secured = 1 update_icon() diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 3edf6478e2b..233d3931b60 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -78,7 +78,7 @@ a creative player the means to solve many problems. Circuits are held inside an var/input = sanitizeSafe(input("What do you want to name the circuit?", "Rename", src.name) as null|text, MAX_NAME_LEN) if(src && input && assembly.check_interactivity(M)) - to_chat(M, "The circuit '[src.name]' is now labeled '[input]'.") + to_chat(M, SPAN_NOTICE("The circuit '[src.name]' is now labeled '[input]'.")) displayed_name = input /obj/item/integrated_circuit/interact(mob/user) @@ -184,7 +184,7 @@ a creative player the means to solve many problems. Circuits are held inside an if(!check_interactivity(usr)) return if (assembly && !assembly.opened) - to_chat(usr, "\The [assembly] is not open!") + to_chat(usr, SPAN_WARNING("\The [assembly] is not open!")) return if(..()) return 1 @@ -248,7 +248,7 @@ a creative player the means to solve many problems. Circuits are held inside an if(pin) debugger.write_data(pin, usr) else - to_chat(usr, "You can't do a whole lot without the proper tools.") + to_chat(usr, SPAN_WARNING("You can't do a whole lot without the proper tools.")) if(href_list["examine"]) var/obj/item/integrated_circuit/examined @@ -275,23 +275,23 @@ a creative player the means to solve many problems. Circuits are held inside an if(D.accepting_refs) D.afterattack(src, usr, TRUE) else - to_chat(usr, "The Debugger's 'ref scanner' needs to be on.") + to_chat(usr, SPAN_WARNING("The Debugger's 'ref scanner' needs to be on.")) else - to_chat(usr, "You need a multitool/debugger set to 'ref' mode to do that.") + to_chat(usr, SPAN_WARNING("You need a multitool/debugger set to 'ref' mode to do that.")) if(href_list["return"]) if(A) update_to_assembly = 1 usr << browse(null, "window=circuit-\ref[src]") else - to_chat(usr, "This circuit is not in an assembly!") + to_chat(usr, SPAN_WARNING("This circuit is not in an assembly!")) if(href_list["remove"]) if(!A) - to_chat(usr, "This circuit is not in an assembly!") + to_chat(usr, SPAN_WARNING("This circuit is not in an assembly!")) return if(!removable) - to_chat(usr, "\The [src] seems to be permanently attached to the case.") + to_chat(usr, SPAN_WARNING("\The [src] seems to be permanently attached to the case.")) return var/obj/item/device/electronic_assembly/ea = loc disconnect_all() @@ -299,7 +299,7 @@ a creative player the means to solve many problems. Circuits are held inside an forceMove(T) assembly = null playsound(T, 'sound/items/crowbar_pry.ogg', 50, 1) - to_chat(usr, "You pop \the [src] out of the case, and slide it out.") + to_chat(usr, SPAN_NOTICE("You pop \the [src] out of the case, and slide it out.")) if(istype(ea)) ea.interact(usr) diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index c363d65d535..8c25f70fea0 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -153,18 +153,18 @@ list[]( if("string") new_data = tgui_input_text(user, "Now type in a string.", "[src] string writing", istext(default) ? default : "", MAX_MESSAGE_LEN) if(istext(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, SPAN_NOTICE("You input [new_data] into the pin.")) return new_data if("number") new_data = tgui_input_number(user, "Now type in a number.", "[src] number writing", isnum(default) ? default : 0) if(isnum(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, SPAN_NOTICE("You input [new_data] into the pin.")) return new_data if("null") if(holder.check_interactivity(user)) - to_chat(user, "You clear the pin's memory.") + to_chat(user, SPAN_NOTICE("You clear the pin's memory.")) return new_data // Basically a null check @@ -178,7 +178,7 @@ list[]( /datum/integrated_io/activate/ask_for_pin_data(mob/user) // This just pulses the pin. holder.check_then_do_work(ignore_power = TRUE) - to_chat(user, "You pulse \the [holder]'s [src] pin.") + to_chat(user, SPAN_NOTICE("You pulse \the [holder]'s [src] pin.")) /datum/integrated_io/activate name = "activation pin" diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index 1cb616a126b..b5093ade512 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -22,15 +22,15 @@ if(stack.material.name == DEFAULT_WALL_MATERIAL) var/num = min((max_metal - metal) / metal_per_sheet, stack.amount) if(num < 1) - to_chat(user, "\The [src] is too full to add more metal.") + to_chat(user, SPAN_WARNING("\The [src] is too full to add more metal.")) return if(stack.use(num)) - to_chat(user, "You add [num] sheet\s to \the [src].") + to_chat(user, SPAN_NOTICE("You add [num] sheet\s to \the [src].")) metal += num * metal_per_sheet return TRUE if(istype(attacking_item,/obj/item/integrated_circuit)) - to_chat(user, "You insert the circuit into \the [src]. ") + to_chat(user, SPAN_NOTICE("You insert the circuit into \the [src]. ")) user.unEquip(attacking_item) metal = min(metal + attacking_item.w_class, max_metal) qdel(attacking_item) @@ -38,17 +38,17 @@ if(istype(attacking_item,/obj/item/disk/integrated_circuit/upgrade/advanced)) if(upgraded) - to_chat(user, "\The [src] already has this upgrade. ") + to_chat(user, SPAN_WARNING("\The [src] already has this upgrade. ")) return TRUE - to_chat(user, "You install \the [attacking_item] into \the [src]. ") + to_chat(user, SPAN_NOTICE("You install \the [attacking_item] into \the [src]. ")) upgraded = TRUE return TRUE if(istype(attacking_item,/obj/item/disk/integrated_circuit/upgrade/clone)) if(can_clone) - to_chat(user, "\The [src] already has this upgrade. ") + to_chat(user, SPAN_WARNING("\The [src] already has this upgrade. ")) return TRUE - to_chat(user, "You install \the [attacking_item] into \the [src]. ") + to_chat(user, SPAN_NOTICE("You install \the [attacking_item] into \the [src]. ")) can_clone = TRUE return TRUE diff --git a/code/modules/integrated_electronics/core/special_pins/char_pin.dm b/code/modules/integrated_electronics/core/special_pins/char_pin.dm index 8f919d9117c..d20eb38f56e 100644 --- a/code/modules/integrated_electronics/core/special_pins/char_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/char_pin.dm @@ -5,7 +5,7 @@ /datum/integrated_io/char/ask_for_pin_data(mob/user) var/new_data = sanitize(input("Please type in one character.","[src] char writing") as null|text) if(holder.check_interactivity(user) ) - to_chat(user, "You input [new_data ? "'[new_data]'" : "NULL"] into the pin.") + to_chat(user, SPAN_NOTICE("You input [new_data ? "'[new_data]'" : "NULL"] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/char/write_data_to_pin(var/new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/color_pin.dm b/code/modules/integrated_electronics/core/special_pins/color_pin.dm index 47460cfd16e..c5fe37ffe51 100644 --- a/code/modules/integrated_electronics/core/special_pins/color_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/color_pin.dm @@ -5,7 +5,7 @@ /datum/integrated_io/color/ask_for_pin_data(mob/user) var/new_data = input("Please select a color.","[src] color writing") as null|color if(holder.check_interactivity(user) ) - to_chat(user, "You input a new color into the pin.") + to_chat(user, SPAN_NOTICE("You input a new color into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/color/write_data_to_pin(new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm index 7526d5fdd7d..25a6c5c7c31 100644 --- a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm @@ -16,7 +16,7 @@ Up = [UP],\n\ Down = [DOWN]","[src] dir writing") as null|num if(isnum(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, SPAN_NOTICE("You input [new_data] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/dir/write_data_to_pin(var/new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm index c4f9f67a145..db15f6155f1 100644 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm @@ -47,7 +47,7 @@ /datum/integrated_io/list/proc/remove_from_list_by_position(mob/user, position) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to remove.") + to_chat(user, SPAN_WARNING("The list is empty, there's nothing to remove.")) return if(!position) return @@ -60,7 +60,7 @@ /datum/integrated_io/list/proc/remove_from_list(mob/user, target_entry) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to remove.") + to_chat(user, SPAN_WARNING("The list is empty, there's nothing to remove.")) return if(!target_entry) target_entry = input("Which piece of data do you want to remove?", "Remove") as null|anything in my_list @@ -70,7 +70,7 @@ /datum/integrated_io/list/proc/edit_in_list(mob/user, target_entry) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to modify.") + to_chat(user, SPAN_WARNING("The list is empty, there's nothing to modify.")) return if(!target_entry) target_entry = input("Which piece of data do you want to edit?", "Edit") as null|anything in my_list @@ -83,7 +83,7 @@ /datum/integrated_io/list/proc/edit_in_list_by_position(mob/user, var/position) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to modify.") + to_chat(user, SPAN_WARNING("The list is empty, there's nothing to modify.")) return if(!position) return @@ -98,7 +98,7 @@ /datum/integrated_io/list/proc/swap_inside_list(mob/user, var/first_target, var/second_target) var/list/my_list = data if(my_list.len <= 1) - to_chat(user, "The list is empty, or too small to do any meaningful swapping.") + to_chat(user, SPAN_WARNING("The list is empty, or too small to do any meaningful swapping.")) return if(!first_target) first_target = input("Which piece of data do you want to swap? (1)", "Swap") as null|anything in my_list diff --git a/code/modules/integrated_electronics/core/special_pins/number_pin.dm b/code/modules/integrated_electronics/core/special_pins/number_pin.dm index e864c3c7891..49feea1d36b 100644 --- a/code/modules/integrated_electronics/core/special_pins/number_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/number_pin.dm @@ -5,7 +5,7 @@ /datum/integrated_io/number/ask_for_pin_data(mob/user) var/new_data = input("Please type in a number.","[src] number writing") as null|num if(isnum(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, SPAN_NOTICE("You input [new_data] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/number/write_data_to_pin(var/new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/string_pin.dm b/code/modules/integrated_electronics/core/special_pins/string_pin.dm index c364347669a..8b1320469b5 100644 --- a/code/modules/integrated_electronics/core/special_pins/string_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/string_pin.dm @@ -5,7 +5,7 @@ /datum/integrated_io/string/ask_for_pin_data(mob/user) var/new_data = sanitize(input("Please type in a string.","[src] string writing") as null|text, MAX_MESSAGE_LEN, 1, 0, 1) if(holder.check_interactivity(user) ) - to_chat(user, "You input [new_data ? "new_data" : "NULL"] into the pin.") + to_chat(user, SPAN_NOTICE("You input [new_data ? "new_data" : "NULL"] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/string/write_data_to_pin(var/new_data) diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index 46ed80f67a2..98075c587ff 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -21,31 +21,32 @@ /obj/item/device/integrated_electronics/wirer/proc/wire(var/datum/integrated_io/io, mob/user) if(!io.holder.assembly) - to_chat(user, "\The [io.holder] needs to be secured inside an assembly first.") + to_chat(user, SPAN_WARNING("\The [io.holder] needs to be secured inside an assembly first.")) return switch (mode) if (WIRE) selected_io = io - to_chat(user, "You attach a data wire to \the [selected_io.holder]'s [selected_io.name] data channel.") + to_chat(user, SPAN_NOTICE("You attach a data wire to \the [selected_io.holder]'s [selected_io.name] data channel.")) mode = WIRING update_icon() if (WIRING) if(io == selected_io) - to_chat(user, "Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.") + to_chat(user, SPAN_WARNING("Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.")) return if(io.io_type != selected_io.io_type) - to_chat(user, "Those two types of channels are incompatable. The first is a [selected_io.io_type], \ - while the second is a [io.io_type].") + to_chat(user, SPAN_WARNING("Those two types of channels are incompatable. The first is a [selected_io.io_type], \ + while the second is a [io.io_type].")) + return if(io.holder.assembly && io.holder.assembly != selected_io.holder.assembly) - to_chat(user, "Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.") + to_chat(user, SPAN_WARNING("Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.")) return selected_io.linked |= io io.linked |= selected_io - to_chat(user, "You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].") + to_chat(user, SPAN_NOTICE("You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].")) mode = WIRE update_icon() selected_io.holder.interact(user) // This is to update the UI. @@ -54,17 +55,18 @@ if (UNWIRE) selected_io = io if(!io.linked.len) - to_chat(user, "There is nothing connected to \the [selected_io] data channel.") + to_chat(user, SPAN_WARNING("There is nothing connected to \the [selected_io] data channel.")) selected_io = null return - to_chat(user, "You prepare to detach a data wire from \the [selected_io.holder]'s [selected_io.name] data channel.") + to_chat(user, SPAN_NOTICE("You prepare to detach a data wire from \the [selected_io.holder]'s [selected_io.name] data channel.")) mode = UNWIRING update_icon() if (UNWIRING) if(io == selected_io) - to_chat(user, "You can't wire a pin into each other, so unwiring \the [selected_io.holder] from \ - the same pin is rather moot.") + to_chat(user, SPAN_WARNING("You can't wire a pin into each other, so unwiring \the [selected_io.holder] from \ + the same pin is rather moot.")) + return if(selected_io in io.linked) io.linked.Remove(selected_io) @@ -76,8 +78,9 @@ mode = UNWIRE update_icon() else - to_chat(user, "\The [selected_io.holder]'s [selected_io.name] and \the [io.holder]'s \ - [io.name] are not connected.") + to_chat(user, SPAN_WARNING("\The [selected_io.holder]'s [selected_io.name] and \the [io.holder]'s \ + [io.name] are not connected.")) + /obj/item/device/integrated_electronics/wirer/attack_self(mob/user) switch(mode) @@ -85,18 +88,18 @@ mode = UNWIRE if(WIRING) if(selected_io) - to_chat(user, "You decide not to wire the data channel.") + to_chat(user, SPAN_NOTICE("You decide not to wire the data channel.")) selected_io = null mode = WIRE if(UNWIRE) mode = WIRE if(UNWIRING) if(selected_io) - to_chat(user, "You decide not to disconnect the data channel.") + to_chat(user, SPAN_NOTICE("You decide not to disconnect the data channel.")) selected_io = null mode = UNWIRE update_icon() - to_chat(user, "You set \the [src] to [mode].") + to_chat(user, SPAN_NOTICE("You set \the [src] to [mode].")) #undef WIRE #undef WIRING @@ -127,25 +130,25 @@ new_data = sanitize(input("Now type in a string.","[src] string writing") as null|text, MAX_MESSAGE_LEN, 1, 0, 1) if(istext(new_data) && CanInteract(user, GLOB.physical_state)) data_to_write = new_data - to_chat(user, "You set \the [src]'s memory to \"[new_data]\".") + to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to \"[new_data]\".")) if("number") accepting_refs = 0 new_data = input("Now type in a number.","[src] number writing") as null|num if(isnum(new_data) && CanInteract(user, GLOB.physical_state)) data_to_write = new_data - to_chat(user, "You set \the [src]'s memory to [new_data].") + to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to [new_data].")) if("ref") accepting_refs = 1 to_chat(user, "You turn \the [src]'s ref scanner on. Slide it across \ an object for a ref of that object to save it in memory.") if("null") data_to_write = null - to_chat(user, "You set \the [src]'s memory to absolutely nothing.") + to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to absolutely nothing.")) /obj/item/device/integrated_electronics/debugger/afterattack(atom/target, mob/living/user, proximity) if(accepting_refs && proximity) data_to_write = WEAKREF(target) - visible_message("[user] slides [src]'s ref scanner over \the [target].") + visible_message(SPAN_NOTICE("[user] slides [src]'s ref scanner over \the [target].")) to_chat(user, "You set \the [src]'s memory to a reference to [target.name] \[Ref\]. The ref scanner is \ now off.") accepting_refs = 0 @@ -159,10 +162,10 @@ var/datum/weakref/w = data_to_write var/atom/A = w.resolve() data_to_show = A.name - to_chat(user, "You write '[data_to_write ? data_to_show : "NULL"]' to the '[io]' pin of \the [io.holder].") + to_chat(user, SPAN_NOTICE("You write '[data_to_write ? data_to_show : "NULL"]' to the '[io]' pin of \the [io.holder].")) if (PULSE_CHANNEL) io.holder.check_then_do_work(ignore_power = TRUE) - to_chat(user, "You pulse \the [io.holder]'s '[io]' pin.") + to_chat(user, SPAN_NOTICE("You pulse \the [io.holder]'s '[io]' pin.")) io.holder.interact(user) // This is to update the UI. diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 989867c89a2..97f6d9b7287 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -18,7 +18,7 @@ spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH /obj/item/integrated_circuit/input/button/ask_for_input(mob/user) //Bit misleading name for this specific use. - to_chat(user, "You press the button labeled '[src.name]'.") + to_chat(user, SPAN_NOTICE("You press the button labeled '[src.name]'.")) activate_pin(1) /obj/item/integrated_circuit/input/toggle_button @@ -36,7 +36,7 @@ set_pin_data(IC_OUTPUT, 1, !get_pin_data(IC_OUTPUT, 1)) push_data() activate_pin(1) - to_chat(user, "You toggle the button labeled '[src.name]' [get_pin_data(IC_OUTPUT, 1) ? "on" : "off"].") + to_chat(user, SPAN_NOTICE("You toggle the button labeled '[src.name]' [get_pin_data(IC_OUTPUT, 1) ? "on" : "off"].")) /obj/item/integrated_circuit/input/numberpad name = "number pad" @@ -1022,7 +1022,7 @@ user.drop_from_inventory(A) set_pin_data(IC_OUTPUT, 1, A) push_data() - to_chat(user, "You let [assembly] scan [A].") + to_chat(user, SPAN_NOTICE("You let [assembly] scan [A].")) activate_pin(1) return TRUE diff --git a/code/modules/integrated_electronics/subtypes/insert_slot.dm b/code/modules/integrated_electronics/subtypes/insert_slot.dm index 21530d97e9a..463288e180d 100644 --- a/code/modules/integrated_electronics/subtypes/insert_slot.dm +++ b/code/modules/integrated_electronics/subtypes/insert_slot.dm @@ -29,7 +29,7 @@ /obj/item/integrated_circuit/insert_slot/do_work() for(var/obj/item/O in items_contained) O.forceMove(get_turf(src)) - visible_message("\The [src] drops [O] on the ground.") + visible_message(SPAN_NOTICE("\The [src] drops [O] on the ground.")) items_contained -= O set_pin_data(IC_OUTPUT, 1, FALSE) push_data() @@ -38,11 +38,11 @@ /obj/item/integrated_circuit/insert_slot/proc/insert(var/obj/item/O, var/mob/user) if(is_type_in_list(O, allowed_types)) if(items_contained.len >= capacity) - to_chat(user, "\The [src] is too full to add [O].") + to_chat(user, SPAN_WARNING("\The [src] is too full to add [O].")) return FALSE items_contained += O user.drop_from_inventory(O,src) - to_chat(user, "You add [O] to \the [src].") + to_chat(user, SPAN_NOTICE("You add [O] to \the [src].")) set_pin_data(IC_OUTPUT, 1, TRUE) return TRUE diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 3e7d005f904..243e1e7b338 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -32,12 +32,12 @@ if(istype(attacking_item, /obj/item/gun)) var/obj/item/gun/gun = attacking_item if(installed_gun) - to_chat(user, "There's already a weapon installed.") + to_chat(user, SPAN_WARNING("There's already a weapon installed.")) return user.drop_from_inventory(gun,src) installed_gun = gun size += gun.w_class - to_chat(user, "You slide \the [gun] into the firing mechanism.") + to_chat(user, SPAN_NOTICE("You slide \the [gun] into the firing mechanism.")) playsound(src.loc, /singleton/sound_category/crowbar_sound, 50, 1) else ..() @@ -45,12 +45,12 @@ /obj/item/integrated_circuit/manipulation/weapon_firing/attack_self(var/mob/user) if(installed_gun) installed_gun.forceMove(get_turf(src)) - to_chat(user, "You slide \the [installed_gun] out of the firing mechanism.") + to_chat(user, SPAN_NOTICE("You slide \the [installed_gun] out of the firing mechanism.")) size = initial(size) playsound(loc, /singleton/sound_category/crowbar_sound, 50, 1) installed_gun = null else - to_chat(user, "There's no weapon to remove from the mechanism.") + to_chat(user, SPAN_NOTICE("There's no weapon to remove from the mechanism.")) /obj/item/integrated_circuit/manipulation/weapon_firing/do_work() if(!installed_gun) @@ -142,9 +142,9 @@ var/obj/item/grenade/G = attacking_item if(istype(G)) if(attached_grenade) - to_chat(user, "There is already a grenade attached!") + to_chat(user, SPAN_WARNING("There is already a grenade attached!")) else if(user.unEquip(G, force=1)) - user.visible_message("\The [user] attaches \a [G] to \the [src]!", "You attach \the [G] to \the [src].") + user.visible_message(SPAN_WARNING("\The [user] attaches \a [G] to \the [src]!"), SPAN_NOTICE("You attach \the [G] to \the [src].")) attach_grenade(G) G.forceMove(src) else @@ -152,7 +152,7 @@ /obj/item/integrated_circuit/manipulation/grenade/attack_self(var/mob/user) if(attached_grenade) - user.visible_message("\The [user] removes \an [attached_grenade] from \the [src]!", "You remove \the [attached_grenade] from \the [src].") + user.visible_message(SPAN_WARNING("\The [user] removes \an [attached_grenade] from \the [src]!"), SPAN_NOTICE("You remove \the [attached_grenade] from \the [src].")) user.put_in_any_hand_if_possible(attached_grenade) || attached_grenade.dropInto(loc) detach_grenade() else @@ -336,10 +336,10 @@ if(!T.Adjacent(M)) return //Can't reach if(shocktime + (5 SECONDS) > world.time) - to_chat(M, "You feel a light tingle from [src]. Luckily it was charging!") + to_chat(M, SPAN_DANGER("You feel a light tingle from [src]. Luckily it was charging!")) return else - to_chat(M, "You feel a sharp shock from the [src]!") + to_chat(M, SPAN_DANGER("You feel a sharp shock from the [src]!")) spark(get_turf(M), 3, 1) M.stun_effect_act(0, Clamp(get_pin_data(IC_INPUT, 2),0,20), null) shocktime = world.time diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm index 086505bf726..070bd3fea58 100644 --- a/code/modules/integrated_electronics/subtypes/memory.dm +++ b/code/modules/integrated_electronics/subtypes/memory.dm @@ -101,26 +101,26 @@ new_data = sanitize(input("Now type in a string.","[src] string writing") as null|text, MAX_MESSAGE_LEN, 1, 0, 1) if(istext(new_data) && CanInteract(user, GLOB.physical_state)) data = new_data - to_chat(user, "You set \the [src]'s memory to [O.display_data(data)].") + to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to [O.display_data(data)].")) if("number") accepting_refs = 0 new_data = input("Now type in a number.","[src] number writing") as null|num if(isnum(new_data) && CanInteract(user, GLOB.physical_state)) data = new_data - to_chat(user, "You set \the [src]'s memory to [O.display_data(data)].") + to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to [O.display_data(data)].")) if("ref") accepting_refs = 1 to_chat(user, "You turn \the [src]'s ref scanner on. Slide it across \ an object for a ref of that object to save it in memory.") if("null") data = null - to_chat(user, "You set \the [src]'s memory to absolutely nothing.") + to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to absolutely nothing.")) /obj/item/integrated_circuit/memory/constant/afterattack(atom/target, mob/living/user, proximity) if(accepting_refs && proximity) var/datum/integrated_io/O = outputs[1] data = WEAKREF(target) - visible_message("[user] slides [src]'s ref scanner over \the [target].") + visible_message(SPAN_NOTICE("[user] slides [src]'s ref scanner over \the [target].")) to_chat(user, "You set \the [src]'s memory to a reference to [O.display_data(data)]. The ref scanner is \ now off.") accepting_refs = 0 diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index a84dedc7518..fa0dff0c3ec 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -44,7 +44,7 @@ var/list/nearby_things = range(0, get_turf(src)) for(var/mob/M in nearby_things) var/obj/O = assembly ? assembly : src - to_chat(M, "[icon2html(O, viewers(get_turf(src)))] [stuff_to_display]") + to_chat(M, SPAN_NOTICE("[icon2html(O, viewers(get_turf(src)))] [stuff_to_display]")) /obj/item/integrated_circuit/output/screen/large name = "large screen" @@ -55,7 +55,7 @@ /obj/item/integrated_circuit/output/screen/large/do_work() ..() var/obj/O = assembly ? loc : assembly - O.visible_message("[icon2html(O, viewers(get_turf(src)))] [stuff_to_display]") + O.visible_message(SPAN_NOTICE("[icon2html(O, viewers(get_turf(src)))] [stuff_to_display]")) /obj/item/integrated_circuit/output/light name = "light" @@ -399,12 +399,12 @@ stuff_to_print = copytext(stuff_to_print, MAX_PAPER_MESSAGE_LEN) if(stuff_to_print || eject) paper_sheet = paper_source.get_item(TRUE) - audible_message("\The [src] buzzes and spits out a sheet of paper.") + audible_message(SPAN_NOTICE("\The [src] buzzes and spits out a sheet of paper.")) paper_sheet.forceMove(get_turf(src)) if(using_tray) paper_sheet = paper_source.get_item(FALSE) if(!paper_sheet) - audible_message("\The [src] beeps, out of paper.") + audible_message(SPAN_NOTICE("\The [src] beeps, out of paper.")) return else - audible_message("\The [src] beeps, out of paper.") + audible_message(SPAN_NOTICE("\The [src] beeps, out of paper.")) diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm index 73209d9177a..598248a9838 100644 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ b/code/modules/integrated_electronics/subtypes/power.dm @@ -85,4 +85,4 @@ if(..()) // If the above code succeeds, do this below. if(prob(2)) spark(src, 3) - visible_message("\The [assembly] makes some sparks!") + visible_message(SPAN_WARNING("\The [assembly] makes some sparks!")) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 7dafd09c74f..6afd1d5a06e 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -68,7 +68,7 @@ if(isliving(AM)) var/mob/living/L = AM var/turf/T = get_turf(AM) - T.visible_message("[assembly] is trying to inject [L]!") + T.visible_message(SPAN_WARNING("[assembly] is trying to inject [L]!")) sleep(3 SECONDS) if(!L.can_be_injected_by(src)) activate_pin(3) @@ -76,8 +76,8 @@ var/contained = reagents.get_reagents() var/trans = reagents.trans_to_mob(L, transfer_amount, CHEM_BLOOD) message_admins("[assembly] injected \the [L] with [trans]u of [contained].") - to_chat(AM, "You feel a tiny prick!") - visible_message("[assembly] injects [L]!") + to_chat(AM, SPAN_NOTICE("You feel a tiny prick!")) + visible_message(SPAN_WARNING("[assembly] injects [L]!")) else reagents.trans_to(AM, transfer_amount) else @@ -111,14 +111,14 @@ activate_pin(3) return T.take_blood(src,tramount) - visible_message( "[assembly] takes a blood sample from [target].") + visible_message( SPAN_NOTICE("[assembly] takes a blood sample from [target].")) else activate_pin(3) return else //if not mob if(!target.reagents.total_volume) - visible_message( "[target] is empty.") + visible_message( SPAN_NOTICE("[target] is empty.")) activate_pin(3) return target.reagents.trans_to_obj(src, tramount) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index d28dfe161c1..f5cda17bb76 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -39,12 +39,12 @@ name = ("bookcase ([newname])") else if(attacking_item.iswrench()) attacking_item.play_tool_sound(get_turf(src), 100) - to_chat(user, (anchored ? "You unfasten \the [src] from the floor." : "You secure \the [src] to the floor.")) + to_chat(user, (anchored ? SPAN_NOTICE("You unfasten \the [src] from the floor.") : SPAN_NOTICE("You secure \the [src] to the floor."))) anchored = !anchored else if(attacking_item.isscrewdriver()) - to_chat(user, "You begin dismantling \the [src].") + to_chat(user, SPAN_NOTICE("You begin dismantling \the [src].")) if(attacking_item.use_tool(src, user, 25, volume = 50)) - to_chat(user, "You dismantle \the [src].") + to_chat(user, SPAN_NOTICE("You dismantle \the [src].")) for(var/obj/item/book/b in contents) b.forceMove((get_turf(src))) dismantle() @@ -209,12 +209,12 @@ /obj/item/book/attack_self(var/mob/user as mob) if(carved) if(store) - to_chat(user, "[store] falls out of [title]!") + to_chat(user, SPAN_NOTICE("[store] falls out of [title]!")) store.forceMove(get_turf(src.loc)) store = null return else - to_chat(user, "The pages of [title] have been cut out!") + to_chat(user, SPAN_NOTICE("The pages of [title] have been cut out!")) return if(src.dat) user << browse("Penned by [author]. " + "[dat]", "window=book") @@ -231,13 +231,13 @@ if(attacking_item.w_class < 3) user.drop_from_inventory(attacking_item,src) store = attacking_item - to_chat(user, "You put [attacking_item] in [title].") + to_chat(user, SPAN_NOTICE("You put [attacking_item] in [title].")) return else - to_chat(user, "[attacking_item] won't fit in [title].") + to_chat(user, SPAN_NOTICE("[attacking_item] won't fit in [title].")) return else - to_chat(user, "There's already something in [title]!") + to_chat(user, SPAN_NOTICE("There's already something in [title]!")) return if(attacking_item.ispen()) if(unique) @@ -300,9 +300,9 @@ to_chat(user, "[attacking_item]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") else if(istype(attacking_item, /obj/item/material/knife) || attacking_item.iswirecutter()) if(carved) return - to_chat(user, "You begin to carve out [title].") + to_chat(user, SPAN_NOTICE("You begin to carve out [title].")) if(attacking_item.use_tool(src, user, 30, volume = 50)) - to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") + to_chat(user, SPAN_NOTICE("You carve out the pages from [title]! You didn't want to read it anyway.")) playsound(loc, 'sound/bureaucracy/papercrumple.ogg', 50, 1) new /obj/item/shreddedp(get_turf(src)) carved = 1 @@ -312,8 +312,8 @@ /obj/item/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone) if(target_zone == BP_EYES) - user.visible_message("You open up the book and show it to [M]. ", \ - " [user] opens up a book and shows it to [M]. ") + user.visible_message(SPAN_NOTICE("You open up the book and show it to [M]. "), \ + SPAN_NOTICE(" [user] opens up a book and shows it to [M]. ")) M << browse("Penned by [author]. " + "[dat]", "window=book") user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index ae45c8ea398..9ad5e84cd15 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -153,8 +153,8 @@ dat += "7. Access the Forbidden Lore Vault " if(arcanecheckout) new /obj/item/book/tome(get_turf(src)) - to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.") - user.visible_message("\The [user] stares at the blank screen for a few moments, [user.get_pronoun("his")] expression frozen in fear. When [user.get_pronoun("he")] finally awakens from it, [user.get_pronoun("he")] looks a lot older.", range = 2) + to_chat(user, SPAN_WARNING("Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.")) + user.visible_message(SPAN_NOTICE("\The [user] stares at the blank screen for a few moments, [user.get_pronoun("his")] expression frozen in fear. When [user.get_pronoun("he")] finally awakens from it, [user.get_pronoun("he")] looks a lot older."), range = 2) arcanecheckout = FALSE if(1) // Inventory diff --git a/code/modules/lock/key.dm b/code/modules/lock/key.dm index d0360ce6239..caa82941c2f 100644 --- a/code/modules/lock/key.dm +++ b/code/modules/lock/key.dm @@ -25,7 +25,7 @@ uses-- if(uses <= 0) user.drop_from_inventory(src,user) - to_chat(user, "\The [src] crumbles in your hands!") + to_chat(user, SPAN_WARNING("\The [src] crumbles in your hands!")) qdel(src) return ..() diff --git a/code/modules/lock/lock.dm b/code/modules/lock/lock.dm index 1dee3205dec..a2c45f6e61e 100644 --- a/code/modules/lock/lock.dm +++ b/code/modules/lock/lock.dm @@ -20,22 +20,22 @@ /datum/lock/proc/unlock(var/key = "", var/mob/user) if(status ^ LOCK_LOCKED) - to_chat(user, "Its already unlocked!") + to_chat(user, SPAN_WARNING("Its already unlocked!")) return 2 key = get_key_data(key, user) if(cmptext(lock_data,key) && (status ^ LOCK_BROKEN)) - to_chat(user, "You unlock the lock.") + to_chat(user, SPAN_WARNING("You unlock the lock.")) status &= ~LOCK_LOCKED return 1 return 0 /datum/lock/proc/lock(var/key = "", var/mob/user) if(status & LOCK_LOCKED) - to_chat(user, "Its already locked!") + to_chat(user, SPAN_WARNING("Its already locked!")) return 2 key = get_key_data(key, user) if(cmptext(lock_data,key) && (status ^ LOCK_BROKEN)) - to_chat(user, "You close the lock.") + to_chat(user, SPAN_WARNING("You close the lock.")) status |= LOCK_LOCKED return 1 return 0 @@ -70,14 +70,14 @@ if(!do_after(user, 2 SECONDS, holder)) return 0 if(prob(20*(unlock_power/getComplexity()))) - to_chat(user, "You pick open \the [holder]'s lock!") + to_chat(user, SPAN_NOTICE("You pick open \the [holder]'s lock!")) unlock(lock_data) return 1 else if(prob(5 * unlock_power)) - to_chat(user, "You accidently break \the [holder]'s lock with \the [I]!") + to_chat(user, SPAN_WARNING("You accidently break \the [holder]'s lock with \the [I]!")) status |= LOCK_BROKEN else - to_chat(user, "You fail to pick open \the [holder].") + to_chat(user, SPAN_WARNING("You fail to pick open \the [holder].")) return 0 #undef LOCK_LOCKED diff --git a/code/modules/lock/lock_construct.dm b/code/modules/lock/lock_construct.dm index 0cfc8c11934..92b9a70bc94 100644 --- a/code/modules/lock/lock_construct.dm +++ b/code/modules/lock/lock_construct.dm @@ -16,15 +16,15 @@ if(istype(attacking_item, /obj/item/key)) var/obj/item/key/K = attacking_item if(!K.key_data) - to_chat(user, "You fashion \the [attacking_item] to unlock \the [src]") + to_chat(user, SPAN_NOTICE("You fashion \the [attacking_item] to unlock \the [src]")) K.key_data = lock_data else - to_chat(user, "\The [attacking_item] already unlocks something.") + to_chat(user, SPAN_WARNING("\The [attacking_item] already unlocks something.")) return ..() /obj/item/material/lock_construct/proc/create_lock(var/atom/target, var/mob/user) . = new /datum/lock(target,lock_data) user.drop_from_inventory(src,user) - user.visible_message("\The [user] attaches \the [src] to \the [target].") + user.visible_message(SPAN_NOTICE("\The [user] attaches \the [src] to \the [target].")) qdel(src) diff --git a/code/modules/maps/planet_types/desert.dm b/code/modules/maps/planet_types/desert.dm index 513051a2431..e28ca3cdbdc 100644 --- a/code/modules/maps/planet_types/desert.dm +++ b/code/modules/maps/planet_types/desert.dm @@ -91,30 +91,30 @@ if(user == buckled) delay *=2 user.visible_message( - "\The [user] tries to climb out of \the [src].", - "You begin to pull yourself out of \the [src].", - "You hear water sloushing." + SPAN_NOTICE("\The [user] tries to climb out of \the [src]."), + SPAN_NOTICE("You begin to pull yourself out of \the [src]."), + SPAN_NOTICE("You hear water sloushing.") ) else user.visible_message( - "\The [user] begins pulling \the [buckled] out of \the [src].", - "You begin to pull \the [buckled] out of \the [src].", - "You hear water sloushing." + SPAN_NOTICE("\The [user] begins pulling \the [buckled] out of \the [src]."), + SPAN_NOTICE("You begin to pull \the [buckled] out of \the [src]."), + SPAN_NOTICE("You hear water sloushing.") ) busy = 1 if(do_after(user, delay, src)) busy = 0 if(user == buckled) if(prob(80)) - to_chat(user, "You slip and fail to get out!") + to_chat(user, SPAN_WARNING("You slip and fail to get out!")) return - user.visible_message("\The [buckled] pulls himself out of \the [src].") + user.visible_message(SPAN_NOTICE("\The [buckled] pulls himself out of \the [src].")) else - user.visible_message("\The [buckled] has been freed from \the [src] by \the [user].") + user.visible_message(SPAN_NOTICE("\The [buckled] has been freed from \the [src] by \the [user].")) unbuckle() else busy = 0 - to_chat(user, "You slip and fail to get out!") + to_chat(user, SPAN_WARNING("You slip and fail to get out!")) return /obj/structure/quicksand/unbuckle() @@ -139,7 +139,7 @@ /obj/structure/quicksand/proc/expose() if(exposed) return - visible_message("The upper crust breaks, exposing treacherous quicksands underneath!") + visible_message(SPAN_WARNING("The upper crust breaks, exposing treacherous quicksands underneath!")) name = "quicksand" desc = "There is no candy at the bottom." exposed = 1 diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 237e9f75a16..9300c124fc2 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -41,7 +41,7 @@ var/obj/item/organ/external/affecting = D.get_organ(hit_zone) if(!affecting || affecting.is_stump()) - to_chat(A, "They are missing that limb!") + to_chat(A, SPAN_DANGER("They are missing that limb!")) return 1 switch(D.a_intent) @@ -85,7 +85,7 @@ if(!attack_message) attack.show_attack(A, D, hit_zone, rand_damage) else - D.visible_message("[attack_message]") + D.visible_message(SPAN_DANGER("[attack_message]")) playsound(D.loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) A.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [D.name] ([D.ckey])") diff --git a/code/modules/martial_arts/plasma_fist.dm b/code/modules/martial_arts/plasma_fist.dm index 87c6e231465..535435b4b4d 100644 --- a/code/modules/martial_arts/plasma_fist.dm +++ b/code/modules/martial_arts/plasma_fist.dm @@ -45,20 +45,20 @@ var/mob/living/M = AM M.Weaken(5) M.adjustBruteLoss(5) - to_chat(M, "You're slammed into the floor by a mystical force!") + to_chat(M, SPAN_DANGER("You're slammed into the floor by a mystical force!")) else if(istype(AM, /mob/living)) var/mob/living/M = AM M.Weaken(2) - to_chat(M, "You're thrown back by a mystical force!") + to_chat(M, SPAN_DANGER("You're thrown back by a mystical force!")) AM.throw_at(throwtarget, ((Clamp((5 - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, 5))), 1) log_and_message_admins("used tornado sweep(Plasma Fist)", "[A]") return /datum/martial_art/plasma_fist/proc/Throwback(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - D.visible_message("[A] has hit [D] with plasma punch!", \ - "[A] has hit [D] with plasma punch!") + D.visible_message(SPAN_DANGER("[A] has hit [D] with plasma punch!"), \ + SPAN_DANGER("[A] has hit [D] with plasma punch!")) playsound(D.loc, "punch", 50, 1, -1) var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A))) D.throw_at(throw_target, 200, 4,A) @@ -70,8 +70,8 @@ A.do_attack_animation(D) playsound(D.loc, 'sound/magic/Disintegrate.ogg', 50, 1, -1) A.say("PLASMA FIST!") - D.visible_message("[A] has hit [D] with the plasma fist technique!", \ - "[A] has hit [D] with the plasma fist technique!") + D.visible_message(SPAN_DANGER("[A] has hit [D] with the plasma fist technique!"), \ + SPAN_DANGER("[A] has hit [D] with the plasma fist technique!")) D.gib() log_and_message_admins("[A] gibbed [D] with the plasma fist (Plasma Fist)") return diff --git a/code/modules/martial_arts/skrell.dm b/code/modules/martial_arts/skrell.dm index 74e550fb379..19124f0713c 100644 --- a/code/modules/martial_arts/skrell.dm +++ b/code/modules/martial_arts/skrell.dm @@ -25,7 +25,7 @@ A.do_attack_animation(D) if(D.stat || D.weakened) return 0 - D.visible_message("[A] leg sweeps [D]!") + D.visible_message(SPAN_WARNING("[A] leg sweeps [D]!")) playsound(get_turf(A), /singleton/sound_category/swing_hit_sound, 50, 1, -1) D.apply_damage(5, DAMAGE_BRUTE) D.Weaken(2) @@ -33,7 +33,7 @@ /datum/martial_art/karak_virul/proc/painful_palm(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch A.do_attack_animation(D) - A.visible_message("[A] strikes [D] with their open palm!") + A.visible_message(SPAN_WARNING("[A] strikes [D] with their open palm!")) playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1) var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting)) D.apply_damage(25, DAMAGE_PAIN, affecting) @@ -46,15 +46,15 @@ if(!organ || ORGAN_IS_DISLOCATED(organ) || organ.dislocated == -1) return 0 organ.dislocate(1) - A.visible_message("[A] strikes [D]'s [organ.name] with their closed fist!") - D.visible_message("[D]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") + A.visible_message(SPAN_WARNING("[A] strikes [D]'s [organ.name] with their closed fist!")) + D.visible_message(SPAN_DANGER("[D]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!")) admin_attack_log(A, D, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of") playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1) return 1 else playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1) D.apply_damage(5, DAMAGE_BRUTE) - A.visible_message("[A] strikes [D] with their closed fist!") + A.visible_message(SPAN_WARNING("[A] strikes [D] with their closed fist!")) return 1 /datum/martial_art/karak_virul/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index 166401312f6..f8a2e4d6ed7 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -38,7 +38,7 @@ /datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!D.stat && !D.stunned && !D.weakened) A.do_attack_animation(D) - D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!") + D.visible_message(SPAN_WARNING("[A] grabs [D]'s wrist and wrenches it sideways!")) playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) D.drop_item() D.apply_damage(5, DAMAGE_BRUTE, pick(BP_L_ARM, BP_R_ARM)) @@ -49,7 +49,7 @@ /datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(A.dir == D.dir && !D.stat && !D.weakened) A.do_attack_animation(D) - D.visible_message("[A] kicks [D] in the back!") + D.visible_message(SPAN_WARNING("[A] kicks [D] in the back!")) step_to(D,get_step(D,D.dir),1) D.Weaken(4) playsound(get_turf(D), "punch", 50, 1, -1) @@ -60,8 +60,8 @@ /datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!D.stat && !D.weakened) A.do_attack_animation(D) - D.visible_message("[A] knees [D] in the stomach!", \ - "[A] winds you with a knee in the stomach!") + D.visible_message(SPAN_WARNING("[A] knees [D] in the stomach!"), \ + SPAN_DANGER("[A] winds you with a knee in the stomach!")) D.audible_message("[D] gags!") if (!(D.species.flags & NO_BREATHE)) D.losebreath += 3 @@ -74,8 +74,8 @@ /datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!D.stat && !D.weakened) A.do_attack_animation(D) - D.visible_message("[A] kicks [D] in the head!", \ - "[A] kicks you in the jaw!") + D.visible_message(SPAN_WARNING("[A] kicks [D] in the head!"), \ + SPAN_DANGER("[A] kicks you in the jaw!")) D.apply_damage(20, DAMAGE_BRUTE, BP_HEAD) D.drop_item() playsound(get_turf(D), "punch", 50, 1, -1) @@ -87,7 +87,7 @@ /datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(D.weakened || D.resting || D.stat) A.do_attack_animation(D) - D.visible_message("[A] elbow drops [D]!") + D.visible_message(SPAN_DANGER("[A] elbow drops [D]!")) if(D.shock_stage >= 60) D.death() //FINISH HIM! D.apply_damage(50, DAMAGE_BRUTE, BP_CHEST) diff --git a/code/modules/martial_arts/sol_combat.dm b/code/modules/martial_arts/sol_combat.dm index 8d731987462..acef8b010a4 100644 --- a/code/modules/martial_arts/sol_combat.dm +++ b/code/modules/martial_arts/sol_combat.dm @@ -41,16 +41,16 @@ var/mob/living/M = AM if(M.stat || M.incapacitated() || distfromcaster == 0) D.apply_damage(25, DAMAGE_BRUTE) - A.visible_message("[A] hits [M] with a powerful kick!") + A.visible_message(SPAN_DANGER("[A] hits [M] with a powerful kick!")) else A.spin(10,1) M.Weaken(3) - A.visible_message(M, "[A] swiftly leg sweeps [M]!") + A.visible_message(M, SPAN_DANGER("[A] swiftly leg sweeps [M]!")) AM.throw_at(sweeptarget, ((Clamp((1 - (Clamp(distfromcaster - 2, 0, distfromcaster))), 1, 1))), 1) /datum/martial_art/sol_combat/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch A.do_attack_animation(D) - A.visible_message("[A] pounds [D] on the chest!") + A.visible_message(SPAN_WARNING("[A] pounds [D] on the chest!")) playsound(get_turf(A), "punch", 50, 1, -1) if(!(D.species.flags & NO_BREATHE)) D.losebreath += 5 @@ -59,7 +59,7 @@ /datum/martial_art/sol_combat/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) A.do_attack_animation(D) - A.visible_message("[A] karate chops [D]'s neck!") + A.visible_message(SPAN_WARNING("[A] karate chops [D]'s neck!")) playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1) D.apply_damage(5, DAMAGE_BRUTE) D.silent += 30 @@ -87,7 +87,7 @@ else playsound(get_turf(D), /singleton/sound_category/punch_sound, 50, 1, -1) - A.visible_message("[A] [picked_hit_type] [D]!") + A.visible_message(SPAN_DANGER("[A] [picked_hit_type] [D]!")) A.attack_log += text("\[[time_stamp()]\] ["[picked_hit_type]"] [D.name] ([D.ckey])") D.attack_log += text("\[[time_stamp()]\] ["Has Been [picked_hit_type]"] by [A.name] ([A.ckey])") msg_admin_attack("[key_name(A)] ["has [picked_hit_type]"] [key_name(D)] (JMP)",ckey=key_name(A),ckey_target=key_name(D)) @@ -107,12 +107,12 @@ if(prob(60)) var/obj/item/I = D.get_active_hand() if(I) - A.visible_message("[A] has disarmed [D]!") + A.visible_message(SPAN_DANGER("[A] has disarmed [D]!")) playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) D.drop_from_inventory(I) A.put_in_hands(I) else - A.visible_message("[A] attempted to disarm [D]!") + A.visible_message(SPAN_DANGER("[A] attempted to disarm [D]!")) playsound(D, /singleton/sound_category/punchmiss_sound, 25, 1, -1) return 1 diff --git a/code/modules/martial_arts/tajara.dm b/code/modules/martial_arts/tajara.dm index e9bbbfa1ce0..50a276879de 100644 --- a/code/modules/martial_arts/tajara.dm +++ b/code/modules/martial_arts/tajara.dm @@ -34,7 +34,7 @@ if(!istype(affecting) || affecting.is_stump()) return 0 - D.visible_message("[A] rakes their claws against [D]'s [affecting.name]!") + D.visible_message(SPAN_DANGER("[A] rakes their claws against [D]'s [affecting.name]!")) for(var/obj/item/protection in list(D.head, D.wear_mask, D.glasses)) if(protection && (protection.body_parts_covered & EYES)) @@ -54,7 +54,7 @@ /datum/martial_art/baghrar/proc/claw_punch(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch A.do_attack_animation(D) - A.visible_message("[A] lunges forwards and strikes [D] with their claws!") + A.visible_message(SPAN_DANGER("[A] lunges forwards and strikes [D] with their claws!")) playsound(get_turf(A), 'sound/weapons/slice.ogg', 50, 1, -1) var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting)) D.apply_damage(20, DAMAGE_BRUTE, affecting, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE) @@ -67,7 +67,7 @@ return 0 A.do_attack_animation(D) var/obj/item/organ/external/organ = D.get_organ(A.zone_sel.selecting) - A.visible_message("[A] stabs [D]'s [organ.name] with their claws!") + A.visible_message(SPAN_DANGER("[A] stabs [D]'s [organ.name] with their claws!")) D.apply_damage(organ.brute_dam, DAMAGE_BRUTE, organ, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE) return 1 diff --git a/code/modules/martial_arts/unathi.dm b/code/modules/martial_arts/unathi.dm index 53b8668ee8a..d4a8e16b128 100644 --- a/code/modules/martial_arts/unathi.dm +++ b/code/modules/martial_arts/unathi.dm @@ -31,7 +31,7 @@ var/obj/item/grab/G = A.get_active_hand() if(G && prob(50)) G.state = GRAB_AGGRESSIVE - D.visible_message("[A] gets a strong grip on [D]!") + D.visible_message(SPAN_DANGER("[A] gets a strong grip on [D]!")) return 1 /datum/martial_art/kis_khan/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) @@ -54,7 +54,7 @@ if(!isunathi(A)) return 0 TornadoAnimate(A) - A.visible_message("[A] sweeps [D] with their tail!") + A.visible_message(SPAN_WARNING("[A] sweeps [D] with their tail!")) playsound(get_turf(A), /singleton/sound_category/swing_hit_sound, 50, 1, -1) D.apply_damage(5, DAMAGE_BRUTE) D.Weaken(2) @@ -73,16 +73,16 @@ var/obj/item/I = D.r_hand D.drop_item() A.put_in_hands(I) - D.visible_message("[A] has disarmed [D]!") + D.visible_message(SPAN_DANGER("[A] has disarmed [D]!")) playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) else - D.visible_message("[A] attempted to disarm [D]!") + D.visible_message(SPAN_DANGER("[A] attempted to disarm [D]!")) playsound(D, /singleton/sound_category/punchmiss_sound, 25, 1, -1) return 1 /datum/martial_art/kis_khan/proc/hammering_strike(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) A.do_attack_animation(D) - A.visible_message("[A] slams [D] away!") + A.visible_message(SPAN_DANGER("[A] slams [D] away!")) playsound(D.loc, "punch", 50, 1, -1) D.apply_effect(2, WEAKEN) var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A))) diff --git a/code/modules/martial_arts/vaurca.dm b/code/modules/martial_arts/vaurca.dm index b7a428e5ab8..372180542aa 100644 --- a/code/modules/martial_arts/vaurca.dm +++ b/code/modules/martial_arts/vaurca.dm @@ -47,8 +47,8 @@ return 0 A.do_attack_animation(D) var/atk_verb = pick("slices", "pinches", "chops", "bites", "claws") - D.visible_message("[A] [atk_verb] [D]!", \ - "[A] [atk_verb] you!") + D.visible_message(SPAN_DANGER("[A] [atk_verb] [D]!"), \ + SPAN_DANGER("[A] [atk_verb] you!")) D.apply_damage(rand(5,15), DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP) playsound(get_turf(D), 'sound/weapons/slash.ogg', 25, 1, -1) @@ -73,7 +73,7 @@ if(istype(A.get_active_hand(),/obj/item/grab)) var/obj/item/grab/G = A.get_active_hand() if(G && G.affecting == D) - A.visible_message("[A] crushes [D] with its mandibles!") + A.visible_message(SPAN_WARNING("[A] crushes [D] with its mandibles!")) D.apply_damage(30, DAMAGE_BRUTE) D.apply_effect(6, WEAKEN) qdel(G) diff --git a/code/modules/martial_arts/wrestling.dm b/code/modules/martial_arts/wrestling.dm index 28da5e4d73a..8aab408760e 100644 --- a/code/modules/martial_arts/wrestling.dm +++ b/code/modules/martial_arts/wrestling.dm @@ -12,15 +12,15 @@ var/obj/item/grab/G = A.get_active_hand() if(G && prob(50)) G.state = GRAB_AGGRESSIVE - D.visible_message("[A] has [D] in a clinch!") + D.visible_message(SPAN_DANGER("[A] has [D] in a clinch!")) else - D.visible_message("[A] fails to get [D] in a clinch!") + D.visible_message(SPAN_DANGER("[A] fails to get [D] in a clinch!")) return 1 /datum/martial_art/wrestling/proc/Suplex(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - D.visible_message("[A] suplexes [D]!") + D.visible_message(SPAN_DANGER("[A] suplexes [D]!")) D.forceMove(A.loc) D.apply_damage(30, DAMAGE_BRUTE) D.apply_effect(6, WEAKEN) @@ -44,7 +44,7 @@ /datum/martial_art/wrestling/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) D.grabbedby(A,1) - D.visible_message("[A] holds [D] down!") + D.visible_message(SPAN_DANGER("[A] holds [D] down!")) var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting)) D.apply_damage(40, DAMAGE_PAIN, affecting) return 1 diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index d534f04c29f..5b6eb712617 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -452,10 +452,10 @@ /obj/item/stack/material/cloth/attackby(obj/item/attacking_item, mob/user) if(is_sharp(attacking_item)) - user.visible_message("\The [user] begins cutting up [src] with [attacking_item].", - "You begin cutting up [src] with [attacking_item].") + user.visible_message(SPAN_NOTICE("\The [user] begins cutting up [src] with [attacking_item]."), + SPAN_NOTICE("You begin cutting up [src] with [attacking_item].")) if(attacking_item.use_tool(src, user, 20, volume = 50)) // takes less time than bedsheets, a second per rag produced on average - to_chat(user, "You cut [src] into pieces!") + to_chat(user, SPAN_NOTICE("You cut [src] into pieces!")) for(var/i in 1 to rand(1,3)) // average of 2 per new /obj/item/reagent_containers/glass/rag(get_turf(src)) use(1) diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index be99fdd24b2..81f6f87ae84 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -119,29 +119,29 @@ /material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) if(!rod_product) - to_chat(user, "You cannot make anything out of \the [target_stack]") + to_chat(user, SPAN_WARNING("You cannot make anything out of \the [target_stack]")) return if(used_stack.get_amount() < 1 || target_stack.get_amount() < 1) - to_chat(user, "You need one rod and one sheet of [display_name] to make anything useful.") + to_chat(user, SPAN_WARNING("You need one rod and one sheet of [display_name] to make anything useful.")) return used_stack.use(1) target_stack.use(1) - to_chat(user, "You attach a rod to the [display_name].") + to_chat(user, SPAN_NOTICE("You attach a rod to the [display_name].")) var/obj/item/stack/S = new rod_product(get_turf(user)) S.add_fingerprint(user) S.add_to_stacks(user) /material/proc/build_wired_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) if(!wire_product) - to_chat(user, "You cannot make anything out of \the [target_stack]") + to_chat(user, SPAN_WARNING("You cannot make anything out of \the [target_stack]")) return if(used_stack.get_amount() < 5 || target_stack.get_amount() < 1) - to_chat(user, "You need five wires and one sheet of [display_name] to make anything useful.") + to_chat(user, SPAN_WARNING("You need five wires and one sheet of [display_name] to make anything useful.")) return used_stack.use(5) target_stack.use(1) - to_chat(user, "You attach wires to the [display_name].") + to_chat(user, SPAN_NOTICE("You attach wires to the [display_name].")) var/obj/item/product = new wire_product(get_turf(user)) if(!(user.l_hand && user.r_hand)) user.put_in_hands(product) @@ -520,12 +520,12 @@ return 0 if(!user.IsAdvancedToolUser()) - to_chat(user, "This task is too complex for your clumsy hands.") + to_chat(user, SPAN_WARNING("This task is too complex for your clumsy hands.")) return 1 var/turf/T = user.loc if(!istype(T)) - to_chat(user, "You must be standing on open flooring to build a window.") + to_chat(user, SPAN_WARNING("You must be standing on open flooring to build a window.")) return 1 var/title = "Sheet-[used_stack.name] ([used_stack.get_amount()] sheet\s left)" @@ -558,13 +558,13 @@ failed_to_build = 1 if(!failed_to_build && choice == "Windoor") if(!is_reinforced()) - to_chat(user, "This material is not reinforced enough to use for a door.") + to_chat(user, SPAN_WARNING("This material is not reinforced enough to use for a door.")) return for(var/obj/obstacle in T) if((obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && obstacle.dir == user.dir) failed_to_build = 1 if(failed_to_build) - to_chat(user, "There is no room in this location.") + to_chat(user, SPAN_WARNING("There is no room in this location.")) return 1 var/build_path = /obj/structure/windoor_assembly @@ -575,7 +575,7 @@ build_path = created_window if(used_stack.get_amount() < sheets_needed) - to_chat(user, "You need at least [sheets_needed] sheets to build this.") + to_chat(user, SPAN_WARNING("You need at least [sheets_needed] sheets to build this.")) return 1 // Build the structure and update sheet count etc. diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm index d0d24a8d5ca..36661aca96d 100644 --- a/code/modules/mob/abstract/new_player/menu.dm +++ b/code/modules/mob/abstract/new_player/menu.dm @@ -296,7 +296,7 @@ /mob/abstract/new_player/proc/join_game(href, href_list) if(SSticker.current_state <= GAME_STATE_SETTING_UP || SSticker.current_state >= GAME_STATE_FINISHED) - to_chat(usr, "The round is either not ready, or has already finished...") + to_chat(usr, SPAN_WARNING("The round is either not ready, or has already finished...")) return LateChoices() //show the latejoin job selection menu @@ -323,10 +323,10 @@ close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") in GLOB.landmarks_list if(istype(O)) - to_chat(src, "Now teleporting.") + to_chat(src, SPAN_NOTICE("Now teleporting.")) observer.forceMove(O.loc) else - to_chat(src, "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.") + to_chat(src, SPAN_DANGER("Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.")) observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. announce_ghost_joinleave(src) diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index e213a90ca48..9430d45ddcc 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -118,7 +118,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) if(href_list["late_join"]) if(SSticker.current_state != GAME_STATE_PLAYING) - to_chat(usr, "The round is either not ready, or has already finished...") + to_chat(usr, SPAN_WARNING("The round is either not ready, or has already finished...")) return // Cannot join without a saved character, if we're on SQL saves. @@ -129,11 +129,11 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) if(!check_rights(R_ADMIN, 0)) var/datum/species/S = GLOB.all_species[client.prefs.species] if((S.spawn_flags & IS_WHITELISTED) && !is_alien_whitelisted(src, client.prefs.species) && GLOB.config.usealienwhitelist) - to_chat(usr, "You are currently not whitelisted to play [client.prefs.species].") + to_chat(usr, SPAN_DANGER("You are currently not whitelisted to play [client.prefs.species].")) return 0 if(!(S.spawn_flags & CAN_JOIN)) - to_chat(usr, "Your current species, [client.prefs.species], is not available for play on the station.") + to_chat(usr, SPAN_DANGER("Your current species, [client.prefs.species], is not available for play on the station.")) return 0 LateChoices() @@ -150,10 +150,10 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) if(href_list["SelectedJob"]) if(!GLOB.config.enter_allowed) - to_chat(usr, "There is an administrative lock on entering the game!") + to_chat(usr, SPAN_NOTICE("There is an administrative lock on entering the game!")) return else if(SSticker.mode && SSticker.mode.explosion_in_progress) - to_chat(usr, "The station is currently exploding. Joining would go poorly.") + to_chat(usr, SPAN_DANGER("The station is currently exploding. Joining would go poorly.")) return if(client.unacked_warning_count > 0) @@ -162,11 +162,11 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) var/datum/species/S = GLOB.all_species[client.prefs.species] if((S.spawn_flags & IS_WHITELISTED) && !is_alien_whitelisted(src, client.prefs.species) && GLOB.config.usealienwhitelist) - to_chat(usr, "You are currently not whitelisted to play [client.prefs.species].") + to_chat(usr, SPAN_DANGER("You are currently not whitelisted to play [client.prefs.species].")) return 0 if(!(S.spawn_flags & CAN_JOIN)) - to_chat(usr, "Your current species, [client.prefs.species], is not available for play on the station.") + to_chat(usr, SPAN_DANGER("Your current species, [client.prefs.species], is not available for play on the station.")) return 0 AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint) @@ -271,16 +271,16 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) if(src != usr) return 0 if(SSticker.current_state != GAME_STATE_PLAYING) - to_chat(usr, "The round is either not ready, or has already finished...") + to_chat(usr, SPAN_WARNING("The round is either not ready, or has already finished...")) return 0 if(!GLOB.config.enter_allowed) - to_chat(usr, "There is an administrative lock on entering the game!") + to_chat(usr, SPAN_NOTICE("There is an administrative lock on entering the game!")) return 0 if(GLOB.config.sql_saves && !client.prefs.current_character) alert(usr, "You have not saved your character yet. Please do so before attempting to join.") return 0 if(!IsJobAvailable(rank)) - to_chat(usr, "[rank] is not available. Please try another.") + to_chat(usr, SPAN_NOTICE("[rank] is not available. Please try another.")) return 0 if(!(spawning_at in SSatlas.current_map.allowed_spawns)) to_chat(usr, SPAN_NOTICE("Spawn location [spawning_at] invalid for [SSatlas.current_map]. Defaulting to [SSatlas.current_map.default_spawn].")) diff --git a/code/modules/mob/abstract/new_player/poll.dm b/code/modules/mob/abstract/new_player/poll.dm index 5e32666607e..0dfd69feb15 100644 --- a/code/modules/mob/abstract/new_player/poll.dm +++ b/code/modules/mob/abstract/new_player/poll.dm @@ -70,7 +70,7 @@ break if(!found) - to_chat(usr, "Poll question details not found.") + to_chat(usr, SPAN_WARNING("Poll question details not found.")) return switch(polltype) @@ -343,7 +343,7 @@ break if(!validpoll) - to_chat(usr, "Poll is not valid.") + to_chat(usr, SPAN_WARNING("Poll is not valid.")) return var/DBQuery/select_query2 = GLOB.dbcon.NewQuery("SELECT id FROM ss13_poll_option WHERE id = [optionid] AND pollid = [pollid]") @@ -356,7 +356,7 @@ break if(!validoption) - to_chat(usr, "Poll option is not valid.") + to_chat(usr, SPAN_WARNING("Poll option is not valid.")) return var/alreadyvoted = 0 @@ -370,11 +370,11 @@ break if(!multichoice && alreadyvoted) - to_chat(usr, "You already voted in this poll.") + to_chat(usr, SPAN_WARNING("You already voted in this poll.")) return if(multichoice && (alreadyvoted >= multiplechoiceoptions)) - to_chat(usr, "You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.") + to_chat(usr, SPAN_WARNING("You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.")) return var/adminrank = "Player" @@ -385,7 +385,7 @@ var/DBQuery/insert_query = GLOB.dbcon.NewQuery("INSERT INTO ss13_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')") insert_query.Execute() - to_chat(usr, "Vote successful.") + to_chat(usr, SPAN_NOTICE("Vote successful.")) usr << browse(null,"window=playerpoll") @@ -409,7 +409,7 @@ break if(!validpoll) - to_chat(usr, "Poll is not valid.") + to_chat(usr, SPAN_WARNING("Poll is not valid.")) return var/alreadyvoted = 0 @@ -422,7 +422,7 @@ break if(alreadyvoted) - to_chat(usr, "You already sent your feedback for this poll.") + to_chat(usr, SPAN_WARNING("You already sent your feedback for this poll.")) return var/adminrank = "Player" @@ -442,7 +442,7 @@ var/DBQuery/insert_query = GLOB.dbcon.NewQuery("INSERT INTO ss13_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')") insert_query.Execute() - to_chat(usr, "Feedback logging successful.") + to_chat(usr, SPAN_NOTICE("Feedback logging successful.")) usr << browse(null,"window=playerpoll") @@ -466,7 +466,7 @@ break if(!validpoll) - to_chat(usr, "Poll is not valid.") + to_chat(usr, SPAN_WARNING("Poll is not valid.")) return var/DBQuery/select_query2 = GLOB.dbcon.NewQuery("SELECT id FROM ss13_poll_option WHERE id = [optionid] AND pollid = [pollid]") @@ -479,7 +479,7 @@ break if(!validoption) - to_chat(usr, "Poll option is not valid.") + to_chat(usr, SPAN_WARNING("Poll option is not valid.")) return var/alreadyvoted = 0 @@ -492,7 +492,7 @@ break if(alreadyvoted) - to_chat(usr, "You already voted in this poll.") + to_chat(usr, SPAN_WARNING("You already voted in this poll.")) return var/adminrank = "Player" @@ -503,5 +503,5 @@ var/DBQuery/insert_query = GLOB.dbcon.NewQuery("INSERT INTO ss13_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])") insert_query.Execute() - to_chat(usr, "Vote successful.") + to_chat(usr, SPAN_NOTICE("Vote successful.")) usr << browse(null,"window=playerpoll") diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm index 36bc4675bf8..b1ee4f110a1 100644 --- a/code/modules/mob/abstract/observer/observer.dm +++ b/code/modules/mob/abstract/observer/observer.dm @@ -183,7 +183,7 @@ Works together with spawning an observer, noted above. //Teleport them back to the ghost spawn var/obj/O = locate("landmark*Observer-Start") if(istype(O)) - to_chat(src, "[message]") + to_chat(src, SPAN_NOTICE("[message]")) forceMove(O.loc) //Teleports the observer away from z-levels they shouldnt be on, if needed. @@ -284,10 +284,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Re-enter Corpse" if(!client) return if(!(mind && mind.current && can_reenter_corpse)) - to_chat(src, "You have no body.") + to_chat(src, SPAN_WARNING("You have no body.")) return if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients - to_chat(usr, "Another consciousness is in your body... it is resisting you.") + to_chat(usr, SPAN_WARNING("Another consciousness is in your body... it is resisting you.")) return if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). var/found_rune @@ -315,10 +315,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return if(medHUD) medHUD = 0 - to_chat(src, "Medical HUD Disabled") + to_chat(src, SPAN_NOTICE("Medical HUD Disabled")) else medHUD = 1 - to_chat(src, "Medical HUD Enabled") + to_chat(src, SPAN_NOTICE("Medical HUD Enabled")) /mob/abstract/observer/verb/scan_target() set category = "Ghost" @@ -345,11 +345,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return var/aux_staff = check_rights(R_MOD|R_ADMIN, 0) if(!GLOB.config.antag_hud_allowed && (!client.holder || aux_staff)) - to_chat(src, "Admins have disabled this for this round.") + to_chat(src, SPAN_WARNING("Admins have disabled this for this round.")) return var/mob/abstract/observer/M = src if(jobban_isbanned(M, "AntagHUD")) - to_chat(src, "You have been banned from using this feature") + to_chat(src, SPAN_DANGER("You have been banned from using this feature")) return if(GLOB.config.antag_hud_restricted && !M.has_enabled_antagHUD && (!client.holder || aux_staff)) var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No") @@ -359,10 +359,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp M.has_enabled_antagHUD = 1 if(M.antagHUD) M.antagHUD = 0 - to_chat(src, "AntagHUD Disabled") + to_chat(src, SPAN_NOTICE("AntagHUD Disabled")) else M.antagHUD = 1 - to_chat(src, "AntagHUD Enabled") + to_chat(src, SPAN_NOTICE("AntagHUD Enabled")) /mob/abstract/observer/proc/dead_tele(A in GLOB.ghostteleportlocs) set category = "Ghost" @@ -391,7 +391,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!L || !L.len) if(holyblock) - to_chat(usr, "This area has been entirely made into sacred grounds, you cannot enter it while you are in this plane of existence!") + to_chat(usr, SPAN_WARNING("This area has been entirely made into sacred grounds, you cannot enter it while you are in this plane of existence!")) return else to_chat(usr, "No area available.") @@ -440,7 +440,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(check_holy(T)) stop_following() teleport_if_needed() - to_chat(usr, "You cannot follow something standing on holy grounds!") + to_chat(usr, SPAN_WARNING("You cannot follow something standing on holy grounds!")) return ..() @@ -473,11 +473,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/abstract/observer/memory() set hidden = 1 - to_chat(src, "You are dead! You have no mind to store memory!") + to_chat(src, SPAN_WARNING("You are dead! You have no mind to store memory!")) /mob/abstract/observer/add_memory() set hidden = 1 - to_chat(src, "You are dead! You have no mind to store memory!") + to_chat(src, SPAN_WARNING("You are dead! You have no mind to store memory!")) /mob/abstract/observer/Post_Incorpmove() stop_following() @@ -498,16 +498,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/pressure = environment.return_pressure() var/total_moles = environment.total_moles - to_chat(src, "Results:") + to_chat(src, SPAN_NOTICE("Results:")) if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(src, "Pressure: [round(pressure,0.1)] kPa") + to_chat(src, SPAN_NOTICE("Pressure: [round(pressure,0.1)] kPa")) else - to_chat(src, "Pressure: [round(pressure,0.1)] kPa") + to_chat(src, SPAN_WARNING("Pressure: [round(pressure,0.1)] kPa")) if(total_moles) for(var/g in environment.gas) - to_chat(src, "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)") - to_chat(src, "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") - to_chat(src, "Heat Capacity: [round(environment.heat_capacity(),0.1)]") + to_chat(src, SPAN_NOTICE("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)")) + to_chat(src, SPAN_NOTICE("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)")) + to_chat(src, SPAN_NOTICE("Heat Capacity: [round(environment.heat_capacity(),0.1)]")) /mob/abstract/observer/verb/view_manifest() set name = "Show Crew Manifest" @@ -534,7 +534,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/abstract/observer/proc/try_possession(var/mob/living/M) if(!GLOB.config.ghosts_can_possess_animals) - to_chat(usr, "Ghosts are not permitted to possess animals.") + to_chat(usr, SPAN_WARNING("Ghosts are not permitted to possess animals.")) return 0 if(!M.can_be_possessed_by(src)) return 0 @@ -547,7 +547,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC." if(!(GLOB.config.cult_ghostwriter)) - to_chat(src, "That verb is not currently permitted.") + to_chat(src, SPAN_WARNING("That verb is not currently permitted.")) return if (!src.stat) @@ -557,7 +557,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 0 //something is terribly wrong if(!round_is_spooky()) - to_chat(src, "The veil is not thin enough for you to do that.") + to_chat(src, SPAN_WARNING("The veil is not thin enough for you to do that.")) return var/list/choices = list() @@ -577,7 +577,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp T = get_step(T,text2dir(direction)) if (!istype(T)) - to_chat(src, "You cannot doodle there.") + to_chat(src, SPAN_WARNING("You cannot doodle there.")) return if(!choice || choice.amount == 0 || !(src.Adjacent(choice))) @@ -589,7 +589,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp for (var/obj/effect/decal/cleanable/blood/writing/W in T) num_doodles++ if (num_doodles > 4) - to_chat(src, "There is no space to write on!") + to_chat(src, SPAN_WARNING("There is no space to write on!")) return var/max_length = 50 @@ -600,14 +600,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if (length(message) > max_length) message += "-" - to_chat(src, "You ran out of blood to write with!") + to_chat(src, SPAN_WARNING("You ran out of blood to write with!")) var/obj/effect/decal/cleanable/blood/writing/W = new(T) W.basecolor = doodle_color W.update_icon() W.message = message W.add_hiddenprint(src) - W.visible_message("Invisible fingers crudely paint something in blood on [T]...") + W.visible_message(SPAN_WARNING("Invisible fingers crudely paint something in blood on [T]...")) /mob/abstract/observer/pointed(atom/A as mob|obj|turf in view()) if(!..()) @@ -625,14 +625,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(src.invisibility != 0) user.visible_message( \ - "\The [user] drags ghost, [src], to our plane of reality!", \ - "You drag [src] to our plane of reality!" \ + SPAN_WARNING("\The [user] drags ghost, [src], to our plane of reality!"), \ + SPAN_WARNING("You drag [src] to our plane of reality!") \ ) toggle_visibility(1) else user.visible_message ( \ - "\The [user] just tried to smash [user.get_pronoun("his")] book into that ghost! It's not very effective.", \ - "You get the feeling that the ghost can't become any more visible." \ + SPAN_WARNING("\The [user] just tried to smash [user.get_pronoun("his")] book into that ghost! It's not very effective."), \ + SPAN_WARNING("You get the feeling that the ghost can't become any more visible.") \ ) @@ -689,13 +689,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/msg = sanitize(input(src, "Message:", "Spectral Whisper") as text|null) if(msg) log_say("SpectralWhisper: [key_name(usr)]->[M.key] : [msg]") - to_chat(M, " You hear a strange, unidentifiable voice in your head... [msg]") - to_chat(src, " You said: '[msg]' to [M].") + to_chat(M, SPAN_WARNING(" You hear a strange, unidentifiable voice in your head... [msg]")) + to_chat(src, SPAN_WARNING(" You said: '[msg]' to [M].")) else return return 1 else - to_chat(src, "You have not been pulled past the veil!") + to_chat(src, SPAN_DANGER("You have not been pulled past the veil!")) /mob/abstract/observer/proc/move_item() set category = "Ghost" @@ -716,7 +716,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp choices += I if(!choices.len) - to_chat(src, "There are no suitable items nearby.") + to_chat(src, SPAN_WARNING("There are no suitable items nearby.")) return var/obj/item/choice = input(src, "What item would you like to pull?") as null|anything in choices @@ -727,7 +727,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return if(step_to(choice, T)) - choice.visible_message("\The [choice] suddenly moves!") + choice.visible_message(SPAN_WARNING("\The [choice] suddenly moves!")) ghost_cooldown = world.time + 500 @@ -805,7 +805,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 0 if(GLOB.config.antag_hud_restricted && has_enabled_antagHUD == 1) if(feedback) - to_chat(src, "antagHUD restrictions prevent you from respawning.") + to_chat(src, SPAN_WARNING("antagHUD restrictions prevent you from respawning.")) return 0 if (respawn_type) @@ -822,7 +822,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 1 else if (feedback) var/timedifference_text = time2text(respawn_time - timedifference,"mm:ss") - to_chat(src, "You must have been dead for [respawn_time/600] minute\s to respawn. You have [timedifference_text] left.") + to_chat(src, SPAN_WARNING("You must have been dead for [respawn_time/600] minute\s to respawn. You have [timedifference_text] left.")) return 0 return 1 @@ -850,7 +850,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Ghost Spawner" if(!ROUND_IS_STARTED) - to_chat(usr, "The round hasn't started yet!") + to_chat(usr, SPAN_DANGER("The round hasn't started yet!")) return SSghostroles.ui_interact(usr) diff --git a/code/modules/mob/abstract/observer/say.dm b/code/modules/mob/abstract/observer/say.dm index aabb0de9faa..4fc470dc87a 100644 --- a/code/modules/mob/abstract/observer/say.dm +++ b/code/modules/mob/abstract/observer/say.dm @@ -6,7 +6,7 @@ if (src.client) if(src.client.prefs.muted & (MUTE_DEADCHAT|MUTE_IC)) - to_chat(src, "You cannot talk in deadchat (muted).") + to_chat(src, SPAN_WARNING("You cannot talk in deadchat (muted).")) return . = src.say_dead(message) diff --git a/code/modules/mob/abstract/unauthed/login.dm b/code/modules/mob/abstract/unauthed/login.dm index b3ba68da5f9..d6553ec63bf 100644 --- a/code/modules/mob/abstract/unauthed/login.dm +++ b/code/modules/mob/abstract/unauthed/login.dm @@ -12,7 +12,7 @@ SHOULD_CALL_PARENT(FALSE) update_Login_details() - to_chat(src, "You need to authenticate before you can continue.") + to_chat(src, SPAN_DANGER("You need to authenticate before you can continue.")) token = md5("[client.ckey][client.computer_id][world.time][rand()]") unauthed[token] = src remove_verb(client, typesof(/client/verb)) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index d962037bc33..63910ca391c 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -4,16 +4,16 @@ /mob/proc/emote_dead(var/message) if(client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "You cannot send deadchat emotes (muted).") + to_chat(src, SPAN_DANGER("You cannot send deadchat emotes (muted).")) return if(!(client.prefs.toggles & CHAT_DEAD)) - to_chat(src, "You have deadchat muted.") + to_chat(src, SPAN_DANGER("You have deadchat muted.")) return if(!src.client.holder) if(!GLOB.config.dsay_allowed) - to_chat(src, "Deadchat is globally muted.") + to_chat(src, SPAN_DANGER("Deadchat is globally muted.")) return diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index f2e9bd42abe..f0d69c68c25 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -57,7 +57,7 @@ if(isdeaf(src)) if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set if(speaker == src) - to_chat(src, "You cannot hear yourself speak!") + to_chat(src, SPAN_WARNING("You cannot hear yourself speak!")) else to_chat(src, "[speaker_name][alt_name] talks but you cannot hear them.") else @@ -228,7 +228,7 @@ formatted += part_c if(isdeaf(src)) if(prob(20)) - to_chat(src, "You feel your headset vibrate but can hear nothing from it!") + to_chat(src, SPAN_WARNING("You feel your headset vibrate but can hear nothing from it!")) else on_hear_radio(part_a, speaker_name, track, part_b, formatted, accent_icon) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 4b05928efb8..243309e7a7a 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -152,11 +152,11 @@ var/list/holder_mob_icon_cache = list() var/mob/living/carbon/human/H = M switch(H.a_intent) if(I_HELP) - H.visible_message("[H] pets [contained].") + H.visible_message(SPAN_NOTICE("[H] pets [contained].")) if(I_HURT) contained.adjustBruteLoss(3) - H.visible_message("[H] crushes [contained].") + H.visible_message(SPAN_ALERT("[H] crushes [contained].")) else to_chat(M, "[contained] is dead.") @@ -197,10 +197,10 @@ var/list/holder_mob_icon_cache = list() if (user == src) if (grabber.r_hand && grabber.l_hand) - to_chat(user, "They have no free hands!") + to_chat(user, SPAN_WARNING("They have no free hands!")) return else if ((grabber.hand == 0 && grabber.r_hand) || (grabber.hand == 1 && grabber.l_hand))//Checking if the hand is full - to_chat(grabber, "Your hand is full!") + to_chat(grabber, SPAN_WARNING("Your hand is full!")) return add_verb(src, /mob/living/proc/get_holder_location) //This has to be before we move the mob into the holder @@ -224,11 +224,11 @@ var/list/holder_mob_icon_cache = list() if (success) if (user == src) - to_chat(grabber, "[src.name] climbs up onto you.") - to_chat(src, "You climb up onto [grabber].") + to_chat(grabber, SPAN_NOTICE("[src.name] climbs up onto you.")) + to_chat(src, SPAN_NOTICE("You climb up onto [grabber].")) else - to_chat(grabber, "You scoop up [src].") - to_chat(src, "[grabber] scoops you up.") + to_chat(grabber, SPAN_NOTICE("You scoop up [src].")) + to_chat(src, SPAN_NOTICE("[grabber] scoops you up.")) H.sync(src) else diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 9e3b9bf7872..41086377dfc 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -385,7 +385,7 @@ var/list/slot_equipment_priority = list( \ var/turf/end_T = get_turf(target) if(start_T && end_T) if(is_pacified()) - to_chat(src, "You gently let go of [M].") + to_chat(src, SPAN_NOTICE("You gently let go of [M].")) src.remove_from_mob(item) item.loc = src.loc return TRUE @@ -452,12 +452,12 @@ var/list/slot_equipment_priority = list( \ return TRUE if(is_pacified()) - to_chat(src, "You set [item] down gently on the ground.") + to_chat(src, SPAN_NOTICE("You set [item] down gently on the ground.")) return TRUE //actually throw it! if(item) - src.visible_message("[src] throws \a [item].") + src.visible_message(SPAN_WARNING("[src] throws \a [item].")) if(!src.lastarea) src.lastarea = get_area(src.loc) if((istype(src.loc, /turf/space)) || (src.lastarea.has_gravity() == 0)) diff --git a/code/modules/mob/living/carbon/alien/alien_attacks.dm b/code/modules/mob/living/carbon/alien/alien_attacks.dm index f8f9c6b742f..eae77767e7f 100644 --- a/code/modules/mob/living/carbon/alien/alien_attacks.dm +++ b/code/modules/mob/living/carbon/alien/alien_attacks.dm @@ -28,7 +28,7 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("[] has grabbed [] passively!", M, src), 1) + O.show_message(SPAN_WARNING("[M] has grabbed [src] passively!"), 1) else var/damage = rand(1, 9) @@ -43,17 +43,19 @@ playsound(loc, /singleton/sound_category/punch_sound, 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("[] has punched []!", M, src), 1) + O.show_message(SPAN_DANGER("[M] has punched [src]!"), 1) if (damage > 4.9) Weaken(rand(10,15)) for(var/mob/O in viewers(M, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("[] has weakened []!", M, src), 1, " You hear someone fall.", 2) + O.show_message(SPAN_DANGER("[M] has weakened [src]!"), 1, + SPAN_WARNING(" You hear someone fall."), 2) + adjustBruteLoss(damage) updatehealth() else playsound(loc, /singleton/sound_category/punchmiss_sound, 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("[] has attempted to punch []!", M, src), 1) + O.show_message(SPAN_DANGER("[M] has attempted to punch [src]!"), 1) return diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index 86b6f83f418..57f2ef5766d 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -362,6 +362,6 @@ if(hat) src.drop_from_inventory(hat) hat = null - visible_message("[src] removes their hat!") + visible_message(SPAN_WARNING("[src] removes their hat!")) else to_chat(src, SPAN_WARNING("You have no hat!")) diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index 28dbc6261f1..0b502a90757 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -150,7 +150,7 @@ adjustFireLoss((environment.temperature - (T0C+66))/5) // Might be too high, check in testing. if (fire) fire.icon_state = "fire2" if(prob(20)) - to_chat(src, "You feel a searing heat!") + to_chat(src, SPAN_DANGER("You feel a searing heat!")) else if (fire) fire.icon_state = "fire0" diff --git a/code/modules/mob/living/carbon/alien/progression.dm b/code/modules/mob/living/carbon/alien/progression.dm index 73878432e96..6edcf2e82aa 100644 --- a/code/modules/mob/living/carbon/alien/progression.dm +++ b/code/modules/mob/living/carbon/alien/progression.dm @@ -12,11 +12,11 @@ return if(handcuffed || legcuffed) - to_chat(src, "You cannot evolve when you are cuffed.") + to_chat(src, SPAN_WARNING("You cannot evolve when you are cuffed.")) return if(amount_grown < max_grown) - to_chat(src, "You are not fully grown.") + to_chat(src, SPAN_WARNING("You are not fully grown.")) return // confirm_evolution() handles choices and other specific requirements. diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 0ccd811f4d4..68b67d45693 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -17,7 +17,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot send IC messages (muted).") + to_chat(src, SPAN_WARNING("You cannot send IC messages (muted).")) return if (stat) return @@ -63,7 +63,7 @@ if ("help") to_chat(src, "alarm,alert,notice,flash,blink,whistle,beep,boop") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, SPAN_NOTICE("Unusable emote '[act]'. Say *help for a list.")) if (message) log_emote("[name]/[key] : [message]",ckey=key_name(key)) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 266511428ae..bbb9bc85ec1 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -124,7 +124,7 @@ silent = 1 if(!alert)//Sounds an alarm, but only once per 'level' emote("alarm") - to_chat(src, "Major electrical distruption detected: System rebooting.") + to_chat(src, SPAN_WARNING("Major electrical distruption detected: System rebooting.")) alert = 1 if(prob(75)) emp_damage -= 1 @@ -140,7 +140,7 @@ ear_damage = 1 if(!alert) emote("alert") - to_chat(src, "Primary systems are now online.") + to_chat(src, SPAN_WARNING("Primary systems are now online.")) alert = 1 if(prob(50)) emp_damage -= 1 @@ -152,13 +152,13 @@ if(2 to 9)//Low level of EMP damage, has few effects(handled elsewhere) if(!alert) emote("notice") - to_chat(src, "System reboot nearly complete.") + to_chat(src, SPAN_WARNING("System reboot nearly complete.")) alert = 1 if(prob(25)) emp_damage -= 1 if(1) alert = 0 - to_chat(src, "All systems restored.") + to_chat(src, SPAN_WARNING("All systems restored.")) emp_damage -= 1 //Other diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 2cb3ecb48b8..14f5b811266 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -76,7 +76,6 @@ . = ..() . += "This is [icon2html(src, user)] \a [src]!\n[desc]\n" - . += "" if(brainmob?.key) switch(brainmob.stat) @@ -84,12 +83,11 @@ if(!src.brainmob.client) . += "It appears to be in stand-by mode.\n" //afk if(UNCONSCIOUS) - . += "It doesn't seem to be responsive.\n" + . += SPAN_WARNING("It doesn't seem to be responsive.\n") if(DEAD) . += "It appears to be completely inactive.\n" else . += "It appears to be completely inactive.\n" - . += "" /obj/item/device/mmi/digital/posibrain/ready_for_use(var/mob/user) if(!brainmob) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 16dde41ff87..5d3ed6f21a7 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -37,7 +37,7 @@ show_ssd = H.species.show_ssd if(H && show_ssd && !client && !teleop) if(H.bg) - visible_message("[P] hit [src] waking [get_pronoun("him")] up!") + visible_message(SPAN_DANGER("[P] hit [src] waking [get_pronoun("him")] up!")) if(H.health / H.maxHealth < 0.5) H.bg.awaken_impl(TRUE) sleeping = 0 @@ -45,9 +45,9 @@ else to_chat(H, SPAN_DANGER("You sense great disturbance to your physical body!")) else if(!vr_mob) - visible_message("[P] hit [src], but they do not respond... Maybe they have S.S.D?") + visible_message(SPAN_DANGER("[P] hit [src], but they do not respond... Maybe they have S.S.D?")) else if(client && willfully_sleeping) - visible_message("[P] hit [src] waking [get_pronoun("him")] up!") + visible_message(SPAN_DANGER("[P] hit [src] waking [get_pronoun("him")] up!")) sleeping = 0 willfully_sleeping = FALSE @@ -66,11 +66,11 @@ else to_chat(H, SPAN_DANGER("You sense great disturbance to your physical body!")) else if(!vr_mob) - user.visible_message("[user] attacks [src] with [I] waking [get_pronoun("him")] up!", \ - "You attack [src] with [I], but they do not respond... Maybe they have S.S.D?") + user.visible_message(SPAN_DANGER("[user] attacks [src] with [I] waking [get_pronoun("him")] up!"), \ + SPAN_DANGER("You attack [src] with [I], but they do not respond... Maybe they have S.S.D?")) else if(client && willfully_sleeping) - user.visible_message("[user] attacked [src] with [I] waking [get_pronoun("him")] up!", \ - "You attack [src] with [I], waking [get_pronoun("him")] up!") + user.visible_message(SPAN_DANGER("[user] attacked [src] with [I] waking [get_pronoun("him")] up!"), \ + SPAN_DANGER("You attack [src] with [I], waking [get_pronoun("him")] up!")) sleeping = 0 willfully_sleeping = FALSE @@ -119,7 +119,7 @@ if(!(damage_flags & (DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE)) || W.damtype != DAMAGE_BRUTE) return FALSE //unsuitable weapon - user.visible_message("\The [user] begins to slit [src]'s throat with \the [W]!") + user.visible_message(SPAN_DANGER("\The [user] begins to slit [src]'s throat with \the [W]!")) user.next_move = world.time + 20 //also should prevent user from triggering this repeatedly if(!W.use_tool(src, user, 20, volume = 50)) @@ -149,9 +149,9 @@ if(total_damage) if(getOxyLoss() >= 40) - user.visible_message("\The [user] slices [src]'s throat open with \the [W]!") + user.visible_message(SPAN_DANGER("\The [user] slices [src]'s throat open with \the [W]!")) else - user.visible_message("\The [user] cuts [src]'s neck open with \the [W]!") + user.visible_message(SPAN_DANGER("\The [user] cuts [src]'s neck open with \the [W]!")) if(W.hitsound) playsound(loc, W.hitsound, W.get_clamped_volume(), 1, -1) diff --git a/code/modules/mob/living/carbon/diona_base.dm b/code/modules/mob/living/carbon/diona_base.dm index c7e1e617ce9..c9eafd527cc 100644 --- a/code/modules/mob/living/carbon/diona_base.dm +++ b/code/modules/mob/living/carbon/diona_base.dm @@ -526,7 +526,7 @@ var/list/diona_banned_languages = list( if (prob(chance)) add_language(L.name) else - to_chat(src, "You have forgotten the [L.name] language!") + to_chat(src, SPAN_DANGER("You have forgotten the [L.name] language!")) /mob/living/carbon/alien/diona/proc/switch_to_gestalt() set name = "Switch to Gestalt" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 558eb1d22a1..1484523787e 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -67,7 +67,7 @@ SSticker.mode.check_win() if(wearing_rig?.ai_override_enabled) - wearing_rig.notify_ai("Warning: user death event. Mobility control passed to integrated intelligence system.") + wearing_rig.notify_ai(SPAN_DANGER("Warning: user death event. Mobility control passed to integrated intelligence system.")) . = ..(gibbed, species.death_message, species.death_message_range) diff --git a/code/modules/mob/living/carbon/human/devour.dm b/code/modules/mob/living/carbon/human/devour.dm index 11659502533..796d8d389a9 100644 --- a/code/modules/mob/living/carbon/human/devour.dm +++ b/code/modules/mob/living/carbon/human/devour.dm @@ -17,13 +17,13 @@ eat_speed *= 3 //We want our bites to take a lot so as to not spam the chat. do_gradual_devour(victim, eat_speed) return - src.visible_message("\The [src] is attempting to devour \the [victim] whole!") + src.visible_message(SPAN_DANGER("\The [src] is attempting to devour \the [victim] whole!")) var/mob/target = victim if(isobj(victim)) target = src if(!do_mob(src,target,eat_speed)) return FALSE - src.visible_message("\The [src] devours \the [victim] whole!") + src.visible_message(SPAN_DANGER("\The [src] devours \the [victim] whole!")) if(ismob(victim)) admin_attack_log(src, victim, "Devoured.", "Was devoured by.", "devoured") else @@ -72,9 +72,9 @@ else time_needed_string = "[time_needed_seconds] seconds" - src.visible_message("[src] starts to devour [victim]!", \ - "You start devouring [victim], this will take approximately [time_needed_string]. You and the victim must remain still to continue, \ - but you can interrupt feeding anytime and leave with what you've already eaten.") + src.visible_message(SPAN_DANGER("[src] starts to devour [victim]!"), \ + SPAN_DANGER("You start devouring [victim], this will take approximately [time_needed_string]. You and the victim must remain still to continue, \ + but you can interrupt feeding anytime and leave with what you've already eaten.")) for (var/i = 0 to num_bites_needed) if(do_mob(src, victim, bite_delay * 10, extra_checks = CALLBACK(src, PROC_REF(devouring_equals), victim))) @@ -83,20 +83,21 @@ var/obj/item/organ/internal/stomach/S = internal_organs_by_name[BP_STOMACH] if(S) S.ingested.add_reagent(victim.composition_reagent, (victim.composition_reagent_quantity * 0.5) * PEPB) - visible_message("[src] bites a chunk out of [victim]!","[bitemessage(victim)]") + visible_message(SPAN_DANGER("[src] bites a chunk out of [victim]!"), + SPAN_DANGER("[bitemessage(victim)]")) if(messes < victim.mob_size - 1 && prob(50)) handle_devour_mess(src, victim) if(victim.getBruteLoss() >= victim_maxhealth) - visible_message("[src] finishes devouring [victim].","You finish devouring [victim].") + visible_message(SPAN_DANGER("[src] finishes devouring [victim]."),SPAN_WARNING("You finish devouring [victim].")) handle_devour_mess(src, victim, TRUE) qdel(victim) else if(nutrition >= (max_nutrition - 60)) - to_chat(src, "Your stomach is full!") + to_chat(src, SPAN_DANGER("Your stomach is full!")) if (victim && !QDELETED(victim) && victimloc != victim.loc) //This procs when the victim gets moved to nullspace. - to_chat(src, "[victim] moved away, you need to keep it still. Try grabbing, stunning or killing it first.") + to_chat(src, SPAN_DANGER("[victim] moved away, you need to keep it still. Try grabbing, stunning or killing it first.")) else if (ourloc != src.loc) - to_chat(src, "You moved! Devouring cancelled.") + to_chat(src, SPAN_DANGER("You moved! Devouring cancelled.")) break /mob/living/carbon/human/proc/devouring_equals(var/mob/victim) diff --git a/code/modules/mob/living/carbon/human/diona_gestalt.dm b/code/modules/mob/living/carbon/human/diona_gestalt.dm index 079928db163..fdc5a540e33 100644 --- a/code/modules/mob/living/carbon/human/diona_gestalt.dm +++ b/code/modules/mob/living/carbon/human/diona_gestalt.dm @@ -351,7 +351,7 @@ //In this unfathomably rare case, the gestalt player simply dies as its mob is qdel'd. //We will generally prevent this from happening by ensuring any nymph-joining functions leave one free for the host - visible_message("\The [src] quivers slightly, then splits apart with a wet slithering noise.") + visible_message(SPAN_WARNING("\The [src] quivers slightly, then splits apart with a wet slithering noise.")) qdel(src) #undef COLD_DAMAGE_LEVEL_1 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 05b706896f8..91c7ec2af92 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -80,14 +80,14 @@ tie_msg_warn += " [lowertext(english_list(accessory_descs))]" if(w_uniform.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] \a [w_uniform][tie_msg].\n" //head if(head) if(head.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] [head.get_head_examine_text(src)]!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] [head.get_head_examine_text(src)]!\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] [head.get_head_examine_text(src)].\n" @@ -108,40 +108,40 @@ tie_msg_warn += " [lowertext(english_list(accessory_descs))]" if(wear_suit.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] \a [wear_suit][tie_msg].\n" //suit/armor storage if(s_store && !skipsuitstorage) if(s_store.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] [wear_suit.name]!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] [wear_suit.name]!\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] \a [s_store] on [get_pronoun("his")] [wear_suit.name].\n" else if(s_store && !skipsuitstorage) if(s_store.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] chest!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [fluid_color_type_map(s_store.blood_color)]-stained [s_store.name] on [get_pronoun("his")] chest!\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] carrying [icon2html(s_store, user)] \a [s_store] on [get_pronoun("his")] chest.\n" //back if(back) if(back.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] [fluid_color_type_map(back.blood_color)]-stained [back] on [get_pronoun("his")] back.\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] [fluid_color_type_map(back.blood_color)]-stained [back] on [get_pronoun("his")] back.\n") else msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(back, user)] \a [back] on [get_pronoun("his")] back.\n" //left hand if(l_hand) if(l_hand.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] [l_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(l_hand.blood_color)]-stained [l_hand.name] in [get_pronoun("his")] left hand!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] [l_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(l_hand.blood_color)]-stained [l_hand.name] in [get_pronoun("his")] left hand!\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(l_hand, user)] \a [l_hand] in [get_pronoun("his")] left hand.\n" //right hand if(r_hand) if(r_hand.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] [r_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(r_hand.blood_color)]-stained [r_hand.name] in [get_pronoun("his")] right hand!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] [r_hand.gender==PLURAL?"some":"a"] [fluid_color_type_map(r_hand.blood_color)]-stained [r_hand.name] in [get_pronoun("his")] right hand!\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] holding [icon2html(r_hand, user)] \a [r_hand] in [get_pronoun("his")] right hand.\n" @@ -149,39 +149,39 @@ if(gloves && !skipgloves) var/gloves_name = gloves if(gloves.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] [fluid_color_type_map(gloves.blood_color)]-stained [gloves_name] on [get_pronoun("his")] hands!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] [fluid_color_type_map(gloves.blood_color)]-stained [gloves_name] on [get_pronoun("his")] hands!\n") else msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(gloves, user)] \a [gloves_name] on [get_pronoun("his")] hands.\n" else if(blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(hand_blood_color)]-stained hands!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(hand_blood_color)]-stained hands!\n") //belt if(belt) if(belt.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] [fluid_color_type_map(belt.blood_color)]-stained [belt.name] about [get_pronoun("his")] waist!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] [fluid_color_type_map(belt.blood_color)]-stained [belt.name] about [get_pronoun("his")] waist!\n") else msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] \a [belt] about [get_pronoun("his")] waist.\n" //shoes if(shoes && !skipshoes) if(shoes.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] [fluid_color_type_map(shoes.blood_color)]-stained [shoes.name] on [get_pronoun("his")] feet!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] [fluid_color_type_map(shoes.blood_color)]-stained [shoes.name] on [get_pronoun("his")] feet!\n") else msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(shoes, user)] \a [shoes] on [get_pronoun("his")] feet.\n" else if(footprint_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(footprint_color)]-stained feet!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [fluid_color_type_map(footprint_color)]-stained feet!\n") //mask if(wear_mask && !skipmask) if(wear_mask.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] [wear_mask.get_mask_examine_text(src)]!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] [wear_mask.get_mask_examine_text(src)]!\n") else msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] [wear_mask.get_mask_examine_text(src)].\n" //eyes if(glasses && !skipeyes) if(glasses.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] [fluid_color_type_map(glasses.blood_color)]-stained [glasses] covering [get_pronoun("his")] eyes!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] [fluid_color_type_map(glasses.blood_color)]-stained [glasses] covering [get_pronoun("his")] eyes!\n") else msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(glasses, user)] \a [glasses] covering [get_pronoun("his")] eyes.\n" @@ -205,20 +205,20 @@ //Jitters if(is_jittery) if(jitteriness >= 300) - msg += "[get_pronoun("He")] [get_pronoun("is")] convulsing violently!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] convulsing violently!\n") else if(jitteriness >= 200) - msg += "[get_pronoun("He")] [get_pronoun("is")] extremely jittery.\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] extremely jittery.\n") else if(jitteriness >= 100) - msg += "[get_pronoun("He")] [get_pronoun("is")] twitching ever so slightly.\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] twitching ever so slightly.\n") //splints for(var/organ in list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_R_FOOT,BP_L_FOOT)) var/obj/item/organ/external/o = get_organ(organ) if(o) if(o.status & ORGAN_SPLINTED) - msg += "[get_pronoun("He")] [get_pronoun("has")] a splint on [get_pronoun("his")] [o.name]!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] a splint on [get_pronoun("his")] [o.name]!\n") if(o.applied_pressure == src) - msg += "[get_pronoun("He")] [get_pronoun("is")] applying pressure to [get_pronoun("his")] [o.name]!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] applying pressure to [get_pronoun("his")] [o.name]!\n") if((mutations & mSmallsize)) msg += "[get_pronoun("He")] [get_pronoun("is")] small halfling!\n" @@ -232,20 +232,20 @@ //handcuffed? if(handcuffed) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(handcuffed, user)] cuffs around [get_pronoun("his")] wrists!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(handcuffed, user)] cuffs around [get_pronoun("his")] wrists!\n") //handcuffed? if(legcuffed) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(legcuffed, user)] cuffs around [get_pronoun("his")] ankles!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [icon2html(legcuffed, user)] cuffs around [get_pronoun("his")] ankles!\n") //Red Nightshade if(is_berserk()) - msg += "[get_pronoun("He")] [get_pronoun("has")] engorged veins, which appear a vibrant red!\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] engorged veins, which appear a vibrant red!\n") if((src.stat || (status_flags & FAKEDEATH)) && !(src.species.flags & NO_BLOOD)) // No point checking pulse of a species that doesn't have one. - msg += "[get_pronoun("He")] [get_pronoun("is")]n't responding to anything around [get_pronoun("him")] and seems to be unconscious.\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")]n't responding to anything around [get_pronoun("him")] and seems to be unconscious.\n") if(distance <= 3 && ((stat == DEAD || is_asystole() || src.losebreath) || (status_flags & FAKEDEATH))) - msg += "[get_pronoun("He")] [get_pronoun("does")] not appear to be breathing.\n" + msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("does")] not appear to be breathing.\n") else if (src.stat) msg += SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] not responding to anything around [get_pronoun("him")].\n") @@ -254,16 +254,12 @@ msg += "[get_pronoun("He")] [get_pronoun("is")] covered in some liquid.\n" if(on_fire) - msg += "[get_pronoun("He")] [get_pronoun("is")] on fire!\n" + msg += SPAN_DANGER("[get_pronoun("He")] [get_pronoun("is")] on fire!\n") //when the player is winded by an admin if(paralysis > 6000) msg += "OOC Information: This player has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.\n" - msg += "" - - msg += "" - var/have_client = client var/inactivity = client ? client.inactivity : null @@ -293,9 +289,9 @@ var/obj/item/organ/external/E = organs_by_name[organ_tag] if(!E) - wound_flavor_text["[organ_descriptor]"] = "[get_pronoun("He")] [get_pronoun("is")] missing [get_pronoun("his")] [organ_descriptor].\n" + wound_flavor_text["[organ_descriptor]"] = SPAN_WARNING("[get_pronoun("He")] [get_pronoun("is")] missing [get_pronoun("his")] [organ_descriptor].\n") else if(E.is_stump()) - wound_flavor_text["[organ_descriptor]"] = "[get_pronoun("He")] [get_pronoun("has")] a stump where [get_pronoun("his")] [organ_descriptor] should be.\n" + wound_flavor_text["[organ_descriptor]"] = SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] a stump where [get_pronoun("his")] [organ_descriptor] should be.\n") else continue @@ -312,22 +308,22 @@ if(!(temp.brute_dam + temp.burn_dam) && !(temp.open)) continue else - wound_flavor_text["[temp.name]"] = "[get_pronoun("He")] [get_pronoun("has")] [temp.get_wounds_desc()] on [get_pronoun("his")] [temp.name]. " + wound_flavor_text["[temp.name]"] = SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [temp.get_wounds_desc()] on [get_pronoun("his")] [temp.name]. ") else if(length(temp.wounds) || temp.open) if(!thin_covering) if(temp.is_stump() && temp.parent_organ && organs_by_name[temp.parent_organ]) var/obj/item/organ/external/parent = organs_by_name[temp.parent_organ] - wound_flavor_text["[temp.name]"] = "[get_pronoun("He")] [get_pronoun("has")] [temp.get_wounds_desc()] on [get_pronoun("his")] [parent.name]. " + wound_flavor_text["[temp.name]"] = SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [temp.get_wounds_desc()] on [get_pronoun("his")] [parent.name]. ") else - wound_flavor_text["[temp.name]"] = "[get_pronoun("He")] [get_pronoun("has")] [temp.get_wounds_desc()] on [get_pronoun("his")] [temp.name]. " + wound_flavor_text["[temp.name]"] = SPAN_WARNING("[get_pronoun("He")] [get_pronoun("has")] [temp.get_wounds_desc()] on [get_pronoun("his")] [temp.name]. ") if(temp.status & ORGAN_BLEEDING) is_bleeding["[temp.name]"] = SPAN_DANGER("[get_pronoun("His")] [temp.name] is bleeding")+ " " else wound_flavor_text["[temp.name]"] = "" if(temp.dislocated == 2) - wound_flavor_text["[temp.name]"] += "[get_pronoun("His")] [temp.joint] is dislocated! " + wound_flavor_text["[temp.name]"] += SPAN_WARNING("[get_pronoun("His")] [temp.joint] is dislocated! ") if(((temp.status & ORGAN_BROKEN) && temp.brute_dam > temp.min_broken_damage) || (temp.status & ORGAN_MUTATED)) - wound_flavor_text["[temp.name]"] += "[get_pronoun("His")] [temp.name] is dented and swollen! " + wound_flavor_text["[temp.name]"] += SPAN_WARNING("[get_pronoun("His")] [temp.name] is dented and swollen! ") //Handles the text strings being added to the actual description. //If they have something that covers the limb, and it is not missing, put flavortext. If it is covered but bleeding, add other flavortext. @@ -341,7 +337,7 @@ for(var/obj/item/organ/external/organ in src.organs) for(var/obj/item/O in organ.implants) if(!istype(O,/obj/item/implant) && !istype(O,/obj/item/material/shard/shrapnel)) - msg += "[src] [get_pronoun("has")] \a [O] sticking out of [get_pronoun("his")] [organ.name]!\n" + msg += SPAN_DANGER("[src] [get_pronoun("has")] \a [O] sticking out of [get_pronoun("his")] [organ.name]!\n") if(digitalcamo) msg += "[get_pronoun("He")] [get_pronoun("is")] a little difficult to identify.\n" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3ca624ce080..4cdf1bbc1a6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1925,11 +1925,11 @@ return var/datum/category_item/underwear/UWI = all_underwear[UWC.name] if(!UWI || UWI.name == "None") - to_chat(src, "You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "any [UWC.display_name]"].") + to_chat(src, SPAN_NOTICE("You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "any [UWC.display_name]"].")) return hide_underwear[UWC.name] = !hide_underwear[UWC.name] update_underwear(1) - to_chat(src, "You [hide_underwear[UWC.name] ? "take off" : "put on"] your [UWC.display_name].") + to_chat(src, SPAN_NOTICE("You [hide_underwear[UWC.name] ? "take off" : "put on"] your [UWC.display_name].")) /mob/living/carbon/human/verb/pull_punches() set name = "Pull Punches" @@ -2278,9 +2278,9 @@ visible_message(SPAN_NOTICE("[src] looks up."), SPAN_NOTICE("You look up.")) reset_view(z_eye) return - to_chat(src, "You can see \the [above ? above : "ceiling"].") + to_chat(src, SPAN_NOTICE("You can see \the [above ? above : "ceiling"].")) else - to_chat(src, "You can't look up right now.") + to_chat(src, SPAN_NOTICE("You can't look up right now.")) /mob/living/verb/lookdown() set name = "Look Down" @@ -2305,9 +2305,9 @@ visible_message(SPAN_NOTICE("[src] leans over to look below."), SPAN_NOTICE("You lean over to look below.")) reset_view(z_eye) return - to_chat(src, "You can see \the [T ? T : "floor"].") + to_chat(src, SPAN_NOTICE("You can see \the [T ? T : "floor"].")) else - to_chat(src, "You can't look below right now.") + to_chat(src, SPAN_NOTICE("You can't look below right now.")) /mob/living/carbon/human/get_speech_bubble_state_modifier() if(speech_bubble_type) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 7ffcb72f9d1..abc20fedd43 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -24,7 +24,7 @@ ..() if ((H.invisibility == INVISIBILITY_LEVEL_TWO) && M.back && (istype(M.back, /obj/item/rig))) - to_chat(H, "You are now visible.") + to_chat(H, SPAN_DANGER("You are now visible.")) H.set_invisibility(0) anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir) @@ -46,7 +46,7 @@ if(M.a_intent == I_HURT)//Stungloves. Any contact will stun the alien. if(G.cell.charge >= 2500) G.cell.use(G.cell.charge) //So it drains the cell. - visible_message("[src] has been touched with the stun gloves by [M]!") + visible_message(SPAN_DANGER("[src] has been touched with the stun gloves by [M]!")) M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])") @@ -57,7 +57,9 @@ if(prob(15)) playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) - M.visible_message("The power source on [M]'s stun gloves overloads in a terrific fashion!", "Your jury rigged stun gloves malfunction!", "You hear a loud sparking.") + M.visible_message(SPAN_WARNING("The power source on [M]'s stun gloves overloads in a terrific fashion!"), + SPAN_WARNING("Your jury rigged stun gloves malfunction!"), + SPAN_WARNING("You hear a loud sparking.")) if(prob(50)) M.apply_damage(rand(1,5), DAMAGE_BURN) @@ -67,8 +69,8 @@ return 1 else - to_chat(M, "Not enough charge!") - visible_message("[src] has been touched with the stun gloves by [M]!") + to_chat(M, SPAN_WARNING("Not enough charge!")) + visible_message(SPAN_DANGER("[src] has been touched with the stun gloves by [M]!")) return @@ -77,7 +79,7 @@ var/damage = rand(0, 9) if(!damage) playsound(loc, /singleton/sound_category/punchmiss_sound, 25, 1, -1) - visible_message("[H] has attempted to punch [src]!") + visible_message(SPAN_DANGER("[H] has attempted to punch [src]!")) return 0 var/obj/item/organ/external/affecting = get_organ(ran_zone(H.zone_sel.selecting)) @@ -86,11 +88,11 @@ playsound(loc, /singleton/sound_category/punch_sound, 25, 1, -1) - visible_message("[H] has punched [src]!") + visible_message(SPAN_DANGER("[H] has punched [src]!")) apply_damage(damage, DAMAGE_PAIN, affecting) if(damage >= 9) - visible_message("[H] has weakened [src]!") + visible_message(SPAN_DANGER("[H] has weakened [src]!")) apply_effect(4, WEAKEN) return @@ -114,7 +116,7 @@ if(M == src || anchored) return 0 if(M.is_pacified()) - to_chat(M, "You don't want to risk hurting [src]!") + to_chat(M, SPAN_NOTICE("You don't want to risk hurting [src]!")) return 0 if(attacker_style && attacker_style.grab_act(H, src)) @@ -122,7 +124,7 @@ for(var/obj/item/grab/G in src.grabbed_by) if(G.assailant == M) - to_chat(M, "You already grabbed [src].") + to_chat(M, SPAN_NOTICE("You already grabbed [src].")) return if (!attempt_grab(M)) @@ -133,7 +135,7 @@ var/obj/item/grab/G = new /obj/item/grab(M, M, src) if(buckled_to) - to_chat(M, "You cannot grab [src], [src.get_pronoun("he")] [get_pronoun("is")] buckled in!") + to_chat(M, SPAN_NOTICE("You cannot grab [src], [src.get_pronoun("he")] [get_pronoun("is")] buckled in!")) if(!G) //the grab will delete itself in New if affecting is anchored return M.put_in_active_hand(G) @@ -147,14 +149,14 @@ G.icon_state = "grabbed1" G.hud.icon_state = "reinforce1" G.last_action = world.time - visible_message("[M] gets a strong grip on [src]!") + visible_message(SPAN_WARNING("[M] gets a strong grip on [src]!")) return 1 - visible_message("[M] has grabbed [src] passively!") + visible_message(SPAN_WARNING("[M] has grabbed [src] passively!")) return 1 if(I_HURT) if(M.is_pacified()) - to_chat(M, "You don't want to risk hurting [src]!") + to_chat(M, SPAN_NOTICE("You don't want to risk hurting [src]!")) return 0 if(attacker_style && attacker_style.harm_act(H, src)) @@ -171,7 +173,7 @@ var/obj/item/organ/external/affecting = get_organ(hit_zone) if(!affecting || affecting.is_stump()) - to_chat(M, "They are missing that limb!") + to_chat(M, SPAN_DANGER("They are missing that limb!")) return 1 switch(src.a_intent) @@ -243,7 +245,7 @@ if(!attack_message) attack.show_attack(H, src, hit_zone, rand_damage) else - H.visible_message("[attack_message]") + H.visible_message(SPAN_DANGER("[attack_message]")) playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) H.attack_log += text("\[[time_stamp()]\] [miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])") @@ -361,11 +363,11 @@ turfs += T if(turfs.len) var/turf/target = pick(turfs) - visible_message("[src]'s [W] goes off during the struggle!") + visible_message(SPAN_DANGER("[src]'s [W] goes off during the struggle!")) return W.afterattack(target,src) else if(M.Adjacent(src)) - visible_message("[src] retaliates against [M]'s disarm attempt with [W]!") + visible_message(SPAN_DANGER("[src] retaliates against [M]'s disarm attempt with [W]!")) return M.attackby(W,src) var/randn = rand(1, 100) @@ -400,7 +402,7 @@ if(H.gloves && istype(H.gloves,/obj/item/clothing/gloves/force)) apply_effect(6, WEAKEN) playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1) - visible_message("[M] hurls [src] to the floor!") + visible_message(SPAN_DANGER("[M] hurls [src] to the floor!")) step_away(src,M,15) sleep(3) step_away(src,M,15) @@ -410,17 +412,17 @@ var/armor_check = 100 * get_blocked_ratio(affecting, DAMAGE_BRUTE, damage = 20) apply_effect(3, WEAKEN, armor_check) if(armor_check < 100) - visible_message("[M] has pushed [src]!") + visible_message(SPAN_DANGER("[M] has pushed [src]!")) playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1) else - visible_message("[M] attempted to push [src]!") + visible_message(SPAN_WARNING("[M] attempted to push [src]!")) playsound(loc, 'sound/weapons/push.ogg', 50, 1, -1) return if(randn <= 60) if(H.gloves && istype(H.gloves,/obj/item/clothing/gloves/force)) playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1) - visible_message("[M] shoves, sending [src] flying!") + visible_message(SPAN_DANGER("[M] shoves, sending [src] flying!")) step_away(src,M,15) sleep(1) step_away(src,M,15) @@ -448,7 +450,7 @@ //No return here is intentional, as it will then try to disarm other items, and/or play a failed disarm message playsound(loc, /singleton/sound_category/punchmiss_sound, 25, 1, -1) - visible_message("[M] attempted to disarm [src]!") + visible_message(SPAN_DANGER("[M] attempted to disarm [src]!")) return /mob/living/carbon/human/proc/cpr(mob/living/carbon/human/H, var/starting = FALSE, var/cpr_mode) @@ -580,15 +582,15 @@ if(!organ || ORGAN_IS_DISLOCATED(organ) || organ.dislocated == -1) return 0 - user.visible_message("[user] begins to dislocate [src]'s [organ.joint]!") + user.visible_message(SPAN_WARNING("[user] begins to dislocate [src]'s [organ.joint]!")) user.limb_breaking = TRUE if(do_after(user, 100)) organ.dislocate(1) admin_attack_log(user, src, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of") - src.visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") + src.visible_message(SPAN_DANGER("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!")) user.limb_breaking = FALSE return 1 - user.visible_message("[user] fails to dislocate [src]'s [organ.joint]!") + user.visible_message(SPAN_WARNING("[user] fails to dislocate [src]'s [organ.joint]!")) user.limb_breaking = FALSE return 0 @@ -596,21 +598,21 @@ /mob/living/carbon/human/proc/break_all_grabs(mob/living/carbon/user) var/success = 0 if(pulling) - visible_message("[user] has broken [src]'s grip on [pulling]!") + visible_message(SPAN_DANGER("[user] has broken [src]'s grip on [pulling]!")) success = 1 stop_pulling() if(istype(l_hand, /obj/item/grab)) var/obj/item/grab/lgrab = l_hand if(lgrab.affecting) - visible_message("[user] has broken [src]'s grip on [lgrab.affecting]!") + visible_message(SPAN_DANGER("[user] has broken [src]'s grip on [lgrab.affecting]!")) success = 1 spawn(1) qdel(lgrab) if(istype(r_hand, /obj/item/grab)) var/obj/item/grab/rgrab = r_hand if(rgrab.affecting) - visible_message("[user] has broken [src]'s grip on [rgrab.affecting]!") + visible_message(SPAN_DANGER("[user] has broken [src]'s grip on [rgrab.affecting]!")) success = 1 spawn(1) qdel(rgrab) @@ -623,14 +625,16 @@ return 0 if(organ.applied_pressure) - var/message = "[ismob(organ.applied_pressure)? "Someone" : "\A [organ.applied_pressure]"] is already applying pressure to [user == src? "your [organ.name]" : "[src]'s [organ.name]"]." + var/message = SPAN_WARNING("[ismob(organ.applied_pressure)? "Someone" : "\A [organ.applied_pressure]"] is already applying pressure to [user == src? "your [organ.name]" : "[src]'s [organ.name]"].") to_chat(user, message) return 0 if(user == src) - user.visible_message("\The [user] starts applying pressure to [user.get_pronoun("his")] [organ.name]!", "You start applying pressure to your [organ.name]!") + user.visible_message(SPAN_NOTICE("\The [user] starts applying pressure to [user.get_pronoun("his")] [organ.name]!"), + SPAN_NOTICE("You start applying pressure to your [organ.name]!")) else - user.visible_message("\The [user] starts applying pressure to [src]'s [organ.name]!", "You start applying pressure to [src]'s [organ.name]!") + user.visible_message(SPAN_NOTICE("\The [user] starts applying pressure to [src]'s [organ.name]!"), + SPAN_NOTICE("You start applying pressure to [src]'s [organ.name]!")) spawn(0) organ.applied_pressure = user @@ -640,9 +644,11 @@ organ.applied_pressure = null if(user == src) - user.visible_message("\The [user] stops applying pressure to [user.get_pronoun("his")] [organ.name]!", "You stop applying pressure to your [organ.name]!") + user.visible_message(SPAN_NOTICE("\The [user] stops applying pressure to [user.get_pronoun("his")] [organ.name]!"), + SPAN_NOTICE("You stop applying pressure to your [organ.name]!")) else - user.visible_message("\The [user] stops applying pressure to [src]'s [organ.name]!", "You stop applying pressure to [src]'s [organ.name]!") + user.visible_message(SPAN_NOTICE("\The [user] stops applying pressure to [src]'s [organ.name]!"), + SPAN_NOTICE("You stop applying pressure to [src]'s [organ.name]!")) return 1 diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 65a44bbc957..787697ed1b1 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -120,7 +120,7 @@ return // Notify our AI if they can now control the suit. if(wearing_rig?.ai_override_enabled && !stat && paralysis < amount) //We are passing out right this second. - wearing_rig.notify_ai("Warning: user consciousness failure. Mobility control passed to integrated intelligence system.") + wearing_rig.notify_ai(SPAN_DANGER("Warning: user consciousness failure. Mobility control passed to integrated intelligence system.")) ..() /mob/living/carbon/human/update_canmove() @@ -424,7 +424,7 @@ This function restores all organs. /mob/living/carbon/human/apply_damage(damage = 0, damagetype = DAMAGE_BRUTE, def_zone, blocked, used_weapon, damage_flags = 0, armor_pen, silent = FALSE) if (invisibility == INVISIBILITY_LEVEL_TWO && back && (istype(back, /obj/item/rig))) if(damage > 0) - to_chat(src, "You are now visible.") + to_chat(src, SPAN_DANGER("You are now visible.")) set_invisibility(0) var/obj/item/organ/external/organ = isorgan(def_zone) ? def_zone : get_organ(def_zone, TRUE) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 48cc49b72f4..1f38ae71c6d 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -206,7 +206,7 @@ emp_act target_zone = user.zone_sel.selecting if(!hit_zone) - visible_message("[user] misses [src] with \the [I]!") + visible_message(SPAN_DANGER("[user] misses [src] with \the [I]!")) return if(check_shields(I.force, I, user, target_zone, "the [I.name]")) @@ -214,7 +214,7 @@ emp_act var/obj/item/organ/external/affecting = get_organ(hit_zone) if (!affecting || affecting.is_stump()) - to_chat(user, "They are missing that limb!") + to_chat(user, SPAN_DANGER("They are missing that limb!")) return return hit_zone @@ -224,7 +224,7 @@ emp_act if(!affecting) return //should be prevented by attacked_with_item() but for sanity. - visible_message("[src] has been [LAZYPICK(I.attack_verb, "attacked")] in the [affecting.name] with [I] by [user]!") + visible_message(SPAN_DANGER("[src] has been [LAZYPICK(I.attack_verb, "attacked")] in the [affecting.name] with [I] by [user]!")) return standard_weapon_hit_effects(I, user, effective_force, hit_zone) /mob/living/carbon/human/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/hit_zone) @@ -261,7 +261,7 @@ emp_act if(headcheck(hit_zone)) //Harder to score a stun but if you do it lasts a bit longer if(prob(effective_force) && head && !istype(head, /obj/item/clothing/head/helmet)) - visible_message("[src] [species.knockout_message]") + visible_message(SPAN_DANGER("[src] [species.knockout_message]")) apply_effect(20, PARALYZE, blocked) //Apply blood @@ -312,7 +312,7 @@ emp_act var/blocked_ratio = get_blocked_ratio(organ.limb_name, W.damtype, W.damage_flags(), W.armor_penetration, W.force) if(prob(W.force * (1 - blocked_ratio))) - visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") + visible_message(SPAN_DANGER("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!")) organ.dislocate(1) return 1 return 0 @@ -320,12 +320,12 @@ emp_act /mob/living/carbon/human/emag_act(var/remaining_charges, mob/user, var/emag_source) var/obj/item/organ/external/affecting = get_organ(user.zone_sel.selecting) if(!affecting || !(affecting.status & ORGAN_ROBOT)) - to_chat(user, "That limb isn't robotic.") + to_chat(user, SPAN_WARNING("That limb isn't robotic.")) return -1 if(affecting.sabotaged) - to_chat(user, "[src]'s [affecting.name] is already sabotaged!") + to_chat(user, SPAN_WARNING("[src]'s [affecting.name] is already sabotaged!")) return -1 - to_chat(user, "You sneakily slide [emag_source] into the dataport on [src]'s [affecting.name] and short out the safeties.") + to_chat(user, SPAN_NOTICE("You sneakily slide [emag_source] into the dataport on [src]'s [affecting.name] and short out the safeties.")) affecting.sabotaged = 1 return 1 @@ -338,7 +338,7 @@ emp_act if(canmove && !restrained()) if(isturf(O.loc)) put_in_active_hand(O) - visible_message("[src] catches [O]!") + visible_message(SPAN_WARNING("[src] catches [O]!")) throw_mode_off() return @@ -367,7 +367,7 @@ emp_act return if(!zone) - visible_message("\The [O] misses [src] narrowly!") + visible_message(SPAN_NOTICE("\The [O] misses [src] narrowly!")) playsound(src, 'sound/effects/throw_miss.ogg', rand(10, 50), 1) return @@ -376,7 +376,8 @@ emp_act var/obj/item/organ/external/affecting = get_organ(zone) var/hit_area = affecting.name - src.visible_message("[src] has been hit in the [hit_area] by [O].", "You're hit in the [hit_area] by [O]!") + src.visible_message(SPAN_WARNING("[src] has been hit in the [hit_area] by [O]."), + SPAN_WARNING("You're hit in the [hit_area] by [O]!")) apply_damage(throw_damage, dtype, zone, used_weapon = O, damage_flags = O.damage_flags(), armor_pen = O.armor_penetration) if(ismob(O.thrower)) @@ -415,7 +416,8 @@ emp_act if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED) var/dir = get_dir(O.throw_source, src) - visible_message("[src] staggers under the impact!"," You stagger under the impact!") + visible_message(SPAN_WARNING("[src] staggers under the impact!"), + SPAN_WARNING("You stagger under the impact!")) src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) return @@ -523,12 +525,12 @@ emp_act if(user == src || anchored) return 0 if(user.is_pacified()) - to_chat(user, "You don't want to risk hurting [src]!") + to_chat(user, SPAN_NOTICE("You don't want to risk hurting [src]!")) return 0 for(var/obj/item/grab/G in user.grabbed_by) if(G.assailant == user) - to_chat(user, "You already grabbed [src].") + to_chat(user, SPAN_NOTICE("You already grabbed [src].")) return if (!attempt_grab(user)) @@ -539,7 +541,7 @@ emp_act var/obj/item/grab/G = new /obj/item/grab(user, user, src) if(buckled_to) - to_chat(user, "You cannot grab [src], [get_pronoun("he")] [get_pronoun("is")] buckled in!") + to_chat(user, SPAN_NOTICE("You cannot grab [src], [get_pronoun("he")] [get_pronoun("is")] buckled in!")) if(!G) //the grab will delete itself in New if affecting is anchored return user.put_in_active_hand(G) @@ -553,9 +555,9 @@ emp_act G.icon_state = "grabbed1" G.hud.icon_state = "reinforce1" G.last_action = world.time - visible_message("[user] gets a strong grip on [src]!") + visible_message(SPAN_WARNING("[user] gets a strong grip on [src]!")) return 1 - visible_message("[user] has grabbed [src] passively!") + visible_message(SPAN_WARNING("[user] has grabbed [src] passively!")) return 1 /mob/living/carbon/human/set_on_fire() diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 2123025a992..e93b23a6c08 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -15,7 +15,7 @@ if(status[1] == HUMAN_EATING_NO_MOUTH) to_chat(src, "Where do you intend to put \the [food]? You don't have a mouth!") else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH) - to_chat(src, "\The [status[2]] is in the way!") + to_chat(src, SPAN_WARNING("\The [status[2]] is in the way!")) return 0 /mob/living/carbon/human/can_force_feed(var/feeder, var/food, var/feedback = 1) @@ -26,7 +26,7 @@ if(status[1] == HUMAN_EATING_NO_MOUTH) to_chat(feeder, "Where do you intend to put \the [food]? \The [src] doesn't have a mouth!") else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH) - to_chat(feeder, "\The [status[2]] is in the way!") + to_chat(feeder, SPAN_WARNING("\The [status[2]] is in the way!")) return 0 /mob/living/carbon/human/proc/can_eat_status() diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 9d24071edce..1bc5b9109d0 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -107,7 +107,7 @@ for(var/limb_tag in list(BP_L_HAND,BP_L_ARM)) var/obj/item/organ/external/E = get_organ(limb_tag) if(!E) - visible_message("Lacking a functioning left hand, \the [src] drops \the [l_hand].") + visible_message(SPAN_DANGER("Lacking a functioning left hand, \the [src] drops \the [l_hand].")) drop_from_inventory(l_hand) break @@ -115,7 +115,7 @@ for(var/limb_tag in list(BP_R_HAND,BP_R_ARM)) var/obj/item/organ/external/E = get_organ(limb_tag) if(!E) - visible_message("Lacking a functioning right hand, \the [src] drops \the [r_hand].") + visible_message(SPAN_DANGER("Lacking a functioning right hand, \the [src] drops \the [r_hand].")) drop_from_inventory(r_hand) break @@ -216,12 +216,12 @@ var/brain_result = get_brain_result() switch(brain_result) if(0) - brain_result = "none, patient is braindead" + brain_result = SPAN_BAD("none, patient is braindead") if(-1) brain_result = "ERROR - Nonstandard biology" else if(brain_result <= 50) - brain_result = "[brain_result]%" + brain_result = SPAN_BAD("[brain_result]%") else if(brain_result <= 80) brain_result = "[brain_result]%" else diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 63033f7b6e6..67207f5def3 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -25,7 +25,7 @@ if(selected_string && h_style != selected_string) h_style = selected_string regenerate_icons() - visible_message("[src] pauses a moment to style their hair.") + visible_message(SPAN_NOTICE("[src] pauses a moment to style their hair.")) else to_chat(src, "You're already using that style.") @@ -50,7 +50,7 @@ if(selected_string && h_style != selected_string) h_style = selected_string regenerate_icons() - visible_message("[src] adjusts [src.get_pronoun("his")] headtails.") + visible_message(SPAN_NOTICE("[src] adjusts [src.get_pronoun("his")] headtails.")) else to_chat(src, "You're already using that style.") @@ -71,7 +71,7 @@ if(selected_string && f_style != selected_string) f_style = selected_string regenerate_icons() - visible_message("[src]'s screen switches to a different display.") + visible_message(SPAN_NOTICE("[src]'s screen switches to a different display.")) else to_chat(src, "You're already using that screen.") @@ -121,7 +121,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("[] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1) + O.show_message(SPAN_DANGER("[src] [failed ? "tried to tackle" : "has tackled"] down [T]!"), 1) /mob/living/carbon/human/proc/leap(mob/living/T as mob in oview(4)) set category = "Abilities" @@ -132,15 +132,15 @@ /mob/living/carbon/human/proc/do_leap(mob/living/T, max_range = 4, restrict_special = TRUE) if(restrict_special && last_special > world.time) - to_chat(src, "You're too tired to leap!") + to_chat(src, SPAN_NOTICE("You're too tired to leap!")) return FALSE if (status_flags & LEAPING) - to_chat(src, "You're already leaping!") + to_chat(src, SPAN_WARNING("You're already leaping!")) return FALSE if(stat || paralysis || stunned || weakened || lying || restrained() || buckled_to) - to_chat(src, "You cannot leap in your current state.") + to_chat(src, SPAN_WARNING("You cannot leap in your current state.")) return FALSE if (!T || issilicon(T)) // Silicon targets require us to rebuild the list. @@ -156,7 +156,7 @@ return FALSE if(get_dist(get_turf(T), get_turf(src)) > max_range) - to_chat(src, "[T] is too far away!") + to_chat(src, SPAN_WARNING("[T] is too far away!")) return FALSE if (restrict_special) @@ -164,7 +164,9 @@ status_flags |= LEAPING - visible_message("[src] leaps at [T]!", "You leap at [T]!") + visible_message(SPAN_DANGER("[src] leaps at [T]!"), + SPAN_DANGER("You leap at [T]!")) + throw_at(get_step(get_turf(T), get_turf(src)), 4, 1, src, do_throw_animation = FALSE) sleep(5) @@ -173,7 +175,7 @@ status_flags &= ~LEAPING if(!src.Adjacent(T)) - to_chat(src, "You miss!") + to_chat(src, SPAN_WARNING("You miss!")) return FALSE T.Weaken(3) @@ -181,12 +183,13 @@ var/use_hand = "left" if(l_hand) if(r_hand) - to_chat(src, "You need to have one hand free to grab someone.") + to_chat(src, SPAN_DANGER("You need to have one hand free to grab someone.")) return TRUE else use_hand = "right" - visible_message("[src] seizes [T] aggressively!", "You aggressively seize [T]!") + visible_message(SPAN_WARNING("[src] seizes [T] aggressively!"), + SPAN_WARNING("You aggressively seize [T]!")) var/obj/item/grab/G = new(src,T) if(use_hand == "left") @@ -209,21 +212,21 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, SPAN_WARNING("You cannot do that in your current state.")) return var/obj/item/grab/G = locate() in src if(!G || !istype(G)) - to_chat(src, "You are not grabbing anyone.") + to_chat(src, SPAN_WARNING("You are not grabbing anyone.")) return if(G.state < GRAB_AGGRESSIVE) - to_chat(src, "You must have an aggressive grab to gut your prey!") + to_chat(src, SPAN_WARNING("You must have an aggressive grab to gut your prey!")) return last_special = world.time + 50 - visible_message("[src] rips viciously at \the [G.affecting]'s body with its claws!") + visible_message(SPAN_WARNING("[src] rips viciously at \the [G.affecting]'s body with its claws!")) if(istype(G.affecting,/mob/living/carbon/human)) var/mob/living/carbon/human/H = G.affecting @@ -258,24 +261,24 @@ var/obj/item/organ/external/rhand = src.get_organ(BP_R_HAND) var/obj/item/organ/external/lhand = src.get_organ(BP_L_HAND) if((!rhand || !rhand.is_usable()) && (!lhand || !lhand.is_usable())) - to_chat(src,"You can't communicate without the ability to use your hands!") + to_chat(src,SPAN_WARNING("You can't communicate without the ability to use your hands!")) return if((lhand.is_stump()) && (rhand.is_stump())) - to_chat(src,"You can't communicate without functioning hands!") + to_chat(src,SPAN_WARNING("You can't communicate without functioning hands!")) return if(src.r_hand != null && src.l_hand != null) - to_chat(src,"You can't communicate while your hands are full!") + to_chat(src,SPAN_WARNING("You can't communicate while your hands are full!")) return if(stat || paralysis || stunned || weakened || restrained()) - to_chat(src,"You can't communicate while unable to move your hands to your head!") + to_chat(src,SPAN_WARNING("You can't communicate while unable to move your hands to your head!")) return if(last_special > world.time) - to_chat(src,"Your mind requires rest!") + to_chat(src,SPAN_NOTICE("Your mind requires rest!")) return last_special = world.time + 100 - visible_message("[src] touches their fingers to their temple.") + visible_message(SPAN_NOTICE("[src] touches their fingers to their temple.")) var/list/targets = list() for(var/mob/living/M in view(client.view, client.eye)) @@ -296,11 +299,11 @@ return if(target.stat == DEAD) - to_chat(src,"Not even a [src.species.name] can speak to the dead.") + to_chat(src,SPAN_CULT("Not even a [src.species.name] can speak to the dead.")) return if (target.isSynthetic()) - to_chat(src,"This can only be used on living organisms.") + to_chat(src,SPAN_WARNING("This can only be used on living organisms.")) return if (target.is_diona()) @@ -308,11 +311,11 @@ return if (isvaurca(target)) - to_chat (src, "You feel your thoughts pass right through a mind empty of psychic energy.") + to_chat (src, SPAN_CULT("You feel your thoughts pass right through a mind empty of psychic energy.")) return if(!(target in view(client.view, client.eye))) - to_chat(src,"[target] is too far for your mind to grasp!") + to_chat(src,SPAN_WARNING("[target] is too far for your mind to grasp!")) return log_say("[key_name(src)] communed to [key_name(target)]: [text]",ckey=key_name(src)) @@ -334,12 +337,12 @@ if (target.has_psionics()) return if(prob(10) && !(H.species.flags & NO_BLOOD)) - to_chat(H,"Your nose begins to bleed...") + to_chat(H,SPAN_WARNING("Your nose begins to bleed...")) H.drip(3) else if(prob(25) && (H.can_feel_pain())) - to_chat(H,"Your head hurts...") + to_chat(H,SPAN_WARNING("Your head hurts...")) else if(prob(50)) - to_chat(H,"Your mind buzzes...") + to_chat(H,SPAN_WARNING("Your mind buzzes...")) /mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview()) set name = "Psychic Whisper" @@ -413,7 +416,7 @@ set desc = "Detonate all explosive flechettes in a range of seven meters." if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, SPAN_WARNING("You cannot do that in your current state.")) return for(var/mob/living/M in range(7, src)) @@ -439,7 +442,7 @@ set desc = "State your laws aloud." if(stat) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, SPAN_WARNING("You cannot do that in your current state.")) return if(last_special > world.time) @@ -458,11 +461,11 @@ var/obj/item/grab/G = locate() in src if(!G || !istype(G)) - to_chat(src, "You are not grabbing anyone.") + to_chat(src, SPAN_WARNING("You are not grabbing anyone.")) return if(G.state < GRAB_AGGRESSIVE) - to_chat(src, "You must have an aggressive grab to do this!") + to_chat(src, SPAN_WARNING("You must have an aggressive grab to do this!")) return return G @@ -473,47 +476,47 @@ set desc = "While grabbing someone aggressively, bite their head off." if(last_special > world.time) - to_chat(src, "Your mandibles still ache!") + to_chat(src, SPAN_WARNING("Your mandibles still ache!")) return if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, SPAN_WARNING("You cannot do that in your current state.")) return var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) - to_chat(src, "We must be grabbing a creature in our active hand to devour their head.") + to_chat(src, SPAN_WARNING("We must be grabbing a creature in our active hand to devour their head.")) return if(G.state != GRAB_KILL) - to_chat(src, "We must have a tighter grip to devour their head.") + to_chat(src, SPAN_WARNING("We must have a tighter grip to devour their head.")) return if(istype(G.affecting,/mob/living/carbon/human)) var/mob/living/carbon/human/H = G.affecting if(!H.species.has_limbs[BP_HEAD]) - to_chat(src, "\The [H] does not have a head!") + to_chat(src, SPAN_WARNING("\The [H] does not have a head!")) return var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) if(!istype(affecting) || affecting.is_stump()) - to_chat(src, "\The [H] does not have a head!") + to_chat(src, SPAN_WARNING("\The [H] does not have a head!")) return - visible_message("\The [src] pulls \the [H] close, sticking \the [H]'s head into its maw!") + visible_message(SPAN_DANGER("\The [src] pulls \the [H] close, sticking \the [H]'s head into its maw!")) sleep(10) if(!src.Adjacent(G.affecting)) return - visible_message("\The [src] closes their jaws around \the [H]'s head!") + visible_message(SPAN_DANGER("\The [src] closes their jaws around \the [H]'s head!")) playsound(H.loc, 'sound/effects/blobattack.ogg', 50, 1) affecting.droplimb(0, DROPLIMB_BLUNT) else var/mob/living/M = G.affecting if(istype(M)) - visible_message("\The [src] rips viciously at \the [M]'s body with its claws!") + visible_message(SPAN_DANGER("\The [src] rips viciously at \the [M]'s body with its claws!")) playsound(M.loc, 'sound/effects/blobattack.ogg', 50, 1) M.gib() @@ -525,12 +528,12 @@ set desc = "When all else has failed, bite the bullet." if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, SPAN_WARNING("You cannot do that in your current state.")) return src.visible_message( - "\The [src] begins to beep ominously!", - "WARNING: SELF-DESTRUCT ENGAGED. Unit termination finalized in three seconds!" + SPAN_DANGER("\The [src] begins to beep ominously!"), + SPAN_DANGER("WARNING: SELF-DESTRUCT ENGAGED. Unit termination finalized in three seconds!") ) sleep(10) playsound(src, 'sound/items/countdown.ogg', 125, 1) @@ -548,7 +551,7 @@ var/text = null if(!(GLOB.all_languages[LANGUAGE_VAURCA] in src.languages)) - to_chat(src, "Your mind is dark, the unity of the hive is torn from you!") + to_chat(src, SPAN_DANGER("Your mind is dark, the unity of the hive is torn from you!")) return targets += getmobs() @@ -565,25 +568,25 @@ var/mob/M = targets[target] if(istype(M, /mob/abstract/observer) || M.stat == DEAD) - to_chat(src, "[M]'s hivenet implant is inactive!") + to_chat(src, SPAN_DANGER("[M]'s hivenet implant is inactive!")) return if(!(GLOB.all_languages[LANGUAGE_VAURCA] in M.languages)) - to_chat(src, "[M]'s hivenet implant is inactive!") + to_chat(src, SPAN_DANGER("[M]'s hivenet implant is inactive!")) return log_say("[key_name(src)] issued a hivenet order to [key_name(M)]: [text]",ckey=key_name(src)) if(istype(M, /mob/living/carbon/human) && isvaurca(M)) - to_chat(M, "You feel a buzzing in the back of your head, and your mind fills with the authority of [src.real_name], your ruler:") - to_chat(M, " [text]") + to_chat(M, SPAN_DANGER("You feel a buzzing in the back of your head, and your mind fills with the authority of [src.real_name], your ruler:")) + to_chat(M, SPAN_NOTICE(" [text]")) else - to_chat(M, "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, SPAN_DANGER("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == src.species.name) return - to_chat(H, "Your nose begins to bleed...") + to_chat(H, SPAN_DANGER("Your nose begins to bleed...")) H.drip(1) /mob/living/carbon/human/proc/quillboar(mob/target as mob in oview()) @@ -592,7 +595,7 @@ set category = "Abilities" if(last_special > world.time) - to_chat(src, "Your spine still aches!") + to_chat(src, SPAN_DANGER("Your spine still aches!")) return if(stat || paralysis || stunned || weakened || lying || restrained() || buckled_to) @@ -601,7 +604,7 @@ last_special = world.time + 30 - visible_message("[src] launches a spine-quill at [target]!") + visible_message(SPAN_WARNING("[src] launches a spine-quill at [target]!")) src.apply_damage(10,DAMAGE_BRUTE) playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1) @@ -625,12 +628,12 @@ set desc = "Shatter all lights around yourself." if(last_special > world.time) - to_chat(src, "You're still regaining your strength!") + to_chat(src, SPAN_DANGER("You're still regaining your strength!")) return last_special = world.time + 50 - visible_message("\The [src] shrieks!") + visible_message(SPAN_DANGER("\The [src] shrieks!")) playsound(src.loc, 'sound/species/revenant/grue_screech.ogg', 100, 1) for (var/mob/living/carbon/human/T in hearers(4, src) - src) if(T.get_hearing_protection() >= EAR_PROTECTION_MAJOR) @@ -650,7 +653,7 @@ set desc = "Create a field of darkness around yourself." if(last_special > world.time) - to_chat(src, "You're still regaining your strength!") + to_chat(src, SPAN_DANGER("You're still regaining your strength!")) return last_special = world.time + 100 @@ -667,12 +670,12 @@ set desc = "Toggle between seeing shadows or not." if (!stop_sight_update) - to_chat(src, "Your eyes shift around, allowing you to see in the dark.") + to_chat(src, SPAN_NOTICE("Your eyes shift around, allowing you to see in the dark.")) src.stop_sight_update = 1 src.see_invisible = SEE_INVISIBLE_NOLIGHTING else - to_chat(src, "You return your vision to normal.") + to_chat(src, SPAN_NOTICE("You return your vision to normal.")) src.stop_sight_update = 0 /mob/living/carbon/human/proc/shadow_step(var/turf/T in world) @@ -681,28 +684,28 @@ set desc = "Travel from place to place using the shadows." if(last_special > world.time) - to_chat(src, "You're still regaining your strength!") + to_chat(src, SPAN_DANGER("You're still regaining your strength!")) return if (!T || T.density || T.contains_dense_objects()) - to_chat(src, "You cannot do that.") + to_chat(src, SPAN_WARNING("You cannot do that.")) return if(!isturf(loc)) - to_chat(src, "You cannot teleport out of your current location.") + to_chat(src, SPAN_WARNING("You cannot teleport out of your current location.")) return if (T.z != src.z || get_dist(T, get_turf(src)) > world.view) - to_chat(src, "Your powers are not capable of taking you that far.") + to_chat(src, SPAN_WARNING("Your powers are not capable of taking you that far.")) return if (T.get_lumcount() > 0.1) - to_chat(src, "The destination is too bright.") + to_chat(src, SPAN_WARNING("The destination is too bright.")) return last_special = world.time + 200 - visible_message("\The [src] vanishes into the shadows!") + visible_message(SPAN_DANGER("\The [src] vanishes into the shadows!")) anim(get_turf(loc), loc,'icons/mob/mob.dmi',,"shadow", null ,loc.dir) @@ -720,20 +723,20 @@ set desc = "Charge forward, trampling anything in your path until you hit something more stubborn than you are." if(last_special > world.time) - to_chat(src, "You are too tired to charge!") + to_chat(src, SPAN_DANGER("You are too tired to charge!")) return if(stat || paralysis || stunned || weakened || lying || restrained() || buckled_to) - to_chat(src, "You cannot charge in your current state!") + to_chat(src, SPAN_DANGER("You cannot charge in your current state!")) return last_special = world.time + 100 - src.visible_message("\The [src] takes a step backwards and rears up.", - "You take a step backwards and then...") + src.visible_message(SPAN_WARNING("\The [src] takes a step backwards and rears up."), + SPAN_NOTICE("You take a step backwards and then...")) if(do_after(src,5)) playsound(loc, 'sound/species/revenant/grue_screech.ogg', 100, 1) - src.visible_message("\The [src] charges!") + src.visible_message(SPAN_DANGER("\The [src] charges!")) trampling() @@ -779,7 +782,7 @@ step(src, dir) playsound(src,'sound/mecha/mechstep.ogg',25,1) if (brokesomething) - src.visible_message("[src.name] breaks through!") + src.visible_message(SPAN_DANGER("[src.name] breaks through!")) addtimer(CALLBACK(src, PROC_REF(trampling)), 1) else @@ -802,7 +805,7 @@ sleep(1) if (A && !(A.gc_destroyed) && A.type == oldtype) - src.visible_message("[src.name] plows into \the [aname]!") + src.visible_message(SPAN_DANGER("[src.name] plows into \the [aname]!")) return 0 return 1 @@ -865,18 +868,18 @@ set desc = "Spew a cone of ignited napalm in front of you" if(last_special > world.time) - to_chat(src,"You are too tired to spray napalm!") + to_chat(src,SPAN_NOTICE("You are too tired to spray napalm!")) return if(stat || paralysis || stunned || weakened || lying || restrained() || buckled_to) - to_chat(src,"You cannot spray napalm in your current state.") + to_chat(src,SPAN_NOTICE("You cannot spray napalm in your current state.")) return last_special = world.time + 100 playsound(loc, 'sound/species/revenant/grue_screech.ogg', 100, 1) - visible_message("\The [src] unleashes a torrent of raging flame!", - "You unleash a gust of fire!", - "You hear the roar of an inferno!") + visible_message(SPAN_DANGER("\The [src] unleashes a torrent of raging flame!"), + SPAN_DANGER("You unleash a gust of fire!"), + SPAN_DANGER("You hear the roar of an inferno!")) var/turf/T = get_step(get_step(src, dir), dir) var/turf/T1 = get_step(T, dir) @@ -911,10 +914,10 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src,"You cannot do that in your current state!") + to_chat(src,SPAN_WARNING("You cannot do that in your current state!")) return - visible_message("\The [src] crackles with energy!") + visible_message(SPAN_DANGER("\The [src] crackles with energy!")) playsound(src, 'sound/magic/LightningShock.ogg', 75, 1) @@ -931,14 +934,14 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src,"You cannot do that in your current state!") + to_chat(src,SPAN_WARNING("You cannot do that in your current state!")) return var/obj/item/stack/material/O = src.get_active_hand() if(istype(O, /obj/item/stack/material)) if(O.material.golem == src.species.name) - to_chat(src,"You incorporate \the [O] into your mass, repairing damage to your structure.") + to_chat(src,SPAN_DANGER("You incorporate \the [O] into your mass, repairing damage to your structure.")) adjustBruteLoss(-10*O.amount) adjustFireLoss(-10*O.amount) if(!(species.flags & NO_BLOOD)) @@ -955,7 +958,7 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src,"You cannot do that in your current state!") + to_chat(src,SPAN_WARNING("You cannot do that in your current state!")) return var/obj/item/organ/internal/brain/golem/O = src.get_active_hand() @@ -963,20 +966,20 @@ if(istype(O)) if(O.health <= 0) - to_chat(src,"The spark of life already left \the [O]!") + to_chat(src,SPAN_WARNING("The spark of life already left \the [O]!")) return if(!O.brainmob) - to_chat(src,"\The [O] remains silent.") + to_chat(src,SPAN_WARNING("\The [O] remains silent.")) return if(!O.dna) - to_chat(src,"\The [O] is blank, you can not bring it back to life.") + to_chat(src,SPAN_WARNING("\The [O] is blank, you can not bring it back to life.")) var/mob/living/carbon/human/G = new(src.loc) G.key = O.brainmob.key INVOKE_ASYNC(G, TYPE_PROC_REF(/mob/living/carbon/human, set_species), O.dna.species) - to_chat(src,"You blow life back in \the [O], returning its past owner to life!") + to_chat(src,SPAN_NOTICE("You blow life back in \the [O], returning its past owner to life!")) qdel(O) last_special = world.time + 200 @@ -989,29 +992,29 @@ return if(stat || paralysis || stunned || weakened || lying || restrained()) - to_chat(src,"You can not do that in your current state!") + to_chat(src,SPAN_WARNING("You can not do that in your current state!")) return var/obj/item/organ/external/E = get_organ(zone_sel.selecting) if(!E) - to_chat(src,"You are missing that limb.") + to_chat(src,SPAN_WARNING("You are missing that limb.")) return if(!E.robotic) - to_chat(src,"You can only detach robotic limbs.") + to_chat(src,SPAN_WARNING("You can only detach robotic limbs.")) return if(E.robotize_type != PROSTHETIC_AUTAKH) - to_chat(src,"Your body fails to interface with this alien technology.") + to_chat(src,SPAN_WARNING("Your body fails to interface with this alien technology.")) return if(E.is_stump() || (E.status & ORGAN_DESTROYED) || E.is_broken()) - to_chat(src,"The limb is too damaged to be removed manually!") + to_chat(src,SPAN_WARNING("The limb is too damaged to be removed manually!")) return if(E.vital && !E.sabotaged) - to_chat(src,"Your safety system stops you from removing \the [E].") + to_chat(src,SPAN_WARNING("Your safety system stops you from removing \the [E].")) return last_special = world.time + 20 @@ -1023,8 +1026,8 @@ updatehealth() UpdateDamageIcon() - visible_message("\The [src] detaches [get_pronoun("his")] [E]!", - "You detach your [E]!") + visible_message(SPAN_NOTICE("\The [src] detaches [get_pronoun("his")] [E]!"), + SPAN_NOTICE("You detach your [E]!")) /mob/living/carbon/human/proc/attach_limb() set category = "Abilities" @@ -1035,7 +1038,7 @@ return if(stat || paralysis || stunned || weakened || lying || restrained()) - to_chat(src,"You can not do that in your current state!") + to_chat(src,SPAN_WARNING("You can not do that in your current state!")) return var/obj/item/organ/external/O = src.get_active_hand() @@ -1043,19 +1046,19 @@ if(istype(O)) if(!O.robotic) - to_chat(src,"You are unable to interface with organic matter.") + to_chat(src,SPAN_WARNING("You are unable to interface with organic matter.")) return if(O.robotize_type != PROSTHETIC_AUTAKH) - to_chat(src,"Your body fails to interface with this alien technology.") + to_chat(src,SPAN_WARNING("Your body fails to interface with this alien technology.")) return if(organs_by_name[O.limb_name]) - to_chat(src,"You already have a limb of this type.") + to_chat(src,SPAN_WARNING("You already have a limb of this type.")) return if(!organs_by_name[O.parent_organ]) - to_chat(src,"You are unable to find a place to attach \the [O] to your body.") + to_chat(src,SPAN_WARNING("You are unable to find a place to attach \the [O] to your body.")) return last_special = world.time + 20 @@ -1070,8 +1073,8 @@ updatehealth() UpdateDamageIcon() - visible_message("\The [src] attaches \the [O] to [get_pronoun("his")] body!", - "You attach \the [O] to your body!") + visible_message(SPAN_NOTICE("\The [src] attaches \the [O] to [get_pronoun("his")] body!"), + SPAN_NOTICE("You attach \the [O] to your body!")) /mob/living/carbon/human/proc/self_diagnostics() set name = "Self-Diagnostics" @@ -1080,9 +1083,9 @@ if(stat == DEAD) return - to_chat(src, "Performing self-diagnostic, please wait...") + to_chat(src, SPAN_NOTICE("Performing self-diagnostic, please wait...")) if (do_after(src, 10)) - var/output = "Self-Diagnostic Results:\n" + var/output = SPAN_NOTICE("Self-Diagnostic Results:\n") output += "Internal Temperature: [convert_k2c(bodytemperature)] Degrees Celsius\n" @@ -1135,15 +1138,15 @@ set category = "Abilities" if(incapacitated()) - to_chat(src, "You need to recover before you can use this ability.") + to_chat(src, SPAN_WARNING("You need to recover before you can use this ability.")) return if(last_special > world.time) - to_chat(src,"Your mind requires rest!") + to_chat(src,SPAN_NOTICE("Your mind requires rest!")) return last_special = world.time + 25 - to_chat(src, "You take a moment to tune into the local Nlom...") + to_chat(src, SPAN_NOTICE("You take a moment to tune into the local Nlom...")) var/list/dirs = list() for(var/mob/living/L in range(20)) var/turf/T = get_turf(L) @@ -1364,8 +1367,8 @@ say(",9!an enormous surge of encrypted data, surging out into the wider Hivenet.") - var/ccia_msg = "[uppertext(selected_hive)]: [key_name(src, 1)] (RPLY): [msg]" - var/admin_msg = "[uppertext(selected_hive)]: [key_name(src, 1)] (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (BSA) (RPLY): [msg]" + var/ccia_msg = SPAN_NOTICE("[uppertext(selected_hive)]: [key_name(src, 1)] (RPLY): [msg]") + var/admin_msg = SPAN_NOTICE("[uppertext(selected_hive)]: [key_name(src, 1)] (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (BSA) (RPLY): [msg]") var/cciaa_present = 0 var/cciaa_afk = 0 diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 06f89a2ed49..fb8ff156431 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -28,7 +28,7 @@ This saves us from having to call add_fingerprint() any time something is put in else update_inv_r_hand(0) else - to_chat(H, "You are unable to equip that.") + to_chat(H, SPAN_WARNING("You are unable to equip that.")) /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, ignore_blocked = FALSE) for(var/slot in slots) @@ -362,7 +362,7 @@ This saves us from having to call add_fingerprint() any time something is put in var/obj/item/clothing/under/uniform = src.w_uniform uniform.attackby(W,src) else - to_chat(src, "You are trying to equip this item to an unsupported inventory slot. If possible, please write a ticket with steps to reproduce. Slot was: [slot]") + to_chat(src, SPAN_DANGER("You are trying to equip this item to an unsupported inventory slot. If possible, please write a ticket with steps to reproduce. Slot was: [slot]")) return if((W == src.l_hand) && (slot != slot_l_hand)) @@ -405,7 +405,7 @@ This saves us from having to call add_fingerprint() any time something is put in check_flags = FACE //this is to stop regular hats from stopping you from changing your ears stuff, but this should work for closed ones, like space helmets if(covering && (covering.body_parts_covered & (I.body_parts_covered|check_flags))) - to_chat(user, "\The [covering] is in the way.") + to_chat(user, SPAN_WARNING("\The [covering] is in the way.")) return 0 return 1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index bb0f4a1bf31..029b2212598 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -175,11 +175,11 @@ if (disabilities & EPILEPSY) if ((prob(1) && paralysis < 1)) - to_chat(src, "You have a seizure!") + to_chat(src, SPAN_WARNING("You have a seizure!")) for(var/mob/O in viewers(src, null)) if(O == src) continue - O.show_message(text("[src] starts having a seizure!"), 1) + O.show_message(SPAN_DANGER("[src] starts having a seizure!"), 1) Paralyse(10) make_jittery(1000) if (disabilities & COUGHING) @@ -230,13 +230,13 @@ total_radiation -= 1 * RADIATION_SPEED_COEFFICIENT if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT)) src.apply_radiation(-5 * RADIATION_SPEED_COEFFICIENT) - to_chat(src, "You feel weak.") + to_chat(src, SPAN_WARNING("You feel weak.")) Weaken(3) if(!lying) emote("collapse") if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && species.name == SPECIES_HUMAN) //apes go bald if((h_style != "Bald" || f_style != "Shaved" )) - to_chat(src, "Your hair falls out.") + to_chat(src, SPAN_WARNING("Your hair falls out.")) h_style = "Bald" f_style = "Shaved" update_hair() @@ -246,9 +246,9 @@ damage = 7 if(prob(5)) take_overall_damage(0, 10 * RADIATION_SPEED_COEFFICIENT, used_weapon = "Radiation Burns") - to_chat(src, "You feel a burning sensation!") + to_chat(src, SPAN_WARNING("You feel a burning sensation!")) if(prob(1)) - to_chat(src, "You feel strange!") + to_chat(src, SPAN_WARNING("You feel strange!")) adjustCloneLoss(5 * RADIATION_SPEED_COEFFICIENT) emote("gasp") hallucination = max(hallucination, 20) //At this level, you're in a constant state of low-level hallucinations. As if you didn't have enough problems. @@ -630,7 +630,7 @@ set_see_invisible(SEE_INVISIBLE_CULT) make_jittery(5) if(prob(5)) - visible_message("[src] trembles uncontrollably.", "You tremble uncontrollably.") + visible_message("[src] trembles uncontrollably.", SPAN_WARNING("You tremble uncontrollably.")) to_chat(src, SPAN_CULT(pick("You feel fingers tracing up your back.", "You hear the distant wailing and sobbing of a departed loved one.", "You feel like you are being closely watched.", "You hear the hysterical laughter of a departed loved one.", "You no longer feel the reassuring presence of a departed loved one.", "You feel a hand taking hold of yours, digging its nails into you as it clings on."))) if(haunted >= 10) if(prob(5)) @@ -752,7 +752,7 @@ if(get_shock() >= species.total_health) if(!stat && !paralysis) - to_chat(src, "[species.halloss_message_self]") + to_chat(src, SPAN_WARNING("[species.halloss_message_self]")) src.visible_message("[src] [species.halloss_message]") Paralyse(10) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 477d9f45831..db1211d1aad 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -136,9 +136,9 @@ var/organ_med_pain_message = "Your %PARTNAME% hurts badly!" var/organ_high_pain_message = "Your %PARTNAME% is screaming out in pain!" - var/organ_low_burn_message = "Your %PARTNAME% burns." - var/organ_med_burn_message = "Your %PARTNAME% burns horribly!" - var/organ_high_burn_message = "Your %PARTNAME% feels like it's on fire!" + var/organ_low_burn_message = SPAN_DANGER("Your %PARTNAME% burns.") + var/organ_med_burn_message = SPAN_DANGER("Your %PARTNAME% burns horribly!") + var/organ_high_burn_message = SPAN_DANGER("Your %PARTNAME% feels like it's on fire!") var/list/stutter_verbs = list("stammers", "stutters") @@ -358,10 +358,10 @@ switch(msg_type) if("cold") if(!covered) - to_chat(H, "[pick(cold_discomfort_strings)]") + to_chat(H, SPAN_DANGER("[pick(cold_discomfort_strings)]")) if("heat") if(covered) - to_chat(H, "[pick(heat_discomfort_strings)]") + to_chat(H, SPAN_DANGER("[pick(heat_discomfort_strings)]")) /datum/species/proc/sanitize_name(var/name) return sanitizeName(name) @@ -443,12 +443,12 @@ if(H.on_fire) target.fire_stacks += 1 target.IgniteMob() - H.visible_message("[H] taps [target], setting [target.get_pronoun("his")] ablaze!", \ - "You tap [target], setting [target.get_pronoun("him")] ablaze!") + H.visible_message(SPAN_DANGER("[H] taps [target], setting [target.get_pronoun("his")] ablaze!"), \ + SPAN_WARNING("You tap [target], setting [target.get_pronoun("him")] ablaze!")) msg_admin_attack("[key_name(H)] spread fire to [target.name] ([target.ckey]) (JMP)",ckey=key_name(H),ckey_target=key_name(target)) else - H.visible_message("[H] taps [target] to get [target.get_pronoun("his")] attention!", \ - "You tap [target] to get [target.get_pronoun("his")] attention!") + H.visible_message(SPAN_NOTICE("[H] taps [target] to get [target.get_pronoun("his")] attention!"), \ + SPAN_NOTICE("You tap [target] to get [target.get_pronoun("his")] attention!")) /datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H) if(inherent_verbs) diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index eb8964f8ac8..19a7506f49f 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -35,7 +35,7 @@ attack_damage = Clamp(attack_damage, 1, 5) if(target == user) - user.visible_message("[user] [pick(attack_verb)] [user.get_pronoun("himself")] in the [affecting.name]!") + user.visible_message(SPAN_DANGER("[user] [pick(attack_verb)] [user.get_pronoun("himself")] in the [affecting.name]!")) return 0 switch(zone) @@ -43,20 +43,20 @@ // ----- HEAD ----- // switch(attack_damage) if(1 to 2) - user.visible_message("[user] scratched [target] across [target.get_pronoun("his")] cheek!") + user.visible_message(SPAN_DANGER("[user] scratched [target] across [target.get_pronoun("his")] cheek!")) if(3 to 4) - user.visible_message("[user] [pick(attack_verb)] [target]'s [pick(BP_HEAD, "neck")]!") //'with spread claws' sounds a little bit odd, just enough that conciseness is better here I think + user.visible_message(SPAN_DANGER("[user] [pick(attack_verb)] [target]'s [pick(BP_HEAD, "neck")]!")) //'with spread claws' sounds a little bit odd, just enough that conciseness is better here I think if(5) user.visible_message(pick( - "[user] rakes [user.get_pronoun("his")] [pick(attack_noun)] across [target]'s face!", - "[user] tears [user.get_pronoun("his")] [pick(attack_noun)] into [target]'s face!", + SPAN_DANGER("[user] rakes [user.get_pronoun("his")] [pick(attack_noun)] across [target]'s face!"), + SPAN_DANGER("[user] tears [user.get_pronoun("his")] [pick(attack_noun)] into [target]'s face!"), )) else // ----- BODY ----- // switch(attack_damage) - if(1 to 2) user.visible_message("[user] scratched [target]'s [affecting.name]!") - if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [pick("", "", "the side of")] [target]'s [affecting.name]!") - if(5) user.visible_message("[user] tears [user.get_pronoun("his")] [pick(attack_noun)] [pick("deep into", "into", "across")] [target]'s [affecting.name]!") + if(1 to 2) user.visible_message(SPAN_DANGER("[user] scratched [target]'s [affecting.name]!")) + if(3 to 4) user.visible_message(SPAN_DANGER("[user] [pick(attack_verb)] [pick("", "", "the side of")] [target]'s [affecting.name]!")) + if(5) user.visible_message(SPAN_DANGER("[user] tears [user.get_pronoun("his")] [pick(attack_noun)] [pick("deep into", "into", "across")] [target]'s [affecting.name]!")) /datum/unarmed_attack/claws/unathi sparring_variant_type = /datum/unarmed_attack/pain_strike/heavy // unathi have heavier pain hits in this mode @@ -103,7 +103,7 @@ /datum/unarmed_attack/stomp/weak/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) - user.visible_message("[user] jumped up and down on \the [target]'s [affecting.name]!") + user.visible_message(SPAN_WARNING("[user] jumped up and down on \the [target]'s [affecting.name]!")) playsound(user.loc, attack_sound, 25, 1, -1) /datum/unarmed_attack/punch/ipc @@ -145,7 +145,7 @@ ..() if(prob(25) && target.mob_size <= 30) playsound(user, 'sound/weapons/push_connect.ogg', 50, 1, -1) - user.visible_message("[user] shoves hard, sending [target] flying!") + user.visible_message(SPAN_DANGER("[user] shoves hard, sending [target] flying!")) var/T = get_turf(user) spark(T, 3, GLOB.alldirs) step_away(target,user,15) @@ -176,10 +176,10 @@ if(L == target) continue L.apply_damage(rand(5,20), DAMAGE_BRUTE, zone, armor) - to_chat(L, "\The [user] [pick(attack_verb)] you with its [attack_noun]!") + to_chat(L, SPAN_DANGER("\The [user] [pick(attack_verb)] you with its [attack_noun]!")) hit_mobs++ if(hit_mobs) - to_chat(user, "You used \the [attack_noun] to attack [hit_mobs] other target\s!") + to_chat(user, SPAN_DANGER("You used \the [attack_noun] to attack [hit_mobs] other target\s!")) /datum/unarmed_attack/bite/mandibles diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 5da0200d9a9..985c6050a8b 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -56,8 +56,8 @@ organ_high_pain_message = "The nymph making up our %PARTNAME% screams out in pain!" organ_low_burn_message = "The nymph making up our %PARTNAME% notes a burning injury." - organ_med_burn_message = "The nymph making up our %PARTNAME% burns terribly!" - organ_high_burn_message = "The nymph making up our %PARTNAME% screams in agony at the burning!" + organ_med_burn_message = SPAN_DANGER("The nymph making up our %PARTNAME% burns terribly!") + organ_high_burn_message = SPAN_DANGER("The nymph making up our %PARTNAME% screams in agony at the burning!") halloss_message = "creaks and crumbles to the floor." halloss_message_self = "We can't take this much pain..." diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm index 0fae386b4a6..895874232ad 100644 --- a/code/modules/mob/living/carbon/human/species/station/golem.dm +++ b/code/modules/mob/living/carbon/human/species/station/golem.dm @@ -396,8 +396,8 @@ var/global/list/golem_types = list( if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflectchance = 50 - round(P.damage/3) if(prob(reflectchance)) - H.visible_message("The [P.name] gets reflected by [H]!", \ - "The [P.name] gets reflected by [H]!") + H.visible_message(SPAN_DANGER("The [P.name] gets reflected by [H]!"), \ + SPAN_DANGER("The [P.name] gets reflected by [H]!")) // Find a turf near or on the original location to bounce to if(P.starting) @@ -602,8 +602,8 @@ var/global/list/golem_types = list( if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflectchance = 80 - round(P.damage/3) if(prob(reflectchance)) - H.visible_message("The [P.name] gets reflected by [H]!", \ - "The [P.name] gets reflected by [H]!") + H.visible_message(SPAN_DANGER("The [P.name] gets reflected by [H]!"), \ + SPAN_DANGER("The [P.name] gets reflected by [H]!")) // Find a turf near or on the original location to bounce to if(P.starting) @@ -696,7 +696,7 @@ var/global/list/golem_types = list( return /datum/species/golem/sand/proc/glassify(var/mob/living/carbon/human/H) - H.visible_message("\The [H] vitrifies into a glass construct!") + H.visible_message(SPAN_WARNING("\The [H] vitrifies into a glass construct!")) H.set_species(SPECIES_GOLEM_GLASS) /datum/species/golem/plastic diff --git a/code/modules/mob/living/carbon/human/species/station/human/human_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/human/human_subspecies.dm index 32b15abd45f..70566a76c09 100644 --- a/code/modules/mob/living/carbon/human/species/station/human/human_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/human/human_subspecies.dm @@ -94,7 +94,7 @@ "Your legs feel harder to move.", "You begin to have trouble standing upright.") - to_chat(H, "[pain_message]") + to_chat(H, SPAN_WARNING("[pain_message]")) /datum/species/human/vatgrown name = SPECIES_HUMAN_VATGROWN diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 314a6309dcb..851456f992d 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -35,22 +35,22 @@ to_chat(user, SPAN_NOTICE("The [T] is set to release [T.distribute_pressure] kPA.")) return TRUE if("pockets") - visible_message("\The [user] is trying to empty \the [src]'s pockets!") + visible_message(SPAN_DANGER("\The [user] is trying to empty \the [src]'s pockets!")) if(do_after(user, HUMAN_STRIP_DELAY, src, do_flags = DO_EQUIP)) empty_pockets(user) return 1 if("splints") - visible_message("\The [user] is trying to remove \the [src]'s splints!") + visible_message(SPAN_DANGER("\The [user] is trying to remove \the [src]'s splints!")) if(do_after(user, HUMAN_STRIP_DELAY, src, do_flags = DO_EQUIP)) remove_splints(user) return 1 if("sensors") - visible_message("\The [user] is trying to set \the [src]'s sensors!") + visible_message(SPAN_DANGER("\The [user] is trying to set \the [src]'s sensors!")) if(do_after(user, HUMAN_STRIP_DELAY, src, do_flags = DO_EQUIP)) toggle_sensors(user) return 1 if("internals") - visible_message("\The [usr] is trying to set \the [src]'s internals!") + visible_message(SPAN_DANGER("\The [usr] is trying to set \the [src]'s internals!")) if(do_after(user, HUMAN_STRIP_DELAY, src, do_flags = DO_EQUIP)) toggle_internals(user) return 1 @@ -70,7 +70,7 @@ if(!istype(A)) return 0 - visible_message("\The [usr] is trying to remove \the [src]'s [A.name]!") + visible_message(SPAN_DANGER("\The [usr] is trying to remove \the [src]'s [A.name]!")) if(!do_after(user, HUMAN_STRIP_DELAY, src, do_flags = DO_EQUIP)) return 0 @@ -79,7 +79,7 @@ return 0 if(istype(A, /obj/item/clothing/accessory/badge) || istype(A, /obj/item/clothing/accessory/medal)) - user.visible_message("\The [user] tears off \the [A] from [src]'s [suit.name]!") + user.visible_message(SPAN_DANGER("\The [user] tears off \the [A] from [src]'s [suit.name]!")) attack_log += "\[[time_stamp()]\] Has had \the [A] removed by [user.name] ([user.ckey])" user.attack_log += "\[[time_stamp()]\] Attempted to remove [name]'s ([ckey]) [A.name]" suit.remove_accessory(user, A) @@ -91,12 +91,12 @@ if(stripping) if(!target_slot.canremove) - to_chat(user, "You cannot remove \the [src]'s [target_slot.name].") + to_chat(user, SPAN_WARNING("You cannot remove \the [src]'s [target_slot.name].")) return 0 else - visible_message("\The [user] is trying to remove \the [src]'s [target_slot.name]!") + visible_message(SPAN_DANGER("\The [user] is trying to remove \the [src]'s [target_slot.name]!")) else - visible_message("\The [user] is trying to put \a [held] on \the [src]!") + visible_message(SPAN_DANGER("\The [user] is trying to put \a [held] on \the [src]!")) if(!do_mob(user,src,HUMAN_STRIP_DELAY)) return 0 if(!stripping && held != user.get_active_hand()) @@ -117,22 +117,22 @@ // Empty out everything in the target's pockets. /mob/living/carbon/human/proc/empty_pockets(var/mob/living/user) if(!r_store && !l_store) - to_chat(user, "\The [src] has nothing in their pockets.") + to_chat(user, SPAN_WARNING("\The [src] has nothing in their pockets.")) return if(r_store) unEquip(r_store) if(l_store) unEquip(l_store) - visible_message("\The [user] empties \the [src]'s pockets!") + visible_message(SPAN_DANGER("\The [user] empties \the [src]'s pockets!")) // Modify the current target sensor level. /mob/living/carbon/human/proc/toggle_sensors(var/mob/living/user) var/obj/item/clothing/under/suit = w_uniform if(!suit) - to_chat(user, "\The [src] is not wearing a suit with sensors.") + to_chat(user, SPAN_WARNING("\The [src] is not wearing a suit with sensors.")) return if (suit.has_sensor >= 2) - to_chat(user, "\The [src]'s suit sensor controls are locked.") + to_chat(user, SPAN_WARNING("\The [src]'s suit sensor controls are locked.")) return attack_log += text("\[[time_stamp()]\] Has had their sensors toggled by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [name]'s ([ckey]) sensors") @@ -145,7 +145,7 @@ if(istype(wear_suit,/obj/item/clothing/suit/space)) var/obj/item/clothing/suit/space/suit = wear_suit if(suit.supporting_limbs && suit.supporting_limbs.len) - to_chat(user, "You cannot remove the splints - [src]'s [suit] is supporting some of the breaks.") + to_chat(user, SPAN_WARNING("You cannot remove the splints - [src]'s [suit] is supporting some of the breaks.")) can_reach_splints = 0 if(can_reach_splints) @@ -158,9 +158,9 @@ W.add_fingerprint(user) removed_splint = 1 if(removed_splint) - visible_message("\The [user] removes \the [src]'s splints!") + visible_message(SPAN_DANGER("\The [user] removes \the [src]'s splints!")) else - to_chat(user, "\The [src] has no splints to remove.") + to_chat(user, SPAN_WARNING("\The [src] has no splints to remove.")) // Set internals on or off. /mob/living/carbon/human/proc/toggle_internals(var/mob/living/user) @@ -182,9 +182,9 @@ internal = belt if(internal) - visible_message("\The [src] is now running on internals!") + visible_message(SPAN_WARNING("\The [src] is now running on internals!")) internal.add_fingerprint(user) if (internals) internals.icon_state = "internal1" else - visible_message("\The [user] disables \the [src]'s internals!") + visible_message(SPAN_DANGER("\The [user] disables \the [src]'s internals!")) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index c70dcdcf620..eec181b54c6 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -73,44 +73,48 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) if(BP_HEAD, BP_MOUTH, BP_EYES) // Induce blurriness if(pain_message) - target.visible_message("[target] looks momentarily disoriented.", "You see stars.") + target.visible_message(SPAN_DANGER("[target] looks momentarily disoriented."), + SPAN_DANGER("You see stars.")) + target.apply_effect(attack_damage*2, EYE_BLUR, armor) if(BP_L_ARM, BP_L_HAND) if (target.l_hand) // Disarm left hand //Urist McAssistant dropped the macguffin with a scream just sounds odd. Plus it doesn't work with NO_PAIN - target.visible_message("\The [target.l_hand] was knocked right out of [target]'s grasp!") + target.visible_message(SPAN_DANGER("\The [target.l_hand] was knocked right out of [target]'s grasp!")) target.drop_l_hand() if(BP_R_ARM, BP_R_HAND) if (target.r_hand) // Disarm right hand - target.visible_message("\The [target.r_hand] was knocked right out of [target]'s grasp!") + target.visible_message(SPAN_DANGER("\The [target.r_hand] was knocked right out of [target]'s grasp!")) target.drop_r_hand() if(BP_CHEST) if(!target.lying) var/turf/T = get_step(get_turf(target), get_dir(get_turf(user), get_turf(target))) if(!T.density) step(target, get_dir(get_turf(user), get_turf(target))) - target.visible_message("[pick("[target] was sent flying backward!", "[target] staggers back from the impact!")]") + target.visible_message(SPAN_DANGER("[pick("[target] was sent flying backward!", "[target] staggers back from the impact!")]")) else - target.visible_message("[target] slams into [T]!") + target.visible_message(SPAN_DANGER("[target] slams into [T]!")) if(prob(50)) target.set_dir(GLOB.reverse_dir[target.dir]) target.apply_effect(attack_damage * 0.4, WEAKEN, armor) if(BP_GROIN) if(pain_message) - target.visible_message("[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!", "[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, that REALLY hurt!"]") + target.visible_message(SPAN_WARNING("[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!"), + SPAN_WARNING("[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, that REALLY hurt!"]")) + target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armor) if(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) if(!target.lying) if(pain_message) - target.visible_message("[target] gives way slightly.") + target.visible_message(SPAN_WARNING("[target] gives way slightly.")) target.apply_effect(attack_damage*3, DAMAGE_PAIN, armor) else if(attack_damage >= 5 && !(target == user) && (stun_chance + attack_damage * 5 >= 100) && armor < 1) // Chance to get the usual throwdown as well (25% standard chance) if(!target.lying) - target.visible_message("[target] [pick("slumps", "falls", "drops")] down to the ground!") + target.visible_message(SPAN_DANGER("[target] [pick("slumps", "falls", "drops")] down to the ground!")) else - target.visible_message("[target] has been weakened!") + target.visible_message(SPAN_DANGER("[target] has been weakened!")) target.apply_effect(3, WEAKEN, armor*100) /datum/unarmed_attack/proc/show_attack(var/mob/living/carbon/human/user, var/mob/living/target, var/zone, var/attack_damage) @@ -143,8 +147,8 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) var/obj/item/organ/internal/eyes/eyes = target.get_eyes() eyes.take_damage(rand(3,4), 1) - user.visible_message("[user] presses [user.get_pronoun("his")] [eye_attack_text] into [target]'s [eyes.name]!") - to_chat(target, "You experience[(!target.can_feel_pain())? "" : " immense pain as you feel" ] [eye_attack_text_victim] being pressed into your [eyes.name][(!target.can_feel_pain())? "." : "!"]") + user.visible_message(SPAN_DANGER("[user] presses [user.get_pronoun("his")] [eye_attack_text] into [target]'s [eyes.name]!")) + to_chat(target, SPAN_DANGER("You experience[(!target.can_feel_pain())? "" : " immense pain as you feel" ] [eye_attack_text_victim] being pressed into your [eyes.name][(!target.can_feel_pain())? "." : "!"]")) /datum/unarmed_attack/proc/damage_flags() . = 0 @@ -192,7 +196,7 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) attack_damage = Clamp(attack_damage, 1, 5) // We expect damage input of 1 to 5 for this proc. But we leave this check juuust in case. if(target == user) - user.visible_message("[user] [pick(attack_verb)] [user.get_pronoun("himself")] in the [organ]!") + user.visible_message(SPAN_DANGER("[user] [pick(attack_verb)] [user.get_pronoun("himself")] in the [organ]!")) return 0 if(!target.lying) @@ -201,31 +205,31 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) // ----- HEAD ----- // switch(attack_damage) if(1 to 2) - user.visible_message("[user] slapped [target] across [target.get_pronoun("his")] cheek!") + user.visible_message(SPAN_DANGER("[user] slapped [target] across [target.get_pronoun("his")] cheek!")) if(3 to 4) user.visible_message(pick( - 40; "[user] [pick(attack_verb)] [target] in the head!", - 30; "[user] struck [target] in the head[pick("", " with a closed fist")]!", - 30; "[user] threw a hook against [target]'s head!" + 40; SPAN_DANGER("[user] [pick(attack_verb)] [target] in the head!"), + 30; SPAN_DANGER("[user] struck [target] in the head[pick("", " with a closed fist")]!"), + 30; SPAN_DANGER("[user] threw a hook against [target]'s head!") )) if(5) user.visible_message(pick( - 30; "[user] gave [target] a resounding [pick("slap", "punch")] to the face!", - 40; "[user] smashed [user.get_pronoun("his")] [pick(attack_noun)] into [target]'s face!", - 30; "[user] gave a strong blow against [target]'s jaw!" + 30; SPAN_DANGER("[user] gave [target] a resounding [pick("slap", "punch")] to the face!"), + 40; SPAN_DANGER("[user] smashed [user.get_pronoun("his")] [pick(attack_noun)] into [target]'s face!"), + 30; SPAN_DANGER("[user] gave a strong blow against [target]'s jaw!") )) else // ----- BODY ----- // switch(attack_damage) - if(1 to 2) user.visible_message("[user] threw a glancing punch at [target]'s [organ]!") - if(1 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in [target.get_pronoun("his")] [organ]!") + if(1 to 2) user.visible_message(SPAN_DANGER("[user] threw a glancing punch at [target]'s [organ]!")) + if(1 to 4) user.visible_message(SPAN_DANGER("[user] [pick(attack_verb)] [target] in [target.get_pronoun("his")] [organ]!")) if(5) user.visible_message(pick( - 50; "[user] smashed [user.get_pronoun("his")] [pick(attack_noun)] into [target]'s [organ]!", - 50; "[user] landed a striking [pick(attack_noun)] on [target]'s [organ]!" + 50; SPAN_DANGER("[user] smashed [user.get_pronoun("his")] [pick(attack_noun)] into [target]'s [organ]!"), + 50; SPAN_DANGER("[user] landed a striking [pick(attack_noun)] on [target]'s [organ]!") )) else - user.visible_message("[user] [pick("punched", "threw a punch against", "struck", "slammed their [pick(attack_noun)] into")] [target]'s [organ]!") //why do we have a separate set of verbs for lying targets? + user.visible_message(SPAN_DANGER("[user] [pick("punched", "threw a punch against", "struck", "slammed their [pick(attack_noun)] into")] [target]'s [organ]!")) //why do we have a separate set of verbs for lying targets? /datum/unarmed_attack/palm // attacking with a fist generally gives higher DPS, this is for style points attack_verb = list("smacked") // Empty hand hurt intent verb. @@ -285,9 +289,9 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) attack_damage = Clamp(attack_damage, 1, 5) switch(attack_damage) - if(1 to 2) user.visible_message("[user] threw [target] a glancing [pick(attack_noun)] to the [organ]!") //it's not that they're kicking lightly, it's that the kick didn't quite connect - if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in [target.get_pronoun("his")] [organ]!") - if(5) user.visible_message("[user] landed a strong [pick(attack_noun)] against [target]'s [organ]!") + if(1 to 2) user.visible_message(SPAN_DANGER("[user] threw [target] a glancing [pick(attack_noun)] to the [organ]!")) //it's not that they're kicking lightly, it's that the kick didn't quite connect + if(3 to 4) user.visible_message(SPAN_DANGER("[user] [pick(attack_verb)] [target] in [target.get_pronoun("his")] [organ]!")) + if(5) user.visible_message(SPAN_DANGER("[user] landed a strong [pick(attack_noun)] against [target]'s [organ]!")) /datum/unarmed_attack/stomp attack_verb = null @@ -333,8 +337,8 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) attack_damage = Clamp(attack_damage, 1, 5) switch(attack_damage) - if(1 to 4) user.visible_message("[pick("[user] stomped on", "[user] slammed [user.get_pronoun("his")] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!") - if(5) user.visible_message("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed [user.get_pronoun("his")] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ + if(1 to 4) user.visible_message(SPAN_DANGER("[pick("[user] stomped on", "[user] slammed [user.get_pronoun("his")] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!")) + if(5) user.visible_message(SPAN_DANGER("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed [user.get_pronoun("his")] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!")) //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ /datum/unarmed_attack/pain_strike damage_type = DAMAGE_PAIN diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm index 043dbde2a16..d1c9bb2acda 100644 --- a/code/modules/mob/living/carbon/taste.dm +++ b/code/modules/mob/living/carbon/taste.dm @@ -5,7 +5,7 @@ var/text_output = temp.generate_taste_message(src) if(text_output != last_taste_text || last_taste_time + 100 < world.time) //We dont want to spam the same message over and over again at the person. Give it a bit of a buffer. - to_chat(src, "You can taste [text_output]")//no taste means there are too many tastes and not enough flavor. + to_chat(src, SPAN_NOTICE("You can taste [text_output]"))//no taste means there are too many tastes and not enough flavor. last_taste_time = world.time last_taste_text = text_output return from.trans_to_holder(target,amount,multiplier,copy) //complete transfer diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 42a4329bc81..1627f2aa013 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -65,14 +65,14 @@ default behaviour is: for(var/mob/living/M in range(tmob, 1)) if(tmob.pinned.len || ((M.pulling == tmob && ( tmob.restrained() && !( M.restrained() ) && M.stat == 0)) || locate(/obj/item/grab, tmob.grabbed_by.len)) ) if (last_push_notif + 0.5 SECONDS <= world.time) - to_chat(src, "[tmob] is restrained, you cannot push past") + to_chat(src, SPAN_WARNING("[tmob] is restrained, you cannot push past")) last_push_notif = world.time now_pushing = FALSE return if( tmob.pulling == M && ( M.restrained() && !( tmob.restrained() ) && tmob.stat == 0) ) if (last_push_notif + 0.5 SECONDS <= world.time) - to_chat(src, "[tmob] is restraining [M], you cannot push past") + to_chat(src, SPAN_WARNING("[tmob] is restraining [M], you cannot push past")) last_push_notif = world.time now_pushing = FALSE @@ -123,7 +123,7 @@ default behaviour is: if(istype(tmob, /mob/living/carbon/human) && (tmob.mutations & FAT)) if(prob(40) && !(mutations & FAT)) - to_chat(src, "You fail to push [tmob]'s fat ass out of the way.") + to_chat(src, SPAN_DANGER("You fail to push [tmob]'s fat ass out of the way.")) now_pushing = FALSE return @@ -224,9 +224,9 @@ default behaviour is: set hidden = 1 if (health < maxHealth / 3) adjustBrainLoss(health + maxHealth * 2) // Deal 2x health in BrainLoss damage, as before but variable. - to_chat(src, "You have given up life and succumbed to death.") + to_chat(src, SPAN_NOTICE("You have given up life and succumbed to death.")) else - to_chat(src, "You are not injured enough to succumb to death!") + to_chat(src, SPAN_WARNING("You are not injured enough to succumb to death!")) /mob/living/proc/updatehealth() @@ -609,7 +609,7 @@ default behaviour is: var/obj/item/grab/G = pick(M.grabbed_by) if (istype(G, /obj/item/grab)) for(var/mob/O in viewers(M, null)) - O.show_message(text("[] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1) + O.show_message(SPAN_WARNING("[G.affecting] has been pulled from [G.assailant]'s grip by [src]"), 1) //G = null qdel(G) else @@ -631,11 +631,11 @@ default behaviour is: //pull damage with injured people if(prob(25)) M.adjustBruteLoss(1) - visible_message("\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!") + visible_message(SPAN_DANGER("\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!")) if(M.pull_damage()) if(prob(25)) M.adjustBruteLoss(2) - visible_message("\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!") + visible_message(SPAN_DANGER("\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!")) var/turf/location = M.loc if (istype(location, /turf/simulated)) location.add_blood(M) @@ -704,8 +704,8 @@ default behaviour is: if(istype(M)) M.drop_from_inventory(H) - to_chat(M, "\The [H] wriggles out of your grip!") - to_chat(src, "You wriggle out of \the [M]'s grip!") + to_chat(M, SPAN_WARNING("\The [H] wriggles out of your grip!")) + to_chat(src, SPAN_WARNING("You wriggle out of \the [M]'s grip!")) // Update whether or not this mob needs to pass emotes to contents. for(var/atom/A in M.contents) @@ -717,10 +717,10 @@ default behaviour is: var/obj/item/clothing/accessory/holster/holster = H.loc if(holster.holstered == H) holster.clear_holster() - to_chat(src, "You extricate yourself from \the [holster].") + to_chat(src, SPAN_WARNING("You extricate yourself from \the [holster].")) H.forceMove(get_turf(H)) else if(istype(H.loc,/obj/item)) - to_chat(src, "You struggle free of \the [H.loc].") + to_chat(src, SPAN_WARNING("You struggle free of \the [H.loc].")) H.forceMove(get_turf(H)) /mob/living/proc/escape_buckle() @@ -734,7 +734,7 @@ default behaviour is: return last_resist = world.time if(stunned > 10) - to_chat(src, "You can't move...") + to_chat(src, SPAN_NOTICE("You can't move...")) return var/resisting = 0 for(var/obj/O in requests) @@ -788,7 +788,7 @@ default behaviour is: return last_special = world.time resting = !resting - to_chat(src, "You are now [resting ? "resting" : "getting up"].") + to_chat(src, SPAN_NOTICE("You are now [resting ? "resting" : "getting up"].")) update_canmove() update_icon() @@ -835,7 +835,7 @@ default behaviour is: inertia_dir = 1 else if(y >= world.maxy -TRANSITIONEDGE) inertia_dir = 2 - to_chat(src, "Something you are carrying is preventing you from leaving.") + to_chat(src, SPAN_WARNING("Something you are carrying is preventing you from leaving.")) return ..() @@ -872,10 +872,10 @@ default behaviour is: if(!..()) return 0 if(!possession_candidate) - to_chat(possessor, "That animal cannot be possessed.") + to_chat(possessor, SPAN_WARNING("That animal cannot be possessed.")) return 0 if(jobban_isbanned(possessor, "Animal")) - to_chat(possessor, "You are banned from animal roles.") + to_chat(possessor, SPAN_WARNING("You are banned from animal roles.")) return 0 if(!possessor.MayRespawn(1,ANIMAL)) return 0 @@ -887,7 +887,7 @@ default behaviour is: return 0 if(src.ckey || src.client) - to_chat(possessor, "\The [src] already has a player.") + to_chat(possessor, SPAN_WARNING("\The [src] already has a player.")) return 0 message_admins("[key_name_admin(possessor)] has taken control of \the [src].") @@ -896,16 +896,16 @@ default behaviour is: qdel(possessor) if(round_is_spooky(6)) // Six or more active cultists. - to_chat(src, "You reach out with tendrils of ectoplasm and invade the mind of \the [src]...") + to_chat(src, SPAN_NOTICE("You reach out with tendrils of ectoplasm and invade the mind of \the [src]...")) to_chat(src, "You have assumed direct control of \the [src].") - to_chat(src, "Due to the spookiness of the round, you have taken control of the poor animal as an invading, possessing spirit - roleplay accordingly.") + to_chat(src, SPAN_NOTICE("Due to the spookiness of the round, you have taken control of the poor animal as an invading, possessing spirit - roleplay accordingly.")) src.universal_speak = 1 src.universal_understand = 1 //src.cultify() // Maybe another time. return to_chat(src, "You are now \the [src]!") - to_chat(src, "Remember to stay in character for a mob of this type!") + to_chat(src, SPAN_NOTICE("Remember to stay in character for a mob of this type!")) return 1 /mob/living/Initialize() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 633579b2c0b..42f047d196f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -30,7 +30,7 @@ if(C && C.active) C.attack_self(src)//Should shut it off update_icon() - to_chat(src, "Your [C.name] was disrupted!") + to_chat(src, SPAN_NOTICE("Your [C.name] was disrupted!")) Stun(2) //Being hit while using a deadman switch @@ -38,7 +38,7 @@ var/obj/item/device/assembly/signaler/signaler = get_active_hand() if(signaler.deadman && prob(80)) log_and_message_admins("has triggered a signaler deadman's switch") - src.visible_message("[src] triggers their deadman's switch!") + src.visible_message(SPAN_WARNING("[src] triggers their deadman's switch!")) signaler.signal() //Armor @@ -143,7 +143,7 @@ //Called when the mob is hit with an item in combat. Returns the blocked result /mob/living/proc/hit_with_weapon(obj/item/I, mob/living/user, var/effective_force, var/hit_zone, var/ground_zero) - visible_message("[src] has been [LAZYPICK(I.attack_verb,"attacked")] with [I] by [user]!") + visible_message(SPAN_DANGER("[src] has been [LAZYPICK(I.attack_verb,"attacked")] with [I] by [user]!")) . = standard_weapon_hit_effects(I, user, effective_force, hit_zone) @@ -180,11 +180,11 @@ miss_chance = max(15*(distance-2), 0) if (prob(miss_chance)) - visible_message("\The [O] misses [src] narrowly!") + visible_message(SPAN_NOTICE("\The [O] misses [src] narrowly!")) playsound(src, 'sound/effects/throw_miss.ogg', 50, 1) return - src.visible_message("[src] has been hit by [O].") + src.visible_message(SPAN_WARNING("[src] has been hit by [O].")) apply_damage(throw_damage, dtype, null, damage_flags = O.damage_flags(), used_weapon = O) O.throwing = 0 //it hit, so stop moving @@ -208,7 +208,9 @@ if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED) var/dir = get_dir(O.throw_source, src) - visible_message("[src] staggers under the impact!","You stagger under the impact!") + visible_message(SPAN_WARNING("[src] staggers under the impact!"), + SPAN_WARNING("You stagger under the impact!")) + src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) @@ -222,7 +224,9 @@ if(T) src.forceMove(T) - visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") + visible_message(SPAN_WARNING("[src] is pinned to the wall by [O]!"), + SPAN_WARNING("You are pinned to the wall by [O]!")) + src.anchored = 1 src.pinned += O @@ -232,7 +236,7 @@ add_verb(src, /mob/proc/yank_out_object) /mob/living/proc/turf_collision(var/atom/T, var/speed = THROWFORCE_SPEED_DIVISOR, var/sound_to_play = 'sound/effects/bangtaper.ogg') - visible_message("[src] slams into \the [T]!") + visible_message(SPAN_DANGER("[src] slams into \the [T]!")) playsound(T, sound_to_play, 50, 1, 1)//so it plays sounds on the turf instead, makes for awesome carps to hull collision and such apply_damage(speed*5, DAMAGE_BRUTE) @@ -259,7 +263,7 @@ user.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] was attacked by [user.name] ([user.ckey])") if (attack_message) - src.visible_message("[user] has [attack_message] [src]!") + src.visible_message(SPAN_DANGER("[user] has [attack_message] [src]!")) user.do_attack_animation(src) apply_damage(damage, damage_type, user.zone_sel?.selecting, armor_pen = armor_penetration, damage_flags = attack_flags) diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm index db76b444d78..4cd62cbb941 100644 --- a/code/modules/mob/living/living_powers.dm +++ b/code/modules/mob/living/living_powers.dm @@ -8,10 +8,10 @@ if (layer != HIDING_MOB_LAYER) layer = HIDING_MOB_LAYER //Just above cables with their 2.44 - to_chat(src, text("You are now hiding.")) + to_chat(src, SPAN_NOTICE("You are now hiding.")) else layer = MOB_LAYER - to_chat(src, text("You have stopped hiding.")) + to_chat(src, SPAN_NOTICE("You have stopped hiding.")) /mob/living/verb/set_walk_speed() set category = "IC" diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index e9408c1d5a7..92428e9c8f8 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -247,7 +247,7 @@ var/list/channel_to_radio_key = new verb = say_quote(message, speaking, is_singing, whisper) if(is_muzzled()) - to_chat(src, "You're muzzled and cannot speak!") + to_chat(src, SPAN_DANGER("You're muzzled and cannot speak!")) return message = trim_left(message) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index c839b072207..da09619e2f0 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -406,7 +406,7 @@ var/list/ai_verbs_default = list( set name = "Examine" if((is_blind() || usr.stat) && !isobserver(src)) - to_chat(src, "Your optical sensors appear to be malfunctioning.") + to_chat(src, SPAN_NOTICE("Your optical sensors appear to be malfunctioning.")) return 1 face_atom(A) @@ -474,16 +474,16 @@ var/list/ai_verbs_default = list( if(check_unable(AI_CHECK_WIRELESS)) return if(!is_relay_online()) - to_chat(usr, "No Emergency Bluespace Relay detected. Unable to transmit message.") + to_chat(usr, SPAN_WARNING("No Emergency Bluespace Relay detected. Unable to transmit message.")) return if(emergency_message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, SPAN_WARNING("Arrays recycling. Please stand by.")) return var/input = sanitize(input(usr, "Please choose a message to transmit to [SSatlas.current_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input) return Centcomm_announce(input, usr) - to_chat(usr, "Message transmitted.") + to_chat(usr, SPAN_NOTICE("Message transmitted.")) log_say("[key_name(usr)] has made an AI [SSatlas.current_map.boss_short] announcement: [input]",ckey=key_name(usr)) emergency_message_cooldown = 1 spawn(300) @@ -528,7 +528,7 @@ var/list/ai_verbs_default = list( if(H) H.attack_ai(src) //may as well recycle else - to_chat(src, "Unable to locate the holopad.") + to_chat(src, SPAN_NOTICE("Unable to locate the holopad.")) if (href_list["track"]) var/mob/target = locate(href_list["track"]) in GLOB.mob_list @@ -536,13 +536,13 @@ var/list/ai_verbs_default = list( if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name())) ai_actual_track(target) else - to_chat(src, "System error. Cannot locate [html_decode(href_list["trackname"])].") + to_chat(src, SPAN_WARNING("System error. Cannot locate [html_decode(href_list["trackname"])].")) return if (href_list["readcapturedpaper"]) //Yep stolen from admin faxes var/entry = text2num(href_list["readcapturedpaper"]) if(!entry || !cameraRecords.len) return if(!cameraRecords[entry]) - to_chat(src, "Unable to locate visual entry.") + to_chat(src, SPAN_NOTICE("Unable to locate visual entry.")) return var/info = cameraRecords[entry] src << browse(text(" " diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index c484432a7f7..598351161eb 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -38,11 +38,11 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores) set desc = "Wipe your core. This is functionally equivalent to cryo or robotic storage, freeing up your job slot." if(SSticker.mode && SSticker.mode.name == "AI malfunction") - to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.") + to_chat(usr, SPAN_DANGER("You cannot use this verb in malfunction. If you need to leave, please adminhelp.")) return if(carded) - to_chat(usr, "No connection to station intelligence storage. You must be in an AI Core to store yourself (adminhelp if you need to leave).") + to_chat(usr, SPAN_DANGER("No connection to station intelligence storage. You must be in an AI Core to store yourself (adminhelp if you need to leave).")) return // Guard against misclicks, this isn't the sort of thing we want happening accidentally diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index b98496961b1..90162d02fb0 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -35,7 +35,7 @@ malf_process() if(APU_power && (hardware_integrity() < 50)) - to_chat(src, "APU GENERATOR FAILURE! (System Damaged)") + to_chat(src, SPAN_NOTICE("APU GENERATOR FAILURE! (System Damaged)")) stop_apu(1) if (!is_blind()) diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index 4e8064ddacc..1d64c508f1c 100644 --- a/code/modules/mob/living/silicon/ai/malf.dm +++ b/code/modules/mob/living/silicon/ai/malf.dm @@ -17,7 +17,7 @@ // And greet user with some OOC info. to_chat(user, "You are malfunctioning, you do not have to follow any laws.") to_chat(user, "Use ai-help command to view relevant information about your abilities") - to_chat(user, "Malf AI has been severely buffed. Ensure that you use these new powers responsibly and follow a narrative.") + to_chat(user, SPAN_DANGER("Malf AI has been severely buffed. Ensure that you use these new powers responsibly and follow a narrative.")) // Safely remove malfunction status, fixing hacked APCs and resetting variables. /mob/living/silicon/ai/proc/stop_malf() @@ -84,7 +84,7 @@ return if(hardware_integrity() < 50) if(!shutup) - to_chat(src, "Starting APU... FAULT(System Damaged)") + to_chat(src, SPAN_NOTICE("Starting APU... FAULT(System Damaged)")) return if(!shutup) to_chat(src, "Starting APU... ONLINE") diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm index 0852b1f4651..7d4f6e08504 100644 --- a/code/modules/mob/living/silicon/pai/emote.dm +++ b/code/modules/mob/living/silicon/pai/emote.dm @@ -113,7 +113,7 @@ if ("help") to_chat(src, "salute, bow, clap, flap, aflap, twitch, twitch_s, nod, beep, ping, \nbuzz, law, halt, meow, meow2, squeal, squeak, softsqueak") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, SPAN_NOTICE("Unusable emote '[act]'. Say *help for a list.")) if ((message && src.stat == 0)) send_emote(message, m_type) diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 554ed7bf00f..4f01bab0d75 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -7,7 +7,7 @@ if(get_dist(src, src.cable) > 1) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("The data cable rapidly retracts back into its spool.", 3, "You hear a click and the sound of wire spooling rapidly.", 2) + M.show_message(SPAN_WARNING("The data cable rapidly retracts back into its spool."), 3, SPAN_WARNING("You hear a click and the sound of wire spooling rapidly."), 2) qdel(src.cable) src.cable = null diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 597bab774ed..4b5a7025da0 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -58,13 +58,11 @@ to_chat(user, SPAN_NOTICE("Localized Damage:")) if(length(damaged) > 0) for(var/datum/robot_component/org in damaged) - user.show_message(text("\t []: [][] - [] - [] - []", \ - capitalize(org.name), \ - (org.installed == -1) ? "DESTROYED " :"",\ - (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \ - (org.brute_damage > 0) ? "[org.brute_damage]" :0, \ - (org.toggled) ? "Toggled ON" : "Toggled OFF",\ - (org.powered) ? "Power ON" : "Power OFF"),1) + user.show_message(SPAN_NOTICE("\t [capitalize(org.name)]: [(org.installed == -1) ? SPAN_WARNING("DESTROYED") :""]\ + [(org.electronics_damage > 0) ? "[org.electronics_damage]" : 0] - [(org.brute_damage > 0) ? SPAN_WARNING("[org.brute_damage]") :0] - \ + [(org.toggled) ? "Toggled ON" : SPAN_WARNING("Toggled OFF")] - \ + [(org.powered) ? "Power ON" : SPAN_WARNING("Power OFF")]"),1) + else to_chat(user, SPAN_NOTICE("Components are OK.")) if(H.emagged && prob(5)) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index e3694ae9732..e3e7a972780 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -37,7 +37,7 @@ continue else if (isNotStationLevel(src.z) && src.z != D.z) //If the console is not on the station, only list drones on the current level continue - dat += " [D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])" + dat += " [D.real_name] ([D.stat == 2 ? SPAN_WARNING("INACTIVE") : "ACTIVE"])" dat += " Cell charge: [D.cell.charge]/[D.cell.maxcharge]." dat += " Currently located in: [get_area(D)]." dat += " Resync | Shutdown" diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 60a71f5aa5a..e28fd3b0981 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -4,33 +4,34 @@ . += describe_all_modules() // describe modules - . += "" + var/robot_status_desc if(getBruteLoss()) if(getBruteLoss() < 75) - . += "It looks slightly dented." + robot_status_desc += "It looks slightly dented." else - . += "It looks severely dented!" + robot_status_desc += "It looks severely dented!" if(getFireLoss()) if(getFireLoss() < 75) - . += "It looks slightly charred." + robot_status_desc += "It looks slightly charred." else - . += "It looks severely burnt and heat-warped!" - . += "" + robot_status_desc += "It looks severely burnt and heat-warped!" + + . += SPAN_WARNING(robot_status_desc) if(opened) - . += "Its cover is open and the power cell is [cell ? "installed" : "missing"]." + . += SPAN_WARNING("Its cover is open and the power cell is [cell ? "installed" : "missing"].") else . += "Its cover is closed." if(!has_power) - . += "It appears to be running on backup power." + . += SPAN_WARNING("It appears to be running on backup power.") switch(stat) if(CONSCIOUS) if(!client) . += "It appears to be in stand-by mode." //afk if(UNCONSCIOUS) - . += "It doesn't seem to be responding." + . += SPAN_WARNING("It doesn't seem to be responding.") if(DEAD) . += "It looks completely unsalvageable." diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index aaeeee8d6ff..44c5232c322 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -207,7 +207,7 @@ if(!(locate(O) in src.module.modules) && O != src.module.emag) return if(activated(O)) - to_chat(src, "Already activated") + to_chat(src, SPAN_NOTICE("Already activated")) return if(!module_state_1) module_state_1 = O @@ -228,7 +228,7 @@ contents += O O.on_module_hotbar(src) else - to_chat(src, "You need to disable a module first!") + to_chat(src, SPAN_NOTICE("You need to disable a module first!")) /mob/living/silicon/robot/put_in_hands(var/obj/item/W) // Maybe hands. var/obj/item/gripper/G = get_active_hand() diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index 66b5829e8c7..f66d2b21ceb 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -47,13 +47,13 @@ strength -= 1 if (strength <= 0) if (prob(25))//probability to reduce spam - src.visible_message("The bee swarm completely dissipates.") + src.visible_message(SPAN_WARNING("The bee swarm completely dissipates.")) qdel(src) return else health = maxHealth if (prob(25))//probability to reduce spam - src.visible_message("The bee swarm starts to thin out a little.") + src.visible_message(SPAN_WARNING("The bee swarm starts to thin out a little.")) update_icon() else @@ -103,7 +103,7 @@ if(prob(max(80, strength * 10))) //If there's enough of a swarm, it can also cause breathing trouble. Yes, even without being allergic. M.apply_damage(venom_strength, DAMAGE_OXY) update_icon() - to_chat(M, "You have been stung!") + to_chat(M, SPAN_WARNING("You have been stung!")) M.flash_pain(5) else step_to(src, target_mob) @@ -156,7 +156,7 @@ if(range_in_typecache(src, 2, calmers)) if(feral > 0) - src.visible_message("The bees calm down!") + src.visible_message(SPAN_NOTICE("The bees calm down!")) feral = -15 target_mob = null target_turf = null @@ -216,7 +216,7 @@ if (!(DirBlocked(get_step(src, get_dir(src,target_turf)),get_dir(src,target_turf)))) // Check for windows and doors! Move(get_step(src, get_dir(src,target_turf))) if(prob(10)) - visible_message("The bees swarm after [target_mob]!") + visible_message(SPAN_NOTICE("The bees swarm after [target_mob]!")) if(get_turf(src) == target_turf) target_turf = null wander = TRUE diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index 8a0a09e935a..e5cd5242890 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -23,7 +23,7 @@ return..() if(M.has_brain_worms()) //Borer stuff - RR - to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.") + to_chat(user, SPAN_WARNING("This being is corrupted by an alien intelligence and cannot be soul trapped.")) return..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])") diff --git a/code/modules/mob/living/simple_animal/friendly/carp.dm b/code/modules/mob/living/simple_animal/friendly/carp.dm index 07ea116f2ad..58e09dbd0fa 100644 --- a/code/modules/mob/living/simple_animal/friendly/carp.dm +++ b/code/modules/mob/living/simple_animal/friendly/carp.dm @@ -116,7 +116,7 @@ return if(!(ishuman(usr) && befriend_job && usr.job == befriend_job)) - to_chat(user, "[src] ignores you.") + to_chat(user, SPAN_NOTICE("[src] ignores you.")) return friend = user diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index cae60917cb4..80e0cd29e10 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -194,7 +194,7 @@ set_flee_target(AM.thrower? AM.thrower : src.loc) /mob/living/simple_animal/cat/fall_impact() - src.visible_message("\The [src] lands softly on \the [loc]!") + src.visible_message(SPAN_NOTICE("\The [src] lands softly on \the [loc]!")) return FALSE //Basic friend AI @@ -270,7 +270,7 @@ return if (!(ishuman(usr) && befriend_job && usr.job == befriend_job)) - to_chat(usr, "[src] ignores you.") + to_chat(usr, SPAN_NOTICE("[src] ignores you.")) return friend = usr diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index caa4d85c403..0f902a8b105 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -75,8 +75,8 @@ if(istype(attacking_item, /obj/item/newspaper)) if(!stat) visible_message( - "[user] baps [src] on the nose with the rolled up [attacking_item.name].", - "[user] baps you on the nose with the rolled up [attacking_item.name]!" + SPAN_NOTICE("[user] baps [src] on the nose with the rolled up [attacking_item.name]."), + SPAN_ALERT("[user] baps you on the nose with the rolled up [attacking_item.name]!") ) scan_interval = max_scan_interval movement_target = null @@ -122,7 +122,7 @@ //pupplies cannot wear anything. /mob/living/simple_animal/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "You can't fit this on [src]") + to_chat(usr, SPAN_WARNING("You can't fit this on [src]")) return ..() @@ -146,7 +146,7 @@ //Lisa already has a cute bow! /mob/living/simple_animal/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "[src] already has a cute bow!") + to_chat(usr, SPAN_WARNING("[src] already has a cute bow!")) return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index d9731b93058..8a84fcf6e36 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -54,7 +54,7 @@ if(enemies.len && prob(10)) enemies = list() LoseTarget() - src.visible_message("[src] calms down.") + src.visible_message(SPAN_NOTICE("[src] calms down.")) if(!pulledby) var/obj/effect/plant/food = locate(/obj/effect/plant) in oview(5,loc) @@ -105,7 +105,9 @@ /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead) - M.visible_message("[M] tips over [src].","You tip over [src].") + M.visible_message(SPAN_WARNING("[M] tips over [src]."), + SPAN_NOTICE("You tip over [src].")) + Weaken(30) icon_state = icon_dead spawn(rand(20,50)) diff --git a/code/modules/mob/living/simple_animal/friendly/mushroom.dm b/code/modules/mob/living/simple_animal/friendly/mushroom.dm index 953ee88dc67..cbde6c1b701 100644 --- a/code/modules/mob/living/simple_animal/friendly/mushroom.dm +++ b/code/modules/mob/living/simple_animal/friendly/mushroom.dm @@ -51,15 +51,15 @@ set src = usr if(stat == 2) - to_chat(usr, "You are dead; it is too late for that.") + to_chat(usr, SPAN_DANGER("You are dead; it is too late for that.")) return if(!seed) - to_chat(usr, "You are sterile!") + to_chat(usr, SPAN_DANGER("You are sterile!")) return if(world.time < harvest_time + min_explode_time) - to_chat(usr, "You are not mature enough for that.") + to_chat(usr, SPAN_DANGER("You are not mature enough for that.")) return spore_explode() diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index eb19e17c2f8..0adaa2a67fc 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -183,7 +183,7 @@ squeals -- log_say("[key_name(src)] squeals! ",ckey=key_name(src)) else - to_chat(src, "Your hoarse rattish throat can't squeal just now, stop and take a breath!") + to_chat(src, SPAN_WARNING("Your hoarse rattish throat can't squeal just now, stop and take a breath!")) //Wrapper verbs for the squeak functions @@ -192,7 +192,7 @@ set category = "Abilities" if (usr.client.prefs.muted & MUTE_IC) - to_chat(usr, "You are muted from IC emotes.") + to_chat(usr, SPAN_DANGER("You are muted from IC emotes.")) return squeak_loud(1) @@ -202,7 +202,7 @@ set category = "Abilities" if (usr.client.prefs.muted & MUTE_IC) - to_chat(usr, "You are muted from IC emotes.") + to_chat(usr, SPAN_DANGER("You are muted from IC emotes.")) return squeak_soft(1) @@ -212,7 +212,7 @@ set category = "Abilities" if (usr.client.prefs.muted & MUTE_IC) - to_chat(usr, "You are muted from IC emotes.") + to_chat(usr, SPAN_DANGER("You are muted from IC emotes.")) return squeak(1) @@ -222,7 +222,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - to_chat(M, "[icon2html(src, M)] Squeek!") + to_chat(M, SPAN_NOTICE("[icon2html(src, M)] Squeek!")) poke(1) //Wake up if stepped on if (prob(95)) squeak(0) @@ -237,8 +237,8 @@ if(!K.health) return - src.visible_message("[src] joins the [K.swarm_name] of \the [K]", \ - "We join our brethren in \the [K.swarm_name]. Long live \the [K].") + src.visible_message(SPAN_WARNING("[src] joins the [K.swarm_name] of \the [K]"), \ + SPAN_NOTICE("We join our brethren in \the [K.swarm_name]. Long live \the [K].")) K.absorb(src) ..() diff --git a/code/modules/mob/living/simple_animal/friendly/ratking.dm b/code/modules/mob/living/simple_animal/friendly/ratking.dm index e05cac290ce..8408cdfa902 100644 --- a/code/modules/mob/living/simple_animal/friendly/ratking.dm +++ b/code/modules/mob/living/simple_animal/friendly/ratking.dm @@ -38,7 +38,7 @@ body_color = "gray" say_dead_direct("An heir to the rat throne has risen, all rejoice and celebrate.") - announceToRodents("The rat king has risen! Go at once and join his kingdom, long live the king!") + announceToRodents(SPAN_NOTICE("The rat king has risen! Go at once and join his kingdom, long live the king!")) /mob/living/simple_animal/rat/king/death() while(rats.len) @@ -165,7 +165,7 @@ set name = "Decree" if( !health ) - to_chat(usr, "You are dead, you cannot use any abilities!") + to_chat(usr, SPAN_NOTICE("You are dead, you cannot use any abilities!")) return var/input = sanitize(input(usr, "Please enter the [lowertext( announce_name )] for your whole kingdom.", "What?", "") as message|null, extra = 0) @@ -183,18 +183,18 @@ set name = "Mighty Roar" if(!health) - to_chat(usr, "You are dead, you cannot use any abilities!") + to_chat(usr, SPAN_NOTICE("You are dead, you cannot use any abilities!")) return if(last_special > world.time) - to_chat(usr, "We must wait a little while before we can use this ability again!") + to_chat(usr, SPAN_WARNING("We must wait a little while before we can use this ability again!")) return if(!canRoar()) - to_chat(usr, "Our [swarm_name] must grow larger before we can use this ability!") + to_chat(usr, SPAN_WARNING("Our [swarm_name] must grow larger before we can use this ability!")) return - src.visible_message("[src] lets loose a mighty roar!") + src.visible_message(SPAN_WARNING("[src] lets loose a mighty roar!")) for( var/obj/machinery/light/L in range( 3, src )) if( canRoarBreakLights() && prob(( rats.len/RAT_EMPEROR_LEVEL )*100 )) L.broken() @@ -212,28 +212,28 @@ return if(!health) - to_chat(usr, "You are dead, you cannot use any abilities!") + to_chat(usr, SPAN_NOTICE("You are dead, you cannot use any abilities!")) return if(!canEatCorpse()) - to_chat(usr, "Our [swarm_name] must grow larger before we can use this ability!") + to_chat(usr, SPAN_WARNING("Our [swarm_name] must grow larger before we can use this ability!")) return if(last_special > world.time) - to_chat(usr, "We must wait a little while before we can use this ability again!") + to_chat(usr, SPAN_WARNING("We must wait a little while before we can use this ability again!")) return if(target.stat != DEAD) - to_chat(usr, "We can only devour the dead!") + to_chat(usr, SPAN_WARNING("We can only devour the dead!")) return - usr.visible_message("\The [usr] swarms the body of \the [target], ripping flesh from bone!" ) + usr.visible_message(SPAN_DANGER("\The [usr] swarms the body of \the [target], ripping flesh from bone!") ) if(!do_after(usr,200)) - to_chat(src, "You need to wait longer to consume the body of [target]!") + to_chat(src, SPAN_WARNING("You need to wait longer to consume the body of [target]!")) return 0 - src.visible_message("\The [usr] consumed the body of \the [target]!") + src.visible_message(SPAN_DANGER("\The [usr] consumed the body of \the [target]!")) target.gib() rejuvenate() updatehealth() diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 77fd20be018..95ed51bec42 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -82,10 +82,10 @@ if(istype(attacking_item, /obj/item/device/mmi)) var/obj/item/device/mmi/B = attacking_item if(src.mmi) - to_chat(user, "There's already a brain in [src]!") + to_chat(user, SPAN_WARNING("There's already a brain in [src]!")) return if(!B.brainmob) - to_chat(user, "Sticking an empty MMI into the frame would sort of defeat the purpose.") + to_chat(user, SPAN_WARNING("Sticking an empty MMI into the frame would sort of defeat the purpose.")) return if(!B.brainmob.key) var/ghost_can_reenter = 0 @@ -95,18 +95,18 @@ ghost_can_reenter = 1 break if(!ghost_can_reenter) - to_chat(user, "[attacking_item] is completely unresponsive; there's no point.") + to_chat(user, SPAN_NOTICE("[attacking_item] is completely unresponsive; there's no point.")) return if(B.brainmob.stat == DEAD) - to_chat(user, "[attacking_item] is dead. Sticking it into the frame would sort of defeat the purpose.") + to_chat(user, SPAN_WARNING("[attacking_item] is dead. Sticking it into the frame would sort of defeat the purpose.")) return if(jobban_isbanned(B.brainmob, "Cyborg")) - to_chat(user, "\The [attacking_item] does not seem to fit.") + to_chat(user, SPAN_WARNING("\The [attacking_item] does not seem to fit.")) return - to_chat(user, "You install \the [attacking_item] in \the [src]!") + to_chat(user, SPAN_NOTICE("You install \the [attacking_item] in \the [src]!")) if(istype(attacking_item, /obj/item/device/mmi/digital)) positronic = 1 @@ -127,15 +127,15 @@ if(health > maxHealth) health = maxHealth add_fingerprint(user) - src.visible_message("\The [user] has spot-welded some of the damage to \the [src]!") + src.visible_message(SPAN_NOTICE("\The [user] has spot-welded some of the damage to \the [src]!")) else - to_chat(user, "\The [src] is undamaged!") + to_chat(user, SPAN_WARNING("\The [src] is undamaged!")) else - to_chat(user, "You need more welding fuel for this task!") + to_chat(user, SPAN_DANGER("You need more welding fuel for this task!")) return else if(attacking_item.GetID()) if (!mmi) - to_chat(user, "There's no reason to swipe your ID - \the [src] has no brain.") + to_chat(user, SPAN_DANGER("There's no reason to swipe your ID - \the [src] has no brain.")) return 0 var/obj/item/card/id/id_card = attacking_item.GetID() @@ -152,14 +152,14 @@ if(use_check_and_message(user)) return 0 if(ACCESS_ROBOTICS in id_card.access) - to_chat(user, "You swipe your access card and pop the brain out of \the [src].") + to_chat(user, SPAN_NOTICE("You swipe your access card and pop the brain out of \the [src].")) eject_brain() if(held_item) held_item.forceMove(src.loc) held_item = null return 1 else - to_chat(user, "You swipe your card with no effect.") + to_chat(user, SPAN_DANGER("You swipe your card with no effect.")) return 0 if("Sync") if(use_check_and_message(user)) @@ -175,12 +175,12 @@ /mob/living/simple_animal/spiderbot/emag_act(var/remaining_charges, var/mob/user) if (emagged) - to_chat(user, "[src] is already overloaded - better run.") + to_chat(user, SPAN_WARNING("[src] is already overloaded - better run.")) return 0 else - to_chat(user, "You short out the security protocols and overload [src]'s cell, priming it to explode in a short time.") - spawn(100) to_chat(src, "Your cell seems to be outputting a lot of power...") - spawn(200) to_chat(src, "Internal heat sensors are spiking! Something is badly wrong with your cell!") + to_chat(user, SPAN_NOTICE("You short out the security protocols and overload [src]'s cell, priming it to explode in a short time.")) + spawn(100) to_chat(src, SPAN_DANGER("Your cell seems to be outputting a lot of power...")) + spawn(200) to_chat(src, SPAN_DANGER("Internal heat sensors are spiking! Something is badly wrong with your cell!")) spawn(300) src.explode() /mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/device/mmi/M as obj) @@ -191,7 +191,7 @@ src.voice_name = src.name /mob/living/simple_animal/spiderbot/proc/explode() //When emagged. - src.visible_message("\The [src] makes an odd warbling noise, fizzles, and explodes!") + src.visible_message(SPAN_DANGER("\The [src] makes an odd warbling noise, fizzles, and explodes!")) explosion(get_turf(loc), -1, -1, 3, 5) eject_brain() death() @@ -252,12 +252,12 @@ return if(!held_item) - to_chat(usr, "You have nothing to drop!") + to_chat(usr, SPAN_WARNING("You have nothing to drop!")) return 0 if(istype(held_item, /obj/item/grenade)) - visible_message("\The [src] launches \the [held_item]!", \ - "You launch \the [held_item]!", \ + visible_message(SPAN_DANGER("\The [src] launches \the [held_item]!"), \ + SPAN_DANGER("You launch \the [held_item]!"), \ "You hear a skittering noise and a thump!") var/obj/item/grenade/G = held_item G.forceMove(src.loc) @@ -265,8 +265,8 @@ held_item = null return 1 - visible_message("\The [src] drops \the [held_item].", \ - "You drop \the [held_item].", \ + visible_message(SPAN_NOTICE("\The [src] drops \the [held_item]."), \ + SPAN_NOTICE("You drop \the [held_item]."), \ "You hear a skittering noise and a soft thump.") held_item.forceMove(src.loc) @@ -282,7 +282,7 @@ return -1 if(held_item) - to_chat(src, "You are already holding \the [held_item]") + to_chat(src, SPAN_WARNING("You are already holding \the [held_item]")) return 1 var/list/items = list() @@ -297,14 +297,14 @@ if(selection == I) held_item = selection selection.forceMove(src) - visible_message("\The [src] scoops up \the [held_item].", \ - "You grab \the [held_item].", \ + visible_message(SPAN_NOTICE("\The [src] scoops up \the [held_item]."), \ + SPAN_NOTICE("You grab \the [held_item]."), \ "You hear a skittering noise and a clink.") return held_item - to_chat(src, "\The [selection] is too far away.") + to_chat(src, SPAN_WARNING("\The [selection] is too far away.")) return 0 - to_chat(src, "There is nothing of interest to take.") + to_chat(src, SPAN_WARNING("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/spiderbot/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index 37a5657e059..06adef7f2de 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -69,7 +69,7 @@ if(istype(L)) if(prob(15)) L.Stun(1) - L.visible_message("\the [src] scares \the [L]!") + L.visible_message(SPAN_DANGER("\the [src] scares \the [L]!")) /mob/living/simple_animal/hostile/scarybat/cult faction = "cult" diff --git a/code/modules/mob/living/simple_animal/hostile/changeling.dm b/code/modules/mob/living/simple_animal/hostile/changeling.dm index cb304041bfa..7fd0e1d69fd 100644 --- a/code/modules/mob/living/simple_animal/hostile/changeling.dm +++ b/code/modules/mob/living/simple_animal/hostile/changeling.dm @@ -94,38 +94,38 @@ return if(src.is_devouring) - to_chat(src, "We are already feasting on something!") + to_chat(src, SPAN_WARNING("We are already feasting on something!")) return 0 if(!health) - to_chat(src, "We are dead, we cannot use any abilities!") + to_chat(src, SPAN_NOTICE("We are dead, we cannot use any abilities!")) return if(last_special > world.time) - to_chat(src, "We must wait a little while before we can use this ability again!") + to_chat(src, SPAN_WARNING("We must wait a little while before we can use this ability again!")) return - src.visible_message("[src] begins ripping apart and feasting on [target]!") + src.visible_message(SPAN_WARNING("[src] begins ripping apart and feasting on [target]!")) src.is_devouring = TRUE target.adjustBruteLoss(35) if(!do_after(src,150)) - to_chat(src, "You need to wait longer to devour \the [target]!") + to_chat(src, SPAN_WARNING("You need to wait longer to devour \the [target]!")) src.is_devouring = FALSE return 0 - src.visible_message("[src] tears a chunk from \the [target]'s flesh!") + src.visible_message(SPAN_WARNING("[src] tears a chunk from \the [target]'s flesh!")) target.adjustBruteLoss(35) if(!do_after(src,150)) - to_chat(src, "You need to wait longer to devour \the [target]!") + to_chat(src, SPAN_WARNING("You need to wait longer to devour \the [target]!")) src.is_devouring = FALSE return 0 - src.visible_message("[target] is completely devoured by [src]!", \ - "You completely devour \the [target]!") + src.visible_message(SPAN_WARNING("[target] is completely devoured by [src]!"), \ + SPAN_DANGER("You completely devour \the [target]!")) target.gib() rejuvenate() updatehealth() @@ -222,7 +222,7 @@ occupant.client.init_verbs() occupant = null - visible_message("\The [src] explodes into a shower of gore!") + visible_message(SPAN_WARNING("\The [src] explodes into a shower of gore!")) gibs(src.loc) qdel(src) return @@ -233,7 +233,7 @@ set category = "Changeling" if(!health) - to_chat(usr, "We are dead, we cannot use any abilities!") + to_chat(usr, SPAN_NOTICE("We are dead, we cannot use any abilities!")) return if(last_special > world.time) @@ -251,6 +251,6 @@ mind.transfer_to(occupant) occupant.client.init_verbs() occupant = null - visible_message("\The [src] explodes into a shower of gore!") + visible_message(SPAN_WARNING("\The [src] explodes into a shower of gore!")) gibs(src.loc) qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm index 90c193f04af..6386ed61cfc 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm @@ -64,7 +64,7 @@ . = 1 //already friends, but show success anyways else - to_chat(usr, "[src] ignores you.") + to_chat(usr, SPAN_NOTICE("[src] ignores you.")) return diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 350d04a749e..b1759b4bd20 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -250,7 +250,7 @@ var/obj/effect/spider/stickyweb/W = locate() in get_turf(src) if(!W) busy = SPINNING_WEB - src.visible_message("\The [src] begins to secrete a sticky substance.") + src.visible_message(SPAN_NOTICE("\The [src] begins to secrete a sticky substance.")) stop_automated_movement = 1 addtimer(CALLBACK(src, PROC_REF(finalize_web)), 40, TIMER_UNIQUE) else @@ -258,7 +258,7 @@ var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) if(!E && fed > 0) busy = LAYING_EGGS - src.visible_message("\The [src] begins to lay a cluster of eggs.") + src.visible_message(SPAN_NOTICE("\The [src] begins to lay a cluster of eggs.")) stop_automated_movement = 1 addtimer(CALLBACK(src, PROC_REF(finalize_eggs)), 50, TIMER_UNIQUE) else @@ -278,7 +278,7 @@ else if(busy == MOVING_TO_TARGET && cocoon_target) if(get_dist(src, cocoon_target) <= 1) busy = SPINNING_COCOON - src.visible_message("\The [src] begins to secrete a sticky substance around \the [cocoon_target].") + src.visible_message(SPAN_NOTICE("\The [src] begins to secrete a sticky substance around \the [cocoon_target].")) stop_automated_movement = 1 SSmove_manager.stop_looping(src) addtimer(CALLBACK(src, PROC_REF(finalize_cocoon)), 50, TIMER_UNIQUE) @@ -323,7 +323,7 @@ continue large_cocoon = 1 fed++ - src.visible_message("\The [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.") + src.visible_message(SPAN_WARNING("\The [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.")) playsound(get_turf(src), 'sound/effects/lingabsorbs.ogg', 50, 1) M.forceMove(C) C.pixel_x = M.pixel_x diff --git a/code/modules/mob/living/simple_animal/hostile/krampus.dm b/code/modules/mob/living/simple_animal/hostile/krampus.dm index 3743c4192f3..640c66702b5 100644 --- a/code/modules/mob/living/simple_animal/hostile/krampus.dm +++ b/code/modules/mob/living/simple_animal/hostile/krampus.dm @@ -49,7 +49,7 @@ if(!gibbed) for (var/mob/living/A in contents) A.forceMove(get_turf(src)) - visible_message("\The [src] vanishes!") + visible_message(SPAN_WARNING("\The [src] vanishes!")) dust() return TRUE @@ -68,21 +68,21 @@ return if(last_special > world.time) - to_chat(src, "You must wait a little while before you can use this ability again!") + to_chat(src, SPAN_WARNING("You must wait a little while before you can use this ability again!")) return - src.visible_message("\The [src] starts stuffing \the [target] inside his bag!", \ - "You begin to drag \the [target] to the depths of hell!") + src.visible_message(SPAN_DANGER("\The [src] starts stuffing \the [target] inside his bag!"), \ + SPAN_DANGER("You begin to drag \the [target] to the depths of hell!")) src.is_punishing = TRUE if(!do_mob(src, target, 60)) - to_chat(src, "\The [target] has managed to escape!") + to_chat(src, SPAN_DANGER("\The [target] has managed to escape!")) src.is_punishing = FALSE return - src.visible_message("\The [target] vanishes into \the [src]'s bag!") + src.visible_message(SPAN_DANGER("\The [target] vanishes into \the [src]'s bag!")) target.forceMove(src) - to_chat(target, "You have been captured by \the [src], you will soon be punished due to your misdeeds!") + to_chat(target, SPAN_DANGER("You have been captured by \the [src], you will soon be punished due to your misdeeds!")) addtimer(CALLBACK(src, PROC_REF(send_to_hell), target), 5 MINUTES) last_special = world.time + 100 src.is_punishing = FALSE @@ -101,7 +101,7 @@ last_special = world.time + 30 - visible_message("\The [src] vomits a cloud of rancid smoke and neatly wrapped gifts!") + visible_message(SPAN_DANGER("\The [src] vomits a cloud of rancid smoke and neatly wrapped gifts!")) var/datum/effect/effect/system/smoke_spread/bad/smoke = new /datum/effect/effect/system/smoke_spread/bad smoke.attach(src) @@ -116,7 +116,7 @@ /mob/living/simple_animal/hostile/krampus/proc/send_to_hell(mob/living/M) if(!M) return - to_chat(M, "You are dragged to the depths of hell to be eternally punished for your misdeeds!") + to_chat(M, SPAN_DANGER("You are dragged to the depths of hell to be eternally punished for your misdeeds!")) qdel(M) rejuvenate() updatehealth() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 6d147654af7..6a0fb43b218 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -88,7 +88,7 @@ if(istype(L)) if(prob(15)) L.Weaken(2) - L.visible_message("\the [src] knocks down \the [L]!") + L.visible_message(SPAN_DANGER("\the [src] knocks down \the [L]!")) /mob/living/simple_animal/hostile/mimic/crate/proc/trigger() if(!attempt_open) @@ -182,4 +182,4 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca if(istype(L)) if(prob(15)) L.Weaken(1) - L.visible_message("\the [src] knocks down \the [L]!") + L.visible_message(SPAN_DANGER("\the [src] knocks down \the [L]!")) diff --git a/code/modules/mob/living/simple_animal/hostile/moghes.dm b/code/modules/mob/living/simple_animal/hostile/moghes.dm index 4ae4e94442e..7d0a3313767 100644 --- a/code/modules/mob/living/simple_animal/hostile/moghes.dm +++ b/code/modules/mob/living/simple_animal/hostile/moghes.dm @@ -41,7 +41,7 @@ if(istype(L)) if(prob(25)) L.Weaken(3) - L.visible_message("\The [src] knocks down \the [L]!") + L.visible_message(SPAN_DANGER("\The [src] knocks down \the [L]!")) /mob/living/simple_animal/hostile/biglizard/death(gibbed) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm index 9daf96ac34a..99450ad1ef1 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm @@ -210,7 +210,7 @@ return /mob/living/simple_animal/hostile/retaliate/minedrone/fall_impact() - visible_message("\The [src] bounces harmlessly on its inflated wheels.") + visible_message(SPAN_DANGER("\The [src] bounces harmlessly on its inflated wheels.")) return FALSE /mob/living/simple_animal/hostile/retaliate/minedrone/get_bullet_impact_effect_type(var/def_zone) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index 6ea37140d09..9982b303991 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -41,7 +41,7 @@ newname = sanitizeName(newname, allow_numbers = TRUE) if(newname && !use_check_and_message(usr)) if(E.rename_species(type, newname)) - to_chat(usr,"This species will be known from now on as '[newname]'.") + to_chat(usr,SPAN_NOTICE("This species will be known from now on as '[newname]'.")) else - to_chat(usr,"This species has already been named!") + to_chat(usr,SPAN_WARNING("This species has already been named!")) return diff --git a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm index 421ce785e75..93deb2f02f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm +++ b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm @@ -31,13 +31,13 @@ if(deployed && isliving(AM) && !originator.eating) var/mob/living/L = AM L.visible_message( - "[L] steps into \the [src].", - "You step into \the [src]!", + SPAN_DANGER("[L] steps into \the [src]."), + SPAN_DANGER("You step into \the [src]!"), "You hear a loud organic snap!" ) attack_mob(L) originator.eating = 1 - to_chat(L, "\The [src] begins digesting your upper body!") + to_chat(L, SPAN_DANGER("\The [src] begins digesting your upper body!")) addtimer(CALLBACK(src, PROC_REF(devour), L), 50 SECONDS) ..() @@ -54,8 +54,8 @@ if(istype(L,/mob/living/carbon/human)) var/mob/living/carbon/human/H = L H.visible_message( - "\The [src] snaps tight across [H]'s upper body, swallowing it in three grisly gulps.", - "You feel a searing pain as \the [src] severs your lower body and sends you careening into its grotesque gullet!", + SPAN_DANGER("\The [src] snaps tight across [H]'s upper body, swallowing it in three grisly gulps."), + SPAN_DANGER("You feel a searing pain as \the [src] severs your lower body and sends you careening into its grotesque gullet!"), "You hear a sick crunch!" ) var/obj/item/organ/external/G = H.get_organ(BP_GROIN) @@ -69,15 +69,15 @@ else if(istype(L,/mob/living/silicon/robot)) var/mob/living/silicon/robot/R = L L.visible_message( - "\The [src] spits [R] out with a frustrated screech after failing to swallow.", - "\The [src] scrapes and gnashes against your exoskeleton before spitting you out!", + SPAN_DANGER("\The [src] spits [R] out with a frustrated screech after failing to swallow."), + SPAN_DANGER("\The [src] scrapes and gnashes against your exoskeleton before spitting you out!"), "You hear several metallic scrapes!" ) R.apply_damage(60,DAMAGE_BRUTE) else L.visible_message( - "\The [src] eviscerates [L] with its teeth, swallowing what little remains whole!", - "\The [src] turns you into a slightly viscuous and very bloody paste.", + SPAN_DANGER("\The [src] eviscerates [L] with its teeth, swallowing what little remains whole!"), + SPAN_DANGER("\The [src] turns you into a slightly viscuous and very bloody paste."), "You hear a grisly splat!" ) L.gib() @@ -151,8 +151,8 @@ asleep = 0 icon_state = "sarlacc" visible_message( - "\The [src] awakens!", - "You awaken! You're so HUNGRY!", + SPAN_DANGER("\The [src] awakens!"), + SPAN_DANGER("You awaken! You're so HUNGRY!"), "You hear a deep, rumbling roar in the earth!" ) sarlacc.deployed = 1 @@ -184,15 +184,15 @@ if(L) L.apply_damage(rand(3,10),DAMAGE_BRUTE) L.visible_message( - "\The [src] tears at [L]'s flesh with its gruesome jaws.", - "You feel a searing pain as \the [src] tears at your flesh!", + SPAN_DANGER("\The [src] tears at [L]'s flesh with its gruesome jaws."), + SPAN_DANGER("You feel a searing pain as \the [src] tears at your flesh!"), "You hear a sick tear!" ) /mob/living/simple_animal/hostile/greatworm/death() ..() - visible_message("With a frenzy of tooth and tendril, \the [src] slides deep into the earth, leaving a gaping hole in its place!") + visible_message(SPAN_DANGER("With a frenzy of tooth and tendril, \the [src] slides deep into the earth, leaving a gaping hole in its place!")) var/turf/T = src.loc T.ChangeTurf(/turf/space) qdel(src) @@ -203,7 +203,7 @@ asleep = 1 icon_state = "sarlacc_asleep" sarlacc.deployed = 0 - visible_message("With a contented heave, \the [src] slides into the earth and begins regurgitating several treasures before shutting tight.") + visible_message(SPAN_DANGER("With a contented heave, \the [src] slides into the earth and begins regurgitating several treasures before shutting tight.")) new/obj/random/loot(get_turf(src)) /mob/living/simple_animal/hostile/greatworm/FindTarget() @@ -239,7 +239,7 @@ active_tentacles += L L.originator = src L.faction = src.faction - visible_message("\The [L] bursts from the earth under [target].") + visible_message(SPAN_DANGER("\The [L] bursts from the earth under [target].")) /mob/living/simple_animal/hostile/greatworm/Move() return @@ -293,10 +293,10 @@ if(L != src) L.apply_damage(15,DAMAGE_BRUTE) possible_targets += L - to_chat(L, "\The [src] wraps around you tightly with its spiny teeth!") + to_chat(L, SPAN_DANGER("\The [src] wraps around you tightly with its spiny teeth!")) if(Adjacent(originator) && possible_targets.len) var/mob/living/L = pick(possible_targets) - to_chat(L, "\The [src] flings you into \the [originator]'s maw!") + to_chat(L, SPAN_DANGER("\The [src] flings you into \the [originator]'s maw!")) L.Move(originator.loc) /mob/living/simple_animal/hostile/lesserworm/Move() diff --git a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm index 500aedec0ec..63e83acc75d 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm @@ -86,7 +86,7 @@ if(istype(target_mob, /obj/effect/energy_field)) var/obj/effect/energy_field/e = target_mob e.Stress(rand(1,2)) - visible_message("\the [src] bites \the [e]!") + visible_message(SPAN_DANGER("\the [src] bites \the [e]!")) src.do_attack_animation(e) return e diff --git a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm index 4677f5d3564..65c3c008623 100644 --- a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm @@ -118,7 +118,7 @@ S.layer = initial(S.layer) var/turf/target_turf = get_turf(S) if(target_turf) - S.visible_message("\The [S] lands on the [target_turf]!") + S.visible_message(SPAN_DANGER("\The [S] lands on the [target_turf]!")) for(var/mob/living/M in target_turf) if(M != src) M.apply_damage(50, DAMAGE_BRUTE) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 060e4967572..5abf6be6aee 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -69,13 +69,13 @@ if (attacking_item.damtype == DAMAGE_PAIN) damage = 0 health -= damage - visible_message("[src] has been attacked with the [attacking_item] by [user].") + visible_message(SPAN_DANGER("[src] has been attacked with the [attacking_item] by [user].")) else - visible_message("[src] blocks the [attacking_item] with its shield!") + visible_message(SPAN_DANGER("[src] blocks the [attacking_item] with its shield!")) //user.do_attack_animation(src) else - to_chat(usr, "This weapon is ineffective, it does no damage.") - visible_message("[user] gently taps [src] with the [attacking_item].") + to_chat(usr, SPAN_WARNING("This weapon is ineffective, it does no damage.")) + visible_message(SPAN_WARNING("[user] gently taps [src] with the [attacking_item].")) /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) @@ -83,7 +83,7 @@ if(prob(65)) src.health -= Proj.damage else - visible_message("[src] blocks [Proj] with its shield!") + visible_message(SPAN_DANGER("[src] blocks [Proj] with its shield!")) return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index d75c43d55ee..0ff5f57dfe2 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -52,7 +52,7 @@ if(istype(L)) if(prob(15)) L.Weaken(3) - L.visible_message("\the [src] knocks down \the [L]!") + L.visible_message(SPAN_DANGER("\the [src] knocks down \the [L]!")) /mob/living/simple_animal/hostile/tree/death() ..(null,"is hacked into pieces!") diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 371f40b9a6f..d1694b6a184 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -166,19 +166,19 @@ if(copytext(possible_phrase,1,3) in department_radio_keys) possible_phrase = copytext(possible_phrase,3,length(possible_phrase)) else - to_chat(usr, "There is nothing to remove from its [remove_from].") + to_chat(usr, SPAN_WARNING("There is nothing to remove from its [remove_from].")) return //Adding things to inventory else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] if(!usr.get_active_hand()) - to_chat(usr, "You have nothing in your hand to put on its [add_to].") + to_chat(usr, SPAN_WARNING("You have nothing in your hand to put on its [add_to].")) return switch(add_to) if("ears") if(ears) - to_chat(usr, "It's already wearing something.") + to_chat(usr, SPAN_WARNING("It's already wearing something.")) return else var/obj/item/item_to_add = usr.get_active_hand() @@ -186,7 +186,7 @@ return if( !istype(item_to_add, /obj/item/device/radio/headset) ) - to_chat(usr, "This object won't fit.") + to_chat(usr, SPAN_WARNING("This object won't fit.")) return var/obj/item/device/radio/headset/headset_to_add = item_to_add @@ -413,7 +413,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.forceMove(src) - visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item]!", SPAN_NOTICE("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.") parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -573,7 +573,7 @@ return -1 if(held_item) - to_chat(src, "You are already holding the [held_item]") + to_chat(src, SPAN_WARNING("You are already holding the [held_item]")) return 1 for(var/obj/item/I in view(1,src)) @@ -586,10 +586,10 @@ held_item = I I.forceMove(src) - visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item]!", SPAN_NOTICE("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.") return held_item - to_chat(src, "There is nothing of interest to take.") + to_chat(src, SPAN_WARNING("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -601,7 +601,7 @@ return -1 if(held_item) - to_chat(src, "You are already holding the [held_item]") + to_chat(src, SPAN_WARNING("You are already holding the [held_item]")) return 1 var/obj/item/stolen_item = null @@ -617,10 +617,10 @@ C.remove_from_mob(stolen_item) held_item = stolen_item stolen_item.forceMove(src) - visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item] out of [C]'s hand!", SPAN_NOTICE("You snag the [held_item] out of [C]'s hand!"), "You hear the sounds of wings flapping furiously.") return held_item - to_chat(src, "There is nothing of interest to take.") + to_chat(src, SPAN_WARNING("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -644,7 +644,7 @@ return -1 if(!held_item) - to_chat(usr, "You have nothing to drop!") + to_chat(usr, SPAN_WARNING("You have nothing to drop!")) return 0 if(!drop_gently) @@ -677,7 +677,7 @@ src.forceMove(AM.loc) icon_state = "parrot_sit" return - to_chat(src, "There is no perch nearby to sit on.") + to_chat(src, SPAN_WARNING("There is no perch nearby to sit on.")) return /mob/living/simple_animal/parrot/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/ghost_hearing = GHOSTS_ALL_HEAR, var/whisper = FALSE) diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 3ab32f4b408..618a4226a10 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -39,7 +39,7 @@ /mob/living/simple_animal/shade/death() . = ..() - visible_message("[src] lets out a contented sigh as their form unwinds.") + visible_message(SPAN_WARNING("[src] lets out a contented sigh as their form unwinds.")) new residue(loc) qdel(src) @@ -146,7 +146,7 @@ adjustCloneLoss(2) if(!heard_dying_message) heard_dying_message = 1 - to_chat(src, "You feel yourself begin to fade away!") + to_chat(src, SPAN_DANGER("You feel yourself begin to fade away!")) ..() /mob/living/simple_animal/shade/bluespace/Life() @@ -159,14 +159,14 @@ if(L.stat == DEAD) adjustCloneLoss(2) if(!heard_dying_message) - to_chat(src, "You feel yourself unable to sustain yourself on your host, and begin to fade away!") + to_chat(src, SPAN_DANGER("You feel yourself unable to sustain yourself on your host, and begin to fade away!")) heard_dying_message = 1 else if(L.sleeping) adjustCloneLoss(2) possession_heard_message = 0 if(!heard_dying_message) - to_chat(src, "Your host's lifestream is obfuscated in their dreams as they sleep, and you begin to fade away!") + to_chat(src, SPAN_DANGER("Your host's lifestream is obfuscated in their dreams as they sleep, and you begin to fade away!")) heard_dying_message = 1 else @@ -182,7 +182,7 @@ var/list/nagging_doubts = list("You feel empowered by the ancestors!","You feel ancestral might flowing through your veins!","You feel the power of your forebears!", \ "You feel the blood of the warrior!", "You feel the glory of a warrior's death!", "You feel mighty!","You feel the strength of the spirits!") if(prob(5) || !possession_heard_message) - to_chat(H, "[pick(nagging_doubts)]") + to_chat(H, SPAN_DANGER("[pick(nagging_doubts)]")) possession_heard_message = 1 else @@ -192,7 +192,7 @@ var/list/nagging_doubts = list("You feel a nagging doubt in the back of your head.","You feel a vacancy in your thoughts.","You feel momentarily forgetful.", \ "You feel temporarily occupied.", "You feel a little worried.", "You feel a hostile presence.","You feel watched.") if(prob(5) || !possession_heard_message) - to_chat(L, "[pick(nagging_doubts)]") + to_chat(L, SPAN_NOTICE("[pick(nagging_doubts)]")) possession_heard_message = 1 /mob/living/simple_animal/shade/bluespace/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol) @@ -203,7 +203,7 @@ adjustCloneLoss(-2) if(heard_dying_message) heard_dying_message = 0 - to_chat(src, "The soothing echoes of life reinvigorate you.") + to_chat(src, SPAN_NOTICE("The soothing echoes of life reinvigorate you.")) /mob/living/simple_animal/shade/bluespace/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/ghost_hearing = GHOSTS_ALL_HEAR, var/whisper = FALSE) if(!possessive) @@ -222,14 +222,14 @@ message = slur(message,15) ..() else - to_chat(src, "You cannot muster a voice when possessing another!") + to_chat(src, SPAN_WARNING("You cannot muster a voice when possessing another!")) /mob/living/simple_animal/shade/bluespace/verb/show_last_message() set name = "Current Echo" set category = "Bluespace Echo" set desc = "Privately display the last message you heard." - to_chat(src, "[last_message_heard]") + to_chat(src, SPAN_NOTICE("[last_message_heard]")) /mob/living/simple_animal/shade/bluespace/verb/flicker() set name = "Flicker Lights" @@ -237,7 +237,7 @@ set desc = "Oh, Nosferatu!" if(possessive) - to_chat(src, "You cannot affect the world outside your host!") + to_chat(src, SPAN_WARNING("You cannot affect the world outside your host!")) return visible_message("\The [src] pulses.") @@ -250,11 +250,11 @@ set desc = "Teleport a small item to where you are." if(possessive) - to_chat(src, "You cannot affect the world outside your host!") + to_chat(src, SPAN_WARNING("You cannot affect the world outside your host!")) return if(message_countdown < 20) - to_chat(src, "You are too faded to warp an item through bluespace.") + to_chat(src, SPAN_WARNING("You are too faded to warp an item through bluespace.")) return var/list/obj/item/choices = list() @@ -263,7 +263,7 @@ choices += I if(!choices.len) - to_chat(src, "There are no suitable items nearby.") + to_chat(src, SPAN_WARNING("There are no suitable items nearby.")) return var/obj/item/choice = input(src, "What item would you like to warp?") as null|anything in choices @@ -281,11 +281,11 @@ set desc = "Draw yourself towards the original cradle of your soul." if(possessive) - to_chat(src, "You cannot affect the world outside your host!") + to_chat(src, SPAN_WARNING("You cannot affect the world outside your host!")) return if(!original_body) - to_chat(src, "You feel an immeasurable hollowness as you realize that the original cradle of your soul is no more.") + to_chat(src, SPAN_DANGER("You feel an immeasurable hollowness as you realize that the original cradle of your soul is no more.")) return @@ -293,7 +293,7 @@ var/turf/T2 = get_turf(src) if(T1.z != T2.z) - to_chat(src, "The original cradle of your soul is too distant from you, perhaps somewhere above or below?") + to_chat(src, SPAN_WARNING("The original cradle of your soul is too distant from you, perhaps somewhere above or below?")) return forceMove(get_step(src, get_dir(T2, T1))) @@ -304,11 +304,11 @@ set desc = "Meld into the mind of another, sustaining yourself off of their lifeforce." if(possessive) - to_chat(src, "You are already possessing a host!") + to_chat(src, SPAN_WARNING("You are already possessing a host!")) return if(message_countdown < 50) - to_chat(src, "You are too faded to squeeze into another's lifestream.") + to_chat(src, SPAN_WARNING("You are too faded to squeeze into another's lifestream.")) return var/list/mob/living/carbon/human/choices = list() @@ -317,7 +317,7 @@ choices += H if(!choices.len) - to_chat(src, "There are no suitable lifestreams nearby.") + to_chat(src, SPAN_WARNING("There are no suitable lifestreams nearby.")) return var/mob/living/carbon/human/H = input(src, "What lifestream would you like to meld with?") as null|anything in choices @@ -340,7 +340,7 @@ set desc = "Seperate yourself from the lifestream of another." if(!possessive) - to_chat(src, "You are not currently possessing a host!") + to_chat(src, SPAN_WARNING("You are not currently possessing a host!")) return forceMove(get_turf(possessed_body)) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 652be0c2d0d..bd414541730 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -222,11 +222,11 @@ /mob/living/simple_animal/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if (stat == DEAD) - . += "It looks dead." + . += SPAN_DANGER("It looks dead.") if (health < maxHealth * 0.5) - . += "It looks badly wounded." + . += SPAN_DANGER("It looks badly wounded.") else if (health < maxHealth) - . += "It looks wounded." + . += SPAN_WARNING("It looks wounded.") /mob/living/simple_animal/can_name(var/mob/living/M) if(named) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index df60ffcf525..e1a7e1b1058 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -19,10 +19,10 @@ spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") if(matches) if(M.client) - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)]."), 1) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].",ckey=key_name(src)) else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). "), 1) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).",ckey=key_name(src)) /mob diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e9f97f070f2..265f983880d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -448,13 +448,13 @@ return if (length(mind.memory) >= MAX_PAPER_MESSAGE_LEN) - to_chat(src, "You have exceeded the alotted text size for memories.") + to_chat(src, SPAN_DANGER("You have exceeded the alotted text size for memories.")) return msg = sanitize(msg) if (length(mind.memory + msg) >= MAX_PAPER_MESSAGE_LEN) - to_chat(src, "Your input would exceed the alotted text size for memories. Try again with a shorter message.") + to_chat(src, SPAN_DANGER("Your input would exceed the alotted text size for memories. Try again with a shorter message.")) return mind.store_memory(msg) @@ -471,7 +471,7 @@ /mob/proc/warn_flavor_changed() if(flavor_text && flavor_text != "") // don't spam people that don't use it! to_chat(src, " OOC Warning:") - to_chat(src, "Your flavor text is likely out of date! Change") + to_chat(src, SPAN_ALERT("Your flavor text is likely out of date! Change")) /mob/proc/print_flavor_text() if (flavor_text && flavor_text != "") @@ -512,7 +512,7 @@ to_chat(usr, "You can respawn now, enjoy your new life!") log_game("[usr.name]/[usr.key] used abandon mob.", ckey=key_name(usr)) - to_chat(usr, "Make sure to play a different character, and please roleplay correctly!") + to_chat(usr, SPAN_NOTICE("Make sure to play a different character, and please roleplay correctly!")) client?.screen.Cut() if(!client) @@ -554,7 +554,7 @@ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || istype(src, /mob/abstract/new_player)) - to_chat(usr, "You must be observing to use this!") + to_chat(usr, SPAN_NOTICE("You must be observing to use this!")) return if(is_admin && stat == DEAD) @@ -704,7 +704,7 @@ if (AM.anchored) if(!AM.buckled_to) - to_chat(src, "It won't budge!") + to_chat(src, SPAN_WARNING("It won't budge!")) else start_pulling(AM.buckled_to) //Pull the thing they're buckled to instead. return @@ -713,15 +713,15 @@ if(ismob(AM)) M = AM if(!can_pull_mobs || !can_pull_size) - to_chat(src, "It won't budge!") + to_chat(src, SPAN_WARNING("It won't budge!")) return if((mob_size < M.mob_size) && (can_pull_mobs != MOB_PULL_LARGER)) - to_chat(src, "It won't budge!") + to_chat(src, SPAN_WARNING("It won't budge!")) return if((mob_size == M.mob_size) && (can_pull_mobs == MOB_PULL_SMALLER)) - to_chat(src, "It won't budge!") + to_chat(src, SPAN_WARNING("It won't budge!")) return if(length(M.grabbed_by)) @@ -740,7 +740,7 @@ else if(isobj(AM)) var/obj/I = AM if(!can_pull_size || can_pull_size < I.w_class) - to_chat(src, "It won't budge!") + to_chat(src, SPAN_WARNING("It won't budge!")) return if(pulling) @@ -765,7 +765,7 @@ visible_message(SPAN_WARNING("\The [src] grips \the [H]'s arm."), SPAN_NOTICE("You grip \the [H]'s arm.")) playsound(loc, /singleton/sound_category/grab_sound, 25, FALSE, -1) //Quieter than hugging/grabbing but we still want some audio feedback if(H.pull_damage()) - to_chat(src, "Pulling \the [H] in their current condition would probably be a bad idea.") + to_chat(src, SPAN_DANGER("Pulling \the [H] in their current condition would probably be a bad idea.")) //Attempted fix for people flying away through space when cuffed and dragged. if(M) @@ -1106,9 +1106,9 @@ var/obj/item/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects if(self) - to_chat(src, "You attempt to get a good grip on [selection] in your body.") + to_chat(src, SPAN_WARNING("You attempt to get a good grip on [selection] in your body.")) else - to_chat(U, "You attempt to get a good grip on [selection] in [S]'s body.") + to_chat(U, SPAN_WARNING("You attempt to get a good grip on [selection] in [S]'s body.")) if(!do_after(U, 30)) return @@ -1116,9 +1116,13 @@ return if(self) - visible_message("[src] rips [selection] out of their body!","You rip [selection] out of your body!") + visible_message(SPAN_WARNING("[src] rips [selection] out of their body!"), + SPAN_WARNING("You rip [selection] out of your body!")) + else - visible_message("[usr] rips [selection] out of [src]'s body!","[usr] rips [selection] out of your body!") + visible_message(SPAN_WARNING("[usr] rips [selection] out of [src]'s body!"), + SPAN_WARNING("[usr] rips [selection] out of your body!")) + valid_objects = get_visible_implants(0) remove_implant(selection) @@ -1319,7 +1323,7 @@ return SetWeakened(200) - visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", "You have been winded by a member of staff! Please stand by until they contact you!") + visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", SPAN_WARNING("You have been winded by a member of staff! Please stand by until they contact you!")) log_admin("[key_name(admin)] winded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src)) message_admins("[key_name_admin(admin)] winded [key_name_admin(src)]!", 1) @@ -1335,7 +1339,7 @@ return SetWeakened(0) - visible_message("OOC Information: [src] has been unwinded by a member of staff!", "You have been unwinded by a member of staff!") + visible_message("OOC Information: [src] has been unwinded by a member of staff!", SPAN_WARNING("You have been unwinded by a member of staff!")) log_admin("[key_name(admin)] unwinded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src)) message_admins("[key_name_admin(admin)] unwinded [key_name_admin(src)]!", 1) diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 69ceb7f96a0..f42f200fb4a 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -4,60 +4,60 @@ var/obj/item/organ/external/E = H.get_organ(target_zone) if(!E || E.is_stump()) - to_chat(user, "[H] is missing that bodypart.") + to_chat(user, SPAN_NOTICE("[H] is missing that bodypart.")) return - user.visible_message("[user] starts inspecting [affecting]'s [E.name] carefully.") + user.visible_message(SPAN_NOTICE("[user] starts inspecting [affecting]'s [E.name] carefully.")) if(!do_mob(user,H, 10)) - to_chat(user, "You must stand still to inspect [E] for wounds.") + to_chat(user, SPAN_NOTICE("You must stand still to inspect [E] for wounds.")) else if(E.wounds.len) - to_chat(user, "You find [E.get_wounds_desc()]") + to_chat(user, SPAN_WARNING("You find [E.get_wounds_desc()]")) else - to_chat(user, "You find no visible wounds.") + to_chat(user, SPAN_NOTICE("You find no visible wounds.")) - to_chat(user, "Checking bones now...") + to_chat(user, SPAN_NOTICE("Checking bones now...")) if(!do_mob(user, H, 20)) - to_chat(user, "You must stand still to feel [E] for fractures.") + to_chat(user, SPAN_NOTICE("You must stand still to feel [E] for fractures.")) else if(E.status & ORGAN_BROKEN) - to_chat(user, "The [E.encased ? E.encased : "bone in the [E.name]"] moves slightly when you poke it!") + to_chat(user, SPAN_WARNING("The [E.encased ? E.encased : "bone in the [E.name]"] moves slightly when you poke it!")) H.custom_pain("Your [E.name] hurts where it's poked.") else - to_chat(user, "The [E.encased ? E.encased : "bones in the [E.name]"] seem to be fine.") + to_chat(user, SPAN_NOTICE("The [E.encased ? E.encased : "bones in the [E.name]"] seem to be fine.")) - to_chat(user, "Checking skin now...") + to_chat(user, SPAN_NOTICE("Checking skin now...")) if(!do_mob(user, H, 10)) - to_chat(user, "You must stand still to check [H]'s skin for abnormalities.") + to_chat(user, SPAN_NOTICE("You must stand still to check [H]'s skin for abnormalities.")) else var/bad = 0 if(H.getToxLoss() >= 40) - to_chat(user, "[H] has an unhealthy skin discoloration.") + to_chat(user, SPAN_WARNING("[H] has an unhealthy skin discoloration.")) bad = 1 if(H.getOxyLoss() >= 20) - to_chat(user, "[H]'s skin is unusually pale.") + to_chat(user, SPAN_WARNING("[H]'s skin is unusually pale.")) bad = 1 if(E.is_infected()) var/severity = E.germ_level < INFECTION_LEVEL_TWO ? "slightly" : E.germ_level < INFECTION_LEVEL_THREE ? "moderately" : "extremely" to_chat(user, SPAN_WARNING("[H]'s skin is [severity] warm and reddened.")) bad = 1 if(E.status & ORGAN_DEAD) - to_chat(user, "[E] is decaying!") + to_chat(user, SPAN_WARNING("[E] is decaying!")) bad = 1 if(!bad) - to_chat(user, "[H]'s skin is normal.") + to_chat(user, SPAN_NOTICE("[H]'s skin is normal.")) /obj/item/grab/proc/jointlock(mob/living/carbon/human/target, mob/attacker, var/target_zone) if(state < GRAB_AGGRESSIVE) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, SPAN_WARNING("You require a better grab to do this.")) return var/obj/item/organ/external/organ = target.get_organ(check_zone(target_zone)) if(!organ || organ.dislocated == -1) return - attacker.visible_message("[attacker] [pick("bent", "twisted")] [target]'s [organ.name] into a jointlock!") + attacker.visible_message(SPAN_DANGER("[attacker] [pick("bent", "twisted")] [target]'s [organ.name] into a jointlock!")) var/armor = 100 * affecting.get_blocked_ratio(target, DAMAGE_BRUTE, damage = 30) if(armor < 70) - to_chat(target, "You feel extreme pain!") + to_chat(target, SPAN_DANGER("You feel extreme pain!")) affecting.adjustHalLoss(Clamp(0, 60 - affecting.getHalLoss(), 30)) //up to 60 halloss /obj/item/grab/proc/attack_eye(mob/living/carbon/human/target, mob/living/carbon/human/attacker) @@ -69,17 +69,17 @@ if(!attack) return if(state < GRAB_NECK) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, SPAN_WARNING("You require a better grab to do this.")) return for(var/obj/item/protection in list(target.head, target.wear_mask, target.glasses)) if(protection && (protection.body_parts_covered & EYES)) - to_chat(attacker, "You're going to need to remove the eye covering first.") + to_chat(attacker, SPAN_DANGER("You're going to need to remove the eye covering first.")) return if(!target.has_eyes()) - to_chat(attacker, "You cannot locate any eyes on [target]!") + to_chat(attacker, SPAN_DANGER("You cannot locate any eyes on [target]!")) return if(isipc(target)) - to_chat(attacker, "You cannot damage [target]'s optics with your bare hands!") + to_chat(attacker, SPAN_DANGER("You cannot damage [target]'s optics with your bare hands!")) return admin_attack_log(attacker, target, "attacked [target.name]'s eyes using a grab.", "had eyes attacked by [attacker.name]'s grab.", "used a grab to attack eyes of") @@ -91,7 +91,7 @@ return if(target.lying) return - attacker.visible_message("[attacker] thrusts [attacker.get_pronoun("his")] head into [target]'s skull!") + attacker.visible_message(SPAN_DANGER("[attacker] thrusts [attacker.get_pronoun("his")] head into [target]'s skull!")) var/damage = 15 if(attacker.mob_size >= 10) @@ -109,7 +109,7 @@ if(armor < 25 && target.headcheck(BP_HEAD) && prob(damage)) target.apply_effect(20, PARALYZE) - target.visible_message("[target] [target.species.knockout_message]") + target.visible_message(SPAN_DANGER("[target] [target.species.knockout_message]")) playsound(attacker.loc, /singleton/sound_category/swing_hit_sound, 25, 1, -1) attacker.attack_log += text("\[[time_stamp()]\] Headbutted [target.name] ([target.ckey])") @@ -121,7 +121,7 @@ /obj/item/grab/proc/dislocate(mob/living/carbon/human/target, mob/living/attacker, var/target_zone) if(state < GRAB_NECK) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, SPAN_WARNING("You require a better grab to do this.")) return if(target.grab_joint(attacker, target_zone)) playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1) @@ -129,15 +129,15 @@ /obj/item/grab/proc/pin_down(mob/target, mob/attacker) if(state < GRAB_AGGRESSIVE) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, SPAN_WARNING("You require a better grab to do this.")) return if(force_down) - to_chat(attacker, "You are already pinning [target] to the ground.") + to_chat(attacker, SPAN_WARNING("You are already pinning [target] to the ground.")) - attacker.visible_message("[attacker] starts forcing [target] to the ground!") + attacker.visible_message(SPAN_DANGER("[attacker] starts forcing [target] to the ground!")) if(do_after(attacker, 20) && target) last_action = world.time - attacker.visible_message("[attacker] forces [target] to the ground!") + attacker.visible_message(SPAN_DANGER("[attacker] forces [target] to the ground!")) apply_pinning(target, attacker) /obj/item/grab/proc/apply_pinning(mob/target, mob/attacker) @@ -160,44 +160,44 @@ var/hairchatname = hair_style.chatname for(var/obj/item/protection in list(target.head, target.wear_mask)) if(protection && (protection.body_parts_covered & HEAD)) - to_chat(assailant, "You can't tug their hair while something is covering it!.") + to_chat(assailant, SPAN_WARNING("You can't tug their hair while something is covering it!.")) return switch(hair_style.length) if(0) - visible_message("[assailant] tried to grab [target] but they have no hair!") + visible_message(SPAN_NOTICE("[assailant] tried to grab [target] but they have no hair!")) if(1) - visible_message("[assailant] tugs [target]'s [hairchatname] before releasing their grip!") + visible_message(SPAN_DANGER("[assailant] tugs [target]'s [hairchatname] before releasing their grip!")) target.apply_damage(5, DAMAGE_PAIN) if(2) - visible_message("[assailant] tugs [target]'s [hairchatname]!") + visible_message(SPAN_DANGER("[assailant] tugs [target]'s [hairchatname]!")) target.apply_damage(5, DAMAGE_PAIN) src.state = GRAB_PASSIVE if(3) - visible_message("[assailant] tugs [target]'s [hairchatname]!") + visible_message(SPAN_DANGER("[assailant] tugs [target]'s [hairchatname]!")) target.apply_damage(10, DAMAGE_PAIN) src.state = GRAB_PASSIVE if(4) - visible_message("[assailant] violently tugs [target]'s [hairchatname], ripping out a clump!") + visible_message(SPAN_DANGER("[assailant] violently tugs [target]'s [hairchatname], ripping out a clump!")) target.apply_damage(15, DAMAGE_PAIN) src.state = GRAB_PASSIVE if(5) if(prob(77)) - visible_message("[assailant] has [target] grasped by their [hairchatname], however suddenly it slips from [assailant]'s hand!") + visible_message(SPAN_DANGER("[assailant] has [target] grasped by their [hairchatname], however suddenly it slips from [assailant]'s hand!")) src.state = GRAB_PASSIVE else - visible_message("[assailant] violently tugs [target]'s [hairchatname]!") + visible_message(SPAN_DANGER("[assailant] violently tugs [target]'s [hairchatname]!")) target.apply_damage(10, DAMAGE_PAIN) src.state = GRAB_AGGRESSIVE if(6) if(prob(67)) - visible_message("[assailant] has [target] grasped by their [hairchatname], however suddenly it slips from [assailant]'s hand!") + visible_message(SPAN_DANGER("[assailant] has [target] grasped by their [hairchatname], however suddenly it slips from [assailant]'s hand!")) src.state = GRAB_PASSIVE playsound(target.loc, 'sound/misc/slip.ogg', 50, 1, -3) else - visible_message("[assailant] violently tugs [target]'s [hairchatname]!") + visible_message(SPAN_DANGER("[assailant] violently tugs [target]'s [hairchatname]!")) target.apply_damage(15, DAMAGE_PAIN) src.state = GRAB_AGGRESSIVE diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 7c0f1ca5370..b97b6423cd7 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -748,9 +748,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) if(!lastpuke) lastpuke = 1 - to_chat(src, "You feel nauseous...") + to_chat(src, SPAN_WARNING("You feel nauseous...")) spawn(150) //15 seconds until second warning - to_chat(src, "You feel like you are about to throw up!") + to_chat(src, SPAN_WARNING("You feel like you are about to throw up!")) spawn(100) //and you have 10 more for mad dash to the bucket if(!QDELETED(src)) empty_stomach() diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index 5d22731a877..f633c4c4729 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -5,7 +5,7 @@ /mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies) if(istype(src,/mob/abstract/new_player)) - to_chat(usr, "cannot convert players who have not entered yet.") + to_chat(usr, SPAN_WARNING("cannot convert players who have not entered yet.")) return if(!new_type) @@ -19,7 +19,7 @@ return if( new_type == /mob/abstract/new_player ) - to_chat(usr, "cannot convert into a new_player mob type.") + to_chat(usr, SPAN_WARNING("cannot convert into a new_player mob type.")) return var/mob/M diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 5cc21c81b8d..60e7833f951 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -21,7 +21,7 @@ set category = "IC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, SPAN_WARNING("Speech is currently admin-disabled.")) return message = sanitize(message) @@ -36,16 +36,16 @@ /mob/proc/say_dead(var/message) if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, SPAN_DANGER("Speech is currently admin-disabled.")) return if(!src.client.holder) if(!GLOB.config.dsay_allowed) - to_chat(src, "Deadchat is globally muted.") + to_chat(src, SPAN_DANGER("Deadchat is globally muted.")) return if(client && !(client.prefs.toggles & CHAT_DEAD)) - to_chat(usr, "You have deadchat muted.") + to_chat(usr, SPAN_DANGER("You have deadchat muted.")) return message = process_chat_markup(message, list("~", "_")) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index cf145eb3d16..dda97c47e9d 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -272,7 +272,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes if(!safe_animal(mobpath)) - to_chat(usr, "Sorry but this mob type is currently unavailable.") + to_chat(usr, SPAN_WARNING("Sorry but this mob type is currently unavailable.")) return if(transforming) @@ -306,7 +306,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes if(!safe_animal(mobpath)) - to_chat(usr, "Sorry but this mob type is currently unavailable.") + to_chat(usr, SPAN_WARNING("Sorry but this mob type is currently unavailable.")) return var/mob/new_mob = new mobpath(src.loc) diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 9e8a2628f9c..ffed4c11b00 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -153,7 +153,7 @@ if(temp_name) id_card.registered_name = temp_name else - computer.visible_message("[computer] buzzes rudely.") + computer.visible_message(SPAN_NOTICE("[computer] buzzes rudely.")) else if(params["account"]) var/account_num = text2num(input("Enter account number.", "Account", id_card.associated_account_number)) id_card.associated_account_number = account_num diff --git a/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm b/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm index fec23084c2e..7148e93bf8a 100644 --- a/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm +++ b/code/modules/modular_computers/file_system/programs/generic/lawmanager.dm @@ -132,15 +132,15 @@ return TRUE if("notify_laws") - to_chat(owner, "Law Notice") + to_chat(owner, SPAN_DANGER("Law Notice")) owner.laws.show_laws(owner) if(isAI(owner)) var/mob/living/silicon/ai/AI = owner for(var/mob/living/silicon/robot/R in AI.connected_robots) - to_chat(R, "Law Notice") + to_chat(R, SPAN_DANGER("Law Notice")) R.laws.show_laws(R) if(usr != owner) - to_chat(usr, "Laws displayed.") + to_chat(usr, SPAN_NOTICE("Laws displayed.")) return TRUE /datum/computer_file/program/law_manager/ui_data(mob/user) diff --git a/code/modules/multiz/mobile_ladders.dm b/code/modules/multiz/mobile_ladders.dm index 0c88cc2126e..c1eec5fd5c4 100644 --- a/code/modules/multiz/mobile_ladders.dm +++ b/code/modules/multiz/mobile_ladders.dm @@ -15,10 +15,10 @@ if (isopenturf(A)) //Place into open space var/turf/below_loc = GetBelow(A) if (!below_loc || (istype(/turf/space, below_loc))) - to_chat(user, "Why would you do that?! There is only infinite space there...") + to_chat(user, SPAN_NOTICE("Why would you do that?! There is only infinite space there...")) return - user.visible_message("[user] begins to lower \the [src] into \the [A].", - "You begin to lower \the [src] into \the [A].") + user.visible_message(SPAN_WARNING("[user] begins to lower \the [src] into \the [A]."), + SPAN_WARNING("You begin to lower \the [src] into \the [A].")) if (!handle_action(A, user)) return // Create the lower ladder first. ladder/Initialize() will make the upper @@ -34,10 +34,10 @@ else if (istype(A, /turf/simulated/floor) || istype(A, /turf/unsimulated/floor)) //Place onto Floor var/turf/upper_loc = GetAbove(A) if (!upper_loc || !isopenturf(upper_loc)) - to_chat(user, "There is something above. You can't deploy!") + to_chat(user, SPAN_NOTICE("There is something above. You can't deploy!")) return - user.visible_message("[user] begins deploying \the [src] on \the [A].", - "You begin to deploy \the [src] on \the [A].") + user.visible_message(SPAN_WARNING("[user] begins deploying \the [src] on \the [A]."), + SPAN_WARNING("You begin to deploy \the [src] on \the [A].")) if (!handle_action(A, user)) return // Ditto here. Create the lower ladder first. diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 4a68837ceb1..3b248f0d071 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -607,8 +607,8 @@ else if(prob(30) && combat_roll >= 1)//landed on their head apply_damage(limb_damage, DAMAGE_BRUTE, BP_HEAD) - visible_message("\The [src] falls and lands on their face!", - "With a loud thud, you land on your head. Hard.", "You hear a thud!") + visible_message(SPAN_WARNING("\The [src] falls and lands on their face!"), + SPAN_DANGER("With a loud thud, you land on your head. Hard."), "You hear a thud!") var/obj/item/organ/external/head = get_organ(BP_HEAD) if(prob(20) && head && head.dislocated != -1) diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm index 5004bdd7fb0..4898212ff3d 100644 --- a/code/modules/multiz/pipes.dm +++ b/code/modules/multiz/pipes.dm @@ -85,7 +85,7 @@ else return 1 /obj/machinery/atmospherics/pipe/zpipe/proc/burst() - src.visible_message("\The [src] bursts!"); + src.visible_message(SPAN_WARNING("\The [src] bursts!")); playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 62c9f0e999a..ba788239cce 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -81,7 +81,7 @@ G = M.r_hand if(!M.Move(get_turf(src))) - to_chat(M, "You fail to reach \the [src].") + to_chat(M, SPAN_NOTICE("You fail to reach \the [src].")) return if (istype(G)) @@ -89,11 +89,11 @@ var/direction = target_ladder == target_up ? "up" : "down" - M.visible_message("\The [M] begins climbing [direction] \the [src]!", + M.visible_message(SPAN_NOTICE("\The [M] begins climbing [direction] \the [src]!"), "You begin climbing [direction] \the [src]!", "You hear the grunting and clanging of a metal ladder being used.") - target_ladder.audible_message("You hear something coming [direction] \the [src]") + target_ladder.audible_message(SPAN_NOTICE("You hear something coming [direction] \the [src]")) if(do_after(M, istype(G) ? (climb_time*2) : climb_time)) climbLadder(M, target_ladder) @@ -105,7 +105,7 @@ /obj/structure/ladder/proc/getTargetLadder(var/mob/M) if((!target_up && !target_down) || (target_up && !istype(target_up.loc, /turf) || (target_down && !istype(target_down.loc,/turf)))) - to_chat(M, "\The [src] is incomplete and can't be climbed.") + to_chat(M, SPAN_NOTICE("\The [src] is incomplete and can't be climbed.")) return if(target_down && target_up) var/direction = alert(M,"Do you want to go up or down?", "Ladder", "Up", "Down", "Cancel") @@ -126,23 +126,23 @@ /mob/proc/may_climb_ladders(var/ladder) if(!Adjacent(ladder)) - to_chat(src, "You need to be next to \the [ladder] to start climbing.") + to_chat(src, SPAN_WARNING("You need to be next to \the [ladder] to start climbing.")) return FALSE if(incapacitated()) - to_chat(src, "You are physically unable to climb \the [ladder].") + to_chat(src, SPAN_WARNING("You are physically unable to climb \the [ladder].")) return FALSE return TRUE /mob/living/silicon/may_climb_ladders(ladder) - to_chat(src, "You're too heavy to climb [ladder]!") + to_chat(src, SPAN_WARNING("You're too heavy to climb [ladder]!")) return FALSE /mob/living/silicon/robot/drone/may_climb_ladders(ladder) if(!Adjacent(ladder)) - to_chat(src, "You need to be next to \the [ladder] to start climbing.") + to_chat(src, SPAN_WARNING("You need to be next to \the [ladder] to start climbing.")) return FALSE if(incapacitated()) - to_chat(src, "You are physically unable to climb \the [ladder].") + to_chat(src, SPAN_WARNING("You are physically unable to climb \the [ladder].")) return FALSE return TRUE @@ -158,15 +158,15 @@ if(istype(target_ladder, target_down)) direction = DOWN if(!LAD.CanZPass(M, direction)) - to_chat(M, "\The [LAD.GetZPassBlocker()] is blocking \the [src].") + to_chat(M, SPAN_NOTICE("\The [LAD.GetZPassBlocker()] is blocking \the [src].")) return FALSE if(!T.CanZPass(M, direction)) - to_chat(M, "\The [T.GetZPassBlocker()] is blocking \the [src].") + to_chat(M, SPAN_NOTICE("\The [T.GetZPassBlocker()] is blocking \the [src].")) return FALSE for(var/atom/A in T) if(!isliving(A)) if(!A.CanPass(M, M.loc, 1.5, 0)) - to_chat(M, "\The [A] is blocking \the [src].") + to_chat(M, SPAN_NOTICE("\The [A] is blocking \the [src].")) return FALSE playsound(src, pick(climbsounds), climb_sound_vol, climb_sound_vary) playsound(target_ladder, pick(climbsounds), climb_sound_vol, climb_sound_vary) diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm index 3515e229b03..3f1db9825e1 100644 --- a/code/modules/multiz/turfs/open_space.dm +++ b/code/modules/multiz/turfs/open_space.dm @@ -229,7 +229,7 @@ return var/obj/item/stack/rods/R = attacking_item if (R.use(1)) - to_chat(user, "You lay down the support lattice.") + to_chat(user, SPAN_NOTICE("You lay down the support lattice.")) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) new /obj/structure/lattice(locate(src.x, src.y, src.z)) return @@ -246,7 +246,7 @@ ChangeTurf(/turf/simulated/floor/airless) return else - to_chat(user, "The plating is going to need some support.") + to_chat(user, SPAN_WARNING("The plating is going to need some support.")) //To lay cable. if(attacking_item.iscoil()) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 0584733a6ef..afe0122c8c6 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -69,9 +69,9 @@ if(blinding) H.eye_blurry = max(H.eye_blurry, 10) H.eye_blind = max(H.eye_blind, 5) - to_chat(H, "You are blinded by a spray of blood!") + to_chat(H, SPAN_DANGER("You are blinded by a spray of blood!")) else - to_chat(H, "You are hit by a spray of blood!") + to_chat(H, SPAN_DANGER("You are hit by a spray of blood!")) hit_mob = TRUE if(!(A.CanPass(src, sprayloc)) || hit_mob) diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index d5eb6b111bb..6dc43db6bd3 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -168,22 +168,22 @@ if(damage > 0 && prob(1)) owner.custom_pain("Your head feels numb and painful.",10) if(is_bruised() && prob(1) && owner.eye_blurry <= 0) - to_chat(owner, "It becomes hard to see for some reason.") + to_chat(owner, SPAN_WARNING("It becomes hard to see for some reason.")) owner.eye_blurry = 10 if(damage >= 0.5*max_damage && prob(1) && owner.get_active_hand()) - to_chat(owner, "Your hand won't respond properly, and you drop what you are holding!") + to_chat(owner, SPAN_DANGER("Your hand won't respond properly, and you drop what you are holding!")) owner.drop_item() if(damage >= 0.6*max_damage) owner.stuttering = max(owner.slurring, 2) if(is_broken()) if(!owner.lying && prob(5)) - to_chat(owner, "You black out!") + to_chat(owner, SPAN_DANGER("You black out!")) owner.Paralyse(10) /obj/item/organ/internal/brain/surgical_fix(mob/user) var/blood_volume = owner.get_blood_oxygenation() if(blood_volume < BLOOD_VOLUME_BAD) - to_chat(user, "Parts of [src] didn't survive the procedure due to lack of air supply!") + to_chat(user, SPAN_DANGER("Parts of [src] didn't survive the procedure due to lack of air supply!")) set_max_damage(FLOOR(max_damage - 0.25*damage, 1)) heal_damage(damage) @@ -205,7 +205,7 @@ if(H.mind) H.mind.transfer_to(brainmob) - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [initial(src.name)].") + to_chat(brainmob, SPAN_NOTICE("You feel slightly disoriented. That's normal when you're just a [initial(src.name)].")) callHook("debrain", list(brainmob)) /obj/item/organ/internal/brain/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index ab6c4d06710..6523cb6a4bd 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -35,13 +35,14 @@ var/b_eyes = hex2num(copytext(new_eyes, 6, 8)) if(do_after(owner, 0.5 SECONDS, do_flags = DO_USER_CAN_MOVE | DO_USER_CAN_TURN) && owner.change_eye_color(r_eyes, g_eyes, b_eyes)) owner.update_eyes() - owner.visible_message("[owner] shifts, their eye color changing.", "You shift, your eye color changing.") + owner.visible_message(SPAN_NOTICE("[owner] shifts, their eye color changing."), + SPAN_NOTICE("You shift, your eye color changing.")) /obj/item/organ/internal/eyes/take_damage(amount, var/silent=0) var/oldbroken = is_broken() . = ..() if(is_broken() && !oldbroken && owner && !owner.stat) - to_chat(owner, "You go blind!") + to_chat(owner, SPAN_DANGER("You go blind!")) /obj/item/organ/internal/eyes/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS) var/burnthrough = intensity - owner.get_flash_protection(ignore_inherent) diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm index 0daf7b31c12..55be8e0b6c2 100644 --- a/code/modules/organs/internal/heart.dm +++ b/code/modules/organs/internal/heart.dm @@ -69,7 +69,7 @@ should_stop = should_stop || (prob(5) && pulse == PULSE_THREADY) //erratic heart patterns, usually caused by oxyloss should_stop = should_stop || owner.chem_effects[CE_NOPULSE] if(should_stop) // The heart has stopped due to going into traumatic or cardiovascular shock. - to_chat(owner, "Your heart has stopped!") + to_chat(owner, SPAN_DANGER("Your heart has stopped!")) pulse = PULSE_NONE return @@ -172,8 +172,8 @@ blood_max *= 0.8 if(world.time >= next_blood_squirt && istype(owner.loc, /turf) && do_spray.len) - owner.visible_message("Blood squirts from \the [owner]'s [pick(do_spray)]!", \ - "Blood sprays out of your [pick(do_spray)]!") + owner.visible_message(SPAN_DANGER("Blood squirts from \the [owner]'s [pick(do_spray)]!"), \ + SPAN_DANGER("Blood sprays out of your [pick(do_spray)]!")) owner.eye_blurry = 2 owner.Stun(1) next_blood_squirt = world.time + 100 diff --git a/code/modules/organs/internal/lungs.dm b/code/modules/organs/internal/lungs.dm index 2f0e7e3512b..72763e5c91b 100644 --- a/code/modules/organs/internal/lungs.dm +++ b/code/modules/organs/internal/lungs.dm @@ -55,14 +55,14 @@ if(prob(2)) owner.visible_message( "\The [owner] coughs up blood!", - "You cough up blood!", + SPAN_WARNING("You cough up blood!"), "You hear someone coughing!", ) owner.drip(10) if(prob(4)) owner.visible_message( "\The [owner] gasps for air!", - "You can't breathe!", + SPAN_DANGER("You can't breathe!"), "You hear someone gasp for air!", ) owner.losebreath = max(round(damage / 2), owner.losebreath) @@ -207,7 +207,7 @@ if(exhaled_pp > safe_exhaled_max) if (!owner.co2_alert|| prob(15)) var/word = pick("extremely dizzy","short of breath","faint","confused") - to_chat(owner, "You feel [word].") + to_chat(owner, SPAN_DANGER("You feel [word].")) owner.co2_alert = 1 failed_exhale = 1 @@ -215,7 +215,7 @@ else if(exhaled_pp > safe_exhaled_max * 0.7) if (!owner.co2_alert || prob(1)) var/word = pick("dizzy","short of breath","faint","momentarily confused") - to_chat(owner, "You feel [word].") + to_chat(owner, SPAN_WARNING("You feel [word].")) owner.co2_alert = 1 failed_exhale = 1 @@ -223,7 +223,7 @@ else if(exhaled_pp > safe_exhaled_max * 0.6) if (prob(0.3)) var/word = pick("a little dizzy","short of breath") - to_chat(owner, "You feel [word].") + to_chat(owner, SPAN_WARNING("You feel [word].")) else owner.co2_alert = 0 @@ -290,10 +290,10 @@ if(breath.temperature <= owner.species.cold_level_1) if(prob(20)) - to_chat(owner, "You feel your face freezing and icicles forming in your lungs!") + to_chat(owner, SPAN_DANGER("You feel your face freezing and icicles forming in your lungs!")) else if(breath.temperature >= owner.species.heat_level_1) if(prob(20)) - to_chat(owner, "You feel your face burning and a searing heat in your lungs!") + to_chat(owner, SPAN_DANGER("You feel your face burning and a searing heat in your lungs!")) if(breath.temperature >= owner.species.heat_level_1) if(breath.temperature < owner.species.heat_level_2) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index ea871dc2c45..8bcdb3e4086 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -211,7 +211,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /obj/item/organ/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(status & ORGAN_DEAD) - . += "The decay has set in." + . += SPAN_NOTICE("The decay has set in.") /obj/item/organ/proc/handle_germ_effects() //** Handle the effects of infections @@ -480,7 +480,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) return ..() if(alert("Do you really want to use this organ as food? It will be useless for anything else afterwards.",,"No.","Yes.") == "No.") - to_chat(user, "You successfully repress your cannibalistic tendencies.") + to_chat(user, SPAN_NOTICE("You successfully repress your cannibalistic tendencies.")) return user.drop_from_inventory(src) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index bacfd922ff0..cfa510d4eaa 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -112,7 +112,7 @@ var/list/tendon_msgs = list("tore apart", "ripped away") - var/damage_msg = "You feel an intense pain!" + var/damage_msg = SPAN_WARNING("You feel an intense pain!") var/broken_description var/open = 0 var/stage = 0 @@ -234,7 +234,7 @@ if(istype(I)) if(!(user.l_hand && user.r_hand)) user.put_in_hands(I) - user.visible_message("\The [user] rips \the [I] out of \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] rips \the [I] out of \the [src]!")) return //no eating the limb until everything's been removed return ..() @@ -244,18 +244,18 @@ for(var/obj/item/I in contents) if(istype(I, /obj/item/organ)) continue - . += "There is \a [I] sticking out of it." + . += SPAN_DANGER("There is \a [I] sticking out of it.") /obj/item/organ/external/attackby(obj/item/attacking_item, mob/user) switch(stage) if(0) if(istype(attacking_item, /obj/item/surgery/scalpel)) - user.visible_message("[user] cuts [src] open with [attacking_item]!") + user.visible_message(SPAN_DANGER("[user] cuts [src] open with [attacking_item]!")) stage++ return if(1) if(istype(attacking_item, /obj/item/surgery/retractor)) - user.visible_message("[user] cracks [src] open like an egg with [attacking_item]!") + user.visible_message(SPAN_DANGER("[user] cracks [src] open like an egg with [attacking_item]!")) stage++ return if(2) @@ -265,9 +265,9 @@ removing.forceMove(get_turf(user.loc)) if(!(user.l_hand && user.r_hand)) user.put_in_hands(removing) - user.visible_message("[user] extracts [removing] from [src] with [attacking_item]!") + user.visible_message(SPAN_DANGER("[user] extracts [removing] from [src] with [attacking_item]!")) else - user.visible_message("[user] fishes around fruitlessly in [src] with [attacking_item].") + user.visible_message(SPAN_DANGER("[user] fishes around fruitlessly in [src] with [attacking_item].")) return ..() @@ -628,12 +628,12 @@ This function completely restores a damaged organ to perfect condition. W.open_wound(damage) if(prob(25)) if(status & ORGAN_ROBOT) - owner.visible_message("The damage to [owner.name]'s [name] worsens.",\ - "The damage to your [name] worsens.",\ + owner.visible_message(SPAN_WARNING("The damage to [owner.name]'s [name] worsens."),\ + SPAN_WARNING("The damage to your [name] worsens."),\ "You hear the screech of abused metal.") else - owner.visible_message("The wound on [owner.name]'s [name] widens with a nasty ripping noise.",\ - "The wound on your [name] widens with a nasty ripping noise.",\ + owner.visible_message(SPAN_WARNING("The wound on [owner.name]'s [name] widens with a nasty ripping noise."),\ + SPAN_WARNING("The wound on your [name] widens with a nasty ripping noise."),\ "You hear a nasty ripping noise, as if flesh is being torn apart.") return @@ -862,7 +862,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 20) //overdosing is necessary to stop severe infections if (!(status & ORGAN_DEAD)) status |= ORGAN_DEAD - to_chat(owner, "You can't feel your [name] anymore...") + to_chat(owner, SPAN_NOTICE("You can't feel your [name] anymore...")) owner.update_body(1) germ_level++ @@ -1009,22 +1009,22 @@ Note that amputating the affected organ does in fact remove the infection from t if(!clean) var/gore_sound = "[(status & ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]" owner.visible_message( - "\The [owner]'s [src.name] flies off in an arc!",\ + SPAN_DANGER("\The [owner]'s [src.name] flies off in an arc!"),\ "Your [src.name] goes flying off!",\ - "You hear the terrible sound of [gore_sound].") + SPAN_DANGER("You hear the terrible sound of [gore_sound].")) if(DROPLIMB_BURN) var/gore = "[(status & ORGAN_ROBOT) ? "": " of burning flesh"]" owner.visible_message( - "\The [owner]'s [src.name] flashes away into ashes!",\ + SPAN_DANGER("\The [owner]'s [src.name] flashes away into ashes!"),\ "Your [src.name] flashes away into ashes!",\ - "You hear the crackling sound[gore].") + SPAN_DANGER("You hear the crackling sound[gore].")) if(DROPLIMB_BLUNT) var/gore = "[(status & ORGAN_ROBOT) ? "": " in a shower of gore"]" var/gore_sound = "[(status & ORGAN_ROBOT) ? "rending sound of tortured metal" : "sickening splatter of gore"]" owner.visible_message( - "\The [owner]'s [src.name] explodes[gore]!",\ + SPAN_DANGER("\The [owner]'s [src.name] explodes[gore]!"),\ "Your [src.name] explodes[gore]!",\ - "You hear the [gore_sound].") + SPAN_DANGER("You hear the [gore_sound].")) var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed(). var/obj/item/organ/external/parent_organ = parent @@ -1180,8 +1180,8 @@ Note that amputating the affected organ does in fact remove the infection from t var/message = pick("broke in half", "shattered") owner.visible_message(\ - "You hear a loud cracking sound coming from \the [owner]!",\ - "Something feels like it [message] in your [name]!",\ + SPAN_WARNING("You hear a loud cracking sound coming from \the [owner]!"),\ + SPAN_DANGER("Something feels like it [message] in your [name]!"),\ "You hear a sickening crack!") if(owner.species && owner.can_feel_pain()) owner.emote("scream") @@ -1312,9 +1312,11 @@ Note that amputating the affected organ does in fact remove the infection from t return if(!silent) if(supplied_message) - owner.visible_message("[supplied_message]") + owner.visible_message(SPAN_DANGER("[supplied_message]")) else - owner.visible_message("\The [W] sticks in [owner]'s wound!", "\The [W] sticks in your wound!") + owner.visible_message(SPAN_DANGER("\The [W] sticks in [owner]'s wound!"), + SPAN_DANGER("\The [W] sticks in your wound!")) + implants += W owner.embedded_flag = 1 add_verb(owner, /mob/proc/yank_out_object) @@ -1370,9 +1372,9 @@ Note that amputating the affected organ does in fact remove the infection from t //Robotic limbs explode if sabotaged. if(is_robotic && sabotaged) victim.visible_message( - "\The [victim]'s [src.name] explodes violently!",\ - "Your [src.name] explodes!",\ - "You hear an explosion!") + SPAN_DANGER("\The [victim]'s [src.name] explodes violently!"),\ + SPAN_DANGER("Your [src.name] explodes!"),\ + SPAN_DANGER("You hear an explosion!")) explosion(get_turf(owner),-1,-1,2,3) spark(victim, 5) qdel(src) @@ -1382,13 +1384,13 @@ Note that amputating the affected organ does in fact remove the infection from t return if(owner) if(type == "brute") - owner.visible_message("You hear a sickening cracking sound coming from \the [owner]'s [name].", \ - "Your [name] becomes a mangled mess!", \ - "You hear a sickening crack.") + owner.visible_message(SPAN_WARNING("You hear a sickening cracking sound coming from \the [owner]'s [name]."), \ + SPAN_DANGER("Your [name] becomes a mangled mess!"), \ + SPAN_WARNING("You hear a sickening crack.")) else - owner.visible_message("\The [owner]'s [name] melts away, turning into a mangled mess!", \ - "Your [name] melts away!", \ - "You hear a sickening sizzle.") + owner.visible_message(SPAN_WARNING("\The [owner]'s [name] melts away, turning into a mangled mess!"), \ + SPAN_DANGER("Your [name] melts away!"), \ + SPAN_WARNING("You hear a sickening sizzle.")) disfigured = 1 /obj/item/organ/external/proc/get_wounds_desc() diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 4ad30a42d7d..84425782a51 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -29,15 +29,15 @@ last_pain_message = message if(power >= 110) flash_strong_pain() - to_chat(src, "[message]") + to_chat(src, SPAN_DANGER("[message]")) else if(power >= 70) - to_chat(src, "[message]") + to_chat(src, SPAN_DANGER("[message]")) else if(power >= 40) - to_chat(src, "[message]") + to_chat(src, SPAN_DANGER("[message]")) else if(power >= 10) - to_chat(src, "[message]") + to_chat(src, SPAN_DANGER("[message]")) else - to_chat(src, "[message]") + to_chat(src, SPAN_WARNING("[message]")) var/force_emote = species.get_pain_emote(src, power) if(force_emote && prob(power)) diff --git a/code/modules/organs/subtypes/autakh.dm b/code/modules/organs/subtypes/autakh.dm index bb6ff34053c..ce09b9e2896 100644 --- a/code/modules/organs/subtypes/autakh.dm +++ b/code/modules/organs/subtypes/autakh.dm @@ -271,19 +271,19 @@ if(.) if(owner.last_special > world.time) - to_chat(owner, "\The [src] is still recharging!") + to_chat(owner, SPAN_DANGER("\The [src] is still recharging!")) return if(owner.stat || owner.paralysis || owner.stunned || owner.weakened) - to_chat(owner, "You can not use \the [src] in your current state!") + to_chat(owner, SPAN_DANGER("You can not use \the [src] in your current state!")) return if(owner.get_active_hand()) - to_chat(owner, "You must empty your active hand before enabling your [src]!") + to_chat(owner, SPAN_DANGER("You must empty your active hand before enabling your [src]!")) return if(is_broken()) - to_chat(owner, "\The [src] is too damaged to be used!") + to_chat(owner, SPAN_DANGER("\The [src] is too damaged to be used!")) return if(is_bruised()) @@ -292,7 +292,8 @@ owner.last_special = world.time + 100 var/obj/item/M = new augment_type(owner) owner.put_in_active_hand(M) - owner.visible_message("\The [M] slides out of \the [owner]'s [src].","You deploy \the [M]!") + owner.visible_message(SPAN_NOTICE("\The [M] slides out of \the [owner]'s [src]."), + SPAN_NOTICE("You deploy \the [M]!")) /obj/item/combitool/robotic name = "robotic combitool" @@ -358,15 +359,15 @@ if(.) if(owner.last_special > world.time) - to_chat(owner, "\The [src] is still recharging!") + to_chat(owner, SPAN_DANGER("\The [src] is still recharging!")) return if(owner.stat || owner.paralysis || owner.stunned || owner.weakened) - to_chat(owner, "You can not use \the [src] in your current state!") + to_chat(owner, SPAN_DANGER("You can not use \the [src] in your current state!")) return if(is_broken()) - to_chat(owner, "\The [src] is too damaged to be used!") + to_chat(owner, SPAN_DANGER("\The [src] is too damaged to be used!")) return if(is_bruised()) @@ -374,7 +375,7 @@ var/obj/item/grab/G = owner.get_active_hand() if(!istype(G)) - to_chat(owner, "You must grab someone before trying to analyze their health!") + to_chat(owner, SPAN_DANGER("You must grab someone before trying to analyze their health!")) return owner.last_special = world.time + 50 @@ -399,15 +400,15 @@ if(.) if(owner.last_special > world.time) - to_chat(owner, "\The [src] is still recharging!") + to_chat(owner, SPAN_DANGER("\The [src] is still recharging!")) return if(owner.stat || owner.paralysis || owner.stunned || owner.weakened) - to_chat(owner, "You can not use \the [src] in your current state!") + to_chat(owner, SPAN_DANGER("You can not use \the [src] in your current state!")) return if(is_broken()) - to_chat(owner, "\The [src] is too damaged to be used!") + to_chat(owner, SPAN_DANGER("\The [src] is too damaged to be used!")) return if(is_bruised()) @@ -415,11 +416,11 @@ var/obj/item/grab/G = owner.get_active_hand() if(!istype(G)) - to_chat(owner, "You must grab someone before trying to use your [src]!") + to_chat(owner, SPAN_DANGER("You must grab someone before trying to use your [src]!")) return if(owner.nutrition <= 200) - to_chat(owner, "Your energy reserves are too low to use your [src]!") + to_chat(owner, SPAN_DANGER("Your energy reserves are too low to use your [src]!")) return if(ishuman(G.affecting)) @@ -435,7 +436,7 @@ else H.stun_effect_act(0, 50, target_zone, owner) - owner.visible_message("[H] has been prodded with [src] by [owner]!") + owner.visible_message(SPAN_DANGER("[H] has been prodded with [src] by [owner]!")) playsound(get_turf(owner), 'sound/weapons/Egloves.ogg', 50, 1, -1) /obj/item/organ/external/hand/right/autakh/tool/nullrod diff --git a/code/modules/organs/subtypes/parasite/zombie.dm b/code/modules/organs/subtypes/parasite/zombie.dm index b7ecbc21ea9..1dcc18565aa 100644 --- a/code/modules/organs/subtypes/parasite/zombie.dm +++ b/code/modules/organs/subtypes/parasite/zombie.dm @@ -123,7 +123,7 @@ break if(prob(10) && (owner.can_feel_pain())) - to_chat(owner, "You feel a burning sensation on your skin!") + to_chat(owner, SPAN_WARNING("You feel a burning sensation on your skin!")) owner.make_jittery(10) /obj/item/organ/internal/parasite/zombie/process_stage() diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm index 29268b44065..d6b39d80ba2 100644 --- a/code/modules/organs/subtypes/vaurca.dm +++ b/code/modules/organs/subtypes/vaurca.dm @@ -107,11 +107,11 @@ if (is_broken()) if (GLOB.all_languages[LANGUAGE_VAURCA] in owner.languages) owner.remove_language(LANGUAGE_VAURCA) - to_chat(owner, "Your mind suddenly grows dark as the unity of the Hive is torn from you.") + to_chat(owner, SPAN_WARNING("Your mind suddenly grows dark as the unity of the Hive is torn from you.")) else if (!(GLOB.all_languages[LANGUAGE_VAURCA] in owner.languages) && !banned) owner.add_language(LANGUAGE_VAURCA) - to_chat(owner, " Your mind expands, and your thoughts join the unity of the Hivenet.") + to_chat(owner, SPAN_NOTICE(" Your mind expands, and your thoughts join the unity of the Hivenet.")) if(disrupted) if(disrupttime > world.time) disrupttime-- @@ -123,14 +123,14 @@ owner = target if (!(GLOB.all_languages[LANGUAGE_VAURCA] in owner.languages) && !banned) owner.add_language(LANGUAGE_VAURCA) - to_chat(owner, " Your mind expands, and your thoughts join the unity of the Hivenet.") + to_chat(owner, SPAN_NOTICE(" Your mind expands, and your thoughts join the unity of the Hivenet.")) add_verb(owner, granted_verbs) ..() /obj/item/organ/internal/vaurca/neuralsocket/removed(var/mob/living/carbon/human/target) if(GLOB.all_languages[LANGUAGE_VAURCA] in target.languages) target.remove_language(LANGUAGE_VAURCA) - to_chat(target, "Your mind suddenly grows dark as the unity of the Hive is torn from you.") + to_chat(target, SPAN_WARNING("Your mind suddenly grows dark as the unity of the Hive is torn from you.")) remove_verb(owner, all_hive_verbs) ..() @@ -355,27 +355,27 @@ descriptive = "room temperature" else descriptive = "cold" - . += "\The [src] feels [descriptive]." + . += SPAN_NOTICE("\The [src] feels [descriptive].") /obj/item/organ/internal/vaurca/preserve/attackby(obj/item/attacking_item, mob/user) ..() var/obj/icon = src if ((istype(attacking_item, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) - user.visible_message("[user] has used [attacking_item] on [icon2html(icon, viewers(get_turf(user)))] [src].") + user.visible_message(SPAN_WARNING("[user] has used [attacking_item] on [icon2html(icon, viewers(get_turf(user)))] [src].")) var/pressure = air_contents.return_pressure() manipulated_by = user.real_name //This person is aware of the contents of the tank. var/total_moles = air_contents.total_moles - to_chat(user, "Results of analysis of [icon2html(icon, user)]") + to_chat(user, SPAN_NOTICE("Results of analysis of [icon2html(icon, user)]")) if (total_moles>0) - to_chat(user, "Pressure: [round(pressure,0.1)] kPa") + to_chat(user, SPAN_NOTICE("Pressure: [round(pressure,0.1)] kPa")) for(var/g in air_contents.gas) - to_chat(user, "[gas_data.name[g]]: [(round(air_contents.gas[g] / total_moles) * 100)]%") - to_chat(user, "Temperature: [round(air_contents.temperature-T0C)]°C") + to_chat(user, SPAN_NOTICE("[gas_data.name[g]]: [(round(air_contents.gas[g] / total_moles) * 100)]%")) + to_chat(user, SPAN_NOTICE("Temperature: [round(air_contents.temperature-T0C)]°C")) else - to_chat(user, "Tank is empty!") + to_chat(user, SPAN_NOTICE("Tank is empty!")) src.add_fingerprint(user) else if (istype(attacking_item, /obj/item/toy/balloon)) var/obj/item/toy/balloon/B = attacking_item @@ -461,7 +461,7 @@ if(location.internal == src) location.internal = null location.internals.icon_state = "internal0" - to_chat(usr, "You close the tank release valve.") + to_chat(usr, SPAN_NOTICE("You close the tank release valve.")) if (location.internals) location.internals.icon_state = "internal0" else @@ -476,11 +476,11 @@ if(can_open_valve) location.internal = src - to_chat(usr, "You open \the [src] valve.") + to_chat(usr, SPAN_NOTICE("You open \the [src] valve.")) if (location.internals) location.internals.icon_state = "internal1" else - to_chat(usr, "You need something to connect to \the [src].") + to_chat(usr, SPAN_NOTICE("You need something to connect to \the [src].")) src.add_fingerprint(usr) return 1 @@ -504,7 +504,7 @@ var/tank_pressure = air_contents.return_pressure() if((tank_pressure < distribute_pressure) && prob(5)) - to_chat(owner, "There is a buzzing in your [parent_organ].") + to_chat(owner, SPAN_WARNING("There is a buzzing in your [parent_organ].")) var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature) @@ -622,15 +622,15 @@ if(.) if(owner.last_special > world.time) - to_chat(owner, "\The [src] is still recharging!") + to_chat(owner, SPAN_DANGER("\The [src] is still recharging!")) return if(owner.stat || owner.paralysis || owner.stunned || owner.weakened) - to_chat(owner, "You can not use \the [src] in your current state!") + to_chat(owner, SPAN_DANGER("You can not use \the [src] in your current state!")) return if(is_broken()) - to_chat(owner, "\The [src] is too damaged to be used!") + to_chat(owner, SPAN_DANGER("\The [src] is too damaged to be used!")) return if(is_bruised()) @@ -638,11 +638,11 @@ var/obj/item/grab/G = owner.get_active_hand() if(!istype(G)) - to_chat(owner, "You must grab someone before trying to use your [src]!") + to_chat(owner, SPAN_DANGER("You must grab someone before trying to use your [src]!")) return if(owner.nutrition <= 150) //slightly more energy-efficient than aut'akh bc bugs are better at augments - to_chat(owner, "Your energy reserves are too low to use your [src]!") + to_chat(owner, SPAN_DANGER("Your energy reserves are too low to use your [src]!")) return if(ishuman(G.affecting)) @@ -658,7 +658,7 @@ else H.stun_effect_act(0, 50, target_zone, owner) - owner.visible_message("[H] has been prodded with [src] by [owner]!") + owner.visible_message(SPAN_DANGER("[H] has been prodded with [src] by [owner]!")) playsound(get_turf(owner), 'sound/weapons/Egloves.ogg', 50, 1, -1) /obj/item/organ/external/hand/right/vaurca/medical @@ -681,15 +681,15 @@ if(.) if(owner.last_special > world.time) - to_chat(owner, "\The [src] is still recharging!") + to_chat(owner, SPAN_DANGER("\The [src] is still recharging!")) return if(owner.stat || owner.paralysis || owner.stunned || owner.weakened) - to_chat(owner, "You can not use \the [src] in your current state!") + to_chat(owner, SPAN_DANGER("You can not use \the [src] in your current state!")) return if(is_broken()) - to_chat(owner, "\The [src] is too damaged to be used!") + to_chat(owner, SPAN_DANGER("\The [src] is too damaged to be used!")) return if(is_bruised()) @@ -697,7 +697,7 @@ var/obj/item/grab/G = owner.get_active_hand() if(!istype(G)) - to_chat(owner, "You must grab someone before trying to analyze their health!") + to_chat(owner, SPAN_DANGER("You must grab someone before trying to analyze their health!")) return owner.last_special = world.time + 50 diff --git a/code/modules/overmap/exoplanets/decor/_turfs.dm b/code/modules/overmap/exoplanets/decor/_turfs.dm index 0ea26782ed3..72519c34642 100644 --- a/code/modules/overmap/exoplanets/decor/_turfs.dm +++ b/code/modules/overmap/exoplanets/decor/_turfs.dm @@ -36,13 +36,13 @@ /turf/simulated/floor/exoplanet/attackby(obj/item/attacking_item, mob/user) if(diggable && istype(attacking_item, /obj/item/shovel)) - visible_message("\The [user] starts digging \the [src]") + visible_message(SPAN_NOTICE("\The [user] starts digging \the [src]")) if(attacking_item.use_tool(src, user, 50, volume = 50)) - to_chat(user,"You dig a deep pit.") + to_chat(user,SPAN_NOTICE("You dig a deep pit.")) new /obj/structure/pit(src) diggable = 0 else - to_chat(user,"You stop shoveling.") + to_chat(user,SPAN_NOTICE("You stop shoveling.")) else if(istype(attacking_item, /obj/item/stack/tile)) var/obj/item/stack/tile/T = attacking_item if(T.use(1)) diff --git a/code/modules/overmap/exoplanets/decor/flora/konyang.dm b/code/modules/overmap/exoplanets/decor/flora/konyang.dm index 85cccbb930c..4fabb9c12fe 100644 --- a/code/modules/overmap/exoplanets/decor/flora/konyang.dm +++ b/code/modules/overmap/exoplanets/decor/flora/konyang.dm @@ -113,7 +113,7 @@ /obj/structure/flora/bush/konyang_reeds/Crossed(atom/movable/AM, atom/oldloc) if(istype(AM, /mob/living)) var/mob/living/L = AM - to_chat(L, "You brush through \the [src] really quite loudly.") + to_chat(L, SPAN_NOTICE("You brush through \the [src] really quite loudly.")) playsound(loc, 'sound/effects/plantshake.ogg', 60, TRUE) shake_animation() ..() diff --git a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm index 41dff8e762f..ed5d9d915f2 100644 --- a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm +++ b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm @@ -40,13 +40,13 @@ if(attacking_item.w_class <= ITEMSIZE_NORMAL) user.drop_from_inventory(attacking_item, src) stored_item = attacking_item - to_chat(user,"You hide \the [attacking_item] in [src].") + to_chat(user,SPAN_NOTICE("You hide \the [attacking_item] in [src].")) return else - to_chat(user,"\The [attacking_item] can't be hidden in [src], it's too big.") + to_chat(user,SPAN_NOTICE("\The [attacking_item] can't be hidden in [src], it's too big.")) return else - to_chat(user,"There is something hidden in [src].") + to_chat(user,SPAN_NOTICE("There is something hidden in [src].")) return return ..() @@ -55,14 +55,14 @@ playsound(loc, 'sound/effects/plantshake.ogg', 50, 1) if(do_after(user, 40, src)) if(!stored_item) - to_chat(user,"There is nothing hidden in [src].") + to_chat(user,SPAN_NOTICE("There is nothing hidden in [src].")) else if(istype(stored_item, /obj/item/device/paicard)) stored_item.forceMove(src.loc) - to_chat(user,"You reveal \the [stored_item] from [src].") + to_chat(user,SPAN_NOTICE("You reveal \the [stored_item] from [src].")) else user.put_in_hands(stored_item) - to_chat(user,"You take \the [stored_item] from [src].") + to_chat(user,SPAN_NOTICE("You take \the [stored_item] from [src].")) stored_item = null /obj/structure/flora/pottedplant/bullet_act(var/obj/item/projectile/Proj) diff --git a/code/modules/overmap/exoplanets/decor/objs/pit.dm b/code/modules/overmap/exoplanets/decor/objs/pit.dm index 91478c222b6..063de14e915 100644 --- a/code/modules/overmap/exoplanets/decor/objs/pit.dm +++ b/code/modules/overmap/exoplanets/decor/objs/pit.dm @@ -10,28 +10,28 @@ /obj/structure/pit/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/shovel)) - visible_message("\The [user] starts [open ? "filling" : "digging open"] \the [src]") + visible_message(SPAN_NOTICE("\The [user] starts [open ? "filling" : "digging open"] \the [src]")) if(attacking_item.use_tool(src, user, 50, volume = 50)) - visible_message("\The [user] [open ? "fills" : "digs open"] \the [src]!") + visible_message(SPAN_NOTICE("\The [user] [open ? "fills" : "digs open"] \the [src]!")) if(open) close(user) else open() else - to_chat(user, "You stop shoveling.") + to_chat(user, SPAN_NOTICE("You stop shoveling.")) return if (!open && istype(attacking_item, /obj/item/stack/material/wood)) if(locate(/obj/structure/gravemarker) in src.loc) - to_chat(user, "There's already a grave marker here.") + to_chat(user, SPAN_NOTICE("There's already a grave marker here.")) else - visible_message("\The [user] starts making a grave marker on top of \the [src]") + visible_message(SPAN_NOTICE("\The [user] starts making a grave marker on top of \the [src]")) if( do_after(user, 50) ) - visible_message("\The [user] finishes the grave marker") + visible_message(SPAN_NOTICE("\The [user] finishes the grave marker")) var/obj/item/stack/material/wood/plank = attacking_item plank.use(1) new/obj/structure/gravemarker(src.loc) else - to_chat(user, "You stop making a grave marker.") + to_chat(user, SPAN_NOTICE("You stop making a grave marker.")) return ..() @@ -73,23 +73,23 @@ return escapee.setClickCooldown(100) - to_chat(escapee, "You start digging your way out of \the [src] (this will take about [breakout_time] minute\s)") - visible_message("Something is scratching its way out of \the [src]!") + to_chat(escapee, SPAN_WARNING("You start digging your way out of \the [src] (this will take about [breakout_time] minute\s)")) + visible_message(SPAN_DANGER("Something is scratching its way out of \the [src]!")) for(var/i in 1 to (6*breakout_time * 2)) //minutes * 6 * 5seconds * 2 playsound(src.loc, 'sound/weapons/bite.ogg', 100, 1) if(!do_after(escapee, 50)) - to_chat(escapee, "You have stopped digging.") + to_chat(escapee, SPAN_WARNING("You have stopped digging.")) return if(open) return if(i == 6*breakout_time) - to_chat(escapee, "Halfway there...") + to_chat(escapee, SPAN_WARNING("Halfway there...")) - to_chat(escapee, "You successfuly dig yourself out!") - visible_message("\the [escapee] emerges from \the [src]!") + to_chat(escapee, SPAN_WARNING("You successfuly dig yourself out!")) + visible_message(SPAN_DANGER("\the [escapee] emerges from \the [src]!")) playsound(src.loc, 'sound/effects/squelch1.ogg', 100, 1) open() diff --git a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm index 27fff80feb6..6d4d9ed1717 100644 --- a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm +++ b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm @@ -153,7 +153,7 @@ return TRUE /obj/item/ship_ammunition/proc/get_additional_info() - . += "[name_override ? name_override : name]" + . += SPAN_DANGER("[name_override ? name_override : name] ") . += "[desc] " . += "Caliber: [caliber] " . += "Ammunition Type: [capitalize_first_letters(impact_type)] " diff --git a/code/modules/overmap/ship_weaponry/_ship_gun.dm b/code/modules/overmap/ship_weaponry/_ship_gun.dm index 749f20438bc..658c280376f 100644 --- a/code/modules/overmap/ship_weaponry/_ship_gun.dm +++ b/code/modules/overmap/ship_weaponry/_ship_gun.dm @@ -79,12 +79,12 @@ if(20 to 40) . = "It has a few holes through which you can see some machinery." if(40 to 60) - . = "Some fairly important parts are missing... but it should work anyway." + . = SPAN_WARNING("Some fairly important parts are missing... but it should work anyway.") if(60 to 80) - . = "It needs repairs direly. Both aiming and firing components are missing or broken. It has a lot of holes, too. It definitely wouldn't \ - pass inspection." + . = SPAN_DANGER("It needs repairs direly. Both aiming and firing components are missing or broken. It has a lot of holes, too. It definitely wouldn't \ + pass inspection.") if(90 to 100) - . = "It's falling apart! Just touching it might make the whole thing collapse!" + . = SPAN_DANGER("It's falling apart! Just touching it might make the whole thing collapse!") else //At roundstart, weapons start with 0 damage, so it'd be 0 / 1000 * 100 -> 0 return "It looks to be in tip top shape and not damaged at all." diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 1affe7991a1..3d0ad429a14 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -202,7 +202,7 @@ sec_name = "Sector #[known_sectors.len]" R.fields["name"] = sec_name if(sec_name in known_sectors) - to_chat(usr, "Sector with that name already exists, please input a different name.") + to_chat(usr, SPAN_WARNING("Sector with that name already exists, please input a different name.")) return TRUE switch(params["add"]) if("current") diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 9d357f217c4..374b50008b1 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -443,13 +443,13 @@ return if(WT.use(0,user)) - to_chat(user, "You start repairing the damage to [src].") + to_chat(user, SPAN_NOTICE("You start repairing the damage to [src].")) playsound(src, 'sound/items/Welder.ogg', 100, 1) if(WT.use_tool(src, user, max(5, damage / 5), volume = 50) && WT && WT.isOn()) - to_chat(user, "You finish repairing the damage to [src].") + to_chat(user, SPAN_NOTICE("You finish repairing the damage to [src].")) take_damage(-damage) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task.")) return return ..() @@ -497,9 +497,9 @@ if(health <= 0) . += "\The [src] is wrecked." else if(health < max_health * 0.25) - . += "\The [src] looks like it's about to break!" + . += SPAN_DANGER("\The [src] looks like it's about to break!") else if(health < max_health * 0.5) - . += "\The [src] looks seriously damaged!" + . += SPAN_DANGER("\The [src] looks seriously damaged!") else if(health < max_health * 0.75) . += "\The [src] shows signs of damage!" @@ -529,7 +529,7 @@ if(desired_range-range <= -max_range/2) set_range(range-1) // if working hard, spool down faster too if(heat > critical_heat) - src.visible_message("\The [src] violently spews out sparks!") + src.visible_message(SPAN_DANGER("\The [src] violently spews out sparks!")) spark(src, 3, GLOB.alldirs) take_damage(rand(10,50)) toggle() diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 6861b501921..ed9aefa4b17 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -212,7 +212,7 @@ if(!is_on()) return 0 if(!check_fuel() || (0 < use_power_oneoff(charge_per_burn)) || check_blockage()) - audible_message(src,"[src] coughs once and goes silent!") + audible_message(src,SPAN_WARNING("[src] coughs once and goes silent!")) update_use_power(POWER_USE_OFF) return 0 diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index f695c364801..af5f8f540b6 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -42,7 +42,7 @@ copy.name = "Copy - " + c.name copy.fields = c.fields copy.updateinfolinks() - to_chat(usr, "You tear off the carbon-copy!") + to_chat(usr, SPAN_NOTICE("You tear off the carbon-copy!")) c.copied = TRUE copy.iscopy = TRUE copy.copied = TRUE // no more infinite copy chains diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 5433ef62a0b..932387bcb40 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -57,7 +57,7 @@ if(istype(attacking_item, /obj/item/paper)) toppaper = attacking_item r_contents = reverselist(contents) - to_chat(user, "You clip the [attacking_item] onto \the [src].") + to_chat(user, SPAN_NOTICE("You clip the [attacking_item] onto \the [src].")) else if(istype(toppaper) && attacking_item.ispen()) toppaper.attackby(attacking_item, user) @@ -106,7 +106,7 @@ if(W.ispen()) user.drop_from_inventory(W,src) haspen = W - to_chat(user, "You slot the pen into \the [src].") + to_chat(user, SPAN_NOTICE("You slot the pen into \the [src].")) else to_chat(user, SPAN_NOTICE("This clipboard already has a pen!")) @@ -180,7 +180,7 @@ var/obj/item/P = locate(href_list["top"]) if(P && (P.loc == src) && istype(P, /obj/item/paper) ) toppaper = P - to_chat(usr, "You move [P.name] to the top.") + to_chat(usr, SPAN_NOTICE("You move [P.name] to the top.")) //Update everything attack_self(usr) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 7501399c988..d36b770ad02 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -89,7 +89,7 @@ var/list/admin_departments if("send") if (get_remaining_cooldown() > 0) // Rate-limit sending faxes - to_chat(usr, "The fax machine isn't ready, yet!") + to_chat(usr, SPAN_WARNING("The fax machine isn't ready, yet!")) return if(copy_item && is_authenticated()) @@ -106,9 +106,9 @@ var/list/admin_departments copy_item.forceMove(loc) if (get_dist(usr, src) < 2) usr.put_in_hands(copy_item) - to_chat(usr, "You take \the [copy_item] out of \the [src].") + to_chat(usr, SPAN_NOTICE("You take \the [copy_item] out of \the [src].")) else - to_chat(usr, "You eject \the [copy_item] from \the [src].") + to_chat(usr, SPAN_NOTICE("You eject \the [copy_item] from \the [src].")) copy_item = null return TRUE @@ -134,23 +134,23 @@ var/list/admin_departments if("linkpda") var/obj/item/modular_computer/pda = usr.get_active_hand() if (!pda || !istype(pda)) - to_chat(usr, "You need to be holding a PDA to link it.") + to_chat(usr, SPAN_WARNING("You need to be holding a PDA to link it.")) else if (pda in alert_pdas) - to_chat(usr, "\The [pda] appears to be already linked.") + to_chat(usr, SPAN_NOTICE("\The [pda] appears to be already linked.")) //Update the name real quick. alert_pdas[pda] = pda.name return TRUE else alert_pdas += pda alert_pdas[pda] = pda.name - to_chat(usr, "You link \the [pda] to \the [src]. It will now ping upon the arrival of a fax to this machine.") + to_chat(usr, SPAN_NOTICE("You link \the [pda] to \the [src]. It will now ping upon the arrival of a fax to this machine.")) return TRUE if("unlink") var/obj/item/modular_computer/pda = locate(params["unlink"]) if (pda && istype(pda)) if (pda in alert_pdas) - to_chat(usr, "You unlink [alert_pdas[pda]] from \the [src]. It will no longer be notified of new faxes.") + to_chat(usr, SPAN_NOTICE("You unlink [alert_pdas[pda]] from \the [src]. It will no longer be notified of new faxes.")) alert_pdas -= pda return TRUE @@ -295,7 +295,7 @@ var/list/admin_departments /obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100") - var/msg = " [faxname]: [key_name(sender, 1)] (PP) (VV) (SM) (JMP) (CA) (REPLY): Receiving '[sent.name]' via secure connection ... view message" + var/msg = SPAN_NOTICE(" [faxname]: [key_name(sender, 1)] (PP) (VV) (SM) (JMP) (CA) (REPLY): Receiving '[sent.name]' via secure connection ... view message") var/cciaa_present = 0 var/cciaa_afk = 0 diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index ca251229936..7a96e957631 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -56,7 +56,7 @@ /obj/structure/filingcabinet/attackby(obj/item/attacking_item, mob/user) if(is_type_in_list(attacking_item, accepted_items)) - to_chat(user, "You put [attacking_item] in [src].") + to_chat(user, SPAN_NOTICE("You put [attacking_item] in [src].")) user.drop_from_inventory(attacking_item, src) flick("[initial(icon_state)]-open", src) playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) @@ -66,14 +66,14 @@ else if(attacking_item.iswrench()) attacking_item.play_tool_sound(get_turf(src), 50) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, SPAN_NOTICE("You [anchored ? "wrench" : "unwrench"] \the [src].")) else - to_chat(user, "You can't put [attacking_item] in [src]!") + to_chat(user, SPAN_NOTICE("You can't put [attacking_item] in [src]!")) /obj/structure/filingcabinet/attack_hand(mob/user as mob) if(contents.len <= 0) - to_chat(user, "\The [src] is empty.") + to_chat(user, SPAN_NOTICE("\The [src] is empty.")) return user.set_machine(src) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index ddf46be80c7..d115ff6a1a6 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -42,7 +42,7 @@ /obj/item/folder/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/paper) || istype(attacking_item, /obj/item/photo) || istype(attacking_item, /obj/item/paper_bundle) || istype(attacking_item, /obj/item/sample)) user.drop_from_inventory(attacking_item, src) - to_chat(user, "You put the [attacking_item] into \the [src].") + to_chat(user, SPAN_NOTICE("You put the [attacking_item] into \the [src].")) update_icon() else if(attacking_item.ispen()) var/n_name = sanitizeSafe( tgui_input_text(user, "What would you like to label the folder?", "Folder Labelling", max_length = MAX_NAME_LEN), MAX_NAME_LEN ) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 1dbf7a5d0b9..877bf0178d9 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -412,7 +412,7 @@ qdel(src) else - to_chat(user, "You must hold \the [P] steady to burn \the [src].") + to_chat(user, SPAN_WARNING("You must hold \the [P] steady to burn \the [src].")) /obj/item/paper/proc/restore_stamps() //Used when unfolding paper from cranes or planes, restores the stamp overlays. diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index da7df444942..43c960943b4 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -22,7 +22,7 @@ if (istype(attacking_item, /obj/item/paper/carbon)) var/obj/item/paper/carbon/C = attacking_item if (!C.iscopy && !C.copied) - to_chat(user, "Take off the carbon copy first.") + to_chat(user, SPAN_NOTICE("Take off the carbon copy first.")) add_fingerprint(user) return // adding sheets @@ -43,7 +43,7 @@ pages.Add(O) amount++ - to_chat(user, "You add \the [attacking_item.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + to_chat(user, SPAN_NOTICE("You add \the [attacking_item.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")) attack_self(usr) //Update the browsed page. qdel(attacking_item) else @@ -60,9 +60,9 @@ /obj/item/paper_bundle/proc/insert_sheet_at(mob/user, var/index, obj/item/sheet) if(istype(sheet, /obj/item/paper)) - to_chat(user, "You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + to_chat(user, SPAN_NOTICE("You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")) else if(istype(sheet, /obj/item/photo)) - to_chat(user, "You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + to_chat(user, SPAN_NOTICE("You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")) user.drop_from_inventory(sheet,src) @@ -89,14 +89,14 @@ qdel(src) else - to_chat(user, "You must hold \the [P] steady to burn \the [src].") + to_chat(user, SPAN_WARNING("You must hold \the [P] steady to burn \the [src].")) /obj/item/paper_bundle/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(is_adjacent) src.show_content(user) else - . += "It is too far away." + . += SPAN_NOTICE("It is too far away.") /obj/item/paper_bundle/proc/show_content(mob/user as mob) var/dat @@ -251,7 +251,7 @@ set category = "Object" set src in usr - to_chat(usr, "You loosen the bundle.") + to_chat(usr, SPAN_NOTICE("You loosen the bundle.")) for(var/obj/O in src) O.forceMove(usr.loc) O.reset_plane_and_layer() diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 4c4cda9cc75..dba6e64625a 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -24,10 +24,10 @@ if (H.hand) temp = H.organs_by_name[BP_L_HAND] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!")) return - to_chat(user, "You pick up the [src].") + to_chat(user, SPAN_NOTICE("You pick up the [src].")) user.put_in_hands(src) return @@ -39,7 +39,7 @@ if (H.hand) temp = H.organs_by_name[BP_L_HAND] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!")) return var/response = "" if(!papers.len > 0) @@ -69,9 +69,9 @@ P.forceMove(user.loc) user.put_in_hands(P) - to_chat(user, "You take [P] out of the [src].") + to_chat(user, SPAN_NOTICE("You take [P] out of the [src].")) else - to_chat(user, "[src] is empty!") + to_chat(user, SPAN_NOTICE("[src] is empty!")) add_fingerprint(user) return @@ -81,7 +81,7 @@ if(istype(attacking_item, /obj/item/paper)) var/obj/item/paper/i = attacking_item user.drop_from_inventory(i,src) - to_chat(user, "You put [i] in [src].") + to_chat(user, SPAN_NOTICE("You put [i] in [src].")) papers.Add(i) amount++ @@ -89,9 +89,9 @@ . = ..() if(is_adjacent) if(amount) - . += "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin." + . += SPAN_NOTICE("There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.") else - . += "There are no papers in the bin." + . += SPAN_NOTICE("There are no papers in the bin.") /obj/item/paper_bin/update_icon() diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 36cb17619fe..91f551f5e68 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -118,7 +118,7 @@ else icon_state = "pen_[colour]" - to_chat(user, "Changed color to '[colour].'") + to_chat(user, SPAN_NOTICE("Changed color to '[colour].'")) /obj/item/pen/attack_self(var/mob/user) playsound(loc, 'sound/items/penclick.ogg', 50, 1) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 08b70cfb6cf..e44160571c3 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -62,9 +62,9 @@ var/global/photo_count = 0 . = ..() if(distance <= 1) show(user) - . += "[picture_desc]" + . += SPAN_NOTICE("[picture_desc]") else - . += "You are too far away to discern its contents." + . += SPAN_NOTICE("You are too far away to discern its contents.") /obj/item/photo/proc/show(mob/user as mob) send_rsc(user, img, "tmp_photo_[id].png") @@ -167,7 +167,7 @@ var/global/photo_count = 0 var/nsize = input("Photo Size","Pick a size of resulting photo.") as null|anything in list(1,3,5,7) if(nsize) size = nsize - to_chat(usr, "Camera will now take [size]x[size] photos.") + to_chat(usr, SPAN_NOTICE("Camera will now take [size]x[size] photos.")) /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) return @@ -184,9 +184,9 @@ var/global/photo_count = 0 /obj/item/device/camera/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/device/camera_film)) if(pictures_left) - to_chat(user, "[src] still has some film in it!") + to_chat(user, SPAN_NOTICE("[src] still has some film in it!")) return TRUE - to_chat(user, "You insert [attacking_item] into [src].") + to_chat(user, SPAN_NOTICE("You insert [attacking_item] into [src].")) user.drop_from_inventory(attacking_item, get_turf(src)) qdel(attacking_item) pictures_left = pictures_max @@ -222,7 +222,7 @@ var/global/photo_count = 0 do_photo_sound() pictures_left-- - to_chat(user, "[pictures_left] photos left.") + to_chat(user, SPAN_NOTICE("[pictures_left] photos left.")) icon_state = icon_off on = 0 spawn(64) diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 6184e379513..e330202b434 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -39,7 +39,7 @@ var/list/nametemp = list() var/find if(cam.aipictures.len == 0) - to_chat(usr, "No images saved") + to_chat(usr, SPAN_NOTICE("No images saved")) return for(var/obj/item/photo/t in cam.aipictures) nametemp += t.name diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index f254bbaeb36..66079c8adbd 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -53,20 +53,20 @@ qdel(src) return 1 else - to_chat(user, "Turn off the [src] before dismantling it.") + to_chat(user, SPAN_WARNING("Turn off the [src] before dismantling it.")) else - to_chat(user, "Better let [src] discharge before dismantling it.") + to_chat(user, SPAN_WARNING("Better let [src] discharge before dismantling it.")) else if ((istype(attacking_item, /obj/item/stock_parts/capacitor) && (capacitors_amount < 5)) || (istype(attacking_item, /obj/item/cell) && (cells_amount < 5))) if (charge < (capacity / 100)) if (!output_attempt && !input_attempt) user.drop_from_inventory(attacking_item,src) component_parts += attacking_item RefreshParts() - to_chat(user, "You upgrade the [src] with [attacking_item.name].") + to_chat(user, SPAN_NOTICE("You upgrade the [src] with [attacking_item.name].")) else - to_chat(user, "Turn off the [src] before dismantling it.") + to_chat(user, SPAN_WARNING("Turn off the [src] before dismantling it.")) else - to_chat(user, "Better let [src] discharge before putting your hand inside it.") + to_chat(user, SPAN_WARNING("Better let [src] discharge before putting your hand inside it.")) else user.set_machine(src) interact(user) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 0eda8a35361..c369bd10df7 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -118,7 +118,7 @@ new /obj/item/device/radiojammer/improvised(assembly, src, user) else - to_chat(user, "You'd need both devices to be signallers for this to work.") + to_chat(user, SPAN_NOTICE("You'd need both devices to be signallers for this to work.")) return else if(attacking_item.ismultitool() && ishuman(user) && user.get_inactive_hand() == src) if(charge < 10) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index d108179b67c..6d4984398b3 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -204,14 +204,14 @@ switch(broken_state) if(GRAV_NEEDS_SCREWDRIVER) if(attacking_item.isscrewdriver()) - to_chat(user, "You secure the screws of the framework.") + to_chat(user, SPAN_NOTICE("You secure the screws of the framework.")) attacking_item.play_tool_sound(get_turf(src), 50) broken_state++ if(GRAV_NEEDS_WELDING) if(attacking_item.iswelder()) var/obj/item/weldingtool/WT = attacking_item if(WT.use(1, user)) - to_chat(user, "You mend the damaged framework.") + to_chat(user, SPAN_NOTICE("You mend the damaged framework.")) playsound(src.loc, 'sound/items/welder_pry.ogg', 50, 1) broken_state++ if(GRAV_NEEDS_PLASTEEL) @@ -219,14 +219,14 @@ var/obj/item/stack/material/plasteel/PS = attacking_item if(PS.amount >= 10) PS.use(10) - to_chat(user, "You add the plating to the framework.") + to_chat(user, SPAN_NOTICE("You add the plating to the framework.")) playsound(src.loc, 'sound/machines/click.ogg', 75, 1) broken_state++ else - to_chat(user, "You need 10 sheets of plasteel.") + to_chat(user, SPAN_NOTICE("You need 10 sheets of plasteel.")) if(GRAV_NEEDS_WRENCH) if(attacking_item.iswrench()) - to_chat(user, "You secure the plating to the framework.") + to_chat(user, SPAN_NOTICE("You secure the plating to the framework.")) attacking_item.play_tool_sound(get_turf(src), 75) set_fix() else @@ -234,11 +234,11 @@ if(attacking_item.iscrowbar()) if(backpanelopen) attacking_item.play_tool_sound(get_turf(src), 50) - to_chat(user, "You replace the back panel.") + to_chat(user, SPAN_NOTICE("You replace the back panel.")) backpanelopen = 0 else attacking_item.play_tool_sound(get_turf(src), 50) - to_chat(user, "You open the back panel.") + to_chat(user, SPAN_NOTICE("You open the back panel.")) backpanelopen = 1 if(old_broken_state != broken_state) @@ -284,7 +284,7 @@ if(href_list["gentoggle"]) breaker = !breaker - investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity") + investigate_log("was toggled [breaker ? "ON" : SPAN_WARNING("OFF")] by [usr.key].", "gravity") set_power() src.updateUsrDialog() else if(href_list["eshutoff"]) diff --git a/code/modules/power/portgen.dm b/code/modules/power/portgen.dm index 5b3588d8484..61d28761f93 100644 --- a/code/modules/power/portgen.dm +++ b/code/modules/power/portgen.dm @@ -500,7 +500,7 @@ temperature_gain = 60 reagents.remove_any(coolant_use) if(prob(2)) - audible_message("[src] churns happily.") + audible_message(SPAN_NOTICE("[src] churns happily.")) else temperature_gain = initial(temperature_gain) ..() @@ -519,10 +519,10 @@ var/obj/item/reagent_containers/R = attacking_item if(R.standard_pour_into(user, src)) if(reagents.has_reagent(/singleton/reagent/coolant)) - audible_message("[src] blips happily!") + audible_message(SPAN_NOTICE("[src] blips happily!")) playsound(get_turf(src),'sound/machines/synth_yes.ogg', 50, 0) else - audible_message("[src] blips in disappointment!") + audible_message(SPAN_WARNING("[src] blips in disappointment!")) playsound(get_turf(src), 'sound/machines/synth_no.ogg', 50, 0) return ..() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 09fa187ead9..2a7e3ea4b57 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -51,7 +51,7 @@ if(special_emitter) message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("Emitter deleted at ([x],[y],[z])") - investigate_log("deleted at ([x],[y],[z])","singulo") + QDEL_NULL(wifi_receiver) QDEL_NULL(spark_system) QDEL_NULL(signaler) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 0d01ef23d19..86dfcdc4425 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -116,13 +116,13 @@ field_generator power level display src.anchored = 0 update_icon() if(2) - to_chat(user, "The [src.name] needs to be unwelded from the floor.") + to_chat(user, SPAN_WARNING("The [src.name] needs to be unwelded from the floor.")) return else if(attacking_item.iswelder()) var/obj/item/weldingtool/WT = attacking_item switch(state) if(0) - to_chat(user, "The [src.name] needs to be wrenched to the floor.") + to_chat(user, SPAN_WARNING("The [src.name] needs to be wrenched to the floor.")) return if(1) if (WT.use(0,user)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 8a0fdee383a..514101c6785 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -213,7 +213,7 @@ /obj/machinery/particle_accelerator/control_box/toggle_power(mob/user) src.active = !src.active - investigate_log("turned [active?"ON":"OFF"] by [user ? user.key : "outside forces"]","singulo") + investigate_log("turned [active?SPAN_WARNING("ON"):"OFF"] by [user ? user.key : "outside forces"]","singulo") message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user, TRUE, highlight_special = TRUE)] in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user)] in ([x],[y],[z])",ckey=key_name(user)) if(src.active) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index f65ef08b5ec..8f2bb73ef51 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -149,7 +149,7 @@ overlays = 0 if(chained) overlays = "chain_s1" - visible_message("The singularity has shrunk to a rather pitiful size.") + visible_message(SPAN_NOTICE("The singularity has shrunk to a rather pitiful size.")) if (STAGE_TWO) //1 to 3 does not check for the turfs if you put the gens right next to a 1x1 then its going to eat them. name = "gravitational singularity" desc = "A gravitational singularity." @@ -167,9 +167,9 @@ if(chained) overlays = "chain_s3" if(growing) - visible_message("The singularity noticeably grows in size.") + visible_message(SPAN_NOTICE("The singularity noticeably grows in size.")) else - visible_message("The singularity has shrunk to a less powerful size.") + visible_message(SPAN_NOTICE("The singularity has shrunk to a less powerful size.")) if (STAGE_THREE) if ((check_turfs_in(1, 2)) && (check_turfs_in(2, 2)) && (check_turfs_in(4, 2)) && (check_turfs_in(8, 2))) name = "gravitational singularity" @@ -188,9 +188,9 @@ if(chained) overlays = "chain_s5" if(growing) - visible_message("The singularity expands to a reasonable size.") + visible_message(SPAN_NOTICE("The singularity expands to a reasonable size.")) else - visible_message("The singularity has returned to a safe size.") + visible_message(SPAN_NOTICE("The singularity has returned to a safe size.")) if(STAGE_FOUR) if ((check_turfs_in(1, 3)) && (check_turfs_in(2, 3)) && (check_turfs_in(4, 3)) && (check_turfs_in(8, 3))) name = "gravitational singularity" @@ -209,9 +209,9 @@ if(chained) overlays = "chain_s7" if(growing) - visible_message("The singularity expands to a dangerous size.") + visible_message(SPAN_WARNING("The singularity expands to a dangerous size.")) else - visible_message("Miraculously, the singularity reduces in size, and can be contained.") + visible_message(SPAN_NOTICE("Miraculously, the singularity reduces in size, and can be contained.")) if(STAGE_FIVE) //This one also lacks a check for gens because it eats everything. name = "gravitational singularity" desc = "A gravitational singularity." @@ -227,9 +227,9 @@ if(chained) overlays = "chain_s9" if(growing) - visible_message("The singularity has grown out of control!") + visible_message(SPAN_DANGER("The singularity has grown out of control!")) else - visible_message("The singularity miraculously reduces in size and loses its supermatter properties.") + visible_message(SPAN_WARNING("The singularity miraculously reduces in size and loses its supermatter properties.")) if(STAGE_SUPER)//SUPERSINGULO name = "super gravitational singularity" desc = "A gravitational singularity with the properties of supermatter. It has the power to destroy worlds." @@ -244,10 +244,10 @@ event_chance = 25 //Events will fire off more often. if(chained) overlays = "chain_s9" - visible_message("You witness the creation of a destructive force that cannot possibly be stopped by human hands.") + visible_message(SPAN_DANGER("You witness the creation of a destructive force that cannot possibly be stopped by human hands.")) if (current_size == allowed_size) - investigate_log("grew to size [current_size].", I_SINGULO) + investigate_log(SPAN_WARNING("grew to size [current_size]."), I_SINGULO) return 1 else if (current_size < (--temp_allowed_size) && current_size != STAGE_SUPER) expand(temp_allowed_size) @@ -313,13 +313,13 @@ if(target && prob(60)) movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one if(target.z < z) - visible_message("\The [src] gravitates downwards.") + visible_message(SPAN_DANGER("\The [src] gravitates downwards.")) zMove(DOWN) - visible_message("\The [src] appears from above.") + visible_message(SPAN_DANGER("\The [src] appears from above.")) else if(target.z > z) - visible_message("\The [src] gravitates upwards.") + visible_message(SPAN_DANGER("\The [src] gravitates upwards.")) zMove(UP) - visible_message("\The [src] appears from below.") + visible_message(SPAN_DANGER("\The [src] appears from below.")) if(current_size >= 9)//The superlarge one does not care about things in its way spawn(0) @@ -446,14 +446,14 @@ if (istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(istype(H.glasses,/obj/item/clothing/glasses/safety) && current_size != 11) - to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!") + to_chat(H, SPAN_NOTICE("You look directly into The [src.name], good thing you had your protective eyewear on!")) return else - to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!") - to_chat(M, "You look directly into The [src.name] and feel [current_size == 11 ? "helpless" : "weak"].") + to_chat(H, SPAN_WARNING("You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!")) + to_chat(M, SPAN_DANGER("You look directly into The [src.name] and feel [current_size == 11 ? "helpless" : "weak"].")) M.apply_effect(3, STUN) for(var/mob/O in viewers(M, null)) - O.show_message(text("[] stares blankly at The []!", M, src), 1) + O.show_message(SPAN_DANGER("[M] stares blankly at The [src]!"), 1) /obj/singularity/proc/emp_area() if(current_size != 11) @@ -464,11 +464,11 @@ /obj/singularity/proc/smwave() for(var/mob/living/M in view(10, src.loc)) if(prob(67)) - to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") - to_chat(M, "Miraculously, it fails to kill you.") + to_chat(M, SPAN_WARNING("You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")) + to_chat(M, SPAN_NOTICE("Miraculously, it fails to kill you.")) else - to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") - to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.") + to_chat(M, SPAN_DANGER("You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")) + to_chat(M, SPAN_DANGER("You don't even have a moment to react as you are reduced to ashes by the intense radiation.")) M.dust() SSradiation.radiate(src, rand(energy)) return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 6d30347d76c..5ca0ac74d64 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -302,7 +302,7 @@ //Will return 1 on failure /obj/machinery/power/smes/proc/make_terminal(const/mob/user) if (user.loc == loc) - to_chat(user, "You must not be on the same tile as the [src].") + to_chat(user, SPAN_WARNING("You must not be on the same tile as the [src].")) return 1 //Direction the terminal will face to @@ -314,13 +314,13 @@ tempDir = WEST var/turf/tempLoc = get_step(src, reverse_direction(tempDir)) if (istype(tempLoc, /turf/space)) - to_chat(user, "You can't build a terminal on space.") + to_chat(user, SPAN_WARNING("You can't build a terminal on space.")) return 1 else if (istype(tempLoc)) if(!tempLoc.is_plating()) - to_chat(user, "You must remove the floor plating first.") + to_chat(user, SPAN_WARNING("You must remove the floor plating first.")) return 1 - to_chat(user, "You start adding cable to the [src].") + to_chat(user, SPAN_NOTICE("You start adding cable to the [src].")) if(do_after(user, 5 SECONDS, src, DO_REPAIR_CONSTRUCT)) terminal = new /obj/machinery/power/terminal(tempLoc) terminal.set_dir(tempDir) @@ -352,27 +352,27 @@ return open_hatch = 1 user.visible_message(\ - "\The [user] opens the maintenance hatch of \the [src].",\ - "You open the maintenance hatch of \the [src].",\ + SPAN_NOTICE("\The [user] opens the maintenance hatch of \the [src]."),\ + SPAN_NOTICE("You open the maintenance hatch of \the [src]."),\ range = 4) return 0 else open_hatch = 0 user.visible_message(\ - "\The [user] closes the maintenance hatch of \the [src].",\ - "You close the maintenance hatch of \the [src].",\ + SPAN_NOTICE("\The [user] closes the maintenance hatch of \the [src]."),\ + SPAN_NOTICE("You close the maintenance hatch of \the [src]."),\ range = 4) return 0 if (!open_hatch) - to_chat(user, "You need to open access hatch on [src] first!") + to_chat(user, SPAN_WARNING("You need to open access hatch on [src] first!")) return 0 if(attacking_item.iscoil() && !terminal && !building_terminal) building_terminal = 1 var/obj/item/stack/cable_coil/CC = attacking_item if (CC.get_amount() <= 10) - to_chat(user, "You need more cables.") + to_chat(user, SPAN_WARNING("You need more cables.")) building_terminal = 0 return 0 if (make_terminal(user)) @@ -381,8 +381,8 @@ building_terminal = 0 CC.use(10) user.visible_message(\ - "[user.name] has added cables to the [src].",\ - "You added cables to the [src].") + SPAN_NOTICE("[user.name] has added cables to the [src]."),\ + SPAN_NOTICE("You added cables to the [src].")) terminal.connect_to_network() stat = 0 return 0 @@ -392,9 +392,9 @@ var/turf/tempTDir = terminal.loc if (istype(tempTDir)) if(!tempTDir.is_plating()) - to_chat(user, "You must remove the floor plating first.") + to_chat(user, SPAN_WARNING("You must remove the floor plating first.")) else - to_chat(user, "You begin to cut the cables...") + to_chat(user, SPAN_NOTICE("You begin to cut the cables...")) if(attacking_item.use_tool(src, user, 50, volume = 50)) if (prob(50) && electrocute_mob(usr, terminal.powernet, terminal)) big_spark.queue() @@ -403,8 +403,8 @@ return 0 new /obj/item/stack/cable_coil(loc,10) user.visible_message(\ - "[user.name] cut the cables and dismantled the power terminal.",\ - "You cut the cables and dismantle the power terminal.") + SPAN_NOTICE("[user.name] cut the cables and dismantled the power terminal."),\ + SPAN_NOTICE("You cut the cables and dismantle the power terminal.")) qdel(terminal) building_terminal = 0 return 0 @@ -474,8 +474,6 @@ output_level = clamp(params["output"], 0, output_level_max) // clamp to range . = TRUE - investigate_log("input/output; on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [usr.key]","singulo") - /obj/machinery/power/smes/proc/energy_fail(var/duration) failure_timer = max(failure_timer, duration) @@ -483,7 +481,7 @@ if(isStationLevel(src.z)) if(prob(1)) //explosion for(var/mob/M in viewers(src)) - M.show_message("The [src.name] is making strange noises!", 3, "You hear sizzling electronics.", 2) + M.show_message(SPAN_WARNING("The [src.name] is making strange noises!"), 3, SPAN_WARNING("You hear sizzling electronics."), 2) sleep(10*pick(4,5,6,7,10,14)) var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() smoke.set_up(3, 0, src.loc) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 1ff7d08be13..b1ea9a7fb7c 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -180,7 +180,7 @@ if(RCon) ..() else // RCON wire cut - to_chat(usr, "Connection error: Destination Unreachable.") + to_chat(usr, SPAN_WARNING("Connection error: Destination Unreachable.")) // Cyborgs standing next to the SMES can play with the wiring. if(istype(usr, /mob/living/silicon/robot) && Adjacent(usr) && open_hatch) @@ -379,7 +379,7 @@ /obj/machinery/power/smes/buildable/attackby(obj/item/attacking_item, mob/user) // No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences. if (failing) - to_chat(user, "The [src]'s screen is flashing with alerts. It seems to be overloaded! Touching it now is probably not a good idea.") + to_chat(user, SPAN_WARNING("The [src]'s screen is flashing with alerts. It seems to be overloaded! Touching it now is probably not a good idea.")) return // If parent returned 1: // - Hatch is open, so we can modify the SMES @@ -407,17 +407,17 @@ var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text if(newtag) RCon_tag = newtag - to_chat(user, "You changed the RCON tag to: [newtag]") + to_chat(user, SPAN_NOTICE("You changed the RCON tag to: [newtag]")) if(RCon_tag != "NO_TAG") SSmachinery.build_rcon_lists() return // Charged above 1% and safeties are enabled. if((charge > (capacity/100)) && safeties_enabled) - to_chat(user, "Safety circuit of [src] is preventing modifications while it's charged!") + to_chat(user, SPAN_WARNING("Safety circuit of [src] is preventing modifications while it's charged!")) return if (output_attempt || input_attempt) - to_chat(user, "Turn off the [src] first!") + to_chat(user, SPAN_WARNING("Turn off the [src] first!")) return // Probability of failure if safety circuit is disabled (in %) @@ -430,18 +430,18 @@ // Crowbar - Disassemble the SMES. if(attacking_item.iscrowbar()) if (terminal) - to_chat(user, "You have to disassemble the terminal first!") + to_chat(user, SPAN_WARNING("You have to disassemble the terminal first!")) return attacking_item.play_tool_sound(get_turf(src), 50) - to_chat(user, "You begin to disassemble the [src]!") + to_chat(user, SPAN_WARNING("You begin to disassemble the [src]!")) if (do_after(usr, 100 * cur_coils, src, DO_REPAIR_CONSTRUCT)) // More coils = takes longer to disassemble. It's complex so largest one with 5 coils will take 50s if (failure_probability && prob(failure_probability)) total_system_failure(failure_probability, user) return - to_chat(usr, "You have disassembled the SMES cell!") + to_chat(usr, SPAN_WARNING("You have disassembled the SMES cell!")) var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" @@ -465,7 +465,7 @@ component_parts += attacking_item recalc_coils() else - to_chat(usr, "You can't insert more coils to this SMES unit!") + to_chat(usr, SPAN_WARNING("You can't insert more coils to this SMES unit!")) // Proc: toggle_input() // Parameters: None diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 34d20ee5a6a..50d63f9d471 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -60,14 +60,14 @@ if(attacking_item.iscrowbar()) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off the solar panel.") + user.visible_message(SPAN_NOTICE("[user] begins to take the glass off the solar panel.")) if(attacking_item.use_tool(src, user, 50, volume = 50)) var/obj/item/solar_assembly/S = locate() in src if(S) S.forceMove(src.loc) S.give_glass() playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the solar panel.") + user.visible_message(SPAN_NOTICE("[user] takes the glass off the solar panel.")) qdel(src) return else if (attacking_item) @@ -222,13 +222,13 @@ if(!anchored && isturf(loc)) if(attacking_item.iswrench()) anchored = 1 - user.visible_message("[user] wrenches the solar assembly into place.") + user.visible_message(SPAN_NOTICE("[user] wrenches the solar assembly into place.")) attacking_item.play_tool_sound(get_turf(src), 75) return 1 else if(attacking_item.iswrench()) anchored = 0 - user.visible_message("[user] unwrenches the solar assembly from it's place.") + user.visible_message(SPAN_NOTICE("[user] unwrenches the solar assembly from it's place.")) attacking_item.play_tool_sound(get_turf(src), 75) return 1 @@ -237,13 +237,13 @@ if(S.use(2)) glass_type = attacking_item.type playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] places the glass on the solar assembly.") + user.visible_message(SPAN_NOTICE("[user] places the glass on the solar assembly.")) if(tracker) new /obj/machinery/power/tracker(get_turf(src), src) else new /obj/machinery/power/solar(get_turf(src), src) else - to_chat(user, "You need two sheets of glass to put them into a solar panel.") + to_chat(user, SPAN_WARNING("You need two sheets of glass to put them into a solar panel.")) return return 1 @@ -252,13 +252,13 @@ tracker = 1 user.drop_from_inventory(attacking_item, get_turf(src)) qdel(attacking_item) - user.visible_message("[user] inserts the electronics into the solar assembly.") + user.visible_message(SPAN_NOTICE("[user] inserts the electronics into the solar assembly.")) return 1 else if(attacking_item.iscrowbar()) new /obj/item/tracker_electronics(src.loc) tracker = 0 - user.visible_message("[user] takes out the electronics from the solar assembly.") + user.visible_message(SPAN_NOTICE("[user] takes out the electronics from the solar assembly.")) return 1 ..() @@ -369,7 +369,7 @@ t += "Search for devices " t += "Solar panels : [connected_panels.len] connected " - t += "Solar tracker : [connected_tracker ? "Found" : "Not found"] " + t += "Solar tracker : [connected_tracker ? SPAN_GOOD("Found") : SPAN_BAD("Not found")] " t += "Close" @@ -384,7 +384,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 2 SECONDS, src, DO_REPAIR_CONSTRUCT)) if (src.stat & BROKEN) - to_chat(user, "The broken glass falls out.") + to_chat(user, SPAN_NOTICE("The broken glass falls out.")) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/material/shard( src.loc ) var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) @@ -396,7 +396,7 @@ A.anchored = 1 qdel(src) else - to_chat(user, "You disconnect the monitor.") + to_chat(user, SPAN_NOTICE("You disconnect the monitor.")) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) for (var/obj/C in src) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 853c85b5f37..824c8c6e399 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -38,7 +38,7 @@ if(attacking_item.iswrench()) attacking_item.play_tool_sound(get_turf(src), 50) - to_chat(user, "You [anchored ? "unfasten" : "fasten"] [src] to the flooring.") + to_chat(user, SPAN_NOTICE("You [anchored ? "unfasten" : "fasten"] [src] to the flooring.")) anchored = !anchored update_icon() if(!anchored) @@ -92,7 +92,7 @@ if(attacking_item.iswrench()) attacking_item.play_tool_sound(get_turf(src), 50) - to_chat(user, "You [anchored ? "unfasten" : "fasten"] [src] to the flooring.") + to_chat(user, SPAN_NOTICE("You [anchored ? "unfasten" : "fasten"] [src] to the flooring.")) anchored = !anchored update_icon() return diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 0c96cab60c5..c680fb7c7f6 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -61,14 +61,14 @@ if(attacking_item.iscrowbar()) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off the solar tracker.") + user.visible_message(SPAN_NOTICE("[user] begins to take the glass off the solar tracker.")) if(attacking_item.use_tool(src, user, 50, volume = 50)) var/obj/item/solar_assembly/S = locate() in src if(S) S.forceMove(src.loc) S.give_glass() playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the tracker.") + user.visible_message(SPAN_NOTICE("[user] takes the glass off the tracker.")) qdel(src) return ..() diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 1bb1ffed362..637c242119b 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -43,18 +43,18 @@ /obj/item/ammo_casing/attackby(obj/item/attacking_item, mob/user) if(attacking_item.isscrewdriver()) if(!BB) - to_chat(user, "There is no bullet in the casing to inscribe anything into.") + to_chat(user, SPAN_NOTICE("There is no bullet in the casing to inscribe anything into.")) return var/tmp_label = "" var/label_text = sanitizeSafe( tgui_input_text(user, "Inscribe some text into \the [initial(BB.name)]", "Inscription", tmp_label, MAX_NAME_LEN), MAX_NAME_LEN ) if(length(label_text) > 20) - to_chat(user, "The inscription can be at most 20 characters long.") + to_chat(user, SPAN_WARNING("The inscription can be at most 20 characters long.")) else if(!label_text) - to_chat(user, "You scratch the inscription off of [initial(BB)].") + to_chat(user, SPAN_NOTICE("You scratch the inscription off of [initial(BB)].")) BB.name = initial(BB.name) else - to_chat(user, "You inscribe \"[label_text]\" into \the [initial(BB.name)].") + to_chat(user, SPAN_NOTICE("You inscribe \"[label_text]\" into \the [initial(BB.name)].")) BB.name = "[initial(BB.name)] (\"[label_text]\")" else if(istype(attacking_item, /obj/item/ammo_casing)) if(attacking_item.type != src.type) @@ -143,10 +143,10 @@ if(istype(attacking_item, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = attacking_item if(C.caliber != caliber) - to_chat(user, "[C] does not fit into [src].") + to_chat(user, SPAN_WARNING("[C] does not fit into [src].")) return if(stored_ammo.len >= max_ammo) - to_chat(user, "[src] is full!") + to_chat(user, SPAN_WARNING("[src] is full!")) return user.remove_from_mob(C) C.forceMove(src) @@ -159,9 +159,9 @@ /obj/item/ammo_magazine/attack_self(mob/user) if(!stored_ammo.len) - to_chat(user, "[src] is already empty!") + to_chat(user, SPAN_NOTICE("[src] is already empty!")) return - to_chat(user, "You empty [src].") + to_chat(user, SPAN_NOTICE("You empty [src].")) for(var/obj/item/ammo_casing/C in stored_ammo) C.forceMove(user.loc) playsound(C, /singleton/sound_category/casing_drop_sound, 50, FALSE) diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 38483adaf84..34a31b7f585 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -47,7 +47,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.species && H.species.name != SPECIES_VAURCA_WARRIOR) - to_chat(user, "\The [src] does not respond to you!") + to_chat(user, SPAN_WARNING("\The [src] does not respond to you!")) return FALSE return ..() @@ -86,7 +86,7 @@ if(H.species.name == SPECIES_VAURCA_WARRIOR) ..() return - to_chat(user, "\The [src] is far too large for you to pick up.") + to_chat(user, SPAN_WARNING("\The [src] is far too large for you to pick up.")) return /obj/item/gun/energy/noisecannon/update_icon() diff --git a/code/modules/projectiles/guns/bang.dm b/code/modules/projectiles/guns/bang.dm index ad2a3733f98..ce3f3a419fd 100644 --- a/code/modules/projectiles/guns/bang.dm +++ b/code/modules/projectiles/guns/bang.dm @@ -23,7 +23,7 @@ /obj/item/gun/bang/handle_click_empty(mob/user) if (user) - to_chat(user, "The flag is already out!") + to_chat(user, SPAN_DANGER("The flag is already out!")) /obj/item/gun/bang/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) if(!user || !target) return @@ -35,9 +35,9 @@ add_fingerprint(user) if (user) - user.visible_message("A flag pops out of the barrel!") + user.visible_message(SPAN_DANGER("A flag pops out of the barrel!")) else - src.visible_message("A flag pops out of the barrel of \the [src.name]'s barrel!") + src.visible_message(SPAN_DANGER("A flag pops out of the barrel of \the [src.name]'s barrel!")) playsound(src, fire_sound, 20, 1) src.AddOverlays(bang_flag) fired_gun = 1 @@ -45,7 +45,9 @@ /obj/item/gun/bang/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src && fired_gun) src.CutOverlays(bang_flag) - user.visible_message("\The [user] pushes the flag back into the barrel of \the [src.name].", "You push the flag back into the barrel of \the [src.name].") + user.visible_message(SPAN_NOTICE("\The [user] pushes the flag back into the barrel of \the [src.name]."), + SPAN_NOTICE("You push the flag back into the barrel of \the [src.name].")) + playsound(src.loc, 'sound/weapons/TargetOff.ogg', 50,1) fired_gun = 0 else diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index 5673d1b3d52..2bbb347b11b 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/code/modules/projectiles/guns/energy/blaster.dm @@ -108,7 +108,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/energy/blaster/tcaf name = "blaster rifle" @@ -209,7 +209,7 @@ power_supply.forceMove(get_turf(src.loc)) user.visible_message( "[power_supply] pops out of the cell mount!", - "[power_supply] pops out of \the [src] and clatters on the floor!" + SPAN_NOTICE("[power_supply] pops out of \the [src] and clatters on the floor!") ) power_supply.update_icon() power_supply = null diff --git a/code/modules/projectiles/guns/energy/crank.dm b/code/modules/projectiles/guns/energy/crank.dm index 473fb33bf87..b3affdcc261 100644 --- a/code/modules/projectiles/guns/energy/crank.dm +++ b/code/modules/projectiles/guns/energy/crank.dm @@ -31,19 +31,19 @@ /obj/item/gun/energy/rifle/icelance/unique_action(mob/living/user) if(is_charging) - to_chat(user, "You are already charging \the [src].") + to_chat(user, SPAN_WARNING("You are already charging \the [src].")) return if(power_supply.charge < power_supply.maxcharge) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message( - "\The [user] begins to crank \the [src]!", - "You begin to rotate \the [src]'s crank!" + SPAN_NOTICE("\The [user] begins to crank \the [src]!"), + SPAN_NOTICE("You begin to rotate \the [src]'s crank!") ) playsound(user.loc, 'sound/items/crank.ogg', 60, 1) is_charging = TRUE flick("crank", src) if(do_after(user,2 SECONDS)) - to_chat(user, "You finish charging \the [src].") + to_chat(user, SPAN_NOTICE("You finish charging \the [src].")) power_supply.give(charge_cost) update_maptext() update_icon() diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 0b840f5eccd..e80906c8eb0 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -174,7 +174,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/energy/laser/shotgun name = "laser shotgun" diff --git a/code/modules/projectiles/guns/energy/lawgiver.dm b/code/modules/projectiles/guns/energy/lawgiver.dm index 4197564af98..47aa5b3d708 100644 --- a/code/modules/projectiles/guns/energy/lawgiver.dm +++ b/code/modules/projectiles/guns/energy/lawgiver.dm @@ -98,10 +98,10 @@ /obj/item/gun/energy/lawgiver/proc/play_message() while (message_enabled && !message_disable) //Shut down command issued. Inform user that boardcasting has been stopped - usr.audible_message("[usr]'s [src.name] broadcasts: [message]","") + usr.audible_message(SPAN_WARNING("[usr]'s [src.name] broadcasts: [message]"),"") playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0) sleep(message_delay) - to_chat(usr, "Broadcasting Message disabled") + to_chat(usr, SPAN_WARNING("Broadcasting Message disabled")) message_enabled = 0 message_disable = 0 @@ -111,7 +111,7 @@ else src.dna = user.dna.unique_enzymes src.owner_name = user.real_name - to_chat(user, "You feel your palm heat up as the gun reads your DNA profile.") + to_chat(user, SPAN_NOTICE("You feel your palm heat up as the gun reads your DNA profile.")) desc += " Linked to: [user.real_name]" return @@ -124,8 +124,8 @@ var/obj/item/organ/external/RA = H.get_organ(BP_R_ARM) var/active_hand = H.hand playsound(user, 'sound/weapons/lawgiver_idfail.ogg', 40, 1) - to_chat(user, "You hear a soft beep from the gun and 'ID FAIL' flashes across the screen.") - to_chat(user, "You feel a tiny prick in your hand!") + to_chat(user, SPAN_DANGER("You hear a soft beep from the gun and 'ID FAIL' flashes across the screen.")) + to_chat(user, SPAN_DANGER("You feel a tiny prick in your hand!")) user.drop_item() //Blow up Unauthorized Users Hand//todo, delet this, as it's duplicate behaviour from Firing pins. sleep(60) @@ -137,7 +137,7 @@ ..() /obj/item/gun/energy/lawgiver/proc/Emag(mob/user as mob) - to_chat(usr, "You short out [src]'s id check") + to_chat(usr, SPAN_WARNING("You short out [src]'s id check")) emagged = 1 return 1 @@ -163,38 +163,38 @@ /* Firing Modes*/ if(findtext(msg,"single")) sel_mode = 1 - to_chat(usr, "[src.name] is now set to single shot mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to single shot mode.")) else if(findtext(msg,"rapidfire")) sel_mode = 2 - to_chat(usr, "[src.name] is now set to rapid fire mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to rapid fire mode.")) else if(findtext(msg,"highex") || findtext(msg,"grenade")) sel_mode = 3 - to_chat(usr, "[src.name] is now set to high explosive mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to high explosive mode.")) else if(findtext(msg,"stun")) sel_mode = 4 - to_chat(usr, "[src.name] is now set to stun mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to stun mode.")) else if(findtext(msg,"hotshot") || findtext(msg,"incendiary")) sel_mode = 5 - to_chat(usr, "[src.name] is now set to incendiary mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to incendiary mode.")) else if(findtext(msg,"armorpiercing") || findtext(msg,"execution")) sel_mode = 6 - to_chat(usr, "[src.name] is now set to armorpiercing mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to armorpiercing mode.")) else if(findtext(msg,"pellets")) sel_mode = 7 - to_chat(usr, "[src.name] is now set to pellet mode.") + to_chat(usr, SPAN_WARNING("[src.name] is now set to pellet mode.")) /* Other Stuff */ else if(findtext(msg,"reset") && (findtext(msg,"user") || findtext(msg,"dna"))) dna = null desc = default_desc - to_chat(usr, "[src.name]´s owner has been reset. Do not attempt to fire [src.name] without rebinding a new owner.") + to_chat(usr, SPAN_WARNING("[src.name]´s owner has been reset. Do not attempt to fire [src.name] without rebinding a new owner.")) else if((findtext(msg,"disable") || findtext(msg,"deactivate")) && findtext(msg,"crowdcontrol")) message_disable = 1 - to_chat(usr, "[src.name]´s crowdcontrol deactivation sequence started.") + to_chat(usr, SPAN_WARNING("[src.name]´s crowdcontrol deactivation sequence started.")) else if((findtext(msg,"enable") || findtext(msg,"activate")) && findtext(msg,"crowdcontrol")) if(message_enabled) //Check if a message is already broadcasting -> abort - to_chat(usr, "[src.name] is already broadcasting a message.") + to_chat(usr, SPAN_WARNING("[src.name] is already broadcasting a message.")) return - to_chat(usr, "[src.name]´s crowdcontrol activation sequence started.") + to_chat(usr, SPAN_WARNING("[src.name]´s crowdcontrol activation sequence started.")) message = "Citizens stay calm. Stand back from the crime scene. Interference with the crime scene carries an automatic brig sentence." message_enabled = 1 message_disable = 0 diff --git a/code/modules/projectiles/guns/energy/magic.dm b/code/modules/projectiles/guns/energy/magic.dm index ffb2ec0c527..241df4035de 100644 --- a/code/modules/projectiles/guns/energy/magic.dm +++ b/code/modules/projectiles/guns/energy/magic.dm @@ -21,14 +21,14 @@ /obj/item/gun/energy/wand/handle_click_empty(mob/user = null) if (user) - user.visible_message("*fizzle*", "*fizzle*") + user.visible_message("*fizzle*", SPAN_DANGER("*fizzle*")) else src.visible_message("*fizzle*") playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1) /obj/item/gun/energy/wand/special_check(var/mob/living/user) if((user.mutations & HULK)) - to_chat(user, "In your rage you momentarily forget the operation of this wand!") + to_chat(user, SPAN_DANGER("In your rage you momentarily forget the operation of this wand!")) return 0 return 1 diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm index 5c456cb5f8a..db50c714e55 100644 --- a/code/modules/projectiles/guns/energy/modular.dm +++ b/code/modules/projectiles/guns/energy/modular.dm @@ -226,19 +226,19 @@ /obj/item/gun/energy/laser/prototype/small_fail(var/mob/user) if(capacitor) - to_chat(user, "\The [src]'s [capacitor] short-circuits!") + to_chat(user, SPAN_DANGER("\The [src]'s [capacitor] short-circuits!")) capacitor.small_fail(user, src) return /obj/item/gun/energy/laser/prototype/medium_fail(var/mob/user) if(capacitor) - to_chat(user, "\The [src]'s [capacitor] overloads!") + to_chat(user, SPAN_DANGER("\The [src]'s [capacitor] overloads!")) capacitor.medium_fail(user, src) return /obj/item/gun/energy/laser/prototype/critical_fail(var/mob/user) if(capacitor) - to_chat(user, "\The [src]'s [capacitor] goes critical!") + to_chat(user, SPAN_DANGER("\The [src]'s [capacitor] goes critical!")) capacitor.critical_fail(user, src) return @@ -261,22 +261,22 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) else - to_chat(usr, "This device does not have a scope installed!") + to_chat(usr, SPAN_WARNING("This device does not have a scope installed!")) /obj/item/gun/energy/laser/prototype/special_check(var/mob/user) if(is_charging && chargetime) - to_chat(user, "\The [src] is already charging!") + to_chat(user, SPAN_DANGER("\The [src] is already charging!")) return 0 if(!wielded && (origin_chassis == CHASSIS_LARGE)) - to_chat(user, "You require both hands to fire this weapon!") + to_chat(user, SPAN_DANGER("You require both hands to fire this weapon!")) return 0 if(chargetime) user.visible_message( - "\The [user] begins charging the [src]!", - "You begin charging the [src]!", - "You hear a low pulsing roar!" + SPAN_DANGER("\The [user] begins charging the [src]!"), + SPAN_DANGER("You begin charging the [src]!"), + SPAN_DANGER("You hear a low pulsing roar!") ) is_charging = 1 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index e08aa8794ac..aea279973fb 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -68,9 +68,9 @@ /obj/item/gun/energy/gun/nuclear/small_fail(var/mob/user) for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it if (M == user) - to_chat(M, "Your gun feels pleasantly warm for a moment.") + to_chat(M, SPAN_WARNING("Your gun feels pleasantly warm for a moment.")) else - to_chat(M, "You feel a warm sensation.") + to_chat(M, SPAN_WARNING("You feel a warm sensation.")) SSradiation.radiate(src, rand(3, 50)) return @@ -82,9 +82,9 @@ return /obj/item/gun/energy/gun/nuclear/critical_fail(var/mob/user) - to_chat(user, "Your gun's reactor overloads!") + to_chat(user, SPAN_DANGER("Your gun's reactor overloads!")) for (var/mob/living/M in range(rand(1,4),src)) - to_chat(M, "You feel a wave of heat wash over you.") + to_chat(M, SPAN_WARNING("You feel a wave of heat wash over you.")) SSradiation.radiate(src, rand(3, 80)) crit_fail = 1 //break the gun so it stops recharging self_recharge = FALSE diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index 8d7c7d942c7..81cdd9f14c2 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/code/modules/projectiles/guns/energy/rifle.dm @@ -169,7 +169,7 @@ secondary_fire_sound = null /obj/item/gun/energy/rifle/pulse/destroyer/toggle_firing_mode(mob/living/user) - to_chat(user, "[src.name] has three settings, and they are all DESTROY.") + to_chat(user, SPAN_WARNING("[src.name] has three settings, and they are all DESTROY.")) /obj/item/gun/energy/rifle/laser/tachyon name = "tachyon rifle" @@ -196,7 +196,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/energy/rifle/ionrifle name = "ion rifle" diff --git a/code/modules/projectiles/guns/energy/scythe.dm b/code/modules/projectiles/guns/energy/scythe.dm index 83a705b5eb3..038ab409c3a 100644 --- a/code/modules/projectiles/guns/energy/scythe.dm +++ b/code/modules/projectiles/guns/energy/scythe.dm @@ -1,7 +1,7 @@ /obj/item/gun/energy/scythe name = "\improper Purpose munitions scythe" - desc = "A seemingly innocuous metal construction the size of a human arm. Through forces unknown, it produces alloy flechettes \ - capable of piercing even the strongest armor known to the Spur." + desc = SPAN_WARNING("A seemingly innocuous metal construction the size of a human arm. Through forces unknown, it produces alloy flechettes \ + capable of piercing even the strongest armor known to the Spur.") icon = 'icons/obj/guns/scythe.dmi' icon_state = "hunterkiller_scythe" item_state = "hunterkiller_scythe" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index e92180ebf0e..b0b41a4e05b 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -37,7 +37,7 @@ /obj/item/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag) //allow shooting into adjacent hydrotrays regardless of intent if(adjacent_flag && istype(target,/obj/machinery/portable_atmospherics/hydroponics)) - user.visible_message("\The [user] fires \the [src] into \the [target]!") + user.visible_message(SPAN_DANGER("\The [user] fires \the [src] into \the [target]!")) Fire(target,user) return ..() @@ -245,16 +245,16 @@ /obj/item/gun/energy/vaurca/gatlinglaser/special_check(var/mob/user) if(is_charging) - to_chat(user, "\The [src] is already spinning!") + to_chat(user, SPAN_DANGER("\The [src] is already spinning!")) return 0 if(!wielded) - to_chat(user, "You cannot fire this weapon with just one hand!") + to_chat(user, SPAN_DANGER("You cannot fire this weapon with just one hand!")) return 0 playsound(src, 'sound/weapons/saw/chainsawstart.ogg', 90, 1) user.visible_message( - "\The [user] begins spinning [src]'s barrels!", - "You begin spinning [src]'s barrels!", - "You hear the spin of a rotary gun!" + SPAN_DANGER("\The [user] begins spinning [src]'s barrels!"), + SPAN_DANGER("You begin spinning [src]'s barrels!"), + SPAN_DANGER("You hear the spin of a rotary gun!") ) is_charging = 1 if(!do_after(user, 30)) @@ -339,15 +339,15 @@ /obj/item/gun/energy/vaurca/typec/special_check(var/mob/user) if(is_charging) - to_chat(user, "\The [src] is already charging!") + to_chat(user, SPAN_DANGER("\The [src] is already charging!")) return 0 if(!wielded) - to_chat(user, "You could never fire this weapon with merely one hand!") + to_chat(user, SPAN_DANGER("You could never fire this weapon with merely one hand!")) return 0 user.visible_message( - "\The [user] begins charging the [src]!", - "You begin charging the [src]!", - "You hear a low pulsing roar!" + SPAN_DANGER("\The [user] begins charging the [src]!"), + SPAN_DANGER("You begin charging the [src]!"), + SPAN_DANGER("You hear a low pulsing roar!") ) is_charging = 1 if(!do_after(user, 20)) @@ -366,11 +366,11 @@ if(H.mob_size >= 30) playsound(user, 'sound/weapons/saberon.ogg', 50, 1) anchored = 1 - to_chat(user, "\The [src] is now energised.") + to_chat(user, SPAN_NOTICE("\The [src] is now energised.")) icon_state = "megaglaive1" ..() return - to_chat(user, "\The [src] is far too large for you to pick up.") + to_chat(user, SPAN_WARNING("\The [src] is far too large for you to pick up.")) return /obj/item/gun/energy/vaurca/typec/dropped(mob/user) diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm index a7adaa0b8af..91a78731309 100644 --- a/code/modules/projectiles/guns/launcher.dm +++ b/code/modules/projectiles/guns/launcher.dm @@ -19,7 +19,7 @@ //Override this to avoid a runtime with suicide handling. /obj/item/gun/launcher/handle_suicide(mob/living/user) - to_chat(user, "Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.") + to_chat(user, SPAN_WARNING("Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.")) return /obj/item/gun/launcher/proc/update_release_force(obj/item/projectile) diff --git a/code/modules/projectiles/guns/launcher/harpoon.dm b/code/modules/projectiles/guns/launcher/harpoon.dm index caef01eeed0..7aa7a31b4d3 100644 --- a/code/modules/projectiles/guns/launcher/harpoon.dm +++ b/code/modules/projectiles/guns/launcher/harpoon.dm @@ -37,7 +37,7 @@ /obj/item/gun/launcher/harpoon/special_check(mob/user) if(!wielded) - to_chat(user, "You can't fire without stabilizing \the [src]!") + to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!")) return FALSE return ..() @@ -46,10 +46,10 @@ if(harpoons.len < max_harpoons) user.drop_from_inventory(attacking_item, src) harpoons += attacking_item - to_chat(user, "You load \the [attacking_item] in \the [src].") + to_chat(user, SPAN_NOTICE("You load \the [attacking_item] in \the [src].")) update_icon() else - to_chat(user, "\The [src] is already loaded.") + to_chat(user, SPAN_WARNING("\The [src] is already loaded.")) /obj/item/gun/launcher/harpoon/attack_hand(mob/user) diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 603748c954e..1d4dc0ba949 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -171,7 +171,7 @@ if(istype(attacking_item, /obj/item/pipe)) if(buildstate == 0) qdel(attacking_item) - to_chat(user, "You secure the piping inside the frame.") + to_chat(user, SPAN_NOTICE("You secure the piping inside the frame.")) buildstate++ update_icon() return @@ -179,16 +179,16 @@ if(buildstate == 2) var/obj/item/stack/material/M = attacking_item if(M.use(5)) - to_chat(user, "You assemble a chassis around the cannon frame.") + to_chat(user, SPAN_NOTICE("You assemble a chassis around the cannon frame.")) buildstate++ update_icon() else - to_chat(user, "You need at least five metal sheets to complete this task.") + to_chat(user, SPAN_NOTICE("You need at least five metal sheets to complete this task.")) return else if(istype(attacking_item,/obj/item/device/transfer_valve)) if(buildstate == 4) qdel(attacking_item) - to_chat(user, "You install the transfer valve and connect it to the piping.") + to_chat(user, SPAN_NOTICE("You install the transfer valve and connect it to the piping.")) buildstate++ update_icon() return @@ -198,7 +198,7 @@ if(T.use(0,user)) if(!src || !T.isOn()) return playsound(src.loc, 'sound/items/welder_pry.ogg', 100, 1) - to_chat(user, "You weld the pipe into place.") + to_chat(user, SPAN_NOTICE("You weld the pipe into place.")) buildstate++ update_icon() if(buildstate == 3) @@ -206,7 +206,7 @@ if(T.use(0,user)) if(!src || !T.isOn()) return playsound(src.loc, 'sound/items/welder_pry.ogg', 100, 1) - to_chat(user, "You weld the metal chassis together.") + to_chat(user, SPAN_NOTICE("You weld the metal chassis together.")) buildstate++ update_icon() if(buildstate == 5) @@ -214,7 +214,7 @@ if(T.use(0,user)) if(!src || !T.isOn()) return playsound(src.loc, 'sound/items/welder_pry.ogg', 100, 1) - to_chat(user, "You weld the valve into place.") + to_chat(user, SPAN_NOTICE("You weld the valve into place.")) new /obj/item/gun/launcher/pneumatic(get_turf(src)) qdel(src) return diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index 3843943808d..7764e03e1b6 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -22,17 +22,17 @@ /obj/item/gun/launcher/rocket/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(is_adjacent) - . += "[rockets.len] / [max_rockets] rockets." + . += SPAN_NOTICE("[rockets.len] / [max_rockets] rockets.") /obj/item/gun/launcher/rocket/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/ammo_casing/rocket)) if(rockets.len < max_rockets) user.drop_from_inventory(attacking_item, src) rockets += attacking_item - to_chat(user, "You put the rocket in [src].") - to_chat(user, "[rockets.len] / [max_rockets] rockets.") + to_chat(user, SPAN_NOTICE("You put the rocket in [src].")) + to_chat(user, SPAN_NOTICE("[rockets.len] / [max_rockets] rockets.")) else - to_chat(usr, "[src] cannot hold more rockets.") + to_chat(usr, SPAN_WARNING("[src] cannot hold more rockets.")) /obj/item/gun/launcher/rocket/consume_next_projectile() if(rockets.len) diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 43cea3ef06c..a75a23c01d8 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -21,7 +21,7 @@ /obj/item/syringe_cartridge/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/reagent_containers/syringe)) syringe = attacking_item - to_chat(user, "You carefully insert [syringe] into [src].") + to_chat(user, SPAN_NOTICE("You carefully insert [syringe] into [src].")) user.remove_from_mob(syringe) syringe.forceMove(src) sharp = 1 @@ -30,7 +30,7 @@ /obj/item/syringe_cartridge/attack_self(mob/user) if(syringe) - to_chat(user, "You remove [syringe] from [src].") + to_chat(user, SPAN_NOTICE("You remove [syringe] from [src].")) user.put_in_hands(syringe) syringe = null sharp = initial(sharp) @@ -97,27 +97,27 @@ /obj/item/gun/launcher/syringe/unique_action(mob/living/user) if(next) - user.visible_message("[user] unlatches and carefully relaxes the bolt on [src].", "You unlatch and carefully relax the bolt on [src], unloading the spring.") + user.visible_message("[user] unlatches and carefully relaxes the bolt on [src].", SPAN_WARNING("You unlatch and carefully relax the bolt on [src], unloading the spring.")) playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1) next = null else if(darts.len) playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) - user.visible_message("[user] draws back the bolt on [src], clicking it into place.", "You draw back the bolt on the [src], loading the spring!") + user.visible_message("[user] draws back the bolt on [src], clicking it into place.", SPAN_WARNING("You draw back the bolt on the [src], loading the spring!")) next = darts[1] add_fingerprint(user) /obj/item/gun/launcher/syringe/attack_hand(mob/living/user as mob) if(user.get_inactive_hand() == src) if(!darts.len) - to_chat(user, "[src] is empty.") + to_chat(user, SPAN_WARNING("[src] is empty.")) return if(next) - to_chat(user, "[src]'s cover is locked shut.") + to_chat(user, SPAN_WARNING("[src]'s cover is locked shut.")) return var/obj/item/syringe_cartridge/C = darts[1] darts -= C user.put_in_hands(C) - user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") + user.visible_message("[user] removes \a [C] from [src].", SPAN_NOTICE("You remove \a [C] from [src].")) else ..() @@ -125,12 +125,12 @@ if(istype(attacking_item, /obj/item/syringe_cartridge)) var/obj/item/syringe_cartridge/C = attacking_item if(darts.len >= max_darts) - to_chat(user, "[src] is full!") + to_chat(user, SPAN_WARNING("[src] is full!")) return user.remove_from_mob(C) C.forceMove(src) darts += C //add to the end - user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].") + user.visible_message("[user] inserts \a [C] into [src].", SPAN_NOTICE("You insert \a [C] into [src].")) else ..() diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 5f6fbbd2d5a..23beef93483 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -102,7 +102,7 @@ if(!jam_num && jam_chance && get_ammo()) if(prob(jam_chance)) playsound(src.loc, 'sound/items/trayhit2.ogg', 50, TRUE) - to_chat(user, "\The [src] jams!") + to_chat(user, SPAN_DANGER("\The [src] jams!")) balloon_alert(user, SPAN_RED("JAM")) jam_num = rand(2, 5) // gotta attackself two to five times to unjam return FALSE @@ -144,21 +144,21 @@ if(istype(A, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/AM = A if(!(load_method & AM.mag_type) || caliber != AM.caliber || (allowed_magazines && !is_type_in_list(A, allowed_magazines))) - to_chat(user,"[AM] won't load into [src]!") + to_chat(user,SPAN_WARNING("[AM] won't load into [src]!")) return switch(AM.mag_type) if(MAGAZINE) if(ammo_magazine) - to_chat(user,"[src] already has a magazine loaded.") //already a magazine here + to_chat(user,SPAN_WARNING("[src] already has a magazine loaded.")) //already a magazine here return user.remove_from_mob(AM) AM.forceMove(src) ammo_magazine = AM - user.visible_message("[user] inserts [AM] into [src].", "You insert [AM] into [src].") + user.visible_message("[user] inserts [AM] into [src].", SPAN_NOTICE("You insert [AM] into [src].")) playsound(src.loc, AM.insert_sound, 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) if(SPEEDLOADER) if(loaded.len >= max_shells) - to_chat(user,"[src] is full!") + to_chat(user,SPAN_WARNING("[src] is full!")) return var/count = 0 for(var/obj/item/ammo_casing/C in AM.stored_ammo) @@ -170,25 +170,25 @@ AM.stored_ammo -= C //should probably go inside an ammo_magazine proc, but I guess less proc calls this way... count++ if(count) - user.visible_message("[user] reloads [src].", "You load [count] round\s into [src] using \the [AM].") + user.visible_message("[user] reloads [src].", SPAN_NOTICE("You load [count] round\s into [src] using \the [AM].")) playsound(src.loc, AM.insert_sound, 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) AM.update_icon() else if(istype(A, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = A if(!(load_method & SINGLE_CASING)) - to_chat(user,"[src] can not be loaded with single casings.") + to_chat(user,SPAN_WARNING("[src] can not be loaded with single casings.")) return //incompatible if(caliber != C.caliber) - to_chat(user,"\The [C] does not fit.") + to_chat(user,SPAN_WARNING("\The [C] does not fit.")) return //incompatible if(loaded.len >= max_shells) - to_chat(user,"[src] is full.") + to_chat(user,SPAN_WARNING("[src] is full.")) return user.remove_from_mob(C) C.forceMove(src) loaded.Insert(1, C) //add to the head of the list - user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].") + user.visible_message("[user] inserts \a [C] into [src].", SPAN_NOTICE("You insert \a [C] into [src].")) playsound(src.loc, C.reload_sound, 50, extrarange = SILENCED_SOUND_EXTRARANGE) //Casings, aka single bullets, are extremely quiet update_maptext() update_icon() @@ -200,7 +200,7 @@ ammo_magazine.forceMove(user.loc) else user.put_in_hands(ammo_magazine) - user.visible_message("[user] removes [ammo_magazine] from [src].", "You remove [ammo_magazine] from [src].") + user.visible_message("[user] removes [ammo_magazine] from [src].", SPAN_NOTICE("You remove [ammo_magazine] from [src].")) playsound(src.loc, ammo_magazine.eject_sound, 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE, falloff_exponent = (SOUND_FALLOFF_EXPONENT+2)) ammo_magazine.update_icon() ammo_magazine = null @@ -216,14 +216,14 @@ count++ loaded.Cut() if(count) - user.visible_message("[user] unloads [src].", "You unload [count] round\s from [src].") + user.visible_message("[user] unloads [src].", SPAN_NOTICE("You unload [count] round\s from [src].")) else if(load_method & SINGLE_CASING) var/obj/item/ammo_casing/C = loaded[loaded.len] loaded.len-- user.put_in_hands(C) - user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") + user.visible_message("[user] removes \a [C] from [src].", SPAN_NOTICE("You remove \a [C] from [src].")) else - to_chat(user, "[src] is empty.") + to_chat(user, SPAN_WARNING("[src] is empty.")) update_maptext() update_icon() @@ -281,7 +281,7 @@ ammo_magazine.forceMove(get_turf(src.loc)) user.visible_message( "[ammo_magazine] falls out and clatters on the floor!", - "[ammo_magazine] falls out and clatters on the floor!" + SPAN_NOTICE("[ammo_magazine] falls out and clatters on the floor!") ) playsound(user, ammo_magazine.eject_sound, 40, FALSE) ammo_magazine.update_icon() @@ -293,7 +293,7 @@ if(distance > 1) return if(jam_num) - . += "It looks jammed." + . += SPAN_WARNING("It looks jammed.") if(ammo_magazine) . += "It has \a [ammo_magazine] loaded." if(suppressed) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 1fc0ff9e068..2bfac99bb02 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -473,13 +473,13 @@ /obj/item/gun/projectile/automatic/rifle/l6_saw/special_check(mob/user) if(cover_open) - to_chat(user, "[src]'s cover is open! Close it before firing!") + to_chat(user, SPAN_WARNING("[src]'s cover is open! Close it before firing!")) return 0 return ..() /obj/item/gun/projectile/automatic/rifle/l6_saw/proc/toggle_cover(mob/user) cover_open = !cover_open - to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") + to_chat(user, SPAN_NOTICE("You [cover_open ? "open" : "close"] [src]'s cover.")) if(cover_open) playsound(user, 'sound/weapons/sawopen.ogg', 60, 1) else @@ -507,13 +507,13 @@ /obj/item/gun/projectile/automatic/rifle/l6_saw/load_ammo(var/obj/item/A, mob/user) if(!cover_open) - to_chat(user, "You need to open the cover to load [src].") + to_chat(user, SPAN_WARNING("You need to open the cover to load [src].")) return ..() /obj/item/gun/projectile/automatic/rifle/l6_saw/unload_ammo(mob/user, var/allow_dump=1) if(!cover_open) - to_chat(user, "You need to open the cover to unload [src].") + to_chat(user, SPAN_WARNING("You need to open the cover to unload [src].")) return ..() @@ -760,7 +760,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/projectile/automatic/rifle/konyang/k556 name = "konyang assault rifle" diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index e395177e5c0..653037a9715 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -100,24 +100,24 @@ /obj/item/gun/projectile/dartgun/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if (beakers.len) - . += "[src] contains:" + . += SPAN_NOTICE("[src] contains:") for(var/obj/item/reagent_containers/glass/beaker/B in beakers) for(var/_R in B.reagents.reagent_volumes) var/singleton/reagent/R = GET_SINGLETON(_R) - . += "[B.reagents.reagent_volumes[_R]] units of [R.name]" + . += SPAN_NOTICE("[B.reagents.reagent_volumes[_R]] units of [R.name]") /obj/item/gun/projectile/dartgun/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/reagent_containers/glass)) if(!istype(attacking_item, container_type)) - to_chat(user, "[attacking_item] doesn't seem to fit into [src].") + to_chat(user, SPAN_NOTICE("[attacking_item] doesn't seem to fit into [src].")) return if(beakers.len >= max_beakers) - to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!") + to_chat(user, SPAN_NOTICE("[src] already has [max_beakers] beakers in it - another one isn't going to fit!")) return var/obj/item/reagent_containers/glass/beaker/B = attacking_item user.drop_from_inventory(B,src) beakers += B - to_chat(user, "You slot [B] into [src].") + to_chat(user, SPAN_NOTICE("You slot [B] into [src].")) src.updateUsrDialog() return 1 ..() @@ -156,7 +156,7 @@ if(ammo_magazine.stored_ammo && ammo_magazine.stored_ammo.len) dat += "The dart cartridge has [ammo_magazine.stored_ammo.len] shots remaining." else - dat += "The dart cartridge is empty!" + dat += SPAN_WARNING("The dart cartridge is empty!") dat += " \[Eject\]" user << browse(dat, "window=dartgun") diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index 74931a02b03..22bfb967679 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -22,7 +22,10 @@ /obj/item/gun/projectile/shotgun/improvised/special_check(var/mob/living/carbon/human/M) if(prob(fail_chance)) - M.visible_message("[M]'s weapon blows up, shattering into pieces!","[src] blows up in your face!", "You hear a loud bang!") + M.visible_message(SPAN_DANGER("[M]'s weapon blows up, shattering into pieces!"), + SPAN_DANGER("[src] blows up in your face!"), + "You hear a loud bang!") + M.take_organ_damage(0,30) M.drop_item() new /obj/item/material/shard/shrapnel(get_turf(src)) @@ -34,11 +37,13 @@ /obj/item/gun/projectile/shotgun/improvised/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/surgery/circular_saw) || istype(attacking_item, /obj/item/melee/energy) || istype(attacking_item, /obj/item/gun/energy/plasmacutter) && w_class != 3) - to_chat(user, "You begin to shorten the barrel of \the [src].") + to_chat(user, SPAN_NOTICE("You begin to shorten the barrel of \the [src].")) if(loaded.len) for(var/i in 1 to max_shells) Fire(user, user) //will this work? //it will. we call it twice, for twice the FUN - user.visible_message("The shotgun goes off!", "The shotgun goes off in your face!") + user.visible_message(SPAN_DANGER("The shotgun goes off!"), + SPAN_DANGER("The shotgun goes off in your face!")) + return if(attacking_item.use_tool(src, user, 30, volume = 50)) icon_state = "ishotgunsawn" @@ -48,7 +53,7 @@ slot_flags &= ~SLOT_BACK slot_flags |= (SLOT_BELT|SLOT_HOLSTER) name = "sawn-off improvised shotgun" - to_chat(user, "You shorten the barrel of \the [src]!") + to_chat(user, SPAN_WARNING("You shorten the barrel of \the [src]!")) else ..() @@ -108,21 +113,21 @@ if(istype(attacking_item, /obj/item/pipe)) if(buildstate == 0) qdel(attacking_item) - to_chat(user, "You place the pipe and the receiver together.") + to_chat(user, SPAN_NOTICE("You place the pipe and the receiver together.")) buildstate++ update_icon() return else if(istype(attacking_item, /obj/item/stock)) if(buildstate == 1) qdel(attacking_item) - to_chat(user, "You add the stock to the assembly.") + to_chat(user, SPAN_NOTICE("You add the stock to the assembly.")) buildstate++ update_icon() return else if(istype(attacking_item, /obj/item/tape_roll)) if(buildstate == 2) qdel(attacking_item) - to_chat(user, "You strap the pieces together with tape.") + to_chat(user, SPAN_NOTICE("You strap the pieces together with tape.")) buildstate++ update_icon() return @@ -130,11 +135,11 @@ var/obj/item/stack/cable_coil/C = attacking_item if(buildstate == 3) if(C.use(10)) - to_chat(user, "You tie the lengths of cable to the pipegun, making a sling.") + to_chat(user, SPAN_NOTICE("You tie the lengths of cable to the pipegun, making a sling.")) new /obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed/pipegun(get_turf(src)) qdel(src) else - to_chat(user, "You need at least ten lengths of cable if you want to make a sling!") + to_chat(user, SPAN_NOTICE("You need at least ten lengths of cable if you want to make a sling!")) return ..() @@ -193,21 +198,21 @@ /obj/item/stock/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/material/hatchet)) if(buildstate == 0) - to_chat(user, "You carve the rifle stock.") + to_chat(user, SPAN_NOTICE("You carve the rifle stock.")) buildstate++ update_icon() return else if(istype(attacking_item, /obj/item/receivergun)) if(buildstate == 1) qdel(attacking_item) - to_chat(user, "You add the receiver to the assembly.") + to_chat(user, SPAN_NOTICE("You add the receiver to the assembly.")) buildstate++ update_icon() return else if(istype(attacking_item, /obj/item/pipe)) if(buildstate == 2) qdel(attacking_item) - to_chat(user, "You strap the pipe to the assembly.") + to_chat(user, SPAN_NOTICE("You strap the pipe to the assembly.")) buildstate++ update_icon() return @@ -217,7 +222,7 @@ if(T.use(0,user)) if(!src || !T.isOn()) return playsound(src.loc, 'sound/items/welder_pry.ogg', 100, 1) - to_chat(user, "You shorten the barrel with the welding tool.") + to_chat(user, SPAN_NOTICE("You shorten the barrel with the welding tool.")) var/obj/item/gun/projectile/improvised_handgun/G = new(get_turf(src)) G.jam_chance = rand(1,100) qdel(src) diff --git a/code/modules/projectiles/guns/projectile/minigun.dm b/code/modules/projectiles/guns/projectile/minigun.dm index 6915c2dbe3a..ba2eb59549a 100644 --- a/code/modules/projectiles/guns/projectile/minigun.dm +++ b/code/modules/projectiles/guns/projectile/minigun.dm @@ -53,21 +53,21 @@ return if (user.back!= src) - to_chat(user, "\The [src] must be worn to deploy \the [gun]!") + to_chat(user, SPAN_WARNING("\The [src] must be worn to deploy \the [gun]!")) return if(use_check_and_message(user)) return if(!gun) - to_chat(user, "There is no weapon attached the \the [src]!") + to_chat(user, SPAN_WARNING("There is no weapon attached the \the [src]!")) if(armed) - to_chat(user, "\The [src] has been already deployed!") + to_chat(user, SPAN_WARNING("\The [src] has been already deployed!")) else if(!user.put_in_hands(gun)) - to_chat(user, "You need a free hand to hold \the [gun]!") + to_chat(user, SPAN_WARNING("You need a free hand to hold \the [gun]!")) return armed = TRUE @@ -137,11 +137,11 @@ /obj/item/gun/projectile/automatic/rifle/minigun/special_check(var/mob/user) if(!wielded) - to_chat(user, "You cannot fire this weapon with just one hand!") + to_chat(user, SPAN_DANGER("You cannot fire this weapon with just one hand!")) return FALSE if (user.back!= source) - to_chat(user, "\The [source] must be worn to fire \the [src]!") + to_chat(user, SPAN_WARNING("\The [source] must be worn to fire \the [src]!")) return FALSE return ..() @@ -155,7 +155,7 @@ /obj/item/gun/projectile/automatic/rifle/minigun/dropped(mob/user) ..() if(source) - to_chat(user, "\The [src] snaps back onto \the [source].") + to_chat(user, SPAN_NOTICE("\The [src] snaps back onto \the [source].")) INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item/minigunpack, remove_gun)) source.update_icon() user.update_inv_back() diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 7bc2f63dacc..2ace57582f8 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -35,7 +35,7 @@ var/mob/M = usr if(!M.mind) return 0 if(!M.mind.assigned_role == "Detective") - to_chat(M, "You don't feel cool enough to name this gun, chump.") + to_chat(M, SPAN_NOTICE("You don't feel cool enough to name this gun, chump.")) return 0 var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 1e4c45d87a3..5975362a3b5 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -24,7 +24,10 @@ set src in usr chamber_offset = 0 - usr.visible_message("\The [usr] spins the cylinder of \the [src]!", "You spin the cylinder of \the [src]!", "You hear something metallic spin and click.") + usr.visible_message(SPAN_WARNING("\The [usr] spins the cylinder of \the [src]!"), + SPAN_WARNING("You spin the cylinder of \the [src]!"), + SPAN_NOTICE("You hear something metallic spin and click.")) + playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) loaded = shuffle(loaded) if(rand(1,max_shells) > loaded.len) @@ -111,7 +114,7 @@ var/mob/M = usr if(!M.mind) return 0 if(!M.mind.assigned_role == "Investigator") - to_chat(M, "You don't feel cool enough to name this gun, chump.") + to_chat(M, SPAN_NOTICE("You don't feel cool enough to name this gun, chump.")) return 0 var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN) @@ -153,7 +156,7 @@ /obj/item/gun/projectile/revolver/capgun/attackby(obj/item/attacking_item, mob/user) if(!attacking_item.iswirecutter() || icon_state == "revolver") return ..() - to_chat(user, "You snip off the toy markings off the [src].") + to_chat(user, SPAN_NOTICE("You snip off the toy markings off the [src].")) icon = 'icons/obj/guns/revolver.dmi' name = "revolver" icon_state = "revolver" @@ -198,7 +201,7 @@ . = ..() /obj/item/gun/projectile/revolver/lemat/unique_action(mob/living/user) - to_chat(user, "You change the firing mode on \the [src].") + to_chat(user, SPAN_NOTICE("You change the firing mode on \the [src].")) if(!flipped_firing) if(max_shells && secondary_max_shells) max_shells = secondary_max_shells @@ -240,8 +243,8 @@ set src in usr chamber_offset = 0 - visible_message("\The [usr] spins the cylinder of \the [src]!", \ - "You hear something metallic spin and click.") + visible_message(SPAN_WARNING("\The [usr] spins the cylinder of \the [src]!"), \ + SPAN_NOTICE("You hear something metallic spin and click.")) playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) if(!flipped_firing) loaded = shuffle(loaded) diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index c44d40a032d..3c46c2d7921 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/code/modules/projectiles/guns/projectile/rifle.dm @@ -70,7 +70,7 @@ update_icon() name = "sawn-off bolt action rifle" desc = "A shortened bolt action rifle, not really acurate." - to_chat(user, "You shorten the barrel and stock of the rifle!") + to_chat(user, SPAN_WARNING("You shorten the barrel and stock of the rifle!")) /obj/item/gun/projectile/shotgun/pump/rifle/obrez name = "sawn-off bolt action rifle" @@ -154,7 +154,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/projectile/contender name = "pocket rifle" @@ -175,7 +175,7 @@ /obj/item/gun/projectile/contender/special_check(mob/user) if(retracted_bolt) - to_chat(user, "You can't fire \the [src] while the bolt is open!") + to_chat(user, SPAN_WARNING("You can't fire \the [src] while the bolt is open!")) return 0 return ..() @@ -187,7 +187,7 @@ loaded -= C if(!retracted_bolt) - to_chat(user, "You cycle back the bolt on \the [src], ejecting the casing and allowing you to reload.") + to_chat(user, SPAN_NOTICE("You cycle back the bolt on \the [src], ejecting the casing and allowing you to reload.")) playsound(user, 'sound/weapons/riflebolt.ogg', 60, 1) icon_state = icon_retracted item_state = icon_retracted @@ -197,10 +197,10 @@ return 1 else if(retracted_bolt && loaded.len) - to_chat(user, "You cycle the loaded round into the chamber, allowing you to fire.") + to_chat(user, SPAN_NOTICE("You cycle the loaded round into the chamber, allowing you to fire.")) else - to_chat(user, "You cycle the bolt back into position, leaving the gun empty.") + to_chat(user, SPAN_NOTICE("You cycle the bolt back into position, leaving the gun empty.")) icon_state = initial(icon_state) item_state = initial(item_state) @@ -212,13 +212,13 @@ /obj/item/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user) if(!retracted_bolt) - to_chat(user, "You can't load \the [src] without cycling the bolt.") + to_chat(user, SPAN_NOTICE("You can't load \the [src] without cycling the bolt.")) return ..() /obj/item/gun/projectile/contender/unload_ammo(mob/user, var/allow_dump=1) if(!retracted_bolt) - to_chat(user, "You can't unload \the [src] without cycling the bolt.") + to_chat(user, SPAN_NOTICE("You can't unload \the [src] without cycling the bolt.")) return ..() @@ -256,15 +256,15 @@ else AddOverlays("springfield-clip-full") else - to_chat(user, "There is no ammo in \the [has_clip.name]!") + to_chat(user, SPAN_WARNING("There is no ammo in \the [has_clip.name]!")) else if(!open_bolt) - to_chat(user, "The bolt on \the [src.name] is closed!") + to_chat(user, SPAN_WARNING("The bolt on \the [src.name] is closed!")) else - to_chat(user, "There is no clip in \the [src.name]!") + to_chat(user, SPAN_WARNING("There is no clip in \the [src.name]!")) /obj/item/gun/projectile/shotgun/pump/rifle/vintage/pump(mob/M as mob) if(!wielded) - to_chat(M, "You cannot work \the [src]'s bolt without gripping it with both hands!") + to_chat(M, SPAN_WARNING("You cannot work \the [src]'s bolt without gripping it with both hands!")) return if(!open_bolt) open_bolt = 1 @@ -295,12 +295,12 @@ /obj/item/gun/projectile/shotgun/pump/rifle/vintage/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/ammo_magazine/boltaction/vintage)) if(!open_bolt) - to_chat(user, "You need to open the bolt of \the [src] first.") + to_chat(user, SPAN_NOTICE("You need to open the bolt of \the [src] first.")) return if(!has_clip) user.drop_from_inventory(attacking_item, src) has_clip = attacking_item - to_chat(user, "You load the clip into \the [src].") + to_chat(user, SPAN_NOTICE("You load the clip into \the [src].")) if(!has_clip.stored_ammo.len) AddOverlays("springfield-clip-empty") else if(has_clip.stored_ammo.len <= 3) @@ -308,20 +308,20 @@ else AddOverlays("springfield-clip-full") else - to_chat(user, "There's already a clip in \the [src].") + to_chat(user, SPAN_NOTICE("There's already a clip in \the [src].")) else ..() /obj/item/gun/projectile/shotgun/pump/rifle/vintage/load_ammo(var/obj/item/A, mob/user) if(!open_bolt) - to_chat(user, "The bolt is closed on \the [src]!") + to_chat(user, SPAN_WARNING("The bolt is closed on \the [src]!")) return ..() /obj/item/gun/projectile/shotgun/pump/rifle/vintage/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) if(open_bolt) - to_chat(user, "The bolt is open on \the [src]!") + to_chat(user, SPAN_WARNING("The bolt is open on \the [src]!")) return ..() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 19e11f5202e..99077c7bfc3 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -20,11 +20,13 @@ /obj/item/gun/energy/plasmacutter // does this even work? )) if(is_type_in_typecache(attacking_item, barrel_cutting_tools) && w_class != 3) - to_chat(user, "You begin to [sawnoff_workmsg] of \the [src].") + to_chat(user, SPAN_NOTICE("You begin to [sawnoff_workmsg] of \the [src].")) if(loaded.len) for(var/i in 1 to max_shells) Fire(user, user) //will this work? //it will. we call it twice, for twice the FUN - user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!") + user.visible_message(SPAN_DANGER("\The [src] goes off!"), + SPAN_DANGER("\The [src] goes off in your face!")) + return sawing_in_progress = TRUE @@ -38,7 +40,7 @@ // called on a SUCCESSFUL saw-off. /obj/item/gun/projectile/shotgun/proc/saw_off(mob/user, obj/item/tool) - to_chat(user, "You attempt to cut [src]'s barrel with [tool], but nothing happens.") + to_chat(user, SPAN_NOTICE("You attempt to cut [src]'s barrel with [tool], but nothing happens.")) LOG_DEBUG("shotgun: attempt to saw-off shotgun with no saw-off behavior.") /obj/item/gun/projectile/shotgun/pump @@ -196,7 +198,7 @@ slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not. name = "sawn-off shotgun" desc = "Omar's coming!" - to_chat(user, "You shorten the barrel of \the [src]!") + to_chat(user, SPAN_WARNING("You shorten the barrel of \the [src]!")) /obj/item/gun/projectile/shotgun/doublebarrel/sawn name = "sawn-off shotgun" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 2600f074ffb..264dd5a05ab 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -51,14 +51,14 @@ if(bolt_open) playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) if(chambered) - to_chat(user, "You work the bolt open, ejecting [chambered]!") + to_chat(user, SPAN_NOTICE("You work the bolt open, ejecting [chambered]!")) chambered.forceMove(get_turf(src)) loaded -= chambered chambered = null else - to_chat(user, "You work the bolt open.") + to_chat(user, SPAN_NOTICE("You work the bolt open.")) else - to_chat(user, "You work the bolt closed.") + to_chat(user, SPAN_NOTICE("You work the bolt closed.")) playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1) bolt_open = 0 add_fingerprint(user) @@ -66,10 +66,10 @@ /obj/item/gun/projectile/heavysniper/special_check(mob/user) if(bolt_open) - to_chat(user, "You can't fire [src] while the bolt is open!") + to_chat(user, SPAN_WARNING("You can't fire [src] while the bolt is open!")) return 0 if(!wielded) - to_chat(user, "You can't fire without stabilizing the rifle!") + to_chat(user, SPAN_WARNING("You can't fire without stabilizing the rifle!")) return 0 return ..() @@ -95,7 +95,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/projectile/heavysniper/unathi name = "hegemony slugger" @@ -213,7 +213,7 @@ /obj/item/gun/projectile/dragunov/special_check(mob/user) if(!wielded) - to_chat(user, "You can't fire without stabilizing the rifle!") + to_chat(user, SPAN_WARNING("You can't fire without stabilizing the rifle!")) return 0 return ..() @@ -225,7 +225,7 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) /obj/item/gun/projectile/automatic/rifle/w556 name = "scout rifle" @@ -275,4 +275,4 @@ if(wielded) toggle_scope(2.0, usr) else - to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!")) diff --git a/code/modules/projectiles/modular/laser_base.dm b/code/modules/projectiles/modular/laser_base.dm index 787d24aa3c9..55c52f42837 100644 --- a/code/modules/projectiles/modular/laser_base.dm +++ b/code/modules/projectiles/modular/laser_base.dm @@ -21,11 +21,11 @@ /obj/item/laser_components/attackby(obj/item/attacking_item, mob/user) if(!istype(attacking_item, repair_item)) return ..() - to_chat(user, "You begin repairing \the [src].") + to_chat(user, SPAN_WARNING("You begin repairing \the [src].")) if(do_after(user, 20) && repair_module(attacking_item)) - to_chat(user, "You repair \the [src].") + to_chat(user, SPAN_NOTICE("You repair \the [src].")) else - to_chat(user, "You fail to repair \the [src].") + to_chat(user, SPAN_WARNING("You fail to repair \the [src].")) /obj/item/laser_components/proc/repair_module(var/obj/item/D) return 1 @@ -48,7 +48,7 @@ . = ..() if(distance <= 1) if(malus > base_malus) - . += "\The [src] appears damaged." + . += SPAN_WARNING("\The [src] appears damaged.") /obj/item/laser_components/modifier/degrade(var/increment = 1) if(increment) @@ -88,7 +88,7 @@ /obj/item/laser_components/capacitor/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(distance <= 1 && condition > 0) - . += "\The [src] appears damaged." + . += SPAN_WARNING("\The [src] appears damaged.") /obj/item/laser_components/capacitor/proc/small_fail(var/mob/user, var/obj/item/gun/energy/laser/prototype/prototype) return @@ -121,7 +121,7 @@ /obj/item/laser_components/focusing_lens/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(distance <= 1 && condition > 0) - . += "\The [src] appears damaged." + . += SPAN_WARNING("\The [src] appears damaged.") /obj/item/laser_components/modulator name = "laser modulator" @@ -196,7 +196,7 @@ else return ..() - to_chat(user, "You insert \the [A] into the assembly.") + to_chat(user, SPAN_NOTICE("You insert \the [A] into the assembly.")) update_icon() if(check_completion()) success = 2 // meaning complete diff --git a/code/modules/projectiles/modular/laser_components.dm b/code/modules/projectiles/modular/laser_components.dm index c464ea133ab..91a7eaa83d7 100644 --- a/code/modules/projectiles/modular/laser_components.dm +++ b/code/modules/projectiles/modular/laser_components.dm @@ -47,20 +47,20 @@ /obj/item/laser_components/capacitor/nuclear/small_fail(var/mob/user, var/obj/item/gun/energy/laser/prototype/prototype) for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it if (M != user) - to_chat(M, "You feel a warm sensation.") + to_chat(M, SPAN_WARNING("You feel a warm sensation.")) M.apply_effect(rand(1,10)*(prototype.criticality+1), DAMAGE_RADIATION) return /obj/item/laser_components/capacitor/nuclear/medium_fail(var/mob/user, var/obj/item/gun/energy/laser/prototype/prototype) for (var/mob/living/M in range(round((prototype.criticality+1)),src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it if (M != user) - to_chat(M, "You feel a warm sensation.") + to_chat(M, SPAN_WARNING("You feel a warm sensation.")) M.apply_effect(rand(1,40)*(prototype.criticality+1), DAMAGE_RADIATION) return /obj/item/laser_components/capacitor/nuclear/critical_fail(var/mob/user, var/obj/item/gun/energy/laser/prototype/prototype) for (var/mob/living/M in range(rand(2,6)*(prototype.criticality+1),src)) - to_chat(M, "You feel a wave of heat wash over you.") + to_chat(M, SPAN_WARNING("You feel a wave of heat wash over you.")) M.apply_effect(300*(prototype.criticality+1), DAMAGE_RADIATION) ..() @@ -96,7 +96,7 @@ /obj/item/laser_components/capacitor/phoron/small_fail(var/mob/user, var/obj/item/gun/energy/laser/prototype/prototype) for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it if (M != user) - to_chat(M, "You feel a warm sensation.") + to_chat(M, SPAN_WARNING("You feel a warm sensation.")) M.apply_effect(rand(1,10)*(prototype.criticality+1), DAMAGE_RADIATION) return diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 335cd165953..54f27ee9a83 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -16,7 +16,7 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh w_class = ITEMSIZE_TINY attack_verb = list("poked") var/emagged = FALSE - var/fail_message = "INVALID USER." + var/fail_message = SPAN_WARNING("INVALID USER.") var/selfdestruct = 0 // Explode when user check is failed. var/force_replace = 0 // Can forcefully replace other pins. var/pin_replaceable = 0 // Can be replaced by any pin. @@ -56,7 +56,7 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh /obj/item/device/firing_pin/emag_act() if(!emagged) emagged = TRUE - to_chat(get_holding_mob(src), "You override the authentication mechanism.") + to_chat(get_holding_mob(src), SPAN_NOTICE("You override the authentication mechanism.")) /obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G) gun = G @@ -76,8 +76,8 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh /obj/item/device/firing_pin/proc/auth_fail(mob/living/carbon/human/user) to_chat(user, fail_message) if(selfdestruct)//sound stolen from the lawgiver. todo, remove this from the lawgiver. there can only be one. - user.show_message("SELF-DESTRUCTING... ", 1) - visible_message("\The [gun] explodes!") + user.show_message(SPAN_DANGER("SELF-DESTRUCTING... "), 1) + visible_message(SPAN_DANGER("\The [gun] explodes!")) playsound(user, 'sound/weapons/lawgiver_idfail.ogg', 40, 1) var/obj/item/organ/external/E = user.organs_by_name[user.hand ? BP_L_HAND : BP_R_HAND] E.droplimb(0,DROPLIMB_BLUNT) @@ -93,7 +93,7 @@ Pins Below. /obj/item/device/firing_pin/test_range name = "test-range firing pin" desc = "This safety firing pin allows weapons to be fired within proximity to a firing range." - fail_message = "TEST RANGE CHECK FAILED." + fail_message = SPAN_WARNING("TEST RANGE CHECK FAILED.") pin_replaceable = 1 durable = TRUE origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2) @@ -109,7 +109,7 @@ Pins Below. /obj/item/device/firing_pin/psionic name = "psionics firing pin" desc = "This is a psionics-locked firing pin which only authorizes users who are capable of psionics." - fail_message = "PSIONICS CHECK FAILED." + fail_message = SPAN_WARNING("PSIONICS CHECK FAILED.") /obj/item/device/firing_pin/psionic/pin_auth(mob/living/user) if(user.has_psionics()) @@ -121,7 +121,7 @@ Pins Below. /obj/item/device/firing_pin/implant name = "implant-keyed firing pin" desc = "This is a implant-locked firing pin which only authorizes users who are implanted with a certain device." - fail_message = "IMPLANT CHECK FAILED." + fail_message = SPAN_WARNING("IMPLANT CHECK FAILED.") var/req_implant /obj/item/device/firing_pin/implant/pin_auth(mob/living/user) @@ -142,7 +142,7 @@ Pins Below. name = "hilarious firing pin" desc = "Advanced clowntech that can convert any firearm into a far more useful object." color = "#FFFF00" - fail_message = "HONK!" + fail_message = SPAN_WARNING("HONK!") force_replace = 1 /obj/item/device/firing_pin/clown/pin_auth(mob/living/user) @@ -155,7 +155,7 @@ Pins Below. name = "DNA-keyed firing pin" desc = "This is a DNA-locked firing pin which only authorizes one user. Attempt to fire once to DNA-link." icon_state = "firing_pin_dna" - fail_message = "DNA CHECK FAILED." + fail_message = SPAN_WARNING("DNA CHECK FAILED.") var/unique_enzymes = null /obj/item/device/firing_pin/dna/afterattack(atom/target, mob/user, proximity_flag) @@ -164,7 +164,7 @@ Pins Below. var/mob/living/carbon/M = target if(M.dna && M.dna.unique_enzymes) unique_enzymes = M.dna.unique_enzymes - to_chat(user, "DNA-LOCK SET.") + to_chat(user, SPAN_NOTICE("DNA-LOCK SET.")) /obj/item/device/firing_pin/dna/pin_auth(mob/living/carbon/user) if(istype(user) && user.dna && user.dna.unique_enzymes) @@ -177,7 +177,7 @@ Pins Below. if(!unique_enzymes) if(istype(user) && user.dna && user.dna.unique_enzymes) unique_enzymes = user.dna.unique_enzymes - to_chat(user, "DNA-LOCK SET.") + to_chat(user, SPAN_NOTICE("DNA-LOCK SET.")) else ..() @@ -190,7 +190,7 @@ Pins Below. /obj/item/device/firing_pin/tag name = "laser tag firing pin" desc = "A recreational firing pin, used in laser tag units to ensure users have their vests on." - fail_message = "SUIT CHECK FAILED." + fail_message = SPAN_WARNING("SUIT CHECK FAILED.") var/tag_color = "" /obj/item/device/firing_pin/tag/pin_auth(mob/living/user) @@ -221,7 +221,7 @@ Pins Below. /obj/item/device/firing_pin/access name = "access-keyed firing pin" desc = "This access locked firing pin allows weapons to be fired only when the user has the required access." - fail_message = "ACCESS CHECK FAILED." + fail_message = SPAN_WARNING("ACCESS CHECK FAILED.") req_access = list(ACCESS_WEAPONS) /obj/item/device/firing_pin/access/pin_auth(mob/living/user) @@ -230,7 +230,7 @@ Pins Below. /obj/item/device/firing_pin/away_site name = "away site firing pin" desc = "This access locked firing pin allows weapons to be fired only when the user is not on-ship." - fail_message = "USER ON SHIP LEVEL." + fail_message = SPAN_WARNING("USER ON SHIP LEVEL.") /obj/item/device/firing_pin/away_site/pin_auth(mob/living/user) var/turf/T = get_turf(src) @@ -241,7 +241,7 @@ var/list/wireless_firing_pins = list() //A list of all initialized wireless firi /obj/item/device/firing_pin/wireless name = "wireless-control firing pin" desc = "This firing pin is wirelessly controlled. On automatic mode it allow allows weapons to be fired on stun unless the alert level is elevated. Otherwise, it can be controlled from a firearm control console." - fail_message = "The wireless-control firing pin clicks!" + fail_message = SPAN_WARNING("The wireless-control firing pin clicks!") var/registered_user = null var/lock_status = WIRELESS_PIN_AUTOMATIC diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 45eeb4baa39..0a6678b28e4 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -214,7 +214,7 @@ if(PROJECTILE_FORCE_MISS) if(!point_blank) if(!suppressed) - target_mob.visible_message("\The [src] misses [target_mob] narrowly!") + target_mob.visible_message(SPAN_NOTICE("\The [src] misses [target_mob] narrowly!")) playsound(target_mob, /singleton/sound_category/bulletflyby_sound, 50, 1) return FALSE if(PROJECTILE_DODGED) @@ -225,9 +225,10 @@ var/impacted_organ = target_mob.get_organ_name_from_zone(def_zone) //hit messages if(suppressed) - to_chat(target_mob, "You've been hit in the [impacted_organ] by \a [src]!") + to_chat(target_mob, SPAN_DANGER("You've been hit in the [impacted_organ] by \a [src]!")) else - target_mob.visible_message("\The [target_mob] is hit by \a [src] in the [impacted_organ]!", "You are hit by \a [src] in the [impacted_organ]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter + target_mob.visible_message(SPAN_DANGER("\The [target_mob] is hit by \a [src] in the [impacted_organ]!"), + SPAN_DANGER("You are hit by \a [src] in the [impacted_organ]!"))//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter var/no_clients = FALSE //admin logs diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 470ca5c09cd..408bf498513 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -287,7 +287,7 @@ distance = 0 if(distance <= range) if (M.mob_size <= 3 && (M.find_type() & TYPE_ORGANIC)) - M.visible_message("\The [M] gets fried!") + M.visible_message(SPAN_DANGER("\The [M] gets fried!")) M.color = "#4d4d4d" //get fried M.death() spark(M, 3, GLOB.alldirs) @@ -302,7 +302,7 @@ if(A.mob_size <= 3 && (A.find_type() & TYPE_ORGANIC)) H.release_mob() - A.visible_message("\The [A] gets fried!") + A.visible_message(SPAN_DANGER("\The [A] gets fried!")) A.color = "#4d4d4d" //get fried A.death() @@ -330,7 +330,7 @@ distance = 0 if(distance <= range) if(M.mob_size <= 4 && (M.find_type() & TYPE_ORGANIC)) - M.visible_message("[M] bursts like a balloon!") + M.visible_message(SPAN_DANGER("[M] bursts like a balloon!")) M.gib() spark(M, 3, GLOB.alldirs) else if(iscarbon(M) && M.contents.len) @@ -344,7 +344,7 @@ if(A.mob_size <= 4 && (A.find_type() & TYPE_ORGANIC)) H.release_mob() - A.visible_message("[A] bursts like a balloon!") + A.visible_message(SPAN_DANGER("[A] bursts like a balloon!")) A.gib() to_chat(M, 'sound/effects/basscannon.ogg') diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 05da6d366be..6113aa13bc4 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -57,7 +57,7 @@ if(prob(chance)) if(A.opacity) //display a message so that people on the other side aren't so confused - A.visible_message("\The [src] pierces through \the [A]!") + A.visible_message(SPAN_WARNING("\The [src] pierces through \the [A]!")) return 1 return 0 diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 9b3202b2022..c18c057ecb2 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -88,10 +88,10 @@ else new_mob.key = M.key - to_chat(new_mob, "Your form morphs into that of \a [lowertext(randomize)].") + to_chat(new_mob, SPAN_WARNING("Your form morphs into that of \a [lowertext(randomize)].")) qdel(M) return else - to_chat(M, "Your form morphs into that of \a [lowertext(randomize)].") + to_chat(M, SPAN_WARNING("Your form morphs into that of \a [lowertext(randomize)].")) return diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 5cf0c402d32..17fd1aa6528 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -30,7 +30,7 @@ //snap pop playsound(src, 'sound/effects/snap.ogg', 50, 1) - src.visible_message("\The [src] explodes in a bright flash!") + src.visible_message(SPAN_WARNING("\The [src] explodes in a bright flash!")) new /obj/effect/decal/cleanable/ash(src.loc) //always use src.loc so that ash doesn't end up inside windows single_spark(T) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 9914a87744f..c658758c784 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -19,14 +19,15 @@ playsound(src.loc, 'sound/magic/LightningShock.ogg', 25, 1) s.surge_left -= 0.5 if(s.surge_left) - H.visible_message("[H] was not affected by EMP pulse.", "Warning: EMP detected, integrated surge prevention module activated. There are [s.surge_left] preventions left.") + H.visible_message(SPAN_WARNING("[H] was not affected by EMP pulse."), + SPAN_WARNING("Warning: EMP detected, integrated surge prevention module activated. There are [s.surge_left] preventions left.")) else s.broken = 1 s.icon_state = "surge_ipc_broken" - to_chat(H, "Warning: EMP detected, integrated surge prevention module activated. The surge prevention module is fried, replacement recommended.") + to_chat(H, SPAN_WARNING("Warning: EMP detected, integrated surge prevention module activated. The surge prevention module is fried, replacement recommended.")) return else - to_chat(src, "Warning: EMP detected, integrated surge prevention module is fried and unable to protect from EMP. Replacement recommended.") + to_chat(src, SPAN_DANGER("Warning: EMP detected, integrated surge prevention module is fried and unable to protect from EMP. Replacement recommended.")) if (isrobot(A)) var/mob/living/silicon/robot/R = A var/datum/robot_component/surge/C = R.components["surge"] @@ -34,15 +35,16 @@ if(C.surge_left >= 0.5) playsound(src.loc, 'sound/magic/LightningShock.ogg', 25, 1) C.surge_left -= 0.5 - R.visible_message("[R] was not affected by EMP pulse.", "Warning: Power surge detected, source - EMP. Surge prevention module re-routed surge to prevent damage to vital electronics.") + R.visible_message(SPAN_WARNING("[R] was not affected by EMP pulse."), + SPAN_WARNING("Warning: Power surge detected, source - EMP. Surge prevention module re-routed surge to prevent damage to vital electronics.")) if(C.surge_left) - to_chat(R, "Surge module has [C.surge_left] preventions left!") + to_chat(R, SPAN_NOTICE("Surge module has [C.surge_left] preventions left!")) else C.destroy() - to_chat(R, "Module is entirely fried, replacement is recommended.") + to_chat(R, SPAN_DANGER("Module is entirely fried, replacement is recommended.")) return else - to_chat(src, "Warning: Power surge detected, source - EMP. Surge prevention module is depleted and requires replacement") + to_chat(src, SPAN_NOTICE("Warning: Power surge detected, source - EMP. Surge prevention module is depleted and requires replacement")) R.emp_act(EMP_LIGHT) // Borgs emp_act is 1-2 else @@ -157,7 +159,7 @@ H.apply_damage(rand(30,80), DAMAGE_RADIATION, damage_flags = DAMAGE_FLAG_DISPERSED) M.Weaken(5) for (var/mob/V in viewers(src)) - V.show_message("[M] writhes in pain as [M.get_pronoun("his")] vacuoles boil.", 3, "You hear the crunching of leaves.", 2) + V.show_message(SPAN_WARNING("[M] writhes in pain as [M.get_pronoun("his")] vacuoles boil."), 3, SPAN_WARNING("You hear the crunching of leaves."), 2) if(prob(35)) if(prob(80)) randmutb(M) @@ -167,9 +169,9 @@ domutcheck(M,null) else M.adjustFireLoss(rand(5,15)) - M.show_message("The radiation beam singes you!") + M.show_message(SPAN_WARNING("The radiation beam singes you!")) else if(iscarbon(target)) - M.show_message("The radiation beam dissipates harmlessly through your body.") + M.show_message(SPAN_NOTICE("The radiation beam dissipates harmlessly through your body.")) else return 1 @@ -188,7 +190,7 @@ if((H.species.flags & IS_PLANT) && (M.nutrition < 500)) M.adjustNutritionLoss(-30) else if (istype(target, /mob/living/carbon/)) - M.show_message("The radiation beam dissipates harmlessly through your body.") + M.show_message(SPAN_NOTICE("The radiation beam dissipates harmlessly through your body.")) else return 1 diff --git a/code/modules/psionics/complexus/complexus_helpers.dm b/code/modules/psionics/complexus/complexus_helpers.dm index f635f483254..8180a386806 100644 --- a/code/modules/psionics/complexus/complexus_helpers.dm +++ b/code/modules/psionics/complexus/complexus_helpers.dm @@ -2,7 +2,7 @@ var/old_stun = stun stun = max(stun, amount) if(amount && !old_stun) - to_chat(owner, "Your concentration has been shattered! You cannot focus your psi power!") + to_chat(owner, SPAN_DANGER("Your concentration has been shattered! You cannot focus your psi power!")) ui.update_icon() /datum/psi_complexus/proc/get_armor(var/armortype) @@ -66,7 +66,7 @@ return FALSE sound_to(owner, sound('sound/effects/psi/power_feedback.ogg')) - to_chat(owner, "Wild energistic feedback blasts across your psyche!") + to_chat(owner, SPAN_DANGER("Wild energistic feedback blasts across your psyche!")) stunned(value * 2) set_cooldown(value * 100) diff --git a/code/modules/psionics/events/mini_spasm.dm b/code/modules/psionics/events/mini_spasm.dm index fb3bfd0715e..66654b4b5de 100644 --- a/code/modules/psionics/events/mini_spasm.dm +++ b/code/modules/psionics/events/mini_spasm.dm @@ -39,7 +39,7 @@ playsound(source, 'sound/effects/narsie.ogg', 75) //LOUD AS FUCK BOY if(!ishuman(victim)) - to_chat(victim, "An annoying buzz passes through your head.") + to_chat(victim, SPAN_NOTICE("An annoying buzz passes through your head.")) return if(victim.psi) diff --git a/code/modules/psionics/events/psi_wail.dm b/code/modules/psionics/events/psi_wail.dm index 2efbb0acfb6..f17aea0a8a2 100644 --- a/code/modules/psionics/events/psi_wail.dm +++ b/code/modules/psionics/events/psi_wail.dm @@ -15,4 +15,4 @@ psi.stamina = max(0, psi.stamina - rand(1,3)) annoyed = TRUE if(annoyed && prob(1)) - to_chat(psi.owner, "[pick(whine_messages)]") + to_chat(psi.owner, SPAN_NOTICE("[pick(whine_messages)]")) diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm index 22ed74d1596..c8835ac66d5 100644 --- a/code/modules/random_map/drop/droppod_doors.dm +++ b/code/modules/random_map/drop/droppod_doors.dm @@ -25,7 +25,7 @@ /obj/structure/droppod_door/attack_hand(var/mob/user) if(deploying || deployed) return - to_chat(user, "You prime the explosive bolts. Better get clear!") + to_chat(user, SPAN_DANGER("You prime the explosive bolts. Better get clear!")) sleep(30) deploy() @@ -56,7 +56,7 @@ return deployed = 1 - visible_message("The explosive bolts on \the [src] detonate, throwing it open!") + visible_message(SPAN_DANGER("The explosive bolts on \the [src] detonate, throwing it open!")) playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5) // This is shit but it will do for the sake of testing. diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index a8142a1e788..086e960dd72 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -26,13 +26,13 @@ deep_count++ // Sanity check. if(surface_count < MIN_SURFACE_COUNT) - admin_notice("Insufficient surface minerals. Rerolling...", R_DEBUG) + admin_notice(SPAN_DANGER("Insufficient surface minerals. Rerolling..."), R_DEBUG) return 0 else if(rare_count < MIN_RARE_COUNT) - admin_notice("Insufficient rare minerals. Rerolling...", R_DEBUG) + admin_notice(SPAN_DANGER("Insufficient rare minerals. Rerolling..."), R_DEBUG) return 0 else if(deep_count < MIN_DEEP_COUNT) - admin_notice("Insufficient deep minerals. Rerolling...", R_DEBUG) + admin_notice(SPAN_DANGER("Insufficient deep minerals. Rerolling..."), R_DEBUG) return 0 else return 1 diff --git a/code/modules/random_map/random_map.dm b/code/modules/random_map/random_map.dm index 5c4c1cecc2c..db35b78b8fd 100644 --- a/code/modules/random_map/random_map.dm +++ b/code/modules/random_map/random_map.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_EMPTY(map_count) set_map_size() var/start_time = world.timeofday - if(!do_not_announce) admin_notice("Generating [name].", R_DEBUG) + if(!do_not_announce) admin_notice(SPAN_DANGER("Generating [name]."), R_DEBUG) CHECK_TICK // Testing needed to see how reliable this is (asynchronous calls, called during worldgen), DM ref is not optimistic @@ -73,9 +73,9 @@ GLOBAL_LIST_EMPTY(map_count) for(var/i = 0;i |