cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 15:15:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/_modifiers/changeling.dm
+1 -1
View File
@@ -47,7 +47,7 @@
desc = "Our eyes are capable of seeing into the infrared spectrum to accurately identify prey through walls."
vision_flags = SEE_MOBS
on_expired_text = "<span class='alien'>Your sight returns to what it once was.</span>"
on_expired_text = span_alien("Your sight returns to what it once was.")
stacks = MODIFIER_STACK_EXTEND
/datum/modifier/changeling/thermal_sight/check_if_valid()
code/modules/mob/_modifiers/cloning.dm
+10 -10
View File
@@ -7,8 +7,8 @@
name = "cloning sickness"
desc = "You feel rather weak, having been cloned not so long ago."
on_created_text = "<span class='warning'><font size='3'>You feel really weak.</font></span>"
on_expired_text = "<span class='notice'><font size='3'>You feel your strength returning to you.</font></span>"
on_created_text = span_warning("<font size='3'>You feel really weak.</font>")
on_expired_text = span_notice("<font size='3'>You feel your strength returning to you.</font>")
max_health_percent = 0.6 // -40% max health.
incoming_damage_percent = 1.1 // 10% more incoming damage.
@@ -31,8 +31,8 @@
desc = "For whatever reason, you cannot be cloned."
//WIP, but these may never be seen anyway, so *shrug
on_created_text = "<span class='warning'>Life suddenly feels more precious.</span>"
on_expired_text = "<span class='notice'>Death is cheap again.</span>"
on_created_text = span_warning("Life suddenly feels more precious.")
on_expired_text = span_notice("Death is cheap again.")
flags = MODIFIER_GENETIC
@@ -52,8 +52,8 @@
name = "reformation sickness"
desc = "Your core feels damaged, as you were reformed with the improper machinery."
on_created_text = "<span class='warning'><font size='3'>Your core aches.</font></span>"
on_expired_text = "<span class='notice'><font size='3'>You feel your core's strength returning to normal.</font></span>"
on_created_text = span_warning("<font size='3'>Your core aches.</font>")
on_expired_text = span_notice("<font size='3'>You feel your core's strength returning to normal.</font>")
incoming_damage_percent = 1 //Level the incoming damage from the parent modifier. They already take 200% burn.
incoming_brute_damage_percent = 1.5 //150% incoming brute damage. Decreases the effectiveness of their 0.75 modifier.
@@ -70,8 +70,8 @@
name = "surgically attached brain"
desc = "You feel weak, as your central nervous system is still recovering from being repaired."
on_created_text = "<span class='warning'><font size='3'>You feel... off, and your head hurts.</font></span>"
on_expired_text = "<span class='notice'><font size='3'>You feel some strength returning to you.</font></span>"
on_created_text = span_warning("<font size='3'>You feel... off, and your head hurts.</font>")
on_expired_text = span_notice("<font size='3'>You feel some strength returning to you.</font>")
max_health_percent = 0.9 // -10% max health.
incoming_damage_percent = 1.1 // 10% more incoming damage.
@@ -107,8 +107,8 @@
name = "neural recovery"
desc = "You feel out of touch, as your central nervous system is still recovering from being repaired."
on_created_text = "<span class='warning'><font size='3'>You feel... off. Everything is fuzzy.</font></span>"
on_expired_text = "<span class='notice'><font size='3'>You feel your senses returning to you.</font></span>"
on_created_text = span_warning("<font size='3'>You feel... off. Everything is fuzzy.</font>")
on_expired_text = span_notice("<font size='3'>You feel your senses returning to you.</font>")
incoming_hal_damage_percent = 1.5 // 50% more halloss damage.
disable_duration_percent = 1.25 // Stuns last 25% longer.
code/modules/mob/_modifiers/crusher_mark.dm
+3 -3
View File
@@ -2,8 +2,8 @@
name = "destabilized"
desc = "You've been struck by a destabilizing bolt. By all accounts, this is probably a bad thing."
stacks = MODIFIER_STACK_EXTEND
on_created_text = "<span class='warning'>You feel physically unstable.</span>"
on_expired_text = "<span class='notice'>You feel physically stable again.</span>"
on_created_text = span_warning("You feel physically unstable.")
on_expired_text = span_notice("You feel physically stable again.")
var/mutable_appearance/marked_underlay
var/obj/item/kinetic_crusher/hammer_synced
@@ -35,4 +35,4 @@
/datum/modifier/crusher_mark/on_expire()
holder.underlays -= marked_underlay //if this is being called, we should have a holder at this point.
..()
..()
code/modules/mob/_modifiers/feysight.dm
+4 -4
View File
@@ -3,8 +3,8 @@
desc = "You are filled with an inner peace, and widened sight."
client_color = "#42e6ca"
on_created_text = "<span class='alien'>You feel an inner peace as your mind's eye expands!</span>"
on_expired_text = "<span class='notice'>Your sight returns to what it once was.</span>"
on_created_text = span_alien("You feel an inner peace as your mind's eye expands!")
on_expired_text = span_notice("Your sight returns to what it once was.")
stacks = MODIFIER_STACK_EXTEND
accuracy = -15
@@ -20,7 +20,7 @@
/datum/modifier/feysight/can_apply(var/mob/living/L)
if(L.stat)
to_chat(L, "<span class='warning'>You can't be unconscious or dead to experience tranquility.</span>")
to_chat(L, span_warning("You can't be unconscious or dead to experience tranquility."))
return FALSE
if(!L.is_sentient())
@@ -29,7 +29,7 @@
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species.name == "Diona")
to_chat(L, "<span class='warning'>You feel strange for a moment, but it passes.</span>")
to_chat(L, span_warning("You feel strange for a moment, but it passes."))
return FALSE // Happy trees aren't affected by tranquility.
return ..()
code/modules/mob/_modifiers/fire.dm
+2 -2
View File
@@ -5,8 +5,8 @@
desc = "You are on fire! You will be harmed until the fire goes out or you extinguish it with water."
mob_overlay_state = "on_fire"
on_created_text = "<span class='danger'>You burst into flames!</span>"
on_expired_text = "<span class='warning'>The fire starts to fade.</span>"
on_created_text = span_danger("You burst into flames!")
on_expired_text = span_warning("The fire starts to fade.")
stacks = MODIFIER_STACK_ALLOWED // Multiple instances will hurt a lot.
var/damage_per_tick = 5
code/modules/mob/_modifiers/medical.dm
+8 -8
View File
@@ -7,8 +7,8 @@
name = "external blood pumping"
desc = "Your blood flows thanks to the wonderful power of science."
on_created_text = "<span class='notice'>You feel alive.</span>"
on_expired_text = "<span class='notice'>You feel.. less alive.</span>"
on_created_text = span_notice("You feel alive.")
on_expired_text = span_notice("You feel.. less alive.")
stacks = MODIFIER_STACK_EXTEND
pulse_set_level = PULSE_NORM
@@ -22,8 +22,8 @@
name = "forced blood pumping"
desc = "Your blood flows thanks to the wonderful power of science."
on_created_text = "<span class='notice'>You feel alive.</span>"
on_expired_text = "<span class='notice'>You feel.. less alive.</span>"
on_created_text = span_notice("You feel alive.")
on_expired_text = span_notice("You feel.. less alive.")
stacks = MODIFIER_STACK_EXTEND
pulse_set_level = PULSE_SLOW
@@ -42,8 +42,8 @@
desc = "Your body begins to freeze."
mob_overlay_state = "chilled"
on_created_text = "<span class='danger'>You feel like you're going to freeze! It's hard to move.</span>"
on_expired_text = "<span class='warning'>You feel somewhat warmer and more mobile now.</span>"
on_created_text = span_danger("You feel like you're going to freeze! It's hard to move.")
on_expired_text = span_warning("You feel somewhat warmer and more mobile now.")
stacks = MODIFIER_STACK_ALLOWED
slowdown = 0.1
@@ -55,8 +55,8 @@
name = "clone stabilized"
desc = "Your body's regeneration is highly restricted."
on_created_text = "<span class='danger'>You feel nauseous.</span>"
on_expired_text = "<span class='warning'>You feel healthier.</span>"
on_created_text = span_danger("You feel nauseous.")
on_expired_text = span_warning("You feel healthier.")
stacks = MODIFIER_STACK_EXTEND
incoming_healing_percent = 0.1
code/modules/mob/_modifiers/modifiers_misc.dm
+44 -44
View File
@@ -46,8 +46,8 @@ the artifact triggers the rage.
client_color = "#FF5555" // Make everything red!
mob_overlay_state = "berserk"
on_created_text = "<span class='critical'>You feel an intense and overwhelming rage overtake you as you go berserk!</span>"
on_expired_text = "<span class='notice'>The blaze of rage inside you has ran out.</span>"
on_created_text = span_critical("You feel an intense and overwhelming rage overtake you as you go berserk!")
on_expired_text = span_notice("The blaze of rage inside you has ran out.")
stacks = MODIFIER_STACK_EXTEND
// The good stuff.
@@ -72,8 +72,8 @@ the artifact triggers the rage.
// For changelings.
/datum/modifier/berserk/changeling
on_created_text = "<span class='critical'>We feel an intense and overwhelming rage overtake us as we go berserk!</span>"
on_expired_text = "<span class='notice'>The blaze of rage inside us has ran out.</span>"
on_created_text = span_critical("We feel an intense and overwhelming rage overtake us as we go berserk!")
on_expired_text = span_notice("The blaze of rage inside us has ran out.")
// For changelings who bought the Recursive Enhancement evolution.
/datum/modifier/berserk/changeling/recursive
@@ -84,7 +84,7 @@ the artifact triggers the rage.
/datum/modifier/berserk/on_applied()
if(ishuman(holder)) // Most other mobs don't really use nutrition and can't get it back.
holder.adjust_nutrition(-nutrition_cost)
holder.visible_message("<span class='critical'>\The [holder] descends into an all consuming rage!</span>")
holder.visible_message(span_critical("\The [holder] descends into an all consuming rage!"))
// End all stuns.
holder.SetParalysis(0)
@@ -105,7 +105,7 @@ the artifact triggers the rage.
holder.add_modifier(/datum/modifier/berserk_exhaustion, exhaustion_duration)
if(prob(last_shock_stage))
to_chat(holder, "<span class='warning'>You pass out from the pain you were suppressing.</span>")
to_chat(holder, span_warning("You pass out from the pain you were suppressing."))
holder.Paralyse(5)
if(ishuman(holder))
@@ -115,7 +115,7 @@ the artifact triggers the rage.
/datum/modifier/berserk/can_apply(var/mob/living/L, var/suppress_failure = FALSE)
if(L.stat)
if(!suppress_failure)
to_chat(L, "<span class='warning'>You can't be unconscious or dead to berserk.</span>")
to_chat(L, span_warning("You can't be unconscious or dead to berserk."))
return FALSE // It would be weird to see a dead body get angry all of a sudden.
if(!L.is_sentient())
@@ -123,7 +123,7 @@ the artifact triggers the rage.
if(L.has_modifier_of_type(/datum/modifier/berserk_exhaustion))
if(!suppress_failure)
to_chat(L, "<span class='warning'>You recently berserked, and cannot do so again while exhausted.</span>")
to_chat(L, span_warning("You recently berserked, and cannot do so again while exhausted."))
return FALSE // On cooldown.
if(L.isSynthetic())
@@ -133,12 +133,12 @@ the artifact triggers the rage.
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species.name == "Diona")
to_chat(L, "<span class='warning'>You feel strange for a moment, but it passes.</span>")
to_chat(L, span_warning("You feel strange for a moment, but it passes."))
return FALSE // Happy trees aren't affected by blood rages.
if(L.nutrition < nutrition_cost)
if(!suppress_failure)
to_chat(L, "<span class='warning'>You are too hungry to berserk.</span>")
to_chat(L, span_warning("You are too hungry to berserk."))
return FALSE // Too hungry to enrage.
return ..()
@@ -153,8 +153,8 @@ the artifact triggers the rage.
name = "exhaustion"
desc = "You recently exerted yourself extremely hard, and need a rest."
on_created_text = "<span class='warning'>You feel extremely exhausted.</span>"
on_expired_text = "<span class='notice'>You feel less exhausted now.</span>"
on_created_text = span_warning("You feel extremely exhausted.")
on_expired_text = span_notice("You feel less exhausted now.")
stacks = MODIFIER_STACK_EXTEND
slowdown = 2
@@ -164,7 +164,7 @@ the artifact triggers the rage.
evasion = -30
/datum/modifier/berserk_exhaustion/on_applied()
holder.visible_message("<span class='warning'>\The [holder] looks exhausted.</span>")
holder.visible_message(span_warning("\The [holder] looks exhausted."))
// Synth version with no benefits due to a loss of focus inside a metal shell, which can't be pushed harder just be being mad.
@@ -177,7 +177,7 @@ the artifact triggers the rage.
on_created_text = "<span class='danger'>You feel an intense and overwhelming rage overtake you as you go berserk! \
Unfortunately, your lifeless body cannot benefit from this. You feel reckless...</span>"
on_expired_text = "<span class='notice'>The blaze of rage inside your mind has ran out.</span>"
on_expired_text = span_notice("The blaze of rage inside your mind has ran out.")
stacks = MODIFIER_STACK_EXTEND
// Just being mad isn't gonna overclock your body when you're a beepboop.
@@ -190,8 +190,8 @@ the artifact triggers the rage.
name = "sprinting"
desc = "You are filled with energy!"
on_created_text = "<span class='warning'>You feel a surge of energy!</span>"
on_expired_text = "<span class='notice'>The energy high dies out.</span>"
on_created_text = span_warning("You feel a surge of energy!")
on_expired_text = span_notice("The energy high dies out.")
stacks = MODIFIER_STACK_EXTEND
slowdown = -1
@@ -202,8 +202,8 @@ the artifact triggers the rage.
name = "melee surge"
desc = "You are filled with energy!"
on_created_text = "<span class='warning'>You feel a surge of energy!</span>"
on_expired_text = "<span class='notice'>The energy high dies out.</span>"
on_created_text = span_warning("You feel a surge of energy!")
on_expired_text = span_notice("The energy high dies out.")
stacks = MODIFIER_STACK_ALLOWED
attack_speed_percent = 0.8
@@ -216,8 +216,8 @@ the artifact triggers the rage.
name = "grievous wounds"
desc = "Your wounds are not easily mended."
on_created_text = "<span class='critical'>Your wounds pain you greatly.</span>"
on_expired_text = "<span class='notice'>The pain lulls.</span>"
on_created_text = span_critical("Your wounds pain you greatly.")
on_expired_text = span_notice("The pain lulls.")
stacks = MODIFIER_STACK_EXTEND
@@ -234,8 +234,8 @@ the artifact triggers the rage.
desc = "You feel yourself freezing up. Its hard to move."
mob_overlay_state = "chilled"
on_created_text = "<span class='danger'>You feel like you're going to freeze! It's hard to move.</span>"
on_expired_text = "<span class='warning'>You feel somewhat warmer and more mobile now.</span>"
on_created_text = span_danger("You feel like you're going to freeze! It's hard to move.")
on_expired_text = span_warning("You feel somewhat warmer and more mobile now.")
stacks = MODIFIER_STACK_EXTEND
slowdown = 2
@@ -252,8 +252,8 @@ the artifact triggers the rage.
desc = "You have poison inside of you. It will cause harm over a long span of time if not cured."
mob_overlay_state = "poisoned"
on_created_text = "<span class='warning'>You feel sick...</span>"
on_expired_text = "<span class='notice'>You feel a bit better.</span>"
on_created_text = span_warning("You feel sick...")
on_expired_text = span_notice("You feel a bit better.")
stacks = MODIFIER_STACK_ALLOWED // Multiple instances will hurt a lot.
var/damage_per_tick = 1
@@ -277,7 +277,7 @@ the artifact triggers the rage.
/datum/modifier/poisoned/paralysis
desc = "You have poison inside of you. It will cause harm over a long span of time if not cured, and may cause temporary paralysis."
on_created_text = "<span class='warning'>You feel incredibly weak...</span>"
on_created_text = span_warning("You feel incredibly weak...")
damage_per_tick = 0.75
/datum/modifier/poisoned/paralysis/tick()
@@ -294,8 +294,8 @@ the artifact triggers the rage.
name = "false pulse"
desc = "Your blood flows, despite all other factors."
on_created_text = "<span class='notice'>You feel alive.</span>"
on_expired_text = "<span class='notice'>You feel.. different.</span>"
on_created_text = span_notice("You feel alive.")
on_expired_text = span_notice("You feel.. different.")
stacks = MODIFIER_STACK_EXTEND
pulse_set_level = PULSE_NORM
@@ -304,8 +304,8 @@ the artifact triggers the rage.
name = "slow pulse"
desc = "Your blood flows slower."
on_created_text = "<span class='notice'>You feel sluggish.</span>"
on_expired_text = "<span class='notice'>You feel energized.</span>"
on_created_text = span_notice("You feel sluggish.")
on_expired_text = span_notice("You feel energized.")
stacks = MODIFIER_STACK_EXTEND
bleeding_rate_percent = 0.8
@@ -317,8 +317,8 @@ the artifact triggers the rage.
name = "temperature resistance"
desc = "Your body normalizes to room temperature."
on_created_text = "<span class='notice'>You feel comfortable.</span>"
on_expired_text = "<span class='notice'>You feel.. still probably comfortable.</span>"
on_created_text = span_notice("You feel comfortable.")
on_expired_text = span_notice("You feel.. still probably comfortable.")
stacks = MODIFIER_STACK_EXTEND
/datum/modifier/homeothermic/tick()
@@ -329,8 +329,8 @@ the artifact triggers the rage.
name = "heat resistance"
desc = "Your body lowers to room temperature."
on_created_text = "<span class='notice'>You feel comfortable.</span>"
on_expired_text = "<span class='notice'>You feel.. still probably comfortable.</span>"
on_created_text = span_notice("You feel comfortable.")
on_expired_text = span_notice("You feel.. still probably comfortable.")
stacks = MODIFIER_STACK_EXTEND
/datum/modifier/exothermic/tick()
@@ -342,8 +342,8 @@ the artifact triggers the rage.
name = "cold resistance"
desc = "Your body rises to room temperature."
on_created_text = "<span class='notice'>You feel comfortable.</span>"
on_expired_text = "<span class='notice'>You feel.. still probably comfortable.</span>"
on_created_text = span_notice("You feel comfortable.")
on_expired_text = span_notice("You feel.. still probably comfortable.")
stacks = MODIFIER_STACK_EXTEND
/datum/modifier/endothermic/tick()
@@ -357,8 +357,8 @@ the artifact triggers the rage.
desc = "You are covered in some form of faraday shielding. EMPs have no effect."
mob_overlay_state = "electricity"
on_created_text = "<span class='notice'>You feel a surge of energy, that fades to a calm tide.</span>"
on_expired_text = "<span class='warning'>You feel a longing for the flow of energy.</span>"
on_created_text = span_notice("You feel a surge of energy, that fades to a calm tide.")
on_expired_text = span_warning("You feel a longing for the flow of energy.")
stacks = MODIFIER_STACK_EXTEND
emp_modifier = 5
@@ -369,8 +369,8 @@ the artifact triggers the rage.
desc = "You are protected from explosions somehow."
mob_overlay_state = "electricity"
on_created_text = "<span class='notice'>You feel a surge of energy, that fades to a stalwart hum.</span>"
on_expired_text = "<span class='warning'>You feel a longing for the flow of energy.</span>"
on_created_text = span_notice("You feel a surge of energy, that fades to a stalwart hum.")
on_expired_text = span_warning("You feel a longing for the flow of energy.")
stacks = MODIFIER_STACK_EXTEND
explosion_modifier = 3
@@ -380,13 +380,13 @@ the artifact triggers the rage.
name = "Doomed"
desc = "You are doomed."
on_created_text = "<span class='notice'>You feel an overwhelming sense of dread.</span>"
on_expired_text = "<span class='warning'>You feel the life drain from your body.</span>"
on_created_text = span_notice("You feel an overwhelming sense of dread.")
on_expired_text = span_warning("You feel the life drain from your body.")
stacks = MODIFIER_STACK_EXTEND
/datum/modifier/doomed/on_expire()
if(holder.stat != DEAD)
holder.visible_message("<span class='alien'>\The [holder] collapses, the life draining from their body.</span>")
holder.visible_message(span_alien("\The [holder] collapses, the life draining from their body."))
holder.death()
/datum/modifier/outline_test
@@ -432,8 +432,8 @@ the artifact triggers the rage.
name = "entangled"
desc = "Its hard to move."
on_created_text = "<span class='danger'>You're caught in something! It's hard to move.</span>"
on_expired_text = "<span class='warning'>Your movement is freed.</span>"
on_created_text = span_danger("You're caught in something! It's hard to move.")
on_expired_text = span_warning("Your movement is freed.")
stacks = MODIFIER_STACK_EXTEND
slowdown = 2
code/modules/mob/_modifiers/modifiers_vr.dm
+7 -7
View File
@@ -50,8 +50,8 @@
name = "underwater stealth"
desc = "You are currently underwater, rendering it more difficult to see you and enabling you to move quicker, thanks to your aquatic nature."
on_created_text = "<span class='warning'>You sink under the water.</span>"
on_expired_text = "<span class='notice'>You come out from the water.</span>"
on_created_text = span_warning("You sink under the water.")
on_expired_text = span_notice("You come out from the water.")
stacks = MODIFIER_STACK_FORBID
@@ -92,8 +92,8 @@
name = "Shield Projection"
desc = "You are currently protected by a shield, rendering nigh impossible to hit you through conventional means."
on_created_text = "<span class='notice'>Your shield generator buzzes on.</span>"
on_expired_text = "<span class='warning'>Your shield generator buzzes off.</span>"
on_created_text = span_notice("Your shield generator buzzes on.")
on_expired_text = span_warning("Your shield generator buzzes off.")
stacks = MODIFIER_STACK_FORBID //No stacking shields. If you put one one your belt and backpack it won't work.
icon_override = 1
@@ -277,8 +277,8 @@
effective_clone_resistance = 1
/datum/modifier/shield_projection/admin // Adminbus.
on_created_text = "<span class='notice'>Your shield generator activates and you feel the power of the tesla buzzing around you.</span>"
on_expired_text = "<span class='warning'>Your shield generator deactivates, leaving you feeling weak and vulnerable.</span>"
on_created_text = span_notice("Your shield generator activates and you feel the power of the tesla buzzing around you.")
on_expired_text = span_warning("Your shield generator deactivates, leaving you feeling weak and vulnerable.")
siemens_coefficient = 0
disable_duration_percent = 0
min_damage_resistance = 0
@@ -332,4 +332,4 @@
max_hal_resistance = 0
min_hal_resistance = 0
effective_hal_resistance = 1
effective_hal_resistance = 1
code/modules/mob/_modifiers/traits.dm
+5 -5
View File
@@ -6,8 +6,8 @@
name = "flimsy"
desc = "You're more fragile than most, and have less of an ability to endure harm."
on_created_text = "<span class='warning'>You feel rather weak.</span>"
on_expired_text = "<span class='notice'>You feel your strength returning to you.</span>"
on_created_text = span_warning("You feel rather weak.")
on_expired_text = span_notice("You feel your strength returning to you.")
max_health_percent = 0.8
@@ -15,8 +15,8 @@
name = "frail"
desc = "Your body is very fragile, and has even less of an ability to endure harm."
on_created_text = "<span class='warning'>You feel really weak.</span>"
on_expired_text = "<span class='notice'>You feel your strength returning to you.</span>"
on_created_text = span_warning("You feel really weak.")
on_expired_text = span_notice("You feel your strength returning to you.")
max_health_percent = 0.6
@@ -162,4 +162,4 @@
desc = "You are fully colorblind. Your condition is rare, but you can see no colors at all."
client_color = MATRIX_Monochromia
wire_colors_replace = GREYSCALE_COLOR_REPLACE
wire_colors_replace = GREYSCALE_COLOR_REPLACE
code/modules/mob/_modifiers/traits_phobias.dm
+102 -103
View File
@@ -60,36 +60,36 @@
desc = "Seeing a bunch of blood isn't really pleasant for most people, but for you, it is very distressing."
fear_decay_rate = 4
on_created_text = "<span class='warning'>You are terrified of seeing blood.</span>"
on_expired_text = "<span class='notice'>You feel that blood doesn't bother you, at least, as much as it used to.</span>"
on_created_text = span_warning("You are terrified of seeing blood.")
on_expired_text = span_notice("You feel that blood doesn't bother you, at least, as much as it used to.")
zero_fear_up = list(
"<span class='warning'><font size='3'>You see some blood nearby...</font></span>",
"<span class='warning'><font size='3'>You try to avoid looking at the blood nearby.</font></span>"
span_warning("<font size='3'>You see some blood nearby...</font>"),
span_warning("<font size='3'>You try to avoid looking at the blood nearby.</font>")
)
zero_fear_down = list(
"<span class='notice'>You feel better now, with no blood in sight.</span>",
"<span class='notice'>At last, the blood is gone.</span>",
"<span class='notice'>Hopefully you won't see anymore blood today.</span>"
span_notice("You feel better now, with no blood in sight."),
span_notice("At last, the blood is gone."),
span_notice("Hopefully you won't see anymore blood today.")
)
half_fear_up = list(
"<span class='danger'><font size='3'>You're still near the blood!</font></span>",
"<span class='danger'><font size='3'>So much blood... You can't stand it.</font></span>"
span_danger("<font size='3'>You're still near the blood!</font>"),
span_danger("<font size='3'>So much blood... You can't stand it.</font>")
)
half_fear_down = list(
"<span class='warning'>The blood is gone now, but you're still worked up.</span>",
"<span class='warning'>You can't see the blood now, but you're still anxious.</span>"
span_warning("The blood is gone now, but you're still worked up."),
span_warning("You can't see the blood now, but you're still anxious.")
)
full_fear_up = list(
"<span class='danger'><font size='4'>The blood is too much!</font></span>",
"<span class='danger'><font size='4'>There is so much blood here, you need to leave!</font></span>",
"<span class='danger'><font size='4'>You gotta get away from the blood!</font></span>"
span_danger("<font size='4'>The blood is too much!</font>"),
span_danger("<font size='4'>There is so much blood here, you need to leave!</font>"),
span_danger("<font size='4'>You gotta get away from the blood!</font>")
)
full_fear_down = list(
"<span class='danger'>The blood is gone, but you're still very anxious.</span>",
"<span class='danger'>No more blood... Please.</span>"
span_danger("The blood is gone, but you're still very anxious."),
span_danger("No more blood... Please.")
)
/datum/modifier/trait/phobia/haemophobia/check_if_valid()
@@ -161,37 +161,37 @@
desc = "Spiders are quite creepy to most people, however for you, those chitters of pure evil inspire pure dread and fear."
fear_decay_rate = 1
on_created_text = "<span class='warning'>You are terrified of seeing spiders.</span>"
on_expired_text = "<span class='notice'>You feel that your fear of spiders has gone from 'crippling' to 'nope nope nope', which is still an improvement.</span>"
on_created_text = span_warning("You are terrified of seeing spiders.")
on_expired_text = span_notice("You feel that your fear of spiders has gone from 'crippling' to 'nope nope nope', which is still an improvement.")
zero_fear_up = list(
"<span class='warning'><font size='3'>You see a spider!</font></span>",
"<span class='warning'><font size='3'>Spider!</font></span>"
span_warning("<font size='3'>You see a spider!</font>"),
span_warning("<font size='3'>Spider!</font>")
)
zero_fear_down = list(
"<span class='notice'>Those evil spiders are finally gone.</span>",
"<span class='notice'>At last, the chitters are gone.</span>",
"<span class='notice'>The spiders are gone, at last.</span>"
span_notice("Those evil spiders are finally gone."),
span_notice("At last, the chitters are gone."),
span_notice("The spiders are gone, at last.")
)
half_fear_up = list(
"<span class='danger'><font size='3'>The spiders are gonna eat you!</font></span>",
"<span class='danger'><font size='3'>The spiders are still here!</font></span>",
"<span class='danger'><font size='3'>The spiders will lay eggs inside you if you don't run!</font></span>",
span_danger("<font size='3'>The spiders are gonna eat you!</font>"),
span_danger("<font size='3'>The spiders are still here!</font>"),
span_danger("<font size='3'>The spiders will lay eggs inside you if you don't run!</font>"),
)
half_fear_down = list(
"<span class='warning'>The spiders are gone... right?</span>",
"<span class='warning'>You can't see any spiders now, but you're still anxious.</span>"
span_warning("The spiders are gone... right?"),
span_warning("You can't see any spiders now, but you're still anxious.")
)
full_fear_up = list(
"<span class='danger'><font size='4'>The chittering is driving you mad!</font></span>",
"<span class='danger'><font size='4'>You're gonna be spider-food if you don't run!</font></span>",
"<span class='danger'><font size='4'>The spiders are gonna feast on your eyes!</font></span>"
span_danger("<font size='4'>The chittering is driving you mad!</font>"),
span_danger("<font size='4'>You're gonna be spider-food if you don't run!</font>"),
span_danger("<font size='4'>The spiders are gonna feast on your eyes!</font>")
)
full_fear_down = list(
"<span class='danger'>The spiders must surely be hiding somewhere...</span>",
"<span class='danger'>No more spiders... Please.</span>"
span_danger("The spiders must surely be hiding somewhere..."),
span_danger("No more spiders... Please.")
)
/datum/modifier/trait/phobia/arachnophobe/should_fear()
@@ -232,38 +232,38 @@
desc = "More commonly known as the fear of darkness. The shadows can hide many dangers, which makes the prospect of going into the depths of Maintenance rather worrisome."
fear_decay_rate = 5
on_created_text = "<span class='warning'>You are terrified of the dark.</span>"
on_expired_text = "<span class='notice'>You feel that darkness isn't quite as scary anymore.</span>"
on_created_text = span_warning("You are terrified of the dark.")
on_expired_text = span_notice("You feel that darkness isn't quite as scary anymore.")
var/fear_threshold = 0.5 // Average lighting needs to be below this to start increasing fear.
zero_fear_up = list(
"<span class='warning'><font size='3'>It's so dark here!</font></span>",
"<span class='warning'><font size='3'>It's too dark!</font></span>"
span_warning("<font size='3'>It's so dark here!</font>"),
span_warning("<font size='3'>It's too dark!</font>")
)
zero_fear_down = list(
"<span class='notice'>You feel calmer, now that you're in the light.</span>",
"<span class='notice'>At last, no more darkness.</span>",
"<span class='notice'>The light makes you feel calmer.</span>"
span_notice("You feel calmer, now that you're in the light."),
span_notice("At last, no more darkness."),
span_notice("The light makes you feel calmer.")
)
half_fear_up = list(
"<span class='danger'><font size='3'>You need to escape this darkness!</font></span>",
"<span class='danger'><font size='3'>Something might be lurking near you, but you can't see in this darkness.</font></span>",
"<span class='danger'><font size='3'>You need to find a light!</font></span>",
span_danger("<font size='3'>You need to escape this darkness!</font>"),
span_danger("<font size='3'>Something might be lurking near you, but you can't see in this darkness.</font>"),
span_danger("<font size='3'>You need to find a light!</font>"),
)
half_fear_down = list(
"<span class='warning'>The darkness is gone, for now...</span>",
"<span class='warning'>You're not in the dark anymore, but you're still anxious.</span>"
span_warning("The darkness is gone, for now..."),
span_warning("You're not in the dark anymore, but you're still anxious.")
)
full_fear_up = list(
"<span class='danger'><font size='4'>What was that?</font></span>",
"<span class='danger'><font size='4'>Something is nearby...</font></span>"
span_danger("<font size='4'>What was that?</font>"),
span_danger("<font size='4'>Something is nearby...</font>")
)
full_fear_down = list(
"<span class='danger'>Light, at last!</span>",
"<span class='danger'>The darkness is finally gone!</span>"
span_danger("Light, at last!"),
span_danger("The darkness is finally gone!")
)
/datum/modifier/trait/phobia/nyctophobe/should_fear()
@@ -311,36 +311,36 @@
var/open_tiles_needed = 15 // Tends to be just right, as maint triggers this but hallways don't.
on_created_text = "<span class='warning'>You are terrified of tight spaces. Why did you come to space?</span>"
on_expired_text = "<span class='notice'>Small rooms aren't so bad now.</span>"
on_created_text = span_warning("You are terrified of tight spaces. Why did you come to space?")
on_expired_text = span_notice("Small rooms aren't so bad now.")
zero_fear_up = list(
"<span class='warning'><font size='3'>This room is too small...</font></span>",
"<span class='warning'><font size='3'>The walls are too close together...</font></span>"
span_warning("<font size='3'>This room is too small...</font>"),
span_warning("<font size='3'>The walls are too close together...</font>")
)
zero_fear_down = list(
"<span class='notice'>You feel calmer, now that you're in a larger room.</span>",
"<span class='notice'>At last, the walls are far apart.</span>",
"<span class='notice'>The relatively open area makes you feel calmer.</span>"
span_notice("You feel calmer, now that you're in a larger room."),
span_notice("At last, the walls are far apart."),
span_notice("The relatively open area makes you feel calmer.")
)
half_fear_up = list(
"<span class='danger'><font size='3'>Your surroundings look like they are closing in.</font></span>",
"<span class='danger'><font size='3'>Is the room getting smaller?</font></span>",
"<span class='danger'><font size='3'>You need to get out of here!</font></span>",
span_danger("<font size='3'>Your surroundings look like they are closing in.</font>"),
span_danger("<font size='3'>Is the room getting smaller?</font>"),
span_danger("<font size='3'>You need to get out of here!</font>"),
)
half_fear_down = list(
"<span class='warning'>Your surroundings seem to have stopped closing in.</span>",
"<span class='warning'>You're not in a tight space anymore, but you're still anxious.</span>"
span_warning("Your surroundings seem to have stopped closing in."),
span_warning("You're not in a tight space anymore, but you're still anxious.")
)
full_fear_up = list(
"<span class='danger'><font size='4'>You need to escape!</font></span>",
"<span class='danger'><font size='4'>There's barely any room to move around!</font></span>"
span_danger("<font size='4'>You need to escape!</font>"),
span_danger("<font size='4'>There's barely any room to move around!</font>")
)
full_fear_down = list(
"<span class='danger'>The surroundings stop shrinking.</span>",
"<span class='danger'>The walls seem to have stopped.</span>"
span_danger("The surroundings stop shrinking."),
span_danger("The walls seem to have stopped.")
)
/datum/modifier/trait/phobia/claustrophobe/should_fear()
@@ -376,34 +376,34 @@
desc = "Slimes are quite dangerous, but just the aspect of something being slimey is uncomfortable."
fear_decay_rate = 1
on_created_text = "<span class='warning'>You are disgusted and horrified by slime.</span>"
on_expired_text = "<span class='notice'>You feel more... okay with slime.</span>"
on_created_text = span_warning("You are disgusted and horrified by slime.")
on_expired_text = span_notice("You feel more... okay with slime.")
zero_fear_up = list(
"<span class='warning'><font size='3'>That's some slime!</font></span>",
"<span class='warning'><font size='3'>There's slime right there!</font></span>"
span_warning("<font size='3'>That's some slime!</font>"),
span_warning("<font size='3'>There's slime right there!</font>")
)
zero_fear_down = list(
"<span class='notice'>The slime is out of sight and out of mind.</span>",
"<span class='notice'>Clean. No more slime.</span>"
span_notice("The slime is out of sight and out of mind."),
span_notice("Clean. No more slime.")
)
half_fear_up = list(
"<span class='danger'><font size='3'>The slimes might strike at any point!</font></span>",
"<span class='danger'><font size='3'>The slime is still there!</font></span>"
span_danger("<font size='3'>The slimes might strike at any point!</font>"),
span_danger("<font size='3'>The slime is still there!</font>")
)
half_fear_down = list(
"<span class='warning'>The slime is gone... right?</span>",
"<span class='warning'>You can't see any slime right now, but you're still anxious.</span>"
span_warning("The slime is gone... right?"),
span_warning("You can't see any slime right now, but you're still anxious.")
)
full_fear_up = list(
"<span class='danger'><font size='4'>The slime is everywhere!</font></span>",
"<span class='danger'><font size='4'>You're gonna get absorbed if you don't get out!</font></span>"
span_danger("<font size='4'>The slime is everywhere!</font>"),
span_danger("<font size='4'>You're gonna get absorbed if you don't get out!</font>")
)
full_fear_down = list(
"<span class='danger'>There must be more of that slime somewhere...</span>",
"<span class='danger'>No more of this slime, please....</span>"
span_danger("There must be more of that slime somewhere..."),
span_danger("No more of this slime, please....")
)
/datum/modifier/trait/phobia/blennophobe/should_fear()
@@ -470,35 +470,35 @@
desc = "Syringes and needles make you very distressed. You really don't want to get sick..."
fear_decay_rate = 100
on_created_text = "<span class='warning'>You are terrified by needles.</span>"
on_expired_text = "<span class='notice'>You feel better about being near needles..</span>"
on_created_text = span_warning("You are terrified by needles.")
on_expired_text = span_notice("You feel better about being near needles..")
zero_fear_up = list(
"<span class='warning'><font size='3'>That's a needle!</font></span>",
"<span class='warning'><font size='3'>There's a needle right there!</font></span>"
span_warning("<font size='3'>That's a needle!</font>"),
span_warning("<font size='3'>There's a needle right there!</font>")
)
zero_fear_down = list(
"<span class='notice'>The needle is gone, no need to worry.</span>",
"<span class='notice'>No more needle.</span>"
span_notice("The needle is gone, no need to worry."),
span_notice("No more needle.")
)
half_fear_up = list(
"<span class='danger'><font size='3'>The needle could get you at any time!</font></span>",
"<span class='danger'><font size='3'>The needle is still there!</font></span>"
span_danger("<font size='3'>The needle could get you at any time!</font>"),
span_danger("<font size='3'>The needle is still there!</font>")
)
half_fear_down = list(
"<span class='warning'>There are no more needles... right?</span>",
"<span class='warning'>You don't see any more needles... But you can never be sure.</span>"
span_warning("There are no more needles... right?"),
span_warning("You don't see any more needles... But you can never be sure.")
)
full_fear_up = list(
"<span class='danger'><font size='4'>The needles are going to pierce you!</font></span>",
"<span class='danger'><font size='4'>They could get you any second!</font></span>"
span_danger("<font size='4'>The needles are going to pierce you!</font>"),
span_danger("<font size='4'>They could get you any second!</font>")
)
full_fear_down = list(
"<span class='danger'>There are more needles around, you can feel it...</span>",
"<span class='danger'>No more needles, please...</span>"
span_danger("There are more needles around, you can feel it..."),
span_danger("No more needles, please...")
)
/datum/modifier/trait/phobia/trypanophobe/should_fear()
@@ -568,8 +568,8 @@
desc = "The mind of the Alien is unknowable, and as such, their intentions cannot be known. You always watch the xenos closely, as they most certainly are watching you \
closely, waiting to strike."
on_created_text = "<span class='warning'>You remain vigilant against the Alien.</span>"
on_expired_text = "<span class='notice'>Aliens aren't so bad after all.</span>"
on_created_text = span_warning("You remain vigilant against the Alien.")
on_expired_text = span_notice("Aliens aren't so bad after all.")
var/last_message = null // world.time we last did a message.
var/message_cooldown = 1 MINUTE
@@ -586,7 +586,7 @@
if(xenos.len)
var/chosen_xeno = pick(xenos)
to_chat(holder, "<span class='warning'><font size='3'>[make_message(chosen_xeno)]</font></span>")
to_chat(holder, span_warning("<font size='3'>[make_message(chosen_xeno)]</font>"))
return TRUE
else
return FALSE // No xenos in sight, so don't apply the cooldown.
@@ -605,8 +605,8 @@
desc = "The mind of the Alien is unknowable, and as such, their intentions cannot be known. You always watch the xenos closely, as they most certainly are watching you \
closely, waiting to strike."
on_created_text = "<span class='warning'>You remain vigilant against the Alien.</span>"
on_expired_text = "<span class='notice'>Aliens aren't so bad afterall.</span>"
on_created_text = span_warning("You remain vigilant against the Alien.")
on_expired_text = span_notice("Aliens aren't so bad afterall.")
/datum/modifier/trait/phobia/xenophobia/generic/get_xenos()
var/list/xenos = list()
@@ -643,8 +643,8 @@
name = "anti-human sentiment"
desc = "Humans are bound to get us all killed with their reckless use of technology..."
on_created_text = "<span class='warning'>You unfortunately are likely to have to deal with humans today.</span>"
on_expired_text = "<span class='notice'>Humans aren't so bad after all.</span>"
on_created_text = span_warning("You unfortunately are likely to have to deal with humans today.")
on_expired_text = span_notice("Humans aren't so bad after all.")
/datum/modifier/trait/phobia/xenophobia/human/get_xenos()
var/list/humans = list()
@@ -672,8 +672,8 @@
name = "anti-skrell sentiment"
desc = "The Skrell pretend that they are Humanity's enlightened allies, but you can see past that."
on_created_text = "<span class='warning'>Hopefully no Skrell show up today.</span>"
on_expired_text = "<span class='notice'>Skrell aren't so bad after all.</span>"
on_created_text = span_warning("Hopefully no Skrell show up today.")
on_expired_text = span_notice("Skrell aren't so bad after all.")
/datum/modifier/trait/phobia/xenophobia/skrell/get_xenos()
var/list/skrell = list()
@@ -692,4 +692,3 @@
"WetSkrell was a mistake."
)
return pick(generic_responses)
code/modules/mob/_modifiers/unholy.dm
+20 -20
View File
@@ -8,8 +8,8 @@
name = "fortified body"
desc = "You are taking less damage from outside sources."
on_created_text = "<span class='critical'>Your body becomes a mountain to your enemies' storm.</span>"
on_expired_text = "<span class='notice'>Your body softens, returning to its regular durability.</span>"
on_created_text = span_critical("Your body becomes a mountain to your enemies' storm.")
on_expired_text = span_notice("Your body softens, returning to its regular durability.")
stacks = MODIFIER_STACK_EXTEND
disable_duration_percent = 0.25 // Disables only last 25% as long.
@@ -25,8 +25,8 @@
name = "phased"
desc = "You are partially shifted from the material plane."
on_created_text = "<span class='critical'>Your body pulses, before partially dematerializing.</span>"
on_expired_text = "<span class='notice'>Your body rematerializes fully.</span>"
on_created_text = span_critical("Your body pulses, before partially dematerializing.")
on_expired_text = span_notice("Your body rematerializes fully.")
stacks = MODIFIER_STACK_FORBID
@@ -50,8 +50,8 @@
name = "deep wounds"
desc = "Your wounds are mysteriously harder to mend."
on_created_text = "<span class='cult'>Your wounds pain you greatly.</span>"
on_expired_text = "<span class='notice'>Your wounds numb for a moment.</span>"
on_created_text = span_cult("Your wounds pain you greatly.")
on_expired_text = span_notice("Your wounds numb for a moment.")
stacks = MODIFIER_STACK_EXTEND
@@ -64,8 +64,8 @@
name = "aura of repair (cult)"
desc = "You are emitting a field of strange energy, capable of repairing occult constructs."
on_created_text = "<span class='cult'>You begin emitting an occult repair aura.</span>"
on_expired_text = "<span class='notice'>The occult repair aura fades.</span>"
on_created_text = span_cult("You begin emitting an occult repair aura.")
on_expired_text = span_notice("The occult repair aura fades.")
stacks = MODIFIER_STACK_EXTEND
mob_overlay_state = "cult_aura"
@@ -80,8 +80,8 @@
name = "agonize"
desc = "Your body is wracked with pain."
on_created_text = "<span class='cult'>A red lightning quickly covers your body. The pain is horrendous.</span>"
on_expired_text = "<span class='notice'>The lightning fades, and so too does the ongoing pain.</span>"
on_created_text = span_cult("A red lightning quickly covers your body. The pain is horrendous.")
on_expired_text = span_notice("The lightning fades, and so too does the ongoing pain.")
stacks = MODIFIER_STACK_EXTEND
@@ -93,15 +93,15 @@
var/mob/living/carbon/human/H = holder
H.apply_effect(20, AGONY)
if(prob(10))
to_chat(H, "<span class='warning'>Just make it stop!</span>")
to_chat(H, span_warning("Just make it stop!"))
////////// Target Modifier
/datum/modifier/mend_occult
name = "occult mending"
desc = "Your body is mending, though at what cost?"
on_created_text = "<span class='cult'>Something haunting envelops your body as it begins to mend.</span>"
on_expired_text = "<span class='notice'>The cloak of unease dissipates.</span>"
on_created_text = span_cult("Something haunting envelops your body as it begins to mend.")
on_expired_text = span_notice("The cloak of unease dissipates.")
stacks = MODIFIER_STACK_EXTEND
@@ -144,7 +144,7 @@
if(!iscultist(H))
H.apply_effect(2, AGONY)
if(prob(10))
to_chat(H, "<span class='danger'>It feels as though your body is being torn apart!</span>")
to_chat(H, span_danger("It feels as though your body is being torn apart!"))
L.updatehealth()
/datum/modifier/gluttonyregeneration
@@ -152,20 +152,20 @@
desc = "You are filled with an overwhelming hunger."
mob_overlay_state = "electricity"
on_created_text = "<span class='critical'>You feel an intense and overwhelming hunger overtake you as your body regenerates!</span>"
on_expired_text = "<span class='notice'>The blaze of hunger inside you has been snuffed.</span>"
on_created_text = span_critical("You feel an intense and overwhelming hunger overtake you as your body regenerates!")
on_expired_text = span_notice("The blaze of hunger inside you has been snuffed.")
stacks = MODIFIER_STACK_EXTEND
/datum/modifier/gluttonyregeneration/can_apply(var/mob/living/L)
if(L.stat == DEAD)
to_chat(L, "<span class='warning'>You can't be dead to consume.</span>")
to_chat(L, span_warning("You can't be dead to consume."))
return FALSE
if(!L.is_sentient())
return FALSE // Drones don't feel anything, not even hunger.
if(L.has_modifier_of_type(/datum/modifier/berserk_exhaustion))
to_chat(L, "<span class='warning'>You recently berserked, so you are too tired to consume.</span>")
to_chat(L, span_warning("You recently berserked, so you are too tired to consume."))
return FALSE
if(!ishuman(L)) // Only humanoids feel hunger. Totally.
@@ -174,7 +174,7 @@
else
var/mob/living/carbon/human/H = L
if(H.species.name == "Diona")
to_chat(L, "<span class='warning'>You feel strange for a moment, but it passes.</span>")
to_chat(L, span_warning("You feel strange for a moment, but it passes."))
return FALSE // Happy trees aren't affected by incredible hunger.
return ..()
@@ -195,4 +195,4 @@
H.adjustToxLoss(-healing_amount * 0.25)
..()
..()