From ecc109915a89b8e14c2af22ae42a7cdf720b55a0 Mon Sep 17 00:00:00 2001
From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Date: Sun, 4 Feb 2024 22:15:20 +0100
Subject: [PATCH] Stamina damage no longer bypass some checks (#23447)
* adjusting stamina damage no longer bypass some checks
* no illness changes
* i surrender on this, let it be
---
code/_onclick/click_override.dm | 2 +-
code/datums/components/defibrillator.dm | 4 ++--
code/datums/components/spooky.dm | 4 ++--
code/datums/status_effects/debuffs.dm | 2 +-
code/game/gamemodes/cult/blood_magic.dm | 2 +-
code/game/gamemodes/cult/cult_items.dm | 2 +-
.../gamemodes/miniantags/revenant/revenant_abilities.dm | 2 +-
code/game/objects/effects/snowcloud.dm | 2 +-
code/game/objects/items/devices/handheld_defib.dm | 2 +-
code/game/objects/items/devices/traitordevices.dm | 2 +-
code/game/objects/items/weapons/batons.dm | 2 +-
code/game/objects/items/weapons/grenades/atmosgrenade.dm | 2 +-
code/game/objects/items/weapons/stunbaton.dm | 4 ++--
code/game/objects/items/weapons/twohanded.dm | 2 +-
.../antagonists/vampire/vampire_powers/vampire_powers.dm | 6 +++---
code/modules/hallucinations/effects/common.dm | 2 +-
code/modules/martial_arts/combos/cqc/consecutive.dm | 2 +-
code/modules/martial_arts/combos/cqc/kick.dm | 2 +-
code/modules/martial_arts/combos/cqc/pressure.dm | 2 +-
code/modules/martial_arts/combos/cqc/restrain.dm | 4 ++--
code/modules/martial_arts/combos/krav_maga/lung_punch.dm | 2 +-
code/modules/martial_arts/martial.dm | 2 +-
code/modules/mining/lavaland/necropolis_chests.dm | 2 +-
code/modules/mining/ores_coins.dm | 2 +-
.../mob/living/carbon/alien/humanoid/caste/hunter.dm | 2 +-
code/modules/mob/living/carbon/carbon_defense.dm | 2 +-
code/modules/mob/living/carbon/human/human_defense.dm | 4 ++--
code/modules/mob/living/living_defense.dm | 2 +-
code/modules/mob/living/simple_animal/bot/ed209bot.dm | 2 +-
code/modules/mob/living/simple_animal/bot/secbot.dm | 2 +-
code/modules/mob/living/simple_animal/hostile/carp.dm | 2 +-
.../mob/living/simple_animal/hostile/gorilla/gorilla.dm | 2 +-
code/modules/mob/living/simple_animal/hostile/headslug.dm | 2 +-
.../living/simple_animal/hostile/terror_spiders/black.dm | 2 +-
.../living/simple_animal/hostile/terror_spiders/prince.dm | 2 +-
.../living/simple_animal/hostile/terror_spiders/white.dm | 2 +-
code/modules/projectiles/projectile/beams.dm | 2 +-
code/modules/reagents/chemistry/reagents/blob_reagents.dm | 4 ++--
code/modules/surgery/organs/subtypes/standard_organs.dm | 4 ++--
39 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index d17ef01694f..9bdd7691a1a 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -78,7 +78,7 @@
var/powergrid = C.get_available_power() //We want available power, so the station being conservative doesn't mess with glove / dark bundle users
if(user.a_intent == INTENT_DISARM)
add_attack_logs(user, L, "shocked with power bio-chip.")
- L.adjustStaminaLoss(60)
+ L.apply_damage(60, STAMINA)
L.Jitter(10 SECONDS)
var/atom/throw_target = get_edge_target_turf(user, get_dir(user, get_step_away(L, user)))
L.throw_at(throw_target, powergrid / 100000, powergrid / 100000) //100 kW in grid throws 1 tile, 200 throws 2, etc.
diff --git a/code/datums/components/defibrillator.dm b/code/datums/components/defibrillator.dm
index 22c88416053..ff1020e5eca 100644
--- a/code/datums/components/defibrillator.dm
+++ b/code/datums/components/defibrillator.dm
@@ -330,7 +330,7 @@
busy = TRUE
target.visible_message("[user] has touched [target] with [parent]!", \
"[user] touches you with [parent], and you feel a strong jolt!")
- target.adjustStaminaLoss(60)
+ target.apply_damage(60, STAMINA)
target.KnockDown(10 SECONDS)
playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, 1, -1)
target.emote("gasp")
@@ -345,7 +345,7 @@
if(!istype(target))
return
busy = TRUE
- target.adjustStaminaLoss(60)
+ target.apply_damage(60, STAMINA)
target.emote("gasp")
add_attack_logs(user, target, "Stunned with [parent]")
target.KnockDown(4 SECONDS)
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index b056bdcac71..860be1f9693 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -8,7 +8,7 @@
if(ishuman(user)) //this weapon wasn't meant for mortals.
var/mob/living/carbon/human/U = user
if(!istype(U.dna.species, /datum/species/skeleton))
- U.adjustStaminaLoss(35) //Extra Damage
+ U.apply_damage(35, STAMINA) //Extra Damage
U.Jitter(70 SECONDS)
U.SetStuttering(40 SECONDS)
if(U.getStaminaLoss() > 95)
@@ -23,7 +23,7 @@
C.Jitter(70 SECONDS)
C.SetStuttering(40 SECONDS)
if(!istype(H.dna.species, /datum/species/diona) && !istype(H.dna.species, /datum/species/machine) && !istype(H.dna.species, /datum/species/slime) && !istype(H.dna.species, /datum/species/golem) && !istype(H.dna.species, /datum/species/plasmaman))
- C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
+ C.apply_damage(25, STAMINA) //boneless humanoids don't lose the will to live
to_chat(C, "DOOT")
spectral_change(H)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 0839d40d597..69a7a497477 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -247,7 +247,7 @@
owner.cut_overlay(overlay)
/datum/status_effect/cult_stun_mark/proc/trigger()
- owner.adjustStaminaLoss(60)
+ owner.apply_damage(60, STAMINA)
owner.Silence(6 SECONDS) // refresh the silence
qdel(src)
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 932ea124f3e..47790984ff8 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -458,7 +458,7 @@
to_chat(user, "In a brilliant flash of red, [L] falls to the ground!")
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(60)
+ L.apply_damage(60, STAMINA)
L.apply_status_effect(STATUS_EFFECT_CULT_STUN)
L.flash_eyes(1, TRUE)
if(issilicon(target))
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index fc4693e8291..23ec5b39dd0 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -598,7 +598,7 @@
S.trigger()
else
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(60)
+ L.apply_damage(60, STAMINA)
L.apply_status_effect(STATUS_EFFECT_CULT_STUN)
L.flash_eyes(1, TRUE)
if(issilicon(L))
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 48c0128bc5d..cd5e61561e3 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -497,7 +497,7 @@
/mob/living/carbon/human/defile()
to_chat(src, "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].")
- adjustStaminaLoss(60)
+ apply_damage(60, STAMINA)
adjustToxLoss(5)
AdjustConfused(40 SECONDS, bound_lower = 0, bound_upper = 60 SECONDS)
new /obj/effect/temp_visual/revenant(loc)
diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm
index 6760b5833f5..266e4314bb7 100644
--- a/code/game/objects/effects/snowcloud.dm
+++ b/code/game/objects/effects/snowcloud.dm
@@ -131,7 +131,7 @@
. = ..()
if(!. && isliving(target))
var/mob/living/M = target
- M.adjustStaminaLoss(stamina_damage)
+ M.apply_damage(stamina_damage, STAMINA)
playsound(target, 'sound/weapons/tap.ogg', 50, TRUE)
qdel(src)
diff --git a/code/game/objects/items/devices/handheld_defib.dm b/code/game/objects/items/devices/handheld_defib.dm
index bae2fde5e88..1931273fd00 100644
--- a/code/game/objects/items/devices/handheld_defib.dm
+++ b/code/game/objects/items/devices/handheld_defib.dm
@@ -47,7 +47,7 @@
add_attack_logs(user, H, "emag-defibbed with [src]")
playsound(user.loc, "sound/weapons/egloves.ogg", 75, 1)
H.KnockDown(knockdown_duration)
- H.adjustStaminaLoss(60)
+ H.apply_damage(60, STAMINA)
SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100)
ADD_TRAIT(H, TRAIT_WAS_BATONNED, user_UID)
cooldown = TRUE
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index e4f434a6384..73c043bfdd1 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -369,7 +369,7 @@
M.EyeBlind(15 SECONDS)
to_chat(M, "and you can't see a goddamn thing!")
if(5)
- M.adjustStaminaLoss(40)
+ M.apply_damage(40, STAMINA)
to_chat(M, "and a wave of tiredness washes over you!")
else
to_chat(M, "but as soon as it arrives, it fades.")
diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm
index 63220202163..08e01fc96b6 100644
--- a/code/game/objects/items/weapons/batons.dm
+++ b/code/game/objects/items/weapons/batons.dm
@@ -130,7 +130,7 @@
percentage_reduction = (100 - ARMOUR_VALUE_TO_PERCENTAGE(armour)) / 100
else
percentage_reduction = (100 - armour) / 100 // converts the % into a decimal
- target.adjustStaminaLoss(stamina_damage * percentage_reduction)
+ target.apply_damage(stamina_damage * percentage_reduction, STAMINA)
/obj/item/melee/classic_baton/proc/baton_delay(mob/living/target, user_UID)
REMOVE_TRAIT(target, TRAIT_WAS_BATONNED, user_UID)
diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm
index 30323173f4e..7da1f504009 100644
--- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm
@@ -48,6 +48,6 @@
for(var/turf/simulated/floor/T in view(freeze_range, loc))
T.MakeSlippery(TURF_WET_ICE)
for(var/mob/living/carbon/L in T)
- L.adjustStaminaLoss(stamina_damage)
+ L.apply_damage(stamina_damage, STAMINA)
L.adjust_bodytemperature(-230)
qdel(src)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 51176509118..ab1bf3d3e91 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -211,7 +211,7 @@
return FALSE
H.Confused(10 SECONDS)
H.Jitter(10 SECONDS)
- H.adjustStaminaLoss(stam_damage)
+ H.apply_damage(stam_damage, STAMINA)
H.SetStuttering(10 SECONDS)
ADD_TRAIT(L, TRAIT_WAS_BATONNED, user_UID) // so one person cannot hit the same person with two separate batons
@@ -248,7 +248,7 @@
return FALSE
L.Confused(4 SECONDS)
L.Jitter(4 SECONDS)
- L.adjustStaminaLoss(30)
+ L.apply_damage(30, STAMINA)
L.SetStuttering(4 SECONDS)
ADD_TRAIT(L, TRAIT_WAS_BATONNED, user_UID) // so one person cannot hit the same person with two separate batons
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index f335db6ae37..d8e18e42e5f 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -1008,7 +1008,7 @@
user.do_attack_animation(H, ATTACK_EFFECT_DISARM)
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 50, TRUE, -1)
H.AdjustConfused(4 SECONDS, 0, 4 SECONDS) //no stacking infinitely
- H.adjustStaminaLoss(15)
+ H.apply_damage(15, STAMINA)
add_attack_logs(user, H, "Swept with the brush of the titanium push broom", ATKLOG_ALL)
diff --git a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
index 50fdd3349d1..62e17c54130 100644
--- a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
@@ -207,14 +207,14 @@
if(deviation == DEVIATION_FULL)
target.Confused(6 SECONDS)
- target.adjustStaminaLoss(20)
+ target.apply_damage(20, STAMINA)
else if(deviation == DEVIATION_PARTIAL)
target.KnockDown(5 SECONDS)
target.Confused(6 SECONDS)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
else
target.Confused(10 SECONDS)
- target.adjustStaminaLoss(70)
+ target.apply_damage(70, STAMINA)
target.KnockDown(12 SECONDS)
target.AdjustSilence(8 SECONDS)
target.flash_eyes(1, TRUE, TRUE)
diff --git a/code/modules/hallucinations/effects/common.dm b/code/modules/hallucinations/effects/common.dm
index 9b29042158d..827ab482b19 100644
--- a/code/modules/hallucinations/effects/common.dm
+++ b/code/modules/hallucinations/effects/common.dm
@@ -112,7 +112,7 @@
/obj/effect/hallucination/chaser/attacker/proc/attack(was_weakened)
dir = get_dir(src, target)
attack_effects()
- target.adjustStaminaLoss(damage)
+ target.apply_damage(damage, STAMINA)
if(!was_weakened && target.IsWeakened())
on_knockdown()
diff --git a/code/modules/martial_arts/combos/cqc/consecutive.dm b/code/modules/martial_arts/combos/cqc/consecutive.dm
index bca508b616f..fc7efc897f8 100644
--- a/code/modules/martial_arts/combos/cqc/consecutive.dm
+++ b/code/modules/martial_arts/combos/cqc/consecutive.dm
@@ -8,7 +8,7 @@
target.visible_message("[user] strikes [target]'s abdomen, neck and back consecutively", \
"[user] strikes your abdomen, neck and back consecutively!")
playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, 1, -1)
- target.adjustStaminaLoss(70)
+ target.apply_damage(70, STAMINA)
target.apply_damage(20, BRUTE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Consecutive", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/cqc/kick.dm b/code/modules/martial_arts/combos/cqc/kick.dm
index 44e003216f6..d94023cc5c9 100644
--- a/code/modules/martial_arts/combos/cqc/kick.dm
+++ b/code/modules/martial_arts/combos/cqc/kick.dm
@@ -21,7 +21,7 @@
playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 25, 1, -1)
var/atom/throw_target = get_edge_target_turf(target, user.dir)
target.throw_at(throw_target, 1, 8, user)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
target.adjustBrainLoss(10)
target.Silence(3 SECONDS)
add_attack_logs(user, target, "Kicked in the head with martial-art [src] : Kick", ATKLOG_ALL)
diff --git a/code/modules/martial_arts/combos/cqc/pressure.dm b/code/modules/martial_arts/combos/cqc/pressure.dm
index 96b482b22ab..90de2f1be93 100644
--- a/code/modules/martial_arts/combos/cqc/pressure.dm
+++ b/code/modules/martial_arts/combos/cqc/pressure.dm
@@ -8,7 +8,7 @@
var/obj/item/I = target.get_active_hand()
if(I && target.drop_item())
user.put_in_hands(I)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 5, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Pressure", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/cqc/restrain.dm b/code/modules/martial_arts/combos/cqc/restrain.dm
index 944c0cac45d..c73603cc057 100644
--- a/code/modules/martial_arts/combos/cqc/restrain.dm
+++ b/code/modules/martial_arts/combos/cqc/restrain.dm
@@ -18,11 +18,11 @@
switch(stam_damage)
if(0 to 40)
target.Immobilize(4 SECONDS)
- target.adjustStaminaLoss(35)
+ target.apply_damage(35, STAMINA)
if(41 to 80)
target.Stun(6 SECONDS)
if(81 to 120)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
CQC.restraining = TRUE
addtimer(CALLBACK(CQC, TYPE_PROC_REF(/datum/martial_art/cqc, drop_restraining)), 5 SECONDS, TIMER_UNIQUE)
diff --git a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
index ba1bfd465a0..9ed06508ca8 100644
--- a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
+++ b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
@@ -8,7 +8,7 @@
"[user] slams your chest! You can't breathe!")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
target.AdjustLoseBreath(10 SECONDS)
- target.adjustStaminaLoss(30)
+ target.apply_damage(30, STAMINA)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Lung Punch", ATKLOG_ALL)
user.mind.martial_art.in_stance = FALSE
return MARTIAL_COMBO_DONE_CLEAR_COMBOS
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 6ee49b535ae..42a94687bd1 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -444,7 +444,7 @@
H.visible_message("[pick(fluffmessages)]", \
"[pick(fluffmessages)]")
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1)
- H.adjustStaminaLoss(rand(13,20))
+ H.apply_damage(rand(13,20), STAMINA)
if(prob(10))
H.visible_message("[H] collapses!", \
"Your legs give out!")
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 8a47ee4838f..8afc4639dbb 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -670,7 +670,7 @@
to_chat(target, "[user] shatters [src] over you!")
target.apply_damage((ishostile(target) ? 75 : 35), BRUTE, BODY_ZONE_CHEST, TRUE)
target.KnockDown(5 SECONDS)
- target.adjustStaminaLoss(60) //Takes 4 hits to do, breaks your weapon. Perfectly fine.
+ target.apply_damage(60, STAMINA) //Takes 4 hits to do, breaks your weapon. Perfectly fine.
user.do_attack_animation(target, ATTACK_EFFECT_SMASH)
playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
if(ishuman(user))
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 3bfe32528eb..8d1bfef8a8c 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
visible_message("[C]'s glasses block the sand!")
return
C.EyeBlurry(12 SECONDS)
- C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage
+ C.apply_damage(15, STAMINA)//the pain from your eyes burning does stamina damage
C.AdjustConfused(10 SECONDS)
to_chat(C, "[src] gets into your eyes! The pain, it burns!")
qdel(src)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index e80f74cd6ef..a3084c4af42 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -84,7 +84,7 @@
if(ishuman(L))
var/mob/living/carbon/human/H = L
H.apply_effect(10 SECONDS, KNOCKDOWN, H.run_armor_check(null, MELEE))
- H.adjustStaminaLoss(40)
+ H.apply_damage(40, STAMINA)
else
L.Weaken(10 SECONDS)
sleep(2)//Runtime prevention (infinite bump() calls on hulks)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 6a19650f051..f9710e12c2b 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -53,7 +53,7 @@
if(..()) //successful slime attack
if(M.powerlevel > 0)
do_sparks(5, TRUE, src)
- adjustStaminaLoss(M.powerlevel * 5) //5-50 stamina damage, at starting power level 10 this means 50, 35, 20 on consecutive hits - stamina crit in 3 hits
+ apply_damage(M.powerlevel * 5, STAMINA) //5-50 stamina damage, at starting power level 10 this means 50, 35, 20 on consecutive hits - stamina crit in 3 hits
KnockDown(M.powerlevel SECONDS)
Stuttering(M.powerlevel SECONDS)
visible_message("[M] has shocked [src]!", "[M] has shocked you!")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 9014e4fb3eb..9af4de76228 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -672,7 +672,7 @@ emp_act
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE))
- adjustStaminaLoss(M.alien_disarm_damage)
+ apply_damage(M.alien_disarm_damage, STAMINA)
add_attack_logs(M, src, "Alien tackled")
visible_message("[M] has tackled down [src]!", "You hear aggressive shuffling!")
@@ -722,7 +722,7 @@ emp_act
var/dmg = rand(M.force/2, M.force)
switch(M.damtype)
if("brute")
- adjustStaminaLoss(dmg)
+ apply_damage(dmg, STAMINA)
if(M.force > 35) // durand and other heavy mechas
KnockDown(6 SECONDS)
else if(M.force > 20 && !IsKnockedDown()) // lightweight mechas like gygax
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index f89b0bc363f..1bea432114c 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -76,7 +76,7 @@
playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
explosion(loc, -1, 0, 2, 2)
else
- adjustStaminaLoss(shock_damage)
+ apply_damage(shock_damage, STAMINA)
visible_message(
"[src] was shocked by \the [source]!", \
"You feel a powerful shock coursing through your body!", \
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index ea2c389b2e4..eb4ae2dea83 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -567,7 +567,7 @@
addtimer(VARSET_CALLBACK(src, icon_state, "[lasercolor]ed209[on]"), 2)
var/threat = C.assess_threat(src)
C.SetStuttering(10 SECONDS)
- C.adjustStaminaLoss(60)
+ C.apply_damage(60, STAMINA)
baton_delayed = TRUE
C.apply_status_effect(STATUS_EFFECT_DELAYED, 2.5 SECONDS, CALLBACK(C, TYPE_PROC_REF(/mob/living/, KnockDown), 10 SECONDS), COMSIG_LIVING_CLEAR_STUNS)
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 2b6a6b2e6a9..54b562cf6bf 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -257,7 +257,7 @@
if(ishuman(C) && harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave
C.apply_damage(10, BRUTE)
C.SetStuttering(10 SECONDS)
- C.adjustStaminaLoss(60)
+ C.apply_damage(60, STAMINA)
baton_delayed = TRUE
C.apply_status_effect(STATUS_EFFECT_DELAYED, 2.5 SECONDS, CALLBACK(C, TYPE_PROC_REF(/mob/living/, KnockDown), 10 SECONDS), COMSIG_LIVING_CLEAR_STUNS)
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index de32d0f6bab..5b6eb1a4702 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -99,7 +99,7 @@
. = ..()
if(. && ishuman(target))
var/mob/living/carbon/human/H = target
- H.adjustStaminaLoss(8)
+ H.apply_damage(8, STAMINA)
/mob/living/simple_animal/hostile/carp/death(gibbed)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index c400bedb1cc..b11c2b299ec 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -141,7 +141,7 @@
living_target.throw_at(get_edge_target_turf(living_target, dir), rand(1, 2), 7, src)
return
- living_target.adjustStaminaLoss(stamina_damage)
+ living_target.apply_damage(stamina_damage, STAMINA)
visible_message("[src] knocks [living_target] down!")
/mob/living/simple_animal/hostile/gorilla/update_icon_state()
diff --git a/code/modules/mob/living/simple_animal/hostile/headslug.dm b/code/modules/mob/living/simple_animal/hostile/headslug.dm
index f2aa53fd8ad..735ca1d4bc7 100644
--- a/code/modules/mob/living/simple_animal/hostile/headslug.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headslug.dm
@@ -73,7 +73,7 @@
owner.adjustToxLoss(30)
if(time >= 90 && prob(15))
to_chat(owner, pick("Something hurts.", "Someone is thinking, but it's not you.", "You feel at peace.", "Close your eyes."))
- owner.adjustStaminaLoss(50)
+ owner.apply_damage(50, STAMINA)
if(time >= EGG_INCUBATION_DEAD_CYCLE && owner.stat == DEAD || time >= EGG_INCUBATION_LIVING_CYCLE)
Pop()
STOP_PROCESSING(SSobj, src)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
index e0416e2c3a4..7a886a3d6dc 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
@@ -34,7 +34,7 @@
if(L.reagents.has_reagent("terror_black_toxin", 100))
return ..()
var/inject_target = pick("chest", "head")
- L.adjustStaminaLoss(30)
+ L.apply_damage(30, STAMINA)
L.attack_animal(src)
if(L.can_inject(null, FALSE, inject_target, FALSE) || (HAS_TRAIT(L, TRAIT_HANDS_BLOCKED) && HAS_TRAIT(L, TRAIT_IMMOBILIZED)))
L.reagents.add_reagent("terror_black_toxin", 30) // inject our special poison
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
index 6a5776414a8..6af2eade562 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
@@ -40,7 +40,7 @@
/mob/living/simple_animal/hostile/poison/terror_spider/prince/spider_specialattack(mob/living/carbon/human/L)
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(40)
+ L.apply_damage(40, STAMINA)
return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/prince/Initialize(mapload)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
index f179a75c3ba..5b55bdf28eb 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
@@ -41,7 +41,7 @@
var/inject_target = pick("chest","head")
L.attack_animal(src)
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(30)
+ L.apply_damage(30, STAMINA)
if(L.can_inject(null, FALSE, inject_target, FALSE) || (HAS_TRAIT(L, TRAIT_HANDS_BLOCKED) && HAS_TRAIT(L, TRAIT_IMMOBILIZED)))
if(!IsTSInfected(L) && ishuman(L))
visible_message("[src] buries its long fangs deep into the [inject_target] of [L]!")
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 9126a74cda8..3d6211b949d 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -178,7 +178,7 @@
var/mob/living/carbon/human/M = target
if(istype(M.wear_suit))
if(M.wear_suit.type in suit_types)
- M.adjustStaminaLoss(34)
+ M.apply_damage(34, STAMINA)
return 1
/obj/item/projectile/beam/lasertag/omni
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 4fc3ce1c13e..0387905fe2c 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -24,7 +24,7 @@
if(method == REAGENT_TOUCH)
volume = ..()
M.apply_damage(0.6*volume, BRUTE)
- M.adjustStaminaLoss(volume)
+ M.apply_damage(volume, STAMINA)
if(iscarbon(M))
M.emote("scream")
@@ -104,7 +104,7 @@
if(method == REAGENT_TOUCH)
volume = ..()
M.apply_damage(0.4*volume, BURN)
- M.adjustStaminaLoss(volume)
+ M.apply_damage(volume, STAMINA)
if(M.reagents)
M.reagents.add_reagent("frostoil", 0.4*volume)
diff --git a/code/modules/surgery/organs/subtypes/standard_organs.dm b/code/modules/surgery/organs/subtypes/standard_organs.dm
index 15cf687de62..f2e3a5ff7c9 100644
--- a/code/modules/surgery/organs/subtypes/standard_organs.dm
+++ b/code/modules/surgery/organs/subtypes/standard_organs.dm
@@ -23,9 +23,9 @@
return
switch(severity)
if(1)
- owner?.adjustStaminaLoss(20)
+ owner?.apply_damage(20, STAMINA)
if(2)
- owner?.adjustStaminaLoss(10)
+ owner?.apply_damage(10, STAMINA)
to_chat(owner, "Your [name] malfunctions, causing fatigue!")
/obj/item/organ/external/groin