diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index dc017d51878..7188ce30ff5 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -9,8 +9,8 @@ var/scan_desc = "generic brain trauma" //description when detected by a health scanner var/mob/living/carbon/owner //the poor bastard var/obj/item/organ/internal/brain/brain //the poor bastard's brain - var/gain_text = "You feel traumatized." - var/lose_text = "You no longer feel traumatized." + var/gain_text = span_notice("You feel traumatized.") + var/lose_text = span_notice("You no longer feel traumatized.") var/can_gain = TRUE var/random_gain = TRUE //can this be gained through random traumas? var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure? diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index 8c1bbd5a3c4..5978148e5cd 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -3,7 +3,7 @@ desc = "Patient has a subtype of delusional disorder, becoming irrationally attached to someone." scan_desc = "psychotic schizophrenic delusions" gain_text = "If you see this message, make a github issue report. The trauma initialized wrong." - lose_text = "The voices in your head fall silent." + lose_text = span_warning("The voices in your head fall silent.") can_gain = TRUE random_gain = FALSE resilience = TRAUMA_RESILIENCE_LOBOTOMY @@ -25,7 +25,7 @@ lose_text = "" qdel(src) return - gain_text = "You hear a sickening, raspy voice in your head. It wants one small task of you..." + gain_text = span_warning("You hear a sickening, raspy voice in your head. It wants one small task of you...") owner.mind.add_antag_datum(/datum/antagonist/obsessed) antagonist = owner.mind.has_antag_datum(/datum/antagonist/obsessed) antagonist.trauma = src diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index 4951b974414..e1b3c4095ed 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -25,14 +25,16 @@ /datum/brain_trauma/hypnosis/on_gain() message_admins("[ADMIN_LOOKUPFLW(owner)] was hypnotized with the phrase '[hypnotic_phrase]'.") owner.log_message("was hypnotized with the phrase '[hypnotic_phrase]'.", LOG_GAME) - to_chat(owner, "[hypnotic_phrase]") - to_chat(owner, "[pick("You feel your thoughts focusing on this phrase... you can't seem to get it out of your head.",\ - "Your head hurts, but this is all you can think of. It must be vitally important.",\ - "You feel a part of your mind repeating this over and over. You need to follow these words.",\ - "Something about this sounds... right, for some reason. You feel like you should follow these words.",\ - "These words keep echoing in your mind. You find yourself completely fascinated by them.")]") - to_chat(owner, "You've been hypnotized by this sentence. You must follow these words. If it isn't a clear order, you can freely interpret how to do so,\ - as long as you act like the words are your highest priority.") + to_chat(owner, span_reallybig(span_hypnophrase("[hypnotic_phrase]"))) + to_chat(owner, span_notice("[pick(list( + "Something about this sounds... right, for some reason. You feel like you should follow these words.", + "These words keep echoing in your mind. You find yourself completely fascinated by them.", + "You feel a part of your mind repeating this over and over. You need to follow these words.", + "You feel your thoughts focusing on this phrase... you can't seem to get it out of your head.", + "Your head hurts, but this is all you can think of. It must be vitally important.", + ))]")) + to_chat(owner, span_boldwarning("You've been hypnotized by this sentence. You must follow these words. \ + If it isn't a clear order, you can freely interpret how to do so, as long as you act like the words are your highest priority.")) var/atom/movable/screen/alert/hypnosis/hypno_alert = owner.throw_alert(ALERT_HYPNOSIS, /atom/movable/screen/alert/hypnosis) owner.mind.add_antag_datum(/datum/antagonist/hypnotized) antagonist = owner.mind.has_antag_datum(/datum/antagonist/hypnotized) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 3d2af7012b9..f8bf0476095 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -2,8 +2,8 @@ name = "Imaginary Friend" desc = "Patient can see and hear an imaginary person." scan_desc = "partial schizophrenia" - gain_text = "You feel in good company, for some reason." - lose_text = "You feel lonely again." + gain_text = span_notice("You feel in good company, for some reason.") + lose_text = span_warning("You feel lonely again.") var/mob/camera/imaginary_friend/friend var/friend_initialized = FALSE @@ -236,15 +236,15 @@ log_talk(message, LOG_SAY, tag="imaginary friend", forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE]) var/quoted_message = say_quote(say_emphasis(message), spans, message_mods) - var/rendered = "[span_name("[name]")] [quoted_message]" - var/dead_rendered = "[span_name("[name] (Imaginary friend of [owner])")] [quoted_message]" + var/rendered = "[span_name("[name]")] [quoted_message]" + var/dead_rendered = "[span_name("[name] (Imaginary friend of [owner])")] [quoted_message]" var/language = message_language || owner.language_holder.get_selected_language() Hear(rendered, src, language, message, null, spans, message_mods) // We always hear what we say var/group = owner.imaginary_group - src // The people in our group don't, so we have to exclude ourselves not to hear twice for(var/mob/person in group) if(eavesdrop_range && get_dist(src, person) > 1 + eavesdrop_range) - var/new_rendered = "[span_name("[name]")] [say_quote(say_emphasis(eavesdropped_message), spans, message_mods)]" + var/new_rendered = "[span_name("[name]")] [say_quote(say_emphasis(eavesdropped_message), spans, message_mods)]" person.Hear(new_rendered, src, language, eavesdropped_message, null, spans, message_mods) else person.Hear(rendered, src, language, message, null, spans, message_mods) @@ -303,8 +303,8 @@ return TRUE var/mob/camera/imaginary_friend/friend = user - var/dchatmsg = "[friend] (Imaginary friend of [friend.owner]) [msg]" - message = "[user] [msg]" + var/dchatmsg = "[span_bold("[friend] (Imaginary friend of [friend.owner])")] [msg]" + message = "[span_name("[user]")] [msg]" var/user_turf = get_turf(user) if (user.client) @@ -312,7 +312,7 @@ if(!ghost.client || isnewplayer(ghost)) continue if(ghost.client.prefs.chat_toggles & CHAT_GHOSTSIGHT && !(ghost in viewers(user_turf, null))) - ghost.show_message("[FOLLOW_LINK(ghost, user)] [dchatmsg]") + ghost.show_message("[FOLLOW_LINK(ghost, user)] [dchatmsg]") for(var/mob/person in friend.owner.imaginary_group) to_chat(person, message) @@ -513,7 +513,7 @@ desc = "The previous host of this body." /mob/camera/imaginary_friend/trapped/greet() - to_chat(src, span_notice("You have managed to hold on as a figment of the new host's imagination!")) + to_chat(src, span_notice(span_bold("You have managed to hold on as a figment of the new host's imagination!"))) to_chat(src, span_notice("All hope is lost for you, but at least you may interact with your host. You do not have to be loyal to them.")) to_chat(src, span_notice("You cannot directly influence the world around you, but you can see what the host cannot.")) diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm index 31d02b408ac..002c2cf8009 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -9,8 +9,8 @@ name = "Lumiphobia" desc = "Patient has an inexplicable adverse reaction to light." scan_desc = "light hypersensitivity" - gain_text = "You feel a craving for darkness." - lose_text = "Light no longer bothers you." + gain_text = span_warning("You feel a craving for darkness.") + lose_text = span_notice("Light no longer bothers you.") /// Cooldown to prevent warning spam COOLDOWN_DECLARE(damage_warning_cooldown) var/next_damage_warning = 0 @@ -33,8 +33,8 @@ name = "Poltergeist" desc = "Patient appears to be targeted by a violent invisible entity." scan_desc = "paranormal activity" - gain_text = "You feel a hateful presence close to you." - lose_text = "You feel the hateful presence fade away." + gain_text = span_warning("You feel a hateful presence close to you.") + lose_text = span_notice("You feel the hateful presence fade away.") /datum/brain_trauma/magic/poltergeist/on_life(delta_time, times_fired) ..() @@ -56,8 +56,8 @@ name = "Athaumasia" desc = "Patient is completely inert to magical forces." scan_desc = "thaumic blank" - gain_text = "You realize that magic cannot be real." - lose_text = "You realize that magic might be real." + gain_text = span_notice("You realize that magic cannot be real.") + lose_text = span_notice("You realize that magic might be real.") /datum/brain_trauma/magic/antimagic/on_gain() ADD_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT) @@ -71,8 +71,8 @@ name = "Stalking Phantom" desc = "Patient is stalked by a phantom only they can see." scan_desc = "extra-sensory paranoia" - gain_text = "You feel like something wants to kill you..." - lose_text = "You no longer feel eyes on your back." + gain_text = span_warning("You feel like something wants to kill you...") + lose_text = span_notice("You no longer feel eyes on your back.") var/obj/effect/client_image_holder/stalker_phantom/stalker var/close_stalker = FALSE //For heartbeat diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 6a8287ed941..c828881be25 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -27,8 +27,8 @@ name = "Stuttering" desc = "Patient can't speak properly." scan_desc = "reduced mouth coordination" - gain_text = "Speaking clearly is getting harder." - lose_text = "You feel in control of your speech." + gain_text = span_warning("Speaking clearly is getting harder.") + lose_text = span_notice("You feel in control of your speech.") /datum/brain_trauma/mild/stuttering/on_life(delta_time, times_fired) owner.adjust_stutter_up_to(5 SECONDS * delta_time, 50 SECONDS) @@ -41,8 +41,8 @@ name = "Dumbness" desc = "Patient has reduced brain activity, making them less intelligent." scan_desc = "reduced brain activity" - gain_text = "You feel dumber." - lose_text = "You feel smart again." + gain_text = span_warning("You feel dumber.") + lose_text = span_notice("You feel smart again.") /datum/brain_trauma/mild/dumbness/on_gain() ADD_TRAIT(owner, TRAIT_DUMB, TRAUMA_TRAIT) @@ -66,8 +66,8 @@ name = "Speech Impediment" desc = "Patient is unable to form coherent sentences." scan_desc = "communication disorder" - gain_text = "You can't seem to form any coherent thoughts!" - lose_text = "Your mind feels more clear." + gain_text = span_danger("You can't seem to form any coherent thoughts!") + lose_text = span_danger("Your mind feels more clear.") /datum/brain_trauma/mild/speech_impediment/on_gain() ADD_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT) @@ -81,8 +81,8 @@ name = "Concussion" desc = "Patient's brain is concussed." scan_desc = "concussion" - gain_text = "Your head hurts!" - lose_text = "The pressure inside your head starts fading." + gain_text = span_warning("Your head hurts!") + lose_text = span_notice("The pressure inside your head starts fading.") /datum/brain_trauma/mild/concussion/on_life(delta_time, times_fired) if(DT_PROB(2.5, delta_time)) @@ -109,8 +109,8 @@ name = "Anosognosia" desc = "Patient always feels healthy, regardless of their condition." scan_desc = "self-awareness deficit" - gain_text = "You feel great!" - lose_text = "You no longer feel perfectly healthy." + gain_text = span_notice("You feel great!") + lose_text = span_warning("You no longer feel perfectly healthy.") /datum/brain_trauma/mild/healthy/on_gain() owner.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) @@ -127,8 +127,8 @@ name = "Muscle Weakness" desc = "Patient experiences occasional bouts of muscle weakness." scan_desc = "weak motor nerve signal" - gain_text = "Your muscles feel oddly faint." - lose_text = "You feel in control of your muscles again." + gain_text = span_warning("Your muscles feel oddly faint.") + lose_text = span_notice("You feel in control of your muscles again.") /datum/brain_trauma/mild/muscle_weakness/on_life(delta_time, times_fired) var/fall_chance = 1 @@ -154,8 +154,8 @@ name = "Muscle Spasms" desc = "Patient has occasional muscle spasms, causing them to move unintentionally." scan_desc = "nervous fits" - gain_text = "Your muscles feel oddly faint." - lose_text = "You feel in control of your muscles again." + gain_text = span_warning("Your muscles feel oddly faint.") + lose_text = span_notice("You feel in control of your muscles again.") /datum/brain_trauma/mild/muscle_spasms/on_gain() owner.apply_status_effect(/datum/status_effect/spasms) @@ -169,8 +169,8 @@ name = "Nervous Cough" desc = "Patient feels a constant need to cough." scan_desc = "nervous cough" - gain_text = "Your throat itches incessantly..." - lose_text = "Your throat stops itching." + gain_text = span_warning("Your throat itches incessantly...") + lose_text = span_notice("Your throat stops itching.") /datum/brain_trauma/mild/nervous_cough/on_life(delta_time, times_fired) if(DT_PROB(6, delta_time) && !HAS_TRAIT(owner, TRAIT_SOOTHED_THROAT)) @@ -187,8 +187,8 @@ name = "Expressive Aphasia" desc = "Patient is affected by partial loss of speech leading to a reduced vocabulary." scan_desc = "inability to form complex sentences" - gain_text = "You lose your grasp on complex words." - lose_text = "You feel your vocabulary returning to normal again." + gain_text = span_warning("You lose your grasp on complex words.") + lose_text = span_notice("You feel your vocabulary returning to normal again.") var/static/list/common_words = world.file2list("strings/1000_most_common.txt") @@ -231,8 +231,8 @@ name = "Mind Echo" desc = "Patient's language neurons do not terminate properly, causing previous speech patterns to occasionally resurface spontaneously." scan_desc = "looping neural pattern" - gain_text = "You feel a faint echo of your thoughts..." - lose_text = "The faint echo fades away." + gain_text = span_warning("You feel a faint echo of your thoughts...") + lose_text = span_notice("The faint echo fades away.") var/list/hear_dejavu = list() var/list/speak_dejavu = list() diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 59833ed2c87..4746989c9e1 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -2,8 +2,8 @@ name = "Phobia" desc = "Patient is unreasonably afraid of something." scan_desc = "phobia" - gain_text = "You start finding default values very unnerving..." - lose_text = "You no longer feel afraid of default values." + gain_text = span_warning("You start finding default values very unnerving...") + lose_text = span_notice("You no longer feel afraid of default values.") var/phobia_type /// Cooldown for proximity checks so we don't spam a range 7 view every two seconds. COOLDOWN_DECLARE(check_cooldown) @@ -24,8 +24,8 @@ if(!phobia_type) phobia_type = pick(GLOB.phobia_types) - gain_text = "You start finding [phobia_type] very unnerving..." - lose_text = "You no longer feel afraid of [phobia_type]." + gain_text = span_warning("You start finding [phobia_type] very unnerving...") + lose_text = span_notice("You no longer feel afraid of [phobia_type].") scan_desc += " of [phobia_type]" trigger_regex = GLOB.phobia_regexes[phobia_type] trigger_mobs = GLOB.phobia_mobs[phobia_type] diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 8beb4eac513..75099a99f8a 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -9,8 +9,8 @@ name = "Mutism" desc = "Patient is completely unable to speak." scan_desc = "extensive damage to the brain's speech center" - gain_text = "You forget how to speak!" - lose_text = "You suddenly remember how to speak." + gain_text = span_warning("You forget how to speak!") + lose_text = span_notice("You suddenly remember how to speak.") /datum/brain_trauma/severe/mute/on_gain() ADD_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT) @@ -24,8 +24,8 @@ name = "Aphasia" desc = "Patient is unable to speak or understand any language." scan_desc = "extensive damage to the brain's language center" - gain_text = "You have trouble forming words in your head..." - lose_text = "You suddenly remember how languages work." + gain_text = span_warning("You have trouble forming words in your head...") + lose_text = span_notice("You suddenly remember how languages work.") /datum/brain_trauma/severe/aphasia/on_gain() owner.add_blocked_language(subtypesof(/datum/language/) - /datum/language/aphasia, LANGUAGE_APHASIA) @@ -41,8 +41,8 @@ name = "Cerebral Blindness" desc = "Patient's brain is no longer connected to its eyes." scan_desc = "extensive damage to the brain's occipital lobe" - gain_text = "You can't see!" - lose_text = "Your vision returns." + gain_text = span_warning("You can't see!") + lose_text = span_notice("Your vision returns.") /datum/brain_trauma/severe/blindness/on_gain() owner.become_blind(TRAUMA_TRAIT) @@ -97,8 +97,8 @@ subject = "your left leg" paralysis_traits = list(TRAIT_PARALYSIS_L_LEG) - gain_text = "You can't feel [subject] anymore!" - lose_text = "You can feel [subject] again!" + gain_text = span_warning("You can't feel [subject] anymore!") + lose_text = span_notice("You can feel [subject] again!") /datum/brain_trauma/severe/paralysis/on_gain() ..() @@ -148,7 +148,7 @@ desc = "Patient feels sick and distressed when not around other people, leading to potentially lethal levels of stress." scan_desc = "monophobia" gain_text = "" - lose_text = "You feel like you could be safe on your own." + lose_text = span_notice("You feel like you could be safe on your own.") var/stress = 0 /datum/brain_trauma/severe/monophobia/on_gain() @@ -229,8 +229,8 @@ name = "Discoordination" desc = "Patient is unable to use complex tools or machinery." scan_desc = "extreme discoordination" - gain_text = "You can barely control your hands!" - lose_text = "You feel in control of your hands again." + gain_text = span_warning("You can barely control your hands!") + lose_text = span_notice("You feel in control of your hands again.") /datum/brain_trauma/severe/discoordination/on_gain() . = ..() @@ -244,8 +244,8 @@ name = "Traumatic Non-Violence" desc = "Patient is extremely unwilling to harm others in violent ways." scan_desc = "pacific syndrome" - gain_text = "You feel oddly peaceful." - lose_text = "You no longer feel compelled to not harm." + gain_text = span_notice("You feel oddly peaceful.") + lose_text = span_notice("You no longer feel compelled to not harm.") /datum/brain_trauma/severe/pacifism/on_gain() ADD_TRAIT(owner, TRAIT_PACIFISM, TRAUMA_TRAIT) @@ -259,8 +259,8 @@ name = "Hypnotic Stupor" desc = "Patient is prone to episodes of extreme stupor that leaves them extremely suggestible." scan_desc = "oneiric feedback loop" - gain_text = "You feel somewhat dazed." - lose_text = "You feel like a fog was lifted from your mind." + gain_text = span_warning("You feel somewhat dazed.") + lose_text = span_notice("You feel like a fog was lifted from your mind.") /datum/brain_trauma/severe/hypnotic_stupor/on_lose() //hypnosis must be cleared separately, but brain surgery should get rid of both anyway ..() @@ -275,8 +275,8 @@ name = "Hypnotic Trigger" desc = "Patient has a trigger phrase set in their subconscious that will trigger a suggestible trance-like state." scan_desc = "oneiric feedback loop" - gain_text = "You feel odd, like you just forgot something important." - lose_text = "You feel like a weight was lifted from your mind." + gain_text = span_warning("You feel odd, like you just forgot something important.") + lose_text = span_notice("You feel like a weight was lifted from your mind.") random_gain = FALSE var/trigger_phrase = "Nanotrasen" @@ -307,8 +307,8 @@ name = "Dyslexia" desc = "Patient is unable to read or write." scan_desc = "dyslexia" - gain_text = "You have trouble reading or writing..." - lose_text = "Your suddenly remember how to read and write." + gain_text = span_warning("You have trouble reading or writing...") + lose_text = span_notice("You suddenly remember how to read and write.") /datum/brain_trauma/severe/dyslexia/on_gain() ADD_TRAIT(owner, TRAIT_ILLITERATE, TRAUMA_TRAIT) diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index 1c832e27163..9f3d83964e7 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -7,8 +7,8 @@ name = "Godwoken Syndrome" desc = "Patient occasionally and uncontrollably channels an eldritch god when speaking." scan_desc = "god delusion" - gain_text = "You feel a higher power inside your mind..." - lose_text = "The divine presence leaves your head, no longer interested." + gain_text = span_notice("You feel a higher power inside your mind...") + lose_text = span_warning("The divine presence leaves your head, no longer interested.") /datum/brain_trauma/special/godwoken/on_life(delta_time, times_fired) ..() @@ -51,8 +51,8 @@ name = "Bluespace Prophecy" desc = "Patient can sense the bob and weave of bluespace around them, showing them passageways no one else can see." scan_desc = "bluespace attunement" - gain_text = "You feel the bluespace pulsing around you..." - lose_text = "The faint pulsing of bluespace fades into silence." + gain_text = span_notice("You feel the bluespace pulsing around you...") + lose_text = span_warning("The faint pulsing of bluespace fades into silence.") /// Cooldown so we can't teleport literally everywhere on a whim COOLDOWN_DECLARE(portal_cooldown) @@ -152,8 +152,8 @@ name = "Quantum Alignment" desc = "Patient is prone to frequent spontaneous quantum entanglement, against all odds, causing spatial anomalies." scan_desc = "quantum alignment" - gain_text = "You feel faintly connected to everything around you..." - lose_text = "You no longer feel connected to your surroundings." + gain_text = span_notice("You feel faintly connected to everything around you...") + lose_text = span_warning("You no longer feel connected to your surroundings.") var/atom/linked_target = null var/linked = FALSE var/returning = FALSE @@ -235,8 +235,8 @@ name = "Violent Psychosis" desc = "Patient fights in unpredictable ways, ranging from helping his target to hitting them with brutal strength." scan_desc = "violent psychosis" - gain_text = "You feel unhinged..." - lose_text = "You feel more balanced." + gain_text = span_warning("You feel unhinged...") + lose_text = span_notice("You feel more balanced.") var/datum/martial_art/psychotic_brawling/psychotic_brawling /datum/brain_trauma/special/psychotic_brawling/on_gain() @@ -258,8 +258,8 @@ name = "Tenacity" desc = "Patient is psychologically unaffected by pain and injuries, and can remain standing far longer than a normal person." scan_desc = "traumatic neuropathy" - gain_text = "You suddenly stop feeling pain." - lose_text = "You realize you can feel pain again." + gain_text = span_warning("You suddenly stop feeling pain.") + lose_text = span_warning("You realize you can feel pain again.") /datum/brain_trauma/special/tenacity/on_gain() ADD_TRAIT(owner, TRAIT_NOSOFTCRIT, TRAUMA_TRAIT) @@ -275,8 +275,8 @@ name = "Functional Cerebral Necrosis" desc = "Patient's brain is stuck in a functional near-death state, causing occasional moments of lucid hallucinations, which are often interpreted as the voices of the dead." scan_desc = "chronic functional necrosis" - gain_text = "You feel dead inside." - lose_text = "You feel alive again." + gain_text = span_warning("You feel dead inside.") + lose_text = span_notice("You feel alive again.") var/active = FALSE /datum/brain_trauma/special/death_whispers/on_life() @@ -302,8 +302,8 @@ name = "Existential Crisis" desc = "Patient's hold on reality becomes faint, causing occasional bouts of non-existence." scan_desc = "existential crisis" - gain_text = "You feel less real." - lose_text = "You feel more substantial again." + gain_text = span_warning("You feel less real.") + lose_text = span_notice("You feel more substantial again.") var/obj/effect/abstract/sync_holder/veil/veil /// A cooldown to prevent constantly erratic dolphining through the fabric of reality COOLDOWN_DECLARE(crisis_cooldown) @@ -324,13 +324,14 @@ return var/duration = rand(5 SECONDS, 45 SECONDS) veil = new(owner.drop_location()) - to_chat(owner, "[pick("You stop thinking for a moment. Therefore you are not.",\ - "To be or not to be...",\ - "Why exist?",\ - "You stop keeping it real.",\ - "Your grip on existence slips.",\ - "Do you even exist?",\ - "You simply fade away.")]") + to_chat(owner, span_warning("[pick(list( + "Do you even exist?", + "To be or not to be...", + "Why exist?", + "You simply fade away.", + "You stop keeping it real.", + "You stop thinking for a moment. Therefore you are not.", + ))]")) owner.forceMove(veil) COOLDOWN_START(src, crisis_cooldown, 1 MINUTES) addtimer(CALLBACK(src, PROC_REF(fade_in)), duration) @@ -349,8 +350,8 @@ name = "Criminal" desc = "Patient seems to be a criminal." scan_desc = "criminal mind" - gain_text = "Justice is coming for you." - lose_text = "You were absolved for your crimes." + gain_text = span_warning("Justice is coming for you.") + lose_text = span_notice("You were absolved for your crimes.") random_gain = FALSE /// A ref to our fake beepsky image that we chase the owner with var/obj/effect/client_image_holder/securitron/beepsky @@ -419,6 +420,6 @@ forceMove(get_step_towards(src, victim)) if(prob(5)) var/beepskys_cry = "Level 10 infraction alert!" - to_chat(victim, "[name] exclaims, \"[beepskys_cry]\"") + to_chat(victim, "[span_name("[name]")] exclaims, \"[span_robot("[beepskys_cry]")]") if(victim.client?.prefs.read_preference(/datum/preference/toggle/enable_runechat)) victim.create_chat_message(src, raw_message = beepskys_cry, spans = list("robotic")) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 03e83627912..df3991dae0d 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -5,8 +5,8 @@ name = "Split Personality" desc = "Patient's brain is split into two personalities, which randomly switch control of the body." scan_desc = "complete lobe separation" - gain_text = "You feel like your mind was split in two." - lose_text = "You feel alone again." + gain_text = span_warning("You feel like your mind was split in two.") + lose_text = span_notice("You feel alone again.") var/current_controller = OWNER var/initialized = FALSE //to prevent personalities deleting themselves while we wait for ghosts var/mob/living/split_personality/stranger_backseat //there's two so they can swap without overwriting @@ -177,7 +177,7 @@ desc = "Patient's brain is split into two personalities, which randomly switch control of the body." scan_desc = "complete lobe separation" gain_text = "" - lose_text = "You are free of your brainwashing." + lose_text = span_notice("You are free of your brainwashing.") can_gain = FALSE var/codeword var/objective diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index c83bcd001fe..83a9cbd8f1b 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -53,7 +53,7 @@ stage_speed = 0 transmittable = 1 level = 6 - passive_message = "You miss the feeling of starlight on your skin." + passive_message = span_notice("You miss the feeling of starlight on your skin.") var/nearspace_penalty = 0.3 threshold_descs = list( "Stage Speed 6" = "Increases healing speed.", @@ -271,7 +271,7 @@ stage_speed = -2 transmittable = -1 level = 6 - passive_message = "You feel tingling on your skin as light passes over it." + passive_message = span_notice("You feel tingling on your skin as light passes over it.") threshold_descs = list( "Stage Speed 7" = "Doubles healing speed.", //SKYRAT EDIT: Brings Noc regen into line with the rest of the healing symptoms. ) @@ -327,7 +327,7 @@ stage_speed = -3 transmittable = -2 level = 8 - passive_message = "The pain from your wounds makes you feel oddly sleepy..." + passive_message = span_notice("The pain from your wounds makes you feel oddly sleepy...") var/deathgasp = FALSE var/stabilize = FALSE var/active_coma = FALSE //to prevent multiple coma procs @@ -425,7 +425,7 @@ stage_speed = 0 transmittable = 1 level = 6 - passive_message = "Your skin feels oddly dry..." + passive_message = span_notice("Your skin feels oddly dry...") var/absorption_coeff = 1 threshold_descs = list( "Resistance 5" = "Water is consumed at a much slower rate.", @@ -497,7 +497,7 @@ stage_speed = -2 transmittable = -2 level = 8 - passive_message = "You feel an odd attraction to plasma." + passive_message = span_notice("You feel an odd attraction to plasma.") var/temp_rate = 1 threshold_descs = list( "Transmission 6" = "Increases temperature adjustment rate.", @@ -518,10 +518,10 @@ . = ..() if(!.) return FALSE - + if(advanced_disease.stage >= 4) ADD_TRAIT(advanced_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT) - else + else REMOVE_TRAIT(advanced_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT) return TRUE @@ -529,7 +529,7 @@ . = ..() if(!.) return - + REMOVE_TRAIT(advanced_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT) // Check internals breath, environmental plasma, and plasma in bloodstream to determine the heal power @@ -553,7 +553,7 @@ if(tank_contents.gases[/datum/gas/plasma]) // higher tank distribution pressure leads to more healing, but once you get to about 15kpa you reach the max . += power * min(MAX_HEAL_COEFFICIENT_INTERNALS, internals_tank.distribute_pressure * HEALING_PER_BREATH_PRESSURE) - // Check environment + // Check environment if(diseased_mob.loc) environment = diseased_mob.loc.return_air() if(environment) @@ -610,7 +610,7 @@ level = 6 symptom_delay_min = 1 symptom_delay_max = 1 - passive_message = "Your skin glows faintly for a moment." + passive_message = span_notice("Your skin glows faintly for a moment.") var/cellular_damage = FALSE threshold_descs = list( "Transmission 6" = "Additionally heals cellular damage.", diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 4d6d0031e06..41f2a76787e 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -119,9 +119,13 @@ stage1 = list() stage2 = list() stage3 = list() - stage4 = list("Your back hurts.", "You breathe through your mouth.", - "You have a craving for bananas.", "Your mind feels clouded.") - stage5 = list("You feel like monkeying around.") + stage4 = list( + span_warning("You breathe through your mouth."), + span_warning("You have a craving for bananas."), + span_warning("Your back hurts."), + span_warning("Your mind feels clouded."), + ) + stage5 = list(span_warning("You feel like monkeying around.")) /datum/disease/transformation/jungle_flu/do_disease_transformation(mob/living/carbon/affected_mob) affected_mob.monkeyize() @@ -134,14 +138,14 @@ switch(stage) if(2) if(DT_PROB(1, delta_time)) - to_chat(affected_mob, span_notice("Your [pick("back", "arm", "leg", "elbow", "head")] itches.")) + to_chat(affected_mob, span_notice("Your [pick("arm", "back", "elbow", "head", "leg")] itches.")) if(3) if(DT_PROB(2, delta_time)) to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.adjust_confusion(10 SECONDS) if(4) if(DT_PROB(1.5, delta_time)) - affected_mob.say(pick("Eeek, ook ook!", "Eee-eeek!", "Eeee!", "Ungh, ungh."), forced = "jungle fever") + affected_mob.say(pick("Eeee!", "Eeek, ook ook!", "Eee-eeek!", "Ungh, ungh."), forced = "jungle fever") /datum/disease/transformation/robot @@ -154,10 +158,14 @@ severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE stage1 = list() - stage2 = list("Your joints feel stiff.", "Beep...boop..") - stage3 = list("Your joints feel very stiff.", "Your skin feels loose.", "You can feel something move...inside.") - stage4 = list("Your skin feels very loose.", "You can feel... something...inside you.") - stage5 = list("Your skin feels as if it's about to burst off!") + stage2 = list(span_danger("Beep...boop.."), "Your joints feel stiff.") + stage3 = list( + span_danger("You can feel something move...inside."), + span_danger("Your joints feel very stiff."), + span_warning("Your skin feels loose."), + ) + stage4 = list(span_danger("You can feel... something...inside you."), span_danger("Your skin feels very loose."),) + stage5 = list(span_danger("Your skin feels as if it's about to burst off!")) new_form = /mob/living/silicon/robot infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC bantype = JOB_CYBORG @@ -171,13 +179,13 @@ switch(stage) if(3) if (DT_PROB(4, delta_time)) - affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"), forced = "robotic transformation") + affected_mob.say(pick("beep, beep!", "Beep, boop", "Boop...bop"), forced = "robotic transformation") if (DT_PROB(2, delta_time)) to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.Unconscious(40) if(4) if (DT_PROB(10, delta_time)) - affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."), forced = "robotic transformation") + affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "I wwwaaannntt tttoo dddiiieeee...", "kkkiiiill mmme"), forced = "robotic transformation") /datum/disease/transformation/xeno @@ -191,10 +199,18 @@ severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE stage1 = list() - stage2 = list("Your throat feels scratchy.", "Kill...") - stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.") - stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") - stage5 = list("Your skin feels as if it's about to burst off!") + stage2 = list("Your throat feels scratchy.", span_danger("Kill...")) + stage3 = list( + span_danger("You can feel something move...inside."), + span_danger("Your throat feels very scratchy."), + span_warning("Your skin feels tight."), + ) + stage4 = list( + span_danger("You can feel... something...inside you."), + span_danger("Your blood boils!"), + span_danger("Your skin feels very tight."), + ) + stage5 = list(span_danger("Your skin feels as if it's about to burst off!")) new_form = /mob/living/carbon/alien/adult/hunter bantype = ROLE_ALIEN @@ -211,7 +227,7 @@ affected_mob.Unconscious(40) if(4) if(DT_PROB(10, delta_time)) - affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"), forced = "xenomorph transformation") + affected_mob.say(pick("Going to... devour you...", "Hsssshhhhh!", "You look delicious."), forced = "xenomorph transformation") /datum/disease/transformation/slime @@ -225,9 +241,9 @@ visibility_flags = NONE stage1 = list("You don't feel very well.") stage2 = list("Your skin feels a little slimy.") - stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") - stage4 = list("You are turning into a slime.") - stage5 = list("You have become a slime.") + stage3 = list(span_danger("Your appendages are melting away."), span_danger("Your limbs begin to lose their shape.")) + stage4 = list(span_danger("You are turning into a slime.")) + stage5 = list(span_danger("You have become a slime.")) new_form = /mob/living/simple_animal/slime @@ -265,9 +281,9 @@ visibility_flags = NONE stage1 = list("BARK.") stage2 = list("You feel the need to wear silly hats.") - stage3 = list("Must... eat... chocolate....", "YAP") - stage4 = list("Visions of washing machines assail your mind!") - stage5 = list("AUUUUUU!!!") + stage3 = list(span_danger("Must... eat... chocolate...."), span_danger("YAP")) + stage4 = list(span_danger("Visions of washing machines assail your mind!")) + stage5 = list(span_danger("AUUUUUU!!!")) new_form = /mob/living/basic/pet/dog/corgi @@ -278,10 +294,10 @@ switch(stage) if(3) if (DT_PROB(4, delta_time)) - affected_mob.say(pick("YAP", "Woof!"), forced = "corgi transformation") + affected_mob.say(pick("Woof!", "YAP"), forced = "corgi transformation") if(4) if (DT_PROB(10, delta_time)) - affected_mob.say(pick("Bark!", "AUUUUUU"), forced = "corgi transformation") + affected_mob.say(pick("AUUUUUU", "Bark!"), forced = "corgi transformation") /datum/disease/transformation/morph @@ -295,9 +311,9 @@ visibility_flags = NONE stage1 = list("Your stomach rumbles.") stage2 = list("Your skin feels saggy.") - stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") - stage4 = list("You're ravenous.") - stage5 = list("You have become a morph.") + stage3 = list(span_danger("Your appendages are melting away."), span_danger("Your limbs begin to lose their shape.")) + stage4 = list(span_danger("You're ravenous.")) + stage5 = list(span_danger("You have become a morph.")) new_form = /mob/living/simple_animal/hostile/morph infectable_biotypes = MOB_ORGANIC|MOB_MINERAL|MOB_UNDEAD //magic! transformed_antag_datum = /datum/antagonist/morph @@ -314,9 +330,13 @@ visibility_flags = NONE stage1 = list("You seem a little lighter in your step.") stage2 = list("You catch yourself smiling for no reason.") - stage3 = list("A cruel sense of calm overcomes you.", "You can't feel your arms!", "You let go of the urge to hurt clowns.") - stage4 = list("You can't feel your arms. It does not bother you anymore.", "You forgive the clown for hurting you.") - stage5 = list("You have become a Gondola.") + stage3 = list( + span_danger("A cruel sense of calm overcomes you."), + span_danger("You can't feel your arms!"), + span_danger("You let go of the urge to hurt clowns."), + ) + stage4 = list(span_danger("You can't feel your arms. It does not bother you anymore."), span_danger("You forgive the clown for hurting you.")) + stage5 = list(span_danger("You have become a Gondola.")) new_form = /mob/living/simple_animal/pet/gondola