diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 84c300002bd..13eda189487 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -1050,7 +1050,7 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
#define MINING_MOB_PROJECTILE_VULNERABILITY list(BRUTE)
/// Helper macro that determines if the mob is at the threshold to start vomitting due to high toxin levels
-#define AT_TOXIN_VOMIT_THRESHOLD(mob) (mob.getToxLoss() > 45 && mob.nutrition > 20)
+#define AT_TOXIN_VOMIT_THRESHOLD(mob) (mob.get_tox_loss() > 45 && mob.nutrition > 20)
/// The duration of the flip emote animation
#define FLIP_EMOTE_DURATION 0.7 SECONDS
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index d185b8c834f..adc4f8c9c6b 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -421,7 +421,7 @@
if(!attacking_item.get_sharpness() && !HAS_TRAIT(src, TRAIT_HEAD_INJURY_BLOCKED) && attacking_item.damtype == BRUTE)
if(prob(damage_done))
- adjustOrganLoss(ORGAN_SLOT_BRAIN, 20)
+ adjust_organ_loss(ORGAN_SLOT_BRAIN, 20)
if(stat == CONSCIOUS)
visible_message(
span_danger("[src] is knocked senseless!"),
@@ -432,7 +432,7 @@
if(prob(10))
gain_trauma(/datum/brain_trauma/mild/concussion)
else
- adjustOrganLoss(ORGAN_SLOT_BRAIN, damage_done * 0.2)
+ adjust_organ_loss(ORGAN_SLOT_BRAIN, damage_done * 0.2)
// rev deconversion through blunt trauma.
// this can be signalized to the rev datum
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 48353a075e1..df00a2703c4 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -327,7 +327,7 @@ Versioning
first_death["role"] = null
first_death["role"] = L.mind.assigned_role.title
first_death["area"] = "[AREACOORD(L)]"
- first_death["damage"] = "[L.getBruteLoss()]/[L.getFireLoss()]/[L.getToxLoss()]/[L.getOxyLoss()]"
+ first_death["damage"] = "[L.get_brute_loss()]/[L.get_fire_loss()]/[L.get_tox_loss()]/[L.get_oxy_loss()]"
first_death["last_words"] = L.last_words
if(!SSdbcore.Connect())
@@ -344,12 +344,12 @@ Versioning
"pod" = get_area_name(L, TRUE),
"laname" = L.lastattacker,
"lakey" = L.lastattackerckey,
- "brute" = L.getBruteLoss(),
- "fire" = L.getFireLoss(),
+ "brute" = L.get_brute_loss(),
+ "fire" = L.get_fire_loss(),
"brain" = L.get_organ_loss(ORGAN_SLOT_BRAIN) || BRAIN_DAMAGE_DEATH, //get_organ_loss returns null without a brain but a value is required for this column
- "oxy" = L.getOxyLoss(),
- "tox" = L.getToxLoss(),
- "stamina" = L.getStaminaLoss(),
+ "oxy" = L.get_oxy_loss(),
+ "tox" = L.get_tox_loss(),
+ "stamina" = L.get_stamina_loss(),
"x_coord" = L.x,
"y_coord" = L.y,
"z_coord" = L.z,
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 81ff1a5640b..d2b25521168 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(processing)
* Additionally, any "prob" you use in this proc should instead use the SPT_PROB define to make sure that the final probability per second stays the same even if the subsystem's wait is altered.
* Examples where this must be considered:
* - Implementing a cooldown timer, use `mytimer -= seconds_per_tick`, not `mytimer -= 1`. This way, `mytimer` will always have the unit of seconds
- * - Damaging a mob, do `L.adjustFireLoss(20 * seconds_per_tick)`, not `L.adjustFireLoss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed
+ * - Damaging a mob, do `L.adjust_fire_loss(20 * seconds_per_tick)`, not `L.adjust_fire_loss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed
* - Probability of something happening, do `if(SPT_PROB(25, seconds_per_tick))`, not `if(prob(25))`. This way, if the subsystem wait is e.g. lowered, there won't be a higher chance of this event happening per second
*
* If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list
diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm
index b38687a72ab..cbc25a78e8a 100644
--- a/code/datums/actions/mobs/fire_breath.dm
+++ b/code/datums/actions/mobs/fire_breath.dm
@@ -77,7 +77,7 @@
to_chat(barbecued, span_userdanger("You're frozen solid by [source]'s icy breath!"))
else
to_chat(barbecued, span_userdanger("You are burned by [source]'s fire breath!"))
- barbecued.adjustFireLoss(fire_damage)
+ barbecued.adjust_fire_loss(fire_damage)
/// Shoot three lines of fire in a sort of fork pattern approximating a cone
/datum/action/cooldown/mob_cooldown/fire_breath/cone
diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm
index 428c9756656..16e2e66f7ef 100644
--- a/code/datums/actions/mobs/lava_swoop.dm
+++ b/code/datums/actions/mobs/lava_swoop.dm
@@ -97,7 +97,7 @@
owner.mouse_opacity = initial(owner.mouse_opacity)
playsound(owner.loc, 'sound/effects/meteorimpact.ogg', 200, TRUE)
for(var/mob/living/victim in orange(1, owner) - owner)
- victim.adjustBruteLoss(75)
+ victim.adjust_brute_loss(75)
if(!QDELETED(victim)) // Some mobs are deleted on death
var/throw_dir = get_dir(owner, victim)
if(victim.loc == owner.loc)
diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm
index fbfb76c2746..cc5cac5fd38 100644
--- a/code/datums/brain_damage/creepy_trauma.dm
+++ b/code/datums/brain_damage/creepy_trauma.dm
@@ -104,7 +104,7 @@
if(41 to 80)
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "pale")
shake_camera(owner, 15, 1)
- owner.adjustStaminaLoss(70)
+ owner.adjust_stamina_loss(70)
to_chat(owner, span_userdanger("You feel your heart lurching in your chest..."))
if(81 to 100)
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "cough")
diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index e6ba2bac38f..81c589d3389 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -125,7 +125,7 @@
return ..()
/datum/brain_trauma/mild/healthy/on_life(seconds_per_tick, times_fired)
- owner.adjustStaminaLoss(-6 * seconds_per_tick) //no pain, no fatigue
+ owner.adjust_stamina_loss(-6 * seconds_per_tick) //no pain, no fatigue
/datum/brain_trauma/mild/healthy/on_lose()
owner.remove_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
@@ -155,7 +155,7 @@
else if(SPT_PROB(1.5, seconds_per_tick))
to_chat(owner, span_warning("You feel a sudden weakness in your muscles!"))
- owner.adjustStaminaLoss(50)
+ owner.adjust_stamina_loss(50)
..()
/datum/brain_trauma/mild/muscle_spasms
diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm
index 43cfd006fd1..d5e5157c1c1 100644
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -392,7 +392,7 @@
if(get_dist(owner, beepsky) <= 1)
owner.playsound_local(owner, 'sound/items/weapons/egloves.ogg', 50)
owner.visible_message(span_warning("[owner]'s body jerks as if it was shocked."), span_userdanger("You feel the fist of the LAW."))
- owner.adjustStaminaLoss(rand(40, 70))
+ owner.adjust_stamina_loss(rand(40, 70))
QDEL_NULL(beepsky)
if(prob(20) && get_dist(owner, beepsky) <= 8)
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index b2062ca043b..04285e07c2b 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -325,7 +325,7 @@
//too drunk to feel anything
//if they're to this point, they're likely dying of liver damage
//and not accounting for that, the split personality is temporary
- owner.adjustStaminaLoss(-25)
+ owner.adjust_stamina_loss(-25)
duration_in_seconds -= seconds_per_tick
/mob/living/split_personality/blackout
diff --git a/code/datums/components/aura_healing.dm b/code/datums/components/aura_healing.dm
index 6d1aa93923d..459f388a276 100644
--- a/code/datums/components/aura_healing.dm
+++ b/code/datums/components/aura_healing.dm
@@ -128,18 +128,18 @@
new /obj/effect/temp_visual/heal(get_turf(candidate), healing_color)
if (iscarbon(candidate) || issilicon(candidate) || isbasicmob(candidate))
- candidate.adjustBruteLoss(-brute_heal * seconds_per_tick, updating_health = FALSE)
- candidate.adjustFireLoss(-burn_heal * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_brute_loss(-brute_heal * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_fire_loss(-burn_heal * seconds_per_tick, updating_health = FALSE)
if (iscarbon(candidate))
// Toxin healing is forced for slime people
- candidate.adjustToxLoss(-toxin_heal * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ candidate.adjust_tox_loss(-toxin_heal * seconds_per_tick, updating_health = FALSE, forced = TRUE)
- candidate.adjustOxyLoss(-suffocation_heal * seconds_per_tick, updating_health = FALSE)
- candidate.adjustStaminaLoss(-stamina_heal * seconds_per_tick, updating_stamina = FALSE)
+ candidate.adjust_oxy_loss(-suffocation_heal * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_stamina_loss(-stamina_heal * seconds_per_tick, updating_stamina = FALSE)
for (var/organ in organ_healing)
- candidate.adjustOrganLoss(organ, -organ_healing[organ] * seconds_per_tick)
+ candidate.adjust_organ_loss(organ, -organ_healing[organ] * seconds_per_tick)
var/mob/living/carbon/carbidate = candidate
for(var/datum/wound/iter_wound as anything in carbidate.all_wounds)
iter_wound.adjust_blood_flow(-wound_clotting * seconds_per_tick)
diff --git a/code/datums/components/blob_minion.dm b/code/datums/components/blob_minion.dm
index ca1e3f0b790..b6db9de6c36 100644
--- a/code/datums/components/blob_minion.dm
+++ b/code/datums/components/blob_minion.dm
@@ -154,9 +154,9 @@
/datum/component/blob_minion/proc/on_burned(mob/living/minion, exposed_temperature, exposed_volume)
SIGNAL_HANDLER
if(isnull(exposed_temperature))
- minion.adjustFireLoss(5)
+ minion.adjust_fire_loss(5)
return
- minion.adjustFireLoss(clamp(0.01 * exposed_temperature, 1, 5))
+ minion.adjust_fire_loss(clamp(0.01 * exposed_temperature, 1, 5))
/// Someone is attempting to move through us, allow it if it is a blob tile
/datum/component/blob_minion/proc/on_attempted_pass(mob/living/minion, atom/movable/incoming)
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index f74261c0022..fb135aeb327 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -163,7 +163,7 @@
if(isliving(dropped_thing))
var/mob/living/fallen = dropped_thing
fallen.Paralyze(100)
- fallen.adjustBruteLoss(30)
+ fallen.adjust_brute_loss(30)
falling_atoms -= falling_ref
return
diff --git a/code/datums/components/damage_aura.dm b/code/datums/components/damage_aura.dm
index 1c95afd9567..3497e83cb90 100644
--- a/code/datums/components/damage_aura.dm
+++ b/code/datums/components/damage_aura.dm
@@ -97,11 +97,11 @@
/// What effect the damage aura has if it has an owner.
/datum/component/damage_aura/proc/owner_effect(mob/living/owner_mob, seconds_per_tick)
var/need_mob_update = FALSE
- need_mob_update += owner_mob.adjustStaminaLoss(-20 * seconds_per_tick, updating_stamina = FALSE)
- need_mob_update += owner_mob.adjustBruteLoss(-1 * seconds_per_tick, updating_health = FALSE)
- need_mob_update += owner_mob.adjustFireLoss(-1 * seconds_per_tick, updating_health = FALSE)
- need_mob_update += owner_mob.adjustToxLoss(-1 * seconds_per_tick, updating_health = FALSE, forced = TRUE)
- need_mob_update += owner_mob.adjustOxyLoss(-1 * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner_mob.adjust_stamina_loss(-20 * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += owner_mob.adjust_brute_loss(-1 * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner_mob.adjust_fire_loss(-1 * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner_mob.adjust_tox_loss(-1 * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner_mob.adjust_oxy_loss(-1 * seconds_per_tick, updating_health = FALSE)
owner_mob.adjust_blood_volume(2 * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL)
@@ -135,16 +135,16 @@
to_chat(candidate, damage_message)
if (iscarbon(candidate) || issilicon(candidate) || isbasicmob(candidate))
- candidate.adjustBruteLoss(brute_damage * seconds_per_tick, updating_health = FALSE)
- candidate.adjustFireLoss(burn_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_brute_loss(brute_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_fire_loss(burn_damage * seconds_per_tick, updating_health = FALSE)
if (iscarbon(candidate))
- candidate.adjustToxLoss(toxin_damage * seconds_per_tick, updating_health = FALSE)
- candidate.adjustOxyLoss(suffocation_damage * seconds_per_tick, updating_health = FALSE)
- candidate.adjustStaminaLoss(stamina_damage * seconds_per_tick, updating_stamina = FALSE)
+ candidate.adjust_tox_loss(toxin_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_oxy_loss(suffocation_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_stamina_loss(stamina_damage * seconds_per_tick, updating_stamina = FALSE)
for (var/organ in organ_damage)
- candidate.adjustOrganLoss(organ, organ_damage[organ] * seconds_per_tick)
+ candidate.adjust_organ_loss(organ, organ_damage[organ] * seconds_per_tick)
else if (isanimal(candidate))
var/mob/living/simple_animal/animal_candidate = candidate
animal_candidate.adjustHealth(simple_damage * seconds_per_tick, updating_health = FALSE)
diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm
index 9407423800c..34b9d0e579f 100644
--- a/code/datums/components/dejavu.dm
+++ b/code/datums/components/dejavu.dm
@@ -48,9 +48,9 @@
if(isliving(parent))
var/mob/living/L = parent
- tox_loss = L.getToxLoss()
- oxy_loss = L.getOxyLoss()
- stamina_loss = L.getStaminaLoss()
+ tox_loss = L.get_tox_loss()
+ oxy_loss = L.get_oxy_loss()
+ stamina_loss = L.get_stamina_loss()
brain_loss = L.get_organ_loss(ORGAN_SLOT_BRAIN)
rewind_type = PROC_REF(rewind_living)
@@ -99,10 +99,10 @@
parent.AddComponent(type, 1, rewind_interval, TRUE)
var/mob/living/master = parent
- master.setToxLoss(tox_loss)
- master.setOxyLoss(oxy_loss)
- master.setStaminaLoss(stamina_loss)
- master.setOrganLoss(ORGAN_SLOT_BRAIN, brain_loss)
+ master.set_tox_loss(tox_loss)
+ master.set_oxy_loss(oxy_loss)
+ master.set_stamina_loss(stamina_loss)
+ master.set_organ_loss(ORGAN_SLOT_BRAIN, brain_loss)
rewind()
/datum/component/dejavu/proc/rewind_carbon()
diff --git a/code/datums/components/empathy.dm b/code/datums/components/empathy.dm
index afcc264b001..fb147ac6013 100644
--- a/code/datums/components/empathy.dm
+++ b/code/datums/components/empathy.dm
@@ -57,9 +57,9 @@
var/t_are = target.p_are()
if((visible_info & EMPATH_SEE_COMBAT) && target.combat_mode)
examine_list += "[t_They] seem[p_s()] to be on guard."
- if((visible_info & EMPATH_SEE_OXY) && target.getOxyLoss() >= 10)
+ if((visible_info & EMPATH_SEE_OXY) && target.get_oxy_loss() >= 10)
examine_list += "[t_They] seem[p_s()] winded."
- if((visible_info & EMPATH_SEE_TOX) && target.getToxLoss() >= 10)
+ if((visible_info & EMPATH_SEE_TOX) && target.get_tox_loss() >= 10)
examine_list += "[t_They] seem[p_s()] sickly."
if((visible_info & EMPATH_SEE_SANITY) && target.mob_mood.sanity <= SANITY_DISTURBED)
examine_list += "[t_They] seem[p_s()] distressed."
diff --git a/code/datums/components/fearful/effects.dm b/code/datums/components/fearful/effects.dm
index b2b4458cbfa..1f2de205df1 100644
--- a/code/datums/components/fearful/effects.dm
+++ b/code/datums/components/fearful/effects.dm
@@ -66,7 +66,7 @@
return
if (terror_buildup < TERROR_BUILDUP_HEART_ATTACK || !prob(15))
- owner.adjustOxyLoss(8)
+ owner.adjust_oxy_loss(8)
if (terror_buildup < TERROR_BUILDUP_FEAR)
to_chat(owner, span_warning("Your heart skips a beat."))
else
diff --git a/code/datums/components/healing_touch.dm b/code/datums/components/healing_touch.dm
index bd611558b6e..b8580e2e458 100644
--- a/code/datums/components/healing_touch.dm
+++ b/code/datums/components/healing_touch.dm
@@ -165,14 +165,14 @@
/datum/component/healing_touch/proc/has_healable_damage(mob/living/target)
if (!isnull(valid_biotypes) && !(valid_biotypes & target.mob_biotypes))
return FALSE
- if (target.getStaminaLoss() > 0 && heal_stamina)
+ if (target.get_stamina_loss() > 0 && heal_stamina)
return TRUE
- if (target.getOxyLoss() > 0 && heal_oxy)
+ if (target.get_oxy_loss() > 0 && heal_oxy)
return TRUE
- if (target.getToxLoss() > 0 && heal_tox)
+ if (target.get_tox_loss() > 0 && heal_tox)
return TRUE
if (!iscarbon(target))
- return (target.getBruteLoss() > 0 && heal_brute) || (target.getFireLoss() > 0 && heal_burn)
+ return (target.get_brute_loss() > 0 && heal_brute) || (target.get_fire_loss() > 0 && heal_burn)
var/mob/living/carbon/carbon_target = target
for (var/obj/item/bodypart/part in carbon_target.bodyparts)
if (!(part.brute_dam && heal_brute) && !(part.burn_dam && heal_burn))
@@ -207,8 +207,8 @@
required_bodytype = required_bodytype,
updating_health = FALSE,
)
- healed += target.adjustOxyLoss(-heal_oxy * mult, updating_health = FALSE, required_biotype = valid_biotypes)
- healed += target.adjustToxLoss(-heal_tox * mult, updating_health = FALSE, required_biotype = valid_biotypes)
+ healed += target.adjust_oxy_loss(-heal_oxy * mult, updating_health = FALSE, required_biotype = valid_biotypes)
+ healed += target.adjust_tox_loss(-heal_tox * mult, updating_health = FALSE, required_biotype = valid_biotypes)
if (healed <= 0)
return
diff --git a/code/datums/components/heart_eater.dm b/code/datums/components/heart_eater.dm
index 1ef06559624..d61aec5ac43 100644
--- a/code/datums/components/heart_eater.dm
+++ b/code/datums/components/heart_eater.dm
@@ -111,11 +111,11 @@
///Heart eater give also strong healing from hearts.
/datum/component/heart_eater/proc/healing_heart(mob/living/carbon/human/eater)
for(var/heal_organ in eater.organs)
- eater.adjustOrganLoss(heal_organ, -50)
+ eater.adjust_organ_loss(heal_organ, -50)
for(var/datum/wound/heal_wound in eater.all_wounds)
heal_wound.remove_wound()
- eater.adjustBruteLoss(-50)
- eater.adjustFireLoss(-50)
- eater.adjustToxLoss(-50)
- eater.adjustOxyLoss(-50)
- eater.adjustStaminaLoss(-50)
+ eater.adjust_brute_loss(-50)
+ eater.adjust_fire_loss(-50)
+ eater.adjust_tox_loss(-50)
+ eater.adjust_oxy_loss(-50)
+ eater.adjust_stamina_loss(-50)
diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm
index 073bdd5cc4e..31ee58bb77e 100644
--- a/code/datums/components/irradiated.dm
+++ b/code/datums/components/irradiated.dm
@@ -85,7 +85,7 @@
return PROCESS_KILL
var/mob/living/carbon/human/human_parent = parent
- if (human_parent.getToxLoss() == 0)
+ if (human_parent.get_tox_loss() == 0)
qdel(src)
return PROCESS_KILL
@@ -181,7 +181,7 @@
if (isliving(source))
var/mob/living/living_source = source
- to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.getToxLoss()]."))
+ to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.get_tox_loss()]."))
else
// In case the green wasn't obvious enough...
to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Target is irradiated."))
diff --git a/code/datums/components/joint_damage.dm b/code/datums/components/joint_damage.dm
index 5397bd307ca..e96a387abc0 100644
--- a/code/datums/components/joint_damage.dm
+++ b/code/datums/components/joint_damage.dm
@@ -31,5 +31,5 @@
var/mob/living/overlord_to_damage = overlord_mob?.resolve()
if(!isnull(overlord_to_damage))
- overlord_to_damage.adjustBruteLoss(previous_health_count - source.health) ///damage or heal overlord
+ overlord_to_damage.adjust_brute_loss(previous_health_count - source.health) ///damage or heal overlord
previous_health_count = source.health
diff --git a/code/datums/components/life_link.dm b/code/datums/components/life_link.dm
index 98858f61c3c..a79758122c5 100644
--- a/code/datums/components/life_link.dm
+++ b/code/datums/components/life_link.dm
@@ -65,13 +65,13 @@
amount *= our_mob.get_damage_mod(type)
switch (type)
if(BRUTE)
- host.adjustBruteLoss(amount, forced = TRUE)
+ host.adjust_brute_loss(amount, forced = TRUE)
if(BURN)
- host.adjustFireLoss(amount, forced = TRUE)
+ host.adjust_fire_loss(amount, forced = TRUE)
if(TOX)
- host.adjustToxLoss(amount, forced = TRUE)
+ host.adjust_tox_loss(amount, forced = TRUE)
if(OXY)
- host.adjustOxyLoss(amount, forced = TRUE)
+ host.adjust_oxy_loss(amount, forced = TRUE)
on_passed_damage?.Invoke(our_mob, host, amount)
return COMPONENT_IGNORE_CHANGE
@@ -80,9 +80,9 @@
/datum/component/life_link/proc/on_limb_damage(mob/living/our_mob, limb, brute, burn)
SIGNAL_HANDLER
if (brute != 0)
- host.adjustBruteLoss(brute, updating_health = FALSE)
+ host.adjust_brute_loss(brute, updating_health = FALSE)
if (burn != 0)
- host.adjustFireLoss(burn, updating_health = FALSE)
+ host.adjust_fire_loss(burn, updating_health = FALSE)
if (brute != 0 || burn != 0)
host.updatehealth()
on_passed_damage?.Invoke(our_mob, host, brute + burn)
diff --git a/code/datums/components/manual_heart.dm b/code/datums/components/manual_heart.dm
index 83fb87124a3..2dfd703ed46 100644
--- a/code/datums/components/manual_heart.dm
+++ b/code/datums/components/manual_heart.dm
@@ -99,9 +99,9 @@
carbon_owner.adjust_blood_volume(blood_loss * 0.5)
carbon_owner.remove_client_colour(REF(src))
add_colour = TRUE
- carbon_owner.adjustBruteLoss(-heal_brute)
- carbon_owner.adjustFireLoss(-heal_burn)
- carbon_owner.adjustOxyLoss(-heal_oxy)
+ carbon_owner.adjust_brute_loss(-heal_brute)
+ carbon_owner.adjust_fire_loss(-heal_burn)
+ carbon_owner.adjust_oxy_loss(-heal_oxy)
/datum/component/manual_heart/process()
var/mob/living/carbon/carbon_parent = parent
diff --git a/code/datums/components/mob_chain.dm b/code/datums/components/mob_chain.dm
index e2f90eed16e..06bec239a2d 100644
--- a/code/datums/components/mob_chain.dm
+++ b/code/datums/components/mob_chain.dm
@@ -171,7 +171,7 @@
SIGNAL_HANDLER
if (forced)
return
- back?.adjustStaminaLoss(amount, forced = forced)
+ back?.adjust_stamina_loss(amount, forced = forced)
/// On damage or heal, affect our furthest segment
/datum/component/mob_chain/proc/on_adjust_damage(mob/living/our_mob, type, amount, forced)
@@ -180,13 +180,13 @@
return
switch (type)
if(BRUTE)
- back.adjustBruteLoss(amount, forced = forced)
+ back.adjust_brute_loss(amount, forced = forced)
if(BURN)
- back.adjustFireLoss(amount, forced = forced)
+ back.adjust_fire_loss(amount, forced = forced)
if(TOX)
- back.adjustToxLoss(amount, forced = forced)
+ back.adjust_tox_loss(amount, forced = forced)
if(OXY) // If all segments are suffocating we pile damage backwards until our ass starts dying forwards
- back.adjustOxyLoss(amount, forced = forced)
+ back.adjust_oxy_loss(amount, forced = forced)
return COMPONENT_IGNORE_CHANGE
/// Special handling for if damage is delegated to a mob's limbs instead of its overall damage
@@ -195,9 +195,9 @@
if (isnull(back))
return
if (brute != 0)
- back.adjustBruteLoss(brute, updating_health = FALSE)
+ back.adjust_brute_loss(brute, updating_health = FALSE)
if (burn != 0)
- back.adjustFireLoss(burn, updating_health = FALSE)
+ back.adjust_fire_loss(burn, updating_health = FALSE)
if (brute != 0 || burn != 0)
back.updatehealth()
return COMPONENT_PREVENT_LIMB_DAMAGE
diff --git a/code/datums/components/regenerator.dm b/code/datums/components/regenerator.dm
index 44c189eaf2f..9e9fdc09738 100644
--- a/code/datums/components/regenerator.dm
+++ b/code/datums/components/regenerator.dm
@@ -115,13 +115,13 @@
var/need_mob_update = FALSE
if(brute_per_second)
- need_mob_update += living_parent.adjustBruteLoss(-1 * heal_mod * brute_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_brute_loss(-1 * heal_mod * brute_per_second * seconds_per_tick, updating_health = FALSE)
if(burn_per_second)
- need_mob_update += living_parent.adjustFireLoss(-1 * heal_mod * burn_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_fire_loss(-1 * heal_mod * burn_per_second * seconds_per_tick, updating_health = FALSE)
if(tox_per_second)
- need_mob_update += living_parent.adjustToxLoss(-1 * heal_mod * tox_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_tox_loss(-1 * heal_mod * tox_per_second * seconds_per_tick, updating_health = FALSE)
if(oxy_per_second)
- need_mob_update += living_parent.adjustOxyLoss(-1 * heal_mod * oxy_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_oxy_loss(-1 * heal_mod * oxy_per_second * seconds_per_tick, updating_health = FALSE)
if(heals_wounds && iscarbon(parent))
var/mob/living/carbon/carbon_parent = living_parent
diff --git a/code/datums/components/squashable.dm b/code/datums/components/squashable.dm
index 785c6771ad3..faa9d0e37fe 100644
--- a/code/datums/components/squashable.dm
+++ b/code/datums/components/squashable.dm
@@ -74,7 +74,7 @@
if(squash_flags & SQUASHED_SHOULD_BE_GIBBED)
target.gib(DROP_ALL_REMAINS)
else
- target.adjustBruteLoss(squash_damage)
+ target.adjust_brute_loss(squash_damage)
/datum/component/squashable/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 7f2d7e73ada..ad8d53b123d 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -118,7 +118,7 @@
clicked_atom = get_turf_in_angle(tackle_angle, get_turf(user), min_distance)
user.Knockdown(base_knockdown, ignore_canstun = TRUE)
- user.adjustStaminaLoss(stamina_cost)
+ user.adjust_stamina_loss(stamina_cost)
user.throw_at(clicked_atom, range, speed, user, FALSE)
addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
return(COMSIG_MOB_CANCEL_CLICKON)
@@ -466,11 +466,11 @@
if(human_sacker.mob_mood.sanity_level == SANITY_LEVEL_INSANE) //I've gone COMPLETELY INSANE
attack_mod += 15
- human_sacker.adjustStaminaLoss(100) //AHAHAHAHAHAHAHAHA
+ human_sacker.adjust_stamina_loss(100) //AHAHAHAHAHAHAHAHA
if(HAS_TRAIT(human_sacker, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)) // tackling with riot specialized armor, like riot armor, is effective but tiring
attack_mod += 2
- human_sacker.adjustStaminaLoss(20)
+ human_sacker.adjust_stamina_loss(20)
var/randomized_tackle_roll = rand(-3, 3) - defense_mod + attack_mod + skill_mod
return randomized_tackle_roll
@@ -622,7 +622,7 @@
embed.ignore_throwspeed_threshold = initial(embed.ignore_throwspeed_threshold)
embed.impact_pain_mult = initial(embed.impact_pain_mult)
windscreen_casualty.atom_destruction()
- user.adjustStaminaLoss(10 * speed)
+ user.adjust_stamina_loss(10 * speed)
user.Paralyze(3 SECONDS)
user.visible_message(span_danger("[user] smacks into [windscreen_casualty] and shatters it, shredding [user.p_them()]self with glass!"), span_userdanger("You smacks into [windscreen_casualty] and shatter it, shredding yourself with glass!"))
@@ -631,8 +631,8 @@
user.Paralyze(1 SECONDS)
user.Knockdown(3 SECONDS)
windscreen_casualty.take_damage(30 * speed)
- user.adjustStaminaLoss(10 * speed, updating_stamina=FALSE)
- user.adjustBruteLoss(5 * speed)
+ user.adjust_stamina_loss(10 * speed, updating_stamina=FALSE)
+ user.adjust_brute_loss(5 * speed)
/datum/component/tackler/proc/delayedSmash(obj/structure/window/windscreen_casualty)
if(windscreen_casualty)
@@ -676,8 +676,8 @@
HOW_big_of_a_miss_did_we_just_make = ", making a ginormous mess!" // an extra exclamation point!! for emphasis!!!
owner.visible_message(span_danger("[owner] trips over [kevved] and slams into it face-first[HOW_big_of_a_miss_did_we_just_make]!"), span_userdanger("You trip over [kevved] and slam into it face-first[HOW_big_of_a_miss_did_we_just_make]!"))
- owner.adjustStaminaLoss(15 + messes.len * 2, updating_stamina = FALSE)
- owner.adjustBruteLoss(8 + messes.len, updating_health = FALSE)
+ owner.adjust_stamina_loss(15 + messes.len * 2, updating_stamina = FALSE)
+ owner.adjust_brute_loss(8 + messes.len, updating_health = FALSE)
owner.Paralyze(0.4 SECONDS * messes.len) // .4 seconds of paralyze for each thing you knock around
owner.Knockdown(2 SECONDS + 0.4 SECONDS * messes.len) // 2 seconds of knockdown after the paralyze
owner.updatehealth()
diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm
index a8116bd6900..a82f247df63 100644
--- a/code/datums/components/transforming.dm
+++ b/code/datums/components/transforming.dm
@@ -273,11 +273,11 @@
var/obj/item/item_parent = parent
switch(item_parent.damtype)
if(STAMINA)
- user.adjustStaminaLoss(clumsy_damage)
+ user.adjust_stamina_loss(clumsy_damage)
if(OXY)
- user.adjustOxyLoss(clumsy_damage)
+ user.adjust_oxy_loss(clumsy_damage)
if(TOX)
- user.adjustToxLoss(clumsy_damage)
+ user.adjust_tox_loss(clumsy_damage)
if(BRUTE)
user.take_bodypart_damage(brute=clumsy_damage)
if(BURN)
diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index 6ae9fe42b6e..68ad1720d9f 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -60,11 +60,11 @@
infected_mob.emote("gasp")
/datum/symptom/choking/proc/Choke_stage_3_4(mob/living/M, datum/disease/advance/A)
- M.adjustOxyLoss(rand(6,13))
+ M.adjust_oxy_loss(rand(6,13))
return 1
/datum/symptom/choking/proc/Choke(mob/living/M, datum/disease/advance/A)
- M.adjustOxyLoss(rand(10,18))
+ M.adjust_oxy_loss(rand(10,18))
return 1
/*
@@ -128,25 +128,25 @@ Bonus
to_chat(M, span_userdanger("[pick("Your lungs hurt!", "It hurts to breathe!")]"))
Asphyxiate(M, A)
M.emote("gasp")
- if(M.getOxyLoss() >= (M.maxHealth / (200/120)))
+ if(M.get_oxy_loss() >= (M.maxHealth / (200/120)))
M.visible_message(span_warning("[M] stops breathing, as if their lungs have totally collapsed!"))
Asphyxiate_death(M, A)
return
/datum/symptom/asphyxiation/proc/Asphyxiate_stage_3_4(mob/living/M, datum/disease/advance/A)
var/get_damage = rand(10,15) * power
- M.adjustOxyLoss(get_damage)
+ M.adjust_oxy_loss(get_damage)
return 1
/datum/symptom/asphyxiation/proc/Asphyxiate(mob/living/M, datum/disease/advance/A)
var/get_damage = rand(15,21) * power
- M.adjustOxyLoss(get_damage)
+ M.adjust_oxy_loss(get_damage)
if(paralysis)
M.reagents.add_reagent_list(list(/datum/reagent/toxin/pancuronium = 3, /datum/reagent/toxin/sodium_thiopental = 3))
return 1
/datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
var/get_damage = rand(25,35) * power
- M.adjustOxyLoss(get_damage)
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, get_damage/2)
+ M.adjust_oxy_loss(get_damage)
+ M.adjust_organ_loss(ORGAN_SLOT_BRAIN, get_damage/2)
return 1
diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm
index 159eccfbd1c..1d54a2b7888 100644
--- a/code/datums/diseases/advance/symptoms/confusion.dm
+++ b/code/datums/diseases/advance/symptoms/confusion.dm
@@ -57,6 +57,6 @@
to_chat(infected_mob, span_userdanger("You can't think straight!"))
infected_mob.adjust_confusion_up_to(16 SECONDS * power, 30 SECONDS)
if(brain_damage)
- infected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * power, 80)
+ infected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3 * power, 80)
infected_mob.updatehealth()
return
diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm
index 89755c17c4b..fa26dfbd708 100644
--- a/code/datums/diseases/advance/symptoms/deafness.dm
+++ b/code/datums/diseases/advance/symptoms/deafness.dm
@@ -55,7 +55,7 @@
if(!HAS_TRAIT_FROM(infected_mob, TRAIT_DEAF, DISEASE_TRAIT))
to_chat(infected_mob, span_userdanger("Your ears pop painfully and start bleeding!"))
// Just absolutely murder me man
- infected_mob.adjustOrganLoss(ORGAN_SLOT_EARS, INFINITY)
+ infected_mob.adjust_organ_loss(ORGAN_SLOT_EARS, INFINITY)
infected_mob.emote("scream")
ADD_TRAIT(infected_mob, TRAIT_DEAF, DISEASE_TRAIT)
else
diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm
index 005a651b7f3..df282fb82ae 100644
--- a/code/datums/diseases/advance/symptoms/flesh_eating.dm
+++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm
@@ -54,7 +54,7 @@ Bonus
var/get_damage = rand(15,25) * power
M.take_overall_damage(brute = get_damage, required_bodytype = BODYTYPE_ORGANIC)
if(pain)
- M.adjustStaminaLoss(get_damage * 2)
+ M.adjust_stamina_loss(get_damage * 2)
if(bleed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm
index f6e2be2aba0..b11a461c3ad 100644
--- a/code/datums/diseases/advance/symptoms/headache.dm
+++ b/code/datums/diseases/advance/symptoms/headache.dm
@@ -50,7 +50,7 @@
to_chat(M, span_warning("[pick("Your head hurts.", "Your head pounds.")]"))
if(power >= 2 && A.stage >= 4)
to_chat(M, span_warning("[pick("Your head hurts a lot.", "Your head pounds incessantly.")]"))
- M.adjustStaminaLoss(25)
+ M.adjust_stamina_loss(25)
if(power >= 3 && A.stage >= 5)
to_chat(M, span_userdanger("[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]"))
M.Stun(35)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index 2b31a2091a4..4e759749768 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -151,10 +151,10 @@
/datum/symptom/heal/starlight/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
var/heal_amt = actual_power
- if(M.getToxLoss() && prob(5))
+ if(M.get_tox_loss() && prob(5))
to_chat(M, span_notice("Your skin tingles as the starlight seems to heal you."))
- M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins
+ M.adjust_tox_loss(-(4 * heal_amt)) //most effective on toxins
var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC)
@@ -167,7 +167,7 @@
return 1
/datum/symptom/heal/starlight/passive_message_condition(mob/living/M)
- if(M.getBruteLoss() || M.getFireLoss() || M.getToxLoss())
+ if(M.get_brute_loss() || M.get_fire_loss() || M.get_tox_loss())
return TRUE
return FALSE
@@ -309,7 +309,7 @@
return 1
/datum/symptom/heal/darkness/passive_message_condition(mob/living/M)
- if(M.getBruteLoss() || M.getFireLoss())
+ if(M.get_brute_loss() || M.get_fire_loss())
return TRUE
return FALSE
@@ -378,7 +378,7 @@
return power * 0.9
if(SOFT_CRIT)
return power * 0.5
- if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma && !(HAS_TRAIT(M,TRAIT_NOSOFTCRIT)))
+ if(M.get_brute_loss() + M.get_fire_loss() >= 70 && !active_coma && !(HAS_TRAIT(M,TRAIT_NOSOFTCRIT)))
to_chat(M, span_warning("You feel yourself slip into a regenerative coma..."))
active_coma = TRUE
addtimer(CALLBACK(src, PROC_REF(coma), M), 6 SECONDS)
@@ -409,13 +409,13 @@
if(bodypart.heal_damage(heal_amt/parts.len, heal_amt/parts.len, required_bodytype = BODYTYPE_ORGANIC))
M.update_damage_overlays()
- if(active_coma && M.getBruteLoss() + M.getFireLoss() == 0)
+ if(active_coma && M.get_brute_loss() + M.get_fire_loss() == 0)
uncoma(M)
return 1
/datum/symptom/heal/coma/passive_message_condition(mob/living/M)
- if((M.getBruteLoss() + M.getFireLoss()) > 30)
+ if((M.get_brute_loss() + M.get_fire_loss()) > 30)
return TRUE
return FALSE
@@ -476,7 +476,7 @@
return 1
/datum/symptom/heal/water/passive_message_condition(mob/living/carbon/infected_mob)
- if(infected_mob.getBruteLoss() || infected_mob.getFireLoss())
+ if(infected_mob.get_brute_loss() || infected_mob.get_fire_loss())
return TRUE
return FALSE
@@ -585,7 +585,7 @@
if(prob(5))
to_chat(M, span_notice("You feel warmer."))
- M.adjustToxLoss(-heal_amt)
+ M.adjust_tox_loss(-heal_amt)
var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC)
if(!parts.len)
@@ -634,7 +634,7 @@
/datum/symptom/heal/radiation/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
var/heal_amt = actual_power
- if(M.adjustToxLoss(-(2 * heal_amt), updating_health = FALSE))
+ if(M.adjust_tox_loss(-(2 * heal_amt), updating_health = FALSE))
M.updatehealth()
var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC)
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index 9966da2f76b..3478114bc6b 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -39,7 +39,7 @@
switch(advanced_disease.stage)
if(4, 5)
infected_mob.losebreath = max(0, infected_mob.losebreath - 4)
- infected_mob.adjustOxyLoss(-7)
+ infected_mob.adjust_oxy_loss(-7)
if(prob(base_message_chance))
to_chat(infected_mob, span_notice("You realize you haven't been breathing."))
if(regenerate_blood)
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index e0677571599..894b6ffcfec 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -64,7 +64,7 @@
M.adjust_hallucinations(-20 SECONDS)
if(A.stage >= 5)
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3)
+ M.adjust_organ_loss(ORGAN_SLOT_BRAIN, -3)
if(trauma_heal_mild && iscarbon(M))
var/mob/living/carbon/C = M
if(prob(10))
diff --git a/code/datums/diseases/anaphylaxis.dm b/code/datums/diseases/anaphylaxis.dm
index 12d408ad215..fb105b4b0de 100644
--- a/code/datums/diseases/anaphylaxis.dm
+++ b/code/datums/diseases/anaphylaxis.dm
@@ -54,8 +54,8 @@
if(affected_mob.num_legs >= 1 && SPT_PROB(5, seconds_per_tick))
to_chat(affected_mob, span_warning("You feel your leg[affected_mob.num_hands == 1 ? "":"s"] shake violently."))
affected_mob.adjust_jitter_up_to(8 SECONDS * seconds_per_tick, 1 MINUTES)
- if(prob(40) && affected_mob.getStaminaLoss() < 75)
- affected_mob.adjustStaminaLoss(15)
+ if(prob(40) && affected_mob.get_stamina_loss() < 75)
+ affected_mob.adjust_stamina_loss(15)
if(affected_mob.get_organ_slot(ORGAN_SLOT_EYES) && SPT_PROB(4, seconds_per_tick))
affected_mob.adjust_eye_blur(4 SECONDS * seconds_per_tick)
to_chat(affected_mob, span_warning("It's getting harder to see clearly."))
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index f2ef68b4e49..faf0445cbcb 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -28,7 +28,7 @@
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach stings painfully."))
if(prob(20))
- affected_mob.adjustToxLoss(2)
+ affected_mob.adjust_tox_loss(2)
if(4)
if(SPT_PROB(5, seconds_per_tick))
affected_mob.visible_message(span_danger("[affected_mob] buzzes."), \
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 4f8571765aa..615d3c94921 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -27,14 +27,14 @@
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You don't feel like yourself."))
if(SPT_PROB(2.5, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1, 170)
if(3)
if(SPT_PROB(1, seconds_per_tick))
affected_mob.emote("stare")
if(SPT_PROB(1, seconds_per_tick))
affected_mob.emote("drool")
if(SPT_PROB(5, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2, 170)
if(prob(2))
to_chat(affected_mob, span_danger("Your try to remember something important...but can't."))
@@ -44,7 +44,7 @@
if(SPT_PROB(1, seconds_per_tick))
affected_mob.emote("drool")
if(SPT_PROB(7.5, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3, 170)
if(prob(2))
to_chat(affected_mob, span_danger("Strange buzzing fills your head, removing all thoughts."))
if(SPT_PROB(1.5, seconds_per_tick))
diff --git a/code/datums/diseases/chronic_illness.dm b/code/datums/diseases/chronic_illness.dm
index 9fc6c32eda1..6152e894558 100644
--- a/code/datums/diseases/chronic_illness.dm
+++ b/code/datums/diseases/chronic_illness.dm
@@ -39,12 +39,12 @@
affected_mob.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 20)
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_userdanger("[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]"))
- need_mob_update += affected_mob.adjustStaminaLoss(70, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(70, updating_stamina = FALSE)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel a buzzing in your brain."))
SEND_SOUND(affected_mob, sound('sound/items/weapons/flash_ring.ogg'))
if(SPT_PROB(0.5, seconds_per_tick))
- need_mob_update += affected_mob.adjustBruteLoss(1, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_brute_loss(1, updating_health = FALSE)
if(need_mob_update)
affected_mob.updatehealth()
if(4)
@@ -56,7 +56,7 @@
if(prob(75))
affected_mob.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 45)
if(SPT_PROB(1, seconds_per_tick))
- need_mob_update += affected_mob.adjustStaminaLoss(100, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(100, updating_stamina = FALSE)
affected_mob.visible_message(span_warning("[affected_mob] collapses!"))
if(prob(30))
to_chat(affected_mob, span_danger("Your vision blurs as you faint!"))
@@ -64,7 +64,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("[pick("You feel as though your atoms are accelerating in place.", "You feel like you're being torn apart!")]"))
affected_mob.emote("scream")
- need_mob_update += affected_mob.adjustBruteLoss(10, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_brute_loss(10, updating_health = FALSE)
if(need_mob_update)
affected_mob.updatehealth()
if(5)
@@ -74,7 +74,7 @@
update_stage(1)
if(2)
to_chat(affected_mob, span_boldwarning("There is no place for you in this timeline."))
- affected_mob.adjustStaminaLoss(100, forced = TRUE)
+ affected_mob.adjust_stamina_loss(100, forced = TRUE)
playsound(affected_mob.loc, 'sound/effects/magic/repulse.ogg', 100, FALSE)
affected_mob.emote("scream")
for(var/mob/living/viewers in viewers(3, affected_mob.loc))
diff --git a/code/datums/diseases/death_sandwich_poisoning.dm b/code/datums/diseases/death_sandwich_poisoning.dm
index f865f4fb5be..6fad7e445ae 100644
--- a/code/datums/diseases/death_sandwich_poisoning.dm
+++ b/code/datums/diseases/death_sandwich_poisoning.dm
@@ -28,7 +28,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("gag")
if(SPT_PROB(0.5, seconds_per_tick))
- affected_mob.adjustToxLoss(5)
+ affected_mob.adjust_tox_loss(5)
if(2)
if(SPT_PROB(5, seconds_per_tick))
affected_mob.emote("cough")
@@ -39,7 +39,7 @@
if(prob(20))
affected_mob.take_bodypart_damage(burn = 1)
if(SPT_PROB(3, seconds_per_tick))
- affected_mob.adjustToxLoss(10)
+ affected_mob.adjust_tox_loss(10)
if(3)
if(SPT_PROB(5, seconds_per_tick))
@@ -53,7 +53,7 @@
if(prob(60))
affected_mob.take_bodypart_damage(burn = 2)
if(SPT_PROB(6, seconds_per_tick))
- affected_mob.adjustToxLoss(15)
+ affected_mob.adjust_tox_loss(15)
if(SPT_PROB(1.5, seconds_per_tick))
to_chat(affected_mob, span_danger("You try to scream, but nothing comes out!"))
affected_mob.set_silence_if_lower(5 SECONDS)
diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm
index 4e13341dab6..8d0d5ece467 100644
--- a/code/datums/diseases/decloning.dm
+++ b/code/datums/diseases/decloning.dm
@@ -49,7 +49,7 @@
affected_mob.emote("drool")
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.apply_status_effect(/datum/status_effect/decloning)
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1, 170)
if(SPT_PROB(7.5, seconds_per_tick))
affected_mob.adjust_stutter(6 SECONDS)
if(5)
@@ -61,4 +61,4 @@
to_chat(affected_mob, span_danger("Your skin starts degrading!"))
if(SPT_PROB(5, seconds_per_tick))
affected_mob.apply_status_effect(/datum/status_effect/decloning)
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2, 170)
diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm
index 77f1b1a3cd2..168c7f3a2f2 100644
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -50,7 +50,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach hurts."))
if(prob(20))
- affected_mob.adjustToxLoss(2, FALSE)
+ affected_mob.adjust_tox_loss(2, FALSE)
if(4)
if(!transformed && !carrier)
//Save original dna for when the disease is cured.
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 9412d2a2a2f..4fa00e06097 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -30,7 +30,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach hurts."))
if(prob(20))
- affected_mob.adjustToxLoss(1, FALSE)
+ affected_mob.adjust_tox_loss(1, FALSE)
if(affected_mob.body_position == LYING_DOWN && SPT_PROB(10, seconds_per_tick))
to_chat(affected_mob, span_notice("You feel better."))
stage--
@@ -48,7 +48,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach hurts."))
if(prob(20))
- affected_mob.adjustToxLoss(1, FALSE)
+ affected_mob.adjust_tox_loss(1, FALSE)
if(affected_mob.body_position == LYING_DOWN && SPT_PROB(7.5, seconds_per_tick))
to_chat(affected_mob, span_notice("You feel better."))
stage--
diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm
index ee38d36b1f7..554aa62e242 100644
--- a/code/datums/diseases/rhumba_beat.dm
+++ b/code/datums/diseases/rhumba_beat.dm
@@ -19,7 +19,7 @@
switch(stage)
if(2)
if(SPT_PROB(26, seconds_per_tick))
- affected_mob.adjustFireLoss(5)
+ affected_mob.adjust_fire_loss(5)
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel strange..."))
if(3)
diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm
index 4b01ef804af..f7d32034cff 100644
--- a/code/datums/diseases/tuberculosis.dm
+++ b/code/datums/diseases/tuberculosis.dm
@@ -35,11 +35,11 @@
affected_mob.set_dizzy_if_lower(10 SECONDS)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel a sharp pain from your lower chest!"))
- need_mob_update += affected_mob.adjustOxyLoss(5, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(5, updating_health = FALSE)
affected_mob.emote("gasp")
if(SPT_PROB(5, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel air escape from your lungs painfully."))
- need_mob_update += affected_mob.adjustOxyLoss(25, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(25, updating_health = FALSE)
affected_mob.emote("gasp")
if(need_mob_update)
affected_mob.updatehealth()
@@ -47,9 +47,9 @@
var/need_mob_update = FALSE
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_userdanger("[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]"))
- need_mob_update += affected_mob.adjustStaminaLoss(70, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(70, updating_stamina = FALSE)
if(SPT_PROB(5, seconds_per_tick))
- need_mob_update += affected_mob.adjustStaminaLoss(100, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(100, updating_stamina = FALSE)
affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_userdanger("You surrender yourself and feel at peace..."))
affected_mob.AdjustSleeping(10 SECONDS)
if(SPT_PROB(1, seconds_per_tick))
diff --git a/code/datums/dna/dna.dm b/code/datums/dna/dna.dm
index 3720b03bd1e..6b0ef3fc1c8 100644
--- a/code/datums/dna/dna.dm
+++ b/code/datums/dna/dna.dm
@@ -722,4 +722,4 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
eyes.Remove(src)
qdel(eyes)
visible_message(span_notice("[src] looks up and their eyes melt away!"), span_userdanger("I understand now."))
- addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(adjust_organ_loss), ORGAN_SLOT_BRAIN, 200), 2 SECONDS)
diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm
index 42f5ceefe38..0b4b6e17443 100644
--- a/code/datums/elements/atmos_requirements.dm
+++ b/code/datums/elements/atmos_requirements.dm
@@ -39,7 +39,7 @@
if(is_breathable_atmos(target))
target.clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
return
- target.adjustBruteLoss(unsuitable_atmos_damage * seconds_per_tick)
+ target.adjust_brute_loss(unsuitable_atmos_damage * seconds_per_tick)
target.throw_alert(ALERT_NOT_ENOUGH_OXYGEN, /atom/movable/screen/alert/not_enough_oxy)
/datum/element/atmos_requirements/proc/is_breathable_atmos(mob/living/target)
diff --git a/code/datums/elements/body_temp_sensitive.dm b/code/datums/elements/body_temp_sensitive.dm
index e3a694baed7..9cbb027123d 100644
--- a/code/datums/elements/body_temp_sensitive.dm
+++ b/code/datums/elements/body_temp_sensitive.dm
@@ -50,7 +50,7 @@
var/gave_alert = FALSE
if(living_mob.bodytemperature < min_body_temp)
- living_mob.adjustFireLoss(cold_damage * seconds_per_tick, forced = TRUE)
+ living_mob.adjust_fire_loss(cold_damage * seconds_per_tick, forced = TRUE)
if(!living_mob.has_status_effect(/datum/status_effect/inebriated))
switch(cold_damage)
if(1 to 5)
@@ -62,7 +62,7 @@
gave_alert = TRUE
else if(living_mob.bodytemperature > max_body_temp)
- living_mob.adjustFireLoss(heat_damage * seconds_per_tick, forced = TRUE)
+ living_mob.adjust_fire_loss(heat_damage * seconds_per_tick, forced = TRUE)
switch(heat_damage)
if(1 to 5)
living_mob.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1)
diff --git a/code/datums/elements/bonus_damage.dm b/code/datums/elements/bonus_damage.dm
index 1fce0672c51..b99d346d289 100644
--- a/code/datums/elements/bonus_damage.dm
+++ b/code/datums/elements/bonus_damage.dm
@@ -32,4 +32,4 @@
var/health_percentage = (living_target.health / living_target.maxHealth) * 100
if(living_target.stat == DEAD || health_percentage > damage_percentage)
return
- living_target.adjustBruteLoss(brute_damage_amount)
+ living_target.adjust_brute_loss(brute_damage_amount)
diff --git a/code/datums/elements/death_drops.dm b/code/datums/elements/death_drops.dm
index 13cb8938b8e..b5d8f988d2d 100644
--- a/code/datums/elements/death_drops.dm
+++ b/code/datums/elements/death_drops.dm
@@ -67,13 +67,13 @@
var/obj/effect/mob_spawn/corpse/spawner = new typepath(loot_loc, TRUE)
var/mob/living/body = spawner.create()
// done before the gib check so the bodyparts will be damaged
- body.setBruteLoss(dead.getBruteLoss())
- body.setFireLoss(dead.getFireLoss())
+ body.set_brute_loss(dead.get_brute_loss())
+ body.set_fire_loss(dead.get_fire_loss())
// if gibbed, dispose of the body
if(gibbed)
body.gib(DROP_ALL_REMAINS)
return null
// otherwise continue with the rest of the damage types
- body.setToxLoss(dead.getToxLoss())
- body.setOxyLoss(dead.getOxyLoss())
+ body.set_tox_loss(dead.get_tox_loss())
+ body.set_oxy_loss(dead.get_oxy_loss())
return body
diff --git a/code/datums/elements/leeching_walk.dm b/code/datums/elements/leeching_walk.dm
index 6948c1b1df7..2ad01fc12d9 100644
--- a/code/datums/elements/leeching_walk.dm
+++ b/code/datums/elements/leeching_walk.dm
@@ -44,11 +44,11 @@
// Heals all damage + Stamina
var/need_mob_update = FALSE
var/delta_time = DELTA_WORLD_TIME(SSmobs) * 0.5 // SSmobs.wait is 2 secs, so this should be halved.
- need_mob_update += source.adjustBruteLoss(-3 * delta_time * healing_multiplier, updating_health = FALSE)
- need_mob_update += source.adjustFireLoss(-3 * delta_time * healing_multiplier, updating_health = FALSE)
- need_mob_update += source.adjustToxLoss(-3 * delta_time * healing_multiplier, updating_health = FALSE, forced = TRUE) // Slimes are people too
- need_mob_update += source.adjustOxyLoss(-1.5 * delta_time * healing_multiplier, updating_health = FALSE)
- need_mob_update += source.adjustStaminaLoss(-10 * delta_time * healing_multiplier, updating_stamina = FALSE)
+ need_mob_update += source.adjust_brute_loss(-3 * delta_time * healing_multiplier, updating_health = FALSE)
+ need_mob_update += source.adjust_fire_loss(-3 * delta_time * healing_multiplier, updating_health = FALSE)
+ need_mob_update += source.adjust_tox_loss(-3 * delta_time * healing_multiplier, updating_health = FALSE, forced = TRUE) // Slimes are people too
+ need_mob_update += source.adjust_oxy_loss(-1.5 * delta_time * healing_multiplier, updating_health = FALSE)
+ need_mob_update += source.adjust_stamina_loss(-10 * delta_time * healing_multiplier, updating_stamina = FALSE)
if(need_mob_update)
source.updatehealth()
new /obj/effect/temp_visual/heal(get_turf(source), COLOR_BROWN)
diff --git a/code/datums/elements/spooky.dm b/code/datums/elements/spooky.dm
index 8edd90dbc25..85daaaeda78 100644
--- a/code/datums/elements/spooky.dm
+++ b/code/datums/elements/spooky.dm
@@ -58,14 +58,14 @@
if(bone_amount)
human.set_jitter_if_lower(12 SECONDS * bone_amount)
human.set_stutter(6.5 SECONDS * bone_amount)
- human.adjustStaminaLoss(3 * bone_amount * stam_dam_mult)
+ human.adjust_stamina_loss(3 * bone_amount * stam_dam_mult)
if(iszombie(human))
- human.adjustStaminaLoss(25)
+ human.adjust_stamina_loss(25)
human.Paralyze(15) //zombies can't resist the doot
return bone_amount
/datum/element/spooky/proc/spectral_change(mob/living/carbon/human/human, mob/living/user, obj/item/source)
- if(human.getStaminaLoss() <= 95)
+ if(human.get_stamina_loss() <= 95)
return
if(single_use)
diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm
index b2564093a33..24e6e69a359 100644
--- a/code/datums/martial/boxing.dm
+++ b/code/datums/martial/boxing.dm
@@ -75,7 +75,7 @@
/datum/martial_art/boxing/proc/tussle(mob/living/attacker, mob/living/defender, atk_verb = "blind jab", atk_verbed = "blind jabbed")
if(honorable_boxer) //Being a good sport, you never hit someone on the ground or already knocked down. It shows you're the better person.
- if(defender.body_position == LYING_DOWN && defender.getStaminaLoss() >= 100 || defender.IsUnconscious()) //If they're in stamcrit or unconscious, don't bloody punch them
+ if(defender.body_position == LYING_DOWN && defender.get_stamina_loss() >= 100 || defender.IsUnconscious()) //If they're in stamcrit or unconscious, don't bloody punch them
attacker.balloon_alert(attacker, "unsportsmanlike behaviour!")
return FALSE
diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index f2d65bf20ac..223697af576 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -115,7 +115,7 @@
return FALSE
attacker.do_attack_animation(defender)
- if(defender.body_position == LYING_DOWN && !defender.IsUnconscious() && defender.getStaminaLoss() >= 100)
+ if(defender.body_position == LYING_DOWN && !defender.IsUnconscious() && defender.get_stamina_loss() >= 100)
log_combat(attacker, defender, "knocked out (Head kick)(CQC)")
defender.visible_message(
span_danger("[attacker] kicks [defender]'s head, knocking [defender.p_them()] out!"),
@@ -130,7 +130,7 @@
var/helmet_protection = defender.run_armor_check(BODY_ZONE_HEAD, MELEE)
defender.apply_effect(20 SECONDS, EFFECT_KNOCKDOWN, helmet_protection)
defender.apply_effect(10 SECONDS, EFFECT_UNCONSCIOUS, helmet_protection)
- defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
+ defender.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15, 150)
else
defender.visible_message(
@@ -146,7 +146,7 @@
defender.throw_at(throw_target, 1, 14, attacker)
defender.apply_damage(10, attacker.get_attack_type())
if(defender.body_position == LYING_DOWN && !defender.IsUnconscious())
- defender.adjustStaminaLoss(45)
+ defender.adjust_stamina_loss(45)
log_combat(attacker, defender, "kicked (CQC)")
return TRUE
@@ -162,7 +162,7 @@
attacker,
)
to_chat(attacker, span_danger("You punch [defender]'s neck!"))
- defender.adjustStaminaLoss(60)
+ defender.adjust_stamina_loss(60)
playsound(attacker, 'sound/items/weapons/cqchit1.ogg', 50, TRUE, -1)
return TRUE
@@ -181,7 +181,7 @@
attacker,
)
to_chat(attacker, span_danger("You lock [defender] into a restraining position!"))
- defender.adjustStaminaLoss(20)
+ defender.adjust_stamina_loss(20)
defender.Stun(10 SECONDS)
restraining_mob = WEAKREF(defender)
addtimer(VARSET_CALLBACK(src, restraining_mob, null), 5 SECONDS, TIMER_UNIQUE)
@@ -205,7 +205,7 @@
var/obj/item/held_item = defender.get_active_held_item()
if(held_item && defender.temporarilyRemoveItemFromInventory(held_item))
attacker.put_in_hands(held_item)
- defender.adjustStaminaLoss(50)
+ defender.adjust_stamina_loss(50)
defender.apply_damage(25, attacker.get_attack_type())
return TRUE
diff --git a/code/datums/martial/kaza_ruk.dm b/code/datums/martial/kaza_ruk.dm
index 5dc043c3ac9..576cd9f5088 100644
--- a/code/datums/martial/kaza_ruk.dm
+++ b/code/datums/martial/kaza_ruk.dm
@@ -167,7 +167,7 @@
playsound(attacker, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
if(defender.losebreath <= 10)
defender.losebreath = clamp(defender.losebreath + 5, 0, 10)
- defender.adjustOxyLoss(10)
+ defender.adjust_oxy_loss(10)
log_combat(attacker, defender, "quickchoked")
return MARTIAL_ATTACK_SUCCESS
diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm
index 99c2b0e2224..1578ff32152 100644
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -73,7 +73,7 @@
if(iscarbon(defender))
var/mob/living/carbon/carbon_defender = defender
if(!istype(carbon_defender.head, /obj/item/clothing/head/helmet/) && !istype(carbon_defender.head, /obj/item/clothing/head/utility/hardhat))
- carbon_defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
+ carbon_defender.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5)
attacker.Stun(rand(1 SECONDS, 4.5 SECONDS))
defender.Stun(rand(0.5 SECONDS, 3 SECONDS))
if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index e4938ab6607..d489dd3d732 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -162,7 +162,7 @@
var/grab_log_description = "grabbed"
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
- if(defender.stat != DEAD && !defender.IsUnconscious() && defender.getStaminaLoss() >= 80) //We put our target to sleep.
+ if(defender.stat != DEAD && !defender.IsUnconscious() && defender.get_stamina_loss() >= 80) //We put our target to sleep.
defender.visible_message(
span_danger("[attacker] carefully pinch a nerve in [defender]'s neck, knocking them out cold!"),
span_userdanger("[attacker] pinches something in your neck, and you fall unconscious!"),
@@ -453,7 +453,7 @@
span_userdanger("[user] [pick(fluffmessages)]s you with [src]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, user)
to_chat(user, span_danger("You [pick(fluffmessages)] [H] with [src]!"))
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, TRUE, -1)
- H.adjustStaminaLoss(rand(13,20))
+ H.adjust_stamina_loss(rand(13,20))
if(prob(10))
H.visible_message(span_warning("[H] collapses!"), \
span_userdanger("Your legs give out!"))
@@ -465,7 +465,7 @@
span_userdanger("You're knocked unconscious by [user]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, user)
to_chat(user, span_danger("You deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!"))
H.SetSleeping(60 SECONDS)
- H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
+ H.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15, 150)
else
return ..()
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index 4c66f236525..961f27b2104 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -330,11 +330,11 @@ If you make a derivative work from this code, you must include this notification
switch(rand(1,3))
if (2)
- defender.adjustBruteLoss(rand(20,30))
+ defender.adjust_brute_loss(rand(20,30))
if (3)
EX_ACT(defender, EXPLODE_LIGHT)
else
- defender.adjustBruteLoss(rand(10,20))
+ defender.adjust_brute_loss(rand(10,20))
else
EX_ACT(defender, EXPLODE_LIGHT)
@@ -368,7 +368,7 @@ If you make a derivative work from this code, you must include this notification
defender.visible_message(span_danger("[attacker] headbutts [defender]!"), \
span_userdanger("You're headbutted by [attacker]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
to_chat(attacker, span_danger("You headbutt [defender]!"))
- defender.adjustBruteLoss(rand(10,20))
+ defender.adjust_brute_loss(rand(10,20))
playsound(attacker.loc, SFX_SWING_HIT, 50, TRUE)
defender.Unconscious(2 SECONDS)
log_combat(attacker, defender, "headbutted")
@@ -384,7 +384,7 @@ If you make a derivative work from this code, you must include this notification
span_userdanger("You're roundhouse-kicked by [attacker]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
to_chat(attacker, span_danger("You roundhouse-kick [defender]!"))
playsound(attacker.loc, SFX_SWING_HIT, 50, TRUE)
- defender.adjustBruteLoss(rand(10,20))
+ defender.adjust_brute_loss(rand(10,20))
var/turf/T = get_edge_target_turf(attacker, get_dir(attacker, get_step_away(defender, attacker)))
if (T && isturf(T))
@@ -428,7 +428,7 @@ If you make a derivative work from this code, you must include this notification
if (falling == 1)
attacker.visible_message(span_danger("...and dives head-first into the ground, ouch!"), \
span_userdanger("...and dive head-first into the ground, ouch!"))
- attacker.adjustBruteLoss(rand(10,20))
+ attacker.adjust_brute_loss(rand(10,20))
attacker.Paralyze(60)
to_chat(attacker, span_warning("[defender] is too far away!"))
return
@@ -456,9 +456,9 @@ If you make a derivative work from this code, you must include this notification
if (prob(33) || defender.stat)
EX_ACT(defender, EXPLODE_LIGHT)
else
- defender.adjustBruteLoss(rand(20,30))
+ defender.adjust_brute_loss(rand(20,30))
else
- defender.adjustBruteLoss(rand(20,30))
+ defender.adjust_brute_loss(rand(20,30))
defender.Paralyze(4 SECONDS)
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index 9b92da0dbdf..2e633fef128 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -703,9 +703,9 @@
return
// Gives you 30 seconds of being in soft crit... give or take
if(HAS_TRAIT(owner, TRAIT_TOXIMMUNE) || HAS_TRAIT(owner, TRAIT_TOXINLOVER))
- owner.adjustBruteLoss(1 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
+ owner.adjust_brute_loss(1 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
else
- owner.adjustToxLoss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
- owner.adjustBruteLoss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
+ owner.adjust_tox_loss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
+ owner.adjust_brute_loss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
// Offsets suffocation but not entirely
- owner.adjustOxyLoss(-0.5 * seconds_per_tick, forced = TRUE)
+ owner.adjust_oxy_loss(-0.5 * seconds_per_tick, forced = TRUE)
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index e2179630beb..b49b06a06e3 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -184,7 +184,7 @@
if(!collateral_mob.density || collateral_mob == yeeted_person)
continue
- yeeted_person.adjustBruteLoss(step*0.5)
+ yeeted_person.adjust_brute_loss(step*0.5)
playsound(collateral_mob,'sound/items/weapons/punch1.ogg',50,TRUE)
log_combat(the_hulk, collateral_mob, "has smacked with tail swing victim")
log_combat(the_hulk, yeeted_person, "has smacked this person into someone while tail swinging") // i have no idea how to better word this
@@ -192,14 +192,14 @@
if(collateral_mob == the_hulk) // if the hulk moves wrong and crosses himself
the_hulk.visible_message(span_warning("[the_hulk] smacks [the_hulk.p_them()]self with [yeeted_person]!"), span_userdanger("You end up smacking [yeeted_person] into yourself!"), ignored_mobs = yeeted_person)
to_chat(yeeted_person, span_userdanger("[the_hulk] smacks you into [the_hulk.p_them()]self, turning you free!"))
- the_hulk.adjustBruteLoss(step)
+ the_hulk.adjust_brute_loss(step)
return
yeeted_person.visible_message(span_warning("[the_hulk] swings [yeeted_person] directly into [collateral_mob], sending [collateral_mob.p_them()] flying!"), \
span_userdanger("You're smacked into [collateral_mob]!"), ignored_mobs = collateral_mob)
to_chat(collateral_mob, span_userdanger("[the_hulk] swings [yeeted_person] directly into you, sending you flying!"))
- collateral_mob.adjustBruteLoss(step*0.5)
+ collateral_mob.adjust_brute_loss(step*0.5)
collateral_mob.throw_at(collat_throw_target, round(step * 0.25) + 1, round(step * 0.25) + 1)
step -= 5
delay += 5
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index 3bbf1a1f2e6..c618f1f0a33 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -107,7 +107,7 @@
if(iscarbon(cast_on))
var/mob/living/carbon/carbon_cast_on = cast_on
- carbon_cast_on.adjustOrganLoss(ORGAN_SLOT_EYES, eye_damage)
+ carbon_cast_on.adjust_organ_loss(ORGAN_SLOT_EYES, eye_damage)
///X-ray Vision lets you see through walls.
/datum/mutation/xray
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index 5325c709959..ba24f4f30bc 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -220,9 +220,9 @@
. = FALSE
// Damage to heal
- var/brute_to_heal = min(hurtguy.getBruteLoss(), 35 * heal_multiplier)
+ var/brute_to_heal = min(hurtguy.get_brute_loss(), 35 * heal_multiplier)
// no double dipping
- var/burn_to_heal = min(hurtguy.getFireLoss(), (35 - brute_to_heal) * heal_multiplier)
+ var/burn_to_heal = min(hurtguy.get_fire_loss(), (35 - brute_to_heal) * heal_multiplier)
// Get at least organic limb to transfer the damage to
var/list/mendicant_organic_limbs = list()
@@ -241,11 +241,11 @@
mendicant_transfer_limb.receive_damage(brute_to_heal * pain_multiplier, burn_to_heal * pain_multiplier, forced = TRUE, wound_bonus = CANT_WOUND)
if(brute_to_heal)
- hurtguy.adjustBruteLoss(-brute_to_heal)
+ hurtguy.adjust_brute_loss(-brute_to_heal)
. = TRUE
if(burn_to_heal)
- hurtguy.adjustFireLoss(-burn_to_heal)
+ hurtguy.adjust_fire_loss(-burn_to_heal)
. = TRUE
if(!.)
@@ -323,7 +323,7 @@
. = TRUE
// Because we do our own spin on it!
if(hurtguy.get_blood_compatibility(mendicant) == FALSE)
- hurtguy.adjustToxLoss((blood_transferred * 0.1) * pain_multiplier) // 1 dmg per 10 blood
+ hurtguy.adjust_tox_loss((blood_transferred * 0.1) * pain_multiplier) // 1 dmg per 10 blood
to_chat(hurtguy, span_notice("Your veins feel thicker, but they itch a bit."))
else
to_chat(hurtguy, span_notice("Your veins feel thicker!"))
@@ -342,7 +342,7 @@
. = TRUE
// Because we do our own spin on it!
if(mendicant.get_blood_compatibility(hurtguy) == FALSE)
- mendicant.adjustToxLoss((blood_received * 0.1) * pain_multiplier) // 1 dmg per 10 blood
+ mendicant.adjust_tox_loss((blood_received * 0.1) * pain_multiplier) // 1 dmg per 10 blood
to_chat(mendicant, span_notice("Your veins swell and itch!"))
else
to_chat(mendicant, span_notice("Your veins swell!"))
diff --git a/code/datums/proximity_monitor/fields/heretic_arena.dm b/code/datums/proximity_monitor/fields/heretic_arena.dm
index 4c41be6cfe6..432a9dfbd7b 100644
--- a/code/datums/proximity_monitor/fields/heretic_arena.dm
+++ b/code/datums/proximity_monitor/fields/heretic_arena.dm
@@ -162,8 +162,8 @@ GLOBAL_LIST_EMPTY(heretic_arenas)
// The mansus celebrates your efforts
if(IS_HERETIC(owner))
owner.heal_overall_damage(60, 60, 60)
- owner.adjustToxLoss(-60, forced = TRUE) // Slime heretics everywhere...
- owner.adjustOxyLoss(-60)
+ owner.adjust_tox_loss(-60, forced = TRUE) // Slime heretics everywhere...
+ owner.adjust_oxy_loss(-60)
if(iscarbon(owner))
var/mob/living/carbon/carbon_owner = owner
for(var/datum/wound/wound as anything in carbon_owner.all_wounds)
diff --git a/code/datums/quirks/negative_quirks/allergic.dm b/code/datums/quirks/negative_quirks/allergic.dm
index 8ebb1a87bc4..394a0a584f6 100644
--- a/code/datums/quirks/negative_quirks/allergic.dm
+++ b/code/datums/quirks/negative_quirks/allergic.dm
@@ -65,5 +65,5 @@
source.reagents.add_reagent(/datum/reagent/toxin/histamine, 3 * seconds_per_tick)
if(SPT_PROB(10, seconds_per_tick))
source.vomit(VOMIT_CATEGORY_DEFAULT)
- source.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN, ORGAN_SLOT_APPENDIX, ORGAN_SLOT_LUNGS, ORGAN_SLOT_HEART, ORGAN_SLOT_LIVER, ORGAN_SLOT_STOMACH), 10)
+ source.adjust_organ_loss(pick(ORGAN_SLOT_BRAIN, ORGAN_SLOT_APPENDIX, ORGAN_SLOT_LUNGS, ORGAN_SLOT_HEART, ORGAN_SLOT_LIVER, ORGAN_SLOT_STOMACH), 10)
return NONE
diff --git a/code/datums/quirks/negative_quirks/brain_problems.dm b/code/datums/quirks/negative_quirks/brain_problems.dm
index 4ecc9c0713a..d9257a33c6b 100644
--- a/code/datums/quirks/negative_quirks/brain_problems.dm
+++ b/code/datums/quirks/negative_quirks/brain_problems.dm
@@ -35,4 +35,4 @@
return ..()
/datum/quirk/item_quirk/brainproblems/process(seconds_per_tick)
- quirk_holder.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * seconds_per_tick)
+ quirk_holder.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.2 * seconds_per_tick)
diff --git a/code/datums/quirks/positive_quirks/drunk_healing.dm b/code/datums/quirks/positive_quirks/drunk_healing.dm
index e1c4ba91125..a0b5f47cfe8 100644
--- a/code/datums/quirks/positive_quirks/drunk_healing.dm
+++ b/code/datums/quirks/positive_quirks/drunk_healing.dm
@@ -13,13 +13,13 @@
var/need_mob_update = FALSE
switch(quirk_holder.get_drunk_amount())
if (6 to 40)
- need_mob_update += quirk_holder.adjustBruteLoss(-0.1 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += quirk_holder.adjustFireLoss(-0.05 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_brute_loss(-0.1 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_fire_loss(-0.05 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
if (41 to 60)
- need_mob_update += quirk_holder.adjustBruteLoss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += quirk_holder.adjustFireLoss(-0.2 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_brute_loss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_fire_loss(-0.2 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
if (61 to INFINITY)
- need_mob_update += quirk_holder.adjustBruteLoss(-0.8 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += quirk_holder.adjustFireLoss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_brute_loss(-0.8 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_fire_loss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
if(need_mob_update)
quirk_holder.updatehealth()
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 75edc87b4ec..3a999b01e6f 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -66,10 +66,10 @@
return
var/grace_heal = bloodlust * 0.02
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += owner.adjustFireLoss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += owner.adjustToxLoss(-grace_heal * seconds_between_ticks, forced = TRUE)
- need_mob_update += owner.adjustOxyLoss(-(grace_heal * 2) * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_brute_loss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_fire_loss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_tox_loss(-grace_heal * seconds_between_ticks, forced = TRUE)
+ need_mob_update += owner.adjust_oxy_loss(-(grace_heal * 2) * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
if(need_mob_update)
owner.updatehealth()
@@ -160,9 +160,9 @@
return
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-4 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(-2 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustOxyLoss(-4 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_brute_loss(-4 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(-2 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_oxy_loss(-4 * seconds_between_ticks, updating_health = FALSE)
if(need_mob_update)
owner.updatehealth()
@@ -340,12 +340,12 @@
if(itemUser.health < itemUser.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(itemUser), "#375637")
var/need_mob_update = FALSE
- need_mob_update += itemUser.adjustBruteLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustFireLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustToxLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE) //Because Slime People are people too
- need_mob_update += itemUser.adjustOxyLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustStaminaLoss(-3 * seconds_between_ticks, updating_stamina = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustOrganLoss(ORGAN_SLOT_BRAIN, -0.6 * seconds_between_ticks)
+ need_mob_update += itemUser.adjust_brute_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_fire_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_tox_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE) //Because Slime People are people too
+ need_mob_update += itemUser.adjust_oxy_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_stamina_loss(-3 * seconds_between_ticks, updating_stamina = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_organ_loss(ORGAN_SLOT_BRAIN, -0.6 * seconds_between_ticks)
if(need_mob_update)
itemUser.updatehealth()
@@ -391,8 +391,8 @@
/datum/status_effect/regenerative_core/on_apply()
owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
- owner.adjustBruteLoss(-25)
- owner.adjustFireLoss(-25)
+ owner.adjust_brute_loss(-25)
+ owner.adjust_fire_loss(-25)
owner.fully_heal(HEAL_CC_STATUS)
owner.bodytemperature = owner.get_body_temp_normal()
if(ishuman(owner))
@@ -529,7 +529,7 @@
var/mob/living/simple_animal/healthy_animal = owner
healthy_animal.adjustHealth(-(health_increase * healing_modifier))
else
- owner.adjustBruteLoss(-(health_increase * healing_modifier))
+ owner.adjust_brute_loss(-(health_increase * healing_modifier))
/datum/status_effect/limited_buff/health_buff/maxed_out()
. = ..()
@@ -549,10 +549,10 @@
return
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-2 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(-2 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustOxyLoss(-4 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustStaminaLoss(-4 * seconds_between_ticks, updating_stamina = FALSE)
+ need_mob_update += owner.adjust_brute_loss(-2 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(-2 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_oxy_loss(-4 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_stamina_loss(-4 * seconds_between_ticks, updating_stamina = FALSE)
if(need_mob_update)
owner.updatehealth()
owner.adjust_bodytemperature(BODYTEMP_NORMAL, 0, BODYTEMP_NORMAL) //Won't save you from the void of space, but it will stop you from freezing or suffocating in low pressure
diff --git a/code/datums/status_effects/debuffs/choke.dm b/code/datums/status_effects/debuffs/choke.dm
index 05f41dcd178..1613c4bbad4 100644
--- a/code/datums/status_effects/debuffs/choke.dm
+++ b/code/datums/status_effects/debuffs/choke.dm
@@ -264,7 +264,7 @@
// If we ain't starting, deal a tad bit of brute, as a treat
// Note, we attempt to process 10 times a second, so over 7 seconds this'll deal 14 brute
if(!before_work)
- victim.adjustBruteLoss(0.2)
+ victim.adjust_brute_loss(0.2)
return TRUE
/datum/status_effect/choke/tick(seconds_between_ticks)
diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm
index cf7611b8ca6..c39670d25a8 100644
--- a/code/datums/status_effects/debuffs/debuffs.dm
+++ b/code/datums/status_effects/debuffs/debuffs.dm
@@ -124,8 +124,8 @@
return ..()
/datum/status_effect/incapacitating/unconscious/tick(seconds_between_ticks)
- if(owner.getStaminaLoss())
- owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds
+ if(owner.get_stamina_loss())
+ owner.adjust_stamina_loss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds
//SLEEPING
@@ -233,10 +233,10 @@
to_chat(carbon_owner, span_notice("You feel your fitness improving!"))
if(health_ratio > 0.8) // only heals minor physical damage
- need_mob_update += owner.adjustBruteLoss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += owner.adjustFireLoss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += owner.adjustToxLoss(-0.2 * sleep_quality * seconds_between_ticks, updating_health = FALSE, forced = TRUE, required_biotype = MOB_ORGANIC)
- need_mob_update += owner.adjustStaminaLoss(min(-0.4 * sleep_quality * seconds_between_ticks, -0.4 * HEALING_SLEEP_DEFAULT * seconds_between_ticks), updating_stamina = FALSE)
+ need_mob_update += owner.adjust_brute_loss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += owner.adjust_fire_loss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += owner.adjust_tox_loss(-0.2 * sleep_quality * seconds_between_ticks, updating_health = FALSE, forced = TRUE, required_biotype = MOB_ORGANIC)
+ need_mob_update += owner.adjust_stamina_loss(min(-0.4 * sleep_quality * seconds_between_ticks, -0.4 * HEALING_SLEEP_DEFAULT * seconds_between_ticks), updating_stamina = FALSE)
if(need_mob_update)
owner.updatehealth()
// Drunkenness gets reduced by 0.3% per tick (6% per 2 seconds)
@@ -332,9 +332,9 @@
qdel(src)
return
var/need_mob_update
- need_mob_update = owner.adjustBruteLoss(0.04 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(0.04 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustToxLoss(0.08 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update = owner.adjust_brute_loss(0.04 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(0.04 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_tox_loss(0.08 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
if(need_mob_update)
owner.updatehealth()
@@ -412,7 +412,7 @@
new /obj/effect/temp_visual/bleed(get_turf(owner))
/datum/status_effect/stacking/saw_bleed/threshold_cross_effect()
- owner.adjustBruteLoss(bleed_damage)
+ owner.adjust_brute_loss(bleed_damage)
new /obj/effect/temp_visual/bleed/explode(get_turf(owner))
for(var/splatter_dir in GLOB.alldirs)
owner.create_splatter(splatter_dir)
@@ -524,7 +524,7 @@
wasting_effect.alpha = 255
animate(wasting_effect, alpha = 0, time = 32)
playsound(owner, 'sound/effects/curse/curse5.ogg', 20, TRUE, -1)
- owner.adjustFireLoss(0.75)
+ owner.adjust_fire_loss(0.75)
if(curse_flags & CURSE_GRASPING)
if(effect_next_activation > world.time)
diff --git a/code/datums/status_effects/debuffs/drunk.dm b/code/datums/status_effects/debuffs/drunk.dm
index 7426692ad5e..ca8a1ef98a2 100644
--- a/code/datums/status_effects/debuffs/drunk.dm
+++ b/code/datums/status_effects/debuffs/drunk.dm
@@ -201,20 +201,20 @@
// Over 81, we will gain constant toxloss
if(drunk_value >= 81)
- owner.adjustToxLoss(1)
+ owner.adjust_tox_loss(1)
if(owner.stat == CONSCIOUS && prob(5))
to_chat(owner, span_warning("Maybe you should lie down for a bit..."))
// Over 91, we gain even more toxloss, brain damage, and have a chance of dropping into a long sleep
if(drunk_value >= 91)
- owner.adjustToxLoss(1)
- owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.4)
+ owner.adjust_tox_loss(1)
+ owner.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.4)
if(owner.stat == CONSCIOUS)
attempt_to_blackout()
// And finally, over 100 - let's be honest, you shouldn't be alive by now.
if(drunk_value >= 101)
- owner.adjustToxLoss(2)
+ owner.adjust_tox_loss(2)
/datum/status_effect/inebriated/drunk/proc/attempt_to_blackout()
var/mob/living/carbon/drunkard = owner
diff --git a/code/datums/status_effects/debuffs/genetic_damage.dm b/code/datums/status_effects/debuffs/genetic_damage.dm
index 9eb90b917b7..c0ae16d4082 100644
--- a/code/datums/status_effects/debuffs/genetic_damage.dm
+++ b/code/datums/status_effects/debuffs/genetic_damage.dm
@@ -39,7 +39,7 @@
return
if(total_damage >= minimum_before_tox_damage)
- owner.adjustToxLoss(toxin_damage_per_second * seconds_between_ticks)
+ owner.adjust_tox_loss(toxin_damage_per_second * seconds_between_ticks)
total_damage -= remove_per_second * seconds_between_ticks
if(total_damage <= 0)
diff --git a/code/datums/status_effects/debuffs/heart_attack.dm b/code/datums/status_effects/debuffs/heart_attack.dm
index 520443f1584..592162ea0f8 100644
--- a/code/datums/status_effects/debuffs/heart_attack.dm
+++ b/code/datums/status_effects/debuffs/heart_attack.dm
@@ -47,12 +47,12 @@
if(time_until_stoppage > ATTACK_STAGE_THREE)
if(SPT_PROB(5, seconds_between_ticks))
owner.playsound_local(owner, 'sound/effects/singlebeat.ogg', 25, FALSE, use_reverb = FALSE)
- owner.adjustStaminaLoss(5)
+ owner.adjust_stamina_loss(5)
if(time_until_stoppage <= ATTACK_STAGE_TWO && time_until_stoppage > ATTACK_STAGE_THREE) //This coughing gets replaced with worse coughing, no need to stack it.
if(SPT_PROB(10, seconds_between_ticks))
owner.emote("cough")
- owner.adjustStaminaLoss(10)
+ owner.adjust_stamina_loss(10)
oxyloss_sum += 4
if(time_until_stoppage <= ATTACK_STAGE_THREE) //At this point, we start with chat messages and make it clear that something is very wrong.
@@ -69,7 +69,7 @@
if(SPT_PROB(8, seconds_between_ticks))
to_chat(owner, span_danger("You feel very weak and dizzy..."))
owner.adjust_confusion_up_to(6 SECONDS, 10 SECONDS)
- owner.adjustStaminaLoss(20)
+ owner.adjust_stamina_loss(20)
owner.emote("cough")
oxyloss_sum += 8
@@ -79,7 +79,7 @@
to_chat(owner, span_userdanger("It feels like you're shutting down..."))
owner.adjust_dizzy_up_to(4 SECONDS, 10 SECONDS)
owner.adjust_eye_blur_up_to(4 SECONDS, 20 SECONDS)
- owner.adjustStaminaLoss(20)
+ owner.adjust_stamina_loss(20)
if(SPT_PROB(5, seconds_between_ticks))
owner.emote("cough")
@@ -94,8 +94,8 @@
owner.Paralyze(1 SECONDS)
oxyloss_sum += 3
- if(owner.getOxyLoss() < OXYLOSS_MAXIMUM) //A bad enough roll on the verge of passing out might still push you over into unconciousness for a few seconds...?
- owner.adjustOxyLoss(oxyloss_sum)
+ if(owner.get_oxy_loss() < OXYLOSS_MAXIMUM) //A bad enough roll on the verge of passing out might still push you over into unconciousness for a few seconds...?
+ owner.adjust_oxy_loss(oxyloss_sum)
if(time_until_stoppage <= 0)
if(owner.stat == CONSCIOUS)
diff --git a/code/datums/status_effects/debuffs/rust_corruption.dm b/code/datums/status_effects/debuffs/rust_corruption.dm
index 168986beb92..6692ef111a0 100644
--- a/code/datums/status_effects/debuffs/rust_corruption.dm
+++ b/code/datums/status_effects/debuffs/rust_corruption.dm
@@ -6,7 +6,7 @@
/datum/status_effect/rust_corruption/tick(seconds_between_ticks)
if(issilicon(owner) || isbot(owner))
- owner.adjustBruteLoss(10 * seconds_between_ticks)
+ owner.adjust_brute_loss(10 * seconds_between_ticks)
return
owner.adjust_disgust(5 * seconds_between_ticks)
owner.reagents?.remove_all(0.75 * seconds_between_ticks)
diff --git a/code/datums/status_effects/debuffs/slime/slime_leech.dm b/code/datums/status_effects/debuffs/slime/slime_leech.dm
index 6b1bb8038bc..8d8c77d95f9 100644
--- a/code/datums/status_effects/debuffs/slime/slime_leech.dm
+++ b/code/datums/status_effects/debuffs/slime/slime_leech.dm
@@ -60,14 +60,14 @@
var/totaldamage = 0 //total damage done to this unfortunate soul
if(iscarbon(owner))
- totaldamage += owner.adjustBruteLoss(rand(2, 4) * 0.5 * seconds_between_ticks)
- totaldamage += owner.adjustToxLoss(rand(1, 2) * 0.5 * seconds_between_ticks)
+ totaldamage += owner.adjust_brute_loss(rand(2, 4) * 0.5 * seconds_between_ticks)
+ totaldamage += owner.adjust_tox_loss(rand(1, 2) * 0.5 * seconds_between_ticks)
if(isanimal_or_basicmob(owner))
var/need_mob_update
- need_mob_update = totaldamage += owner.adjustBruteLoss(rand(2, 4) * 0.5 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += totaldamage += owner.adjustToxLoss(rand(1, 2) * 0.5 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update = totaldamage += owner.adjust_brute_loss(rand(2, 4) * 0.5 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += totaldamage += owner.adjust_tox_loss(rand(1, 2) * 0.5 * seconds_between_ticks, updating_health = FALSE)
if(need_mob_update)
owner.updatehealth()
@@ -95,4 +95,4 @@
our_slime.adjust_nutrition(-1 * 1.8 * totaldamage) //damage is already modified by seconds_between_ticks
//Heal yourself.
- our_slime.adjustBruteLoss(-1.5 * seconds_between_ticks)
+ our_slime.adjust_brute_loss(-1.5 * seconds_between_ticks)
diff --git a/code/datums/status_effects/debuffs/spacer.dm b/code/datums/status_effects/debuffs/spacer.dm
index de12088d255..e2e8b8be1d4 100644
--- a/code/datums/status_effects/debuffs/spacer.dm
+++ b/code/datums/status_effects/debuffs/spacer.dm
@@ -41,7 +41,7 @@
if(seconds_in_nograv >= 3 MINUTES)
// This has some interesting side effects with gravitum or similar negating effects that may be worth nothing
- owner.adjustStaminaLoss(-1 * stamina_heal_per_tick)
+ owner.adjust_stamina_loss(-1 * stamina_heal_per_tick)
owner.AdjustAllImmobility(-1 * stun_heal_per_tick)
// For comparison: Ephedrine heals 4 stamina per tick / 2 per second
// and Nicotine heals 5 seconds of stun per tick / 2.5 per second
@@ -74,8 +74,8 @@
var/minutes_active = round(seconds_active / (1 MINUTES))
// Sit at a passive amount of stamina damage depending on how long it's been
- if(!the_spacer.getStaminaLoss())
- the_spacer.adjustStaminaLoss(min(25, 5 * minutes_active))
+ if(!the_spacer.get_stamina_loss())
+ the_spacer.adjust_stamina_loss(min(25, 5 * minutes_active))
// Max disgust increases over time as well
max_disgust = min(DISGUST_LEVEL_VERYGROSS + 5, initial(max_disgust) + 5 * minutes_active)
// And your lungs can't really handle it good
diff --git a/code/datums/status_effects/debuffs/stamcrit.dm b/code/datums/status_effects/debuffs/stamcrit.dm
index 5c8c2b46234..fb5b5e30920 100644
--- a/code/datums/status_effects/debuffs/stamcrit.dm
+++ b/code/datums/status_effects/debuffs/stamcrit.dm
@@ -16,9 +16,9 @@
// This should be in on apply but we need it to happen AFTER being added to the mob
// (Because we need to wait until the status effect is in their status effect list, or we'll add two)
- if(owner.getStaminaLoss() < 120)
+ if(owner.get_stamina_loss() < 120)
// Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems.
- owner.adjustStaminaLoss(30, FALSE)
+ owner.adjust_stamina_loss(30, FALSE)
// Same
RegisterSignal(owner, COMSIG_LIVING_ADJUST_STAMINA_DAMAGE, PROC_REF(update_diminishing_return))
@@ -80,5 +80,5 @@
qdel(src)
return
- if(owner.maxHealth - owner.getStaminaLoss() > owner.crit_threshold)
+ if(owner.maxHealth - owner.get_stamina_loss() > owner.crit_threshold)
qdel(src)
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index f3111bc36cf..93e6f89219c 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -152,10 +152,10 @@
spell.reset_spell_cooldown()
var/need_mob_update = FALSE
- need_mob_update += rewarded.adjustBruteLoss(-25, updating_health = FALSE)
- need_mob_update += rewarded.adjustFireLoss(-25, updating_health = FALSE)
- need_mob_update += rewarded.adjustToxLoss(-25, updating_health = FALSE)
- need_mob_update += rewarded.adjustOxyLoss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_brute_loss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_fire_loss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_tox_loss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_oxy_loss(-25, updating_health = FALSE)
if(need_mob_update)
rewarded.updatehealth()
@@ -683,11 +683,11 @@
var/healed = 0
if(recovery) //very mild healing for those with the water adaptation trait (fish infusion)
- healed += owner.adjustOxyLoss(recovery * (water_adaptation ? 1.5 : 1), updating_health = FALSE, required_biotype = MOB_ORGANIC)
- healed += owner.adjustFireLoss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- healed += owner.adjustToxLoss(recovery, updating_health = FALSE, required_biotype = MOB_ORGANIC)
- healed += owner.adjustBruteLoss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- healed += owner.adjustStaminaLoss(stam_recovery, updating_stamina = FALSE)
+ healed += owner.adjust_oxy_loss(recovery * (water_adaptation ? 1.5 : 1), updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ healed += owner.adjust_fire_loss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ healed += owner.adjust_tox_loss(recovery, updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ healed += owner.adjust_brute_loss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ healed += owner.adjust_stamina_loss(stam_recovery, updating_stamina = FALSE)
if(healed)
owner.updatehealth()
else if(istype(shower_reagent, /datum/reagent/blood))
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 2eb77ff33f0..f3e9f3c4b04 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -61,7 +61,7 @@
return TRUE
/datum/weather/ash_storm/weather_act_mob(mob/living/victim)
- victim.adjustFireLoss(4, required_bodytype = BODYTYPE_ORGANIC)
+ victim.adjust_fire_loss(4, required_bodytype = BODYTYPE_ORGANIC)
return ..()
/datum/weather/ash_storm/end()
diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
index 14130421e6e..2dcbbed0aa7 100644
--- a/code/datums/weather/weather_types/floor_is_lava.dm
+++ b/code/datums/weather/weather_types/floor_is_lava.dm
@@ -44,5 +44,5 @@
return FALSE
/datum/weather/floor_is_lava/weather_act_mob(mob/living/victim)
- victim.adjustFireLoss(3)
+ victim.adjust_fire_loss(3)
return ..()
diff --git a/code/datums/weather/weather_types/sand_storm.dm b/code/datums/weather/weather_types/sand_storm.dm
index 89d71c09ae5..c346c536a91 100644
--- a/code/datums/weather/weather_types/sand_storm.dm
+++ b/code/datums/weather/weather_types/sand_storm.dm
@@ -43,7 +43,7 @@
return ..()
/datum/weather/sand_storm/weather_act_mob(mob/living/victim)
- victim.adjustBruteLoss(5, required_bodytype = BODYTYPE_ORGANIC)
+ victim.adjust_brute_loss(5, required_bodytype = BODYTYPE_ORGANIC)
return ..()
/datum/weather/sand_storm/harmless
diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm
index f5493fd40d0..496b9c8811e 100644
--- a/code/datums/wounds/bones.dm
+++ b/code/datums/wounds/bones.dm
@@ -101,7 +101,7 @@
if(!is_bone_limb && SPT_PROB(severity * 1.5, seconds_per_tick))
victim.take_bodypart_damage(rand(1, severity * 2), wound_bonus=CANT_WOUND)
- victim.adjustStaminaLoss(rand(2, severity * 2.5))
+ victim.adjust_stamina_loss(rand(2, severity * 2.5))
if(prob(33))
to_chat(victim, span_danger("You feel a sharp pain in your body as your bones are reforming!"))
diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm
index 9ffd70f195f..870df194c53 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -42,7 +42,7 @@
. = ..()
if(strikes_to_lose_limb <= 0) // we've already hit sepsis, nothing more to do
- victim.adjustToxLoss(0.25 * seconds_per_tick)
+ victim.adjust_tox_loss(0.25 * seconds_per_tick)
if(SPT_PROB(0.5, seconds_per_tick))
victim.visible_message(span_danger("The infection on the remnants of [victim]'s [limb.plaintext_zone] shift and bubble nauseatingly!"), span_warning("You can feel the infection on the remnants of your [limb.plaintext_zone] coursing through your veins!"), vision_distance = COMBAT_MESSAGE_RANGE)
return
@@ -90,7 +90,7 @@
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
if(SPT_PROB(15, seconds_per_tick))
- victim.adjustToxLoss(0.2)
+ victim.adjust_tox_loss(0.2)
if(prob(6))
to_chat(victim, span_warning("The blisters on your [limb.plaintext_zone] ooze a strange pus..."))
@@ -106,7 +106,7 @@
return
if(SPT_PROB(10, seconds_per_tick))
- victim.adjustToxLoss(0.5)
+ victim.adjust_tox_loss(0.5)
if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC)
if(!disabling)
@@ -122,9 +122,9 @@
if(SPT_PROB(2.48, seconds_per_tick))
if(prob(20))
to_chat(victim, span_warning("You contemplate life without your [limb.plaintext_zone]..."))
- victim.adjustToxLoss(0.75)
+ victim.adjust_tox_loss(0.75)
else
- victim.adjustToxLoss(1)
+ victim.adjust_tox_loss(1)
if(WOUND_INFECTION_SEPTIC to INFINITY)
if(SPT_PROB(0.5 * infection, seconds_per_tick))
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 6c6b41da72c..dd76cd1efb7 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -68,9 +68,9 @@
say("Not enough energy. Restoration cancelled.")
return FALSE
var/need_mob_update = FALSE
- need_mob_update += occupier.adjustOxyLoss(-5, updating_health = FALSE)
- need_mob_update += occupier.adjustFireLoss(-5, updating_health = FALSE)
- need_mob_update += occupier.adjustBruteLoss(-5, updating_health = FALSE)
+ need_mob_update += occupier.adjust_oxy_loss(-5, updating_health = FALSE)
+ need_mob_update += occupier.adjust_fire_loss(-5, updating_health = FALSE)
+ need_mob_update += occupier.adjust_brute_loss(-5, updating_health = FALSE)
if(need_mob_update)
occupier.updatehealth()
if(occupier.health >= 0 && occupier.stat == DEAD)
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index bc3a8f2f4be..ff21a3912a5 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -267,10 +267,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
// Damage
if (sensor_mode >= SENSOR_VITALS)
entry += list(
- "oxydam" = round(tracked_living_mob.getOxyLoss(), 1),
- "toxdam" = round(tracked_living_mob.getToxLoss(), 1),
- "burndam" = round(tracked_living_mob.getFireLoss(), 1),
- "brutedam" = round(tracked_living_mob.getBruteLoss(), 1),
+ "oxydam" = round(tracked_living_mob.get_oxy_loss(), 1),
+ "toxdam" = round(tracked_living_mob.get_tox_loss(), 1),
+ "burndam" = round(tracked_living_mob.get_fire_loss(), 1),
+ "brutedam" = round(tracked_living_mob.get_brute_loss(), 1),
"health" = round(tracked_living_mob.health, 1),
)
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index 0c7498888a6..f7ebf99e141 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -126,10 +126,10 @@
data["patient"]["blood_type"] = patient.get_bloodtype()?.name || "UNKNOWN"
data["patient"]["maxHealth"] = patient.maxHealth
data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD
- data["patient"]["bruteLoss"] = patient.getBruteLoss()
- data["patient"]["fireLoss"] = patient.getFireLoss()
- data["patient"]["toxLoss"] = patient.getToxLoss()
- data["patient"]["oxyLoss"] = patient.getOxyLoss()
+ data["patient"]["bruteLoss"] = patient.get_brute_loss()
+ data["patient"]["fireLoss"] = patient.get_fire_loss()
+ data["patient"]["toxLoss"] = patient.get_tox_loss()
+ data["patient"]["oxyLoss"] = patient.get_oxy_loss()
if(patient.surgeries.len)
for(var/datum/surgery/procedure in patient.surgeries)
var/datum/surgery_step/surgery_step = GLOB.surgery_steps[procedure.steps[procedure.status]]
diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
index ea80cbe1017..960491df3ca 100644
--- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
@@ -134,7 +134,7 @@
if(!bonus_active || !HAS_TRAIT(owner, TRAIT_IS_WET))
return
owner.adjust_bodytemperature(-2 * seconds_between_ticks, min_temp = owner.get_body_temp_normal())
- owner.adjustStaminaLoss(-1.5 * seconds_between_ticks)
+ owner.adjust_stamina_loss(-1.5 * seconds_between_ticks)
/datum/status_effect/organ_set_bonus/fish/proc/update_wetness(datum/source)
SIGNAL_HANDLER
@@ -374,7 +374,7 @@
breathe_gas_volume(breath, /datum/gas/water_vapor, /datum/gas/carbon_dioxide)
// Heal mob if not in crit.
if(breather.health >= breather.crit_threshold && breather.oxyloss)
- breather.adjustOxyLoss(-5)
+ breather.adjust_oxy_loss(-5)
/// Called when there isn't enough water to breath
/obj/item/organ/lungs/fish/proc/on_low_water(mob/living/carbon/breather, datum/gas_mixture/breath, water_pp)
diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm
index afe4610f7cd..3b8ef7cd22f 100644
--- a/code/game/machinery/medical_kiosk.dm
+++ b/code/game/machinery/medical_kiosk.dm
@@ -225,10 +225,10 @@
var/patient_status = "Alive."
var/max_health = patient.maxHealth
var/total_health = patient.health
- var/brute_loss = patient.getBruteLoss()
- var/fire_loss = patient.getFireLoss()
- var/tox_loss = patient.getToxLoss()
- var/oxy_loss = patient.getOxyLoss()
+ var/brute_loss = patient.get_brute_loss()
+ var/fire_loss = patient.get_fire_loss()
+ var/tox_loss = patient.get_tox_loss()
+ var/oxy_loss = patient.get_oxy_loss()
var/chaos_modifier = 0
var/sickness = "Patient does not show signs of disease."
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 406b7a7c902..eb937cc538b 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -290,7 +290,7 @@
// Instantly lie down, also go unconscious from the pain, before you die.
living_mob.Unconscious(100)
- living_mob.adjustBruteLoss(crush_damage)
+ living_mob.adjust_brute_loss(crush_damage)
update_appearance()
/obj/machinery/recycler/on_deconstruction(disassembled)
diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm
index 9b843cd5506..1715ead9968 100644
--- a/code/game/machinery/sleepers.dm
+++ b/code/game/machinery/sleepers.dm
@@ -218,10 +218,10 @@
data["occupant"]["health"] = mob_occupant.health
data["occupant"]["maxHealth"] = mob_occupant.maxHealth
data["occupant"]["minHealth"] = HEALTH_THRESHOLD_DEAD
- data["occupant"]["bruteLoss"] = mob_occupant.getBruteLoss()
- data["occupant"]["oxyLoss"] = mob_occupant.getOxyLoss()
- data["occupant"]["toxLoss"] = mob_occupant.getToxLoss()
- data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
+ data["occupant"]["bruteLoss"] = mob_occupant.get_brute_loss()
+ data["occupant"]["oxyLoss"] = mob_occupant.get_oxy_loss()
+ data["occupant"]["toxLoss"] = mob_occupant.get_tox_loss()
+ data["occupant"]["fireLoss"] = mob_occupant.get_fire_loss()
data["occupant"]["brainLoss"] = mob_occupant.get_organ_loss(ORGAN_SLOT_BRAIN)
data["occupant"]["reagents"] = list()
if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 65f66907c9d..64e4e735afd 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -493,9 +493,9 @@
update_appearance()
if(mob_occupant)
if(uv_super)
- mob_occupant.adjustFireLoss(rand(20, 36))
+ mob_occupant.adjust_fire_loss(rand(20, 36))
else
- mob_occupant.adjustFireLoss(rand(10, 16))
+ mob_occupant.adjust_fire_loss(rand(10, 16))
if(iscarbon(mob_occupant) && mob_occupant.stat < UNCONSCIOUS)
//Awake, organic and screaming
mob_occupant.emote("scream")
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 6b705fa3dc5..c2da8bd2780 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -92,7 +92,7 @@
playsound(src.loc, 'sound/items/tools/welder.ogg', 50, TRUE)
victim.emote("scream") // It is painful
- victim.adjustBruteLoss(max(0, 80 - victim.getBruteLoss())) // Hurt the human, don't try to kill them though.
+ victim.adjust_brute_loss(max(0, 80 - victim.get_brute_loss())) // Hurt the human, don't try to kill them though.
// Sleep for a couple of ticks to allow the human to see the pain
sleep(0.5 SECONDS)
diff --git a/code/game/machinery/wall_healer.dm b/code/game/machinery/wall_healer.dm
index fbf9f1c2f24..2a924a102d0 100644
--- a/code/game/machinery/wall_healer.dm
+++ b/code/game/machinery/wall_healer.dm
@@ -487,9 +487,9 @@
add_mob_blood(current_user)
return
- var/brute_healing_now = round(min(initial(brute_healing) * 0.1, brute_healing, current_user.getBruteLoss()), DAMAGE_PRECISION)
- var/burn_healing_now = round(min(initial(burn_healing) * 0.1, burn_healing, current_user.getFireLoss()), DAMAGE_PRECISION)
- var/tox_healing_now = round(min(initial(tox_healing) * 0.1, tox_healing, current_user.getToxLoss()), DAMAGE_PRECISION)
+ var/brute_healing_now = round(min(initial(brute_healing) * 0.1, brute_healing, current_user.get_brute_loss()), DAMAGE_PRECISION)
+ var/burn_healing_now = round(min(initial(burn_healing) * 0.1, burn_healing, current_user.get_fire_loss()), DAMAGE_PRECISION)
+ var/tox_healing_now = round(min(initial(tox_healing) * 0.1, tox_healing, current_user.get_tox_loss()), DAMAGE_PRECISION)
var/blood_healing_now = round(min(initial(blood_healing) * 0.1, blood_healing, max(0, BLOOD_VOLUME_OKAY - current_user.get_blood_volume())), 0.1)
var/cost = round(per_heal_cost * (brute_healing_now + burn_healing_now + tox_healing_now + blood_healing_now), 1)
@@ -502,14 +502,14 @@
var/amount_healed = 0
if(brute_healing_now)
- amount_healed += current_user.adjustBruteLoss(-brute_healing_now, required_bodytype = BODYTYPE_ORGANIC)
+ amount_healed += current_user.adjust_brute_loss(-brute_healing_now, required_bodytype = BODYTYPE_ORGANIC)
brute_healing -= brute_healing_now
add_mob_blood(current_user)
if(burn_healing_now)
- amount_healed += current_user.adjustFireLoss(-burn_healing_now, required_bodytype = BODYTYPE_ORGANIC)
+ amount_healed += current_user.adjust_fire_loss(-burn_healing_now, required_bodytype = BODYTYPE_ORGANIC)
burn_healing -= burn_healing_now
if(tox_healing_now)
- amount_healed += current_user.adjustToxLoss(-tox_healing_now, required_biotype = MOB_ORGANIC)
+ amount_healed += current_user.adjust_tox_loss(-tox_healing_now, required_biotype = MOB_ORGANIC)
tox_healing -= tox_healing_now
if(blood_healing_now)
amount_healed += current_user.adjust_blood_volume(blood_healing_now, maximum = BLOOD_VOLUME_OKAY)
@@ -527,9 +527,9 @@
playsound(src, 'sound/machines/defib/defib_saftyOff.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE)
if(antispam_counter % 3 != 1)
return
- var/missed_brute_healing = brute_healing_now > 0 && !current_user.getBruteLoss()
- var/missed_burn_healing = burn_healing_now > 0 && !current_user.getFireLoss()
- var/missed_tox_healing = tox_healing_now > 0 && !current_user.getToxLoss()
+ var/missed_brute_healing = brute_healing_now > 0 && !current_user.get_brute_loss()
+ var/missed_burn_healing = burn_healing_now > 0 && !current_user.get_fire_loss()
+ var/missed_tox_healing = tox_healing_now > 0 && !current_user.get_tox_loss()
var/missed_blood_healing = blood_healing_now > 0 && current_user.get_blood_volume() >= BLOOD_VOLUME_OKAY
if(missed_brute_healing || missed_burn_healing || missed_tox_healing || missed_blood_healing)
to_chat(current_user, span_notice("Nothing happens. Seems like [src] needs to recharge."))
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index e52ea36acec..3154afb37e9 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -290,7 +290,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
/mob/living/carbon/human/machine_wash(obj/machinery/washing_machine/washer, mob/user)
adjust_wet_stacks(8)
adjust_disgust(40, DISGUST_LEVEL_VERYDISGUSTED)
- adjustOxyLoss(12)
+ adjust_oxy_loss(12)
log_combat(user, src, "machine washed (oxy)")
/obj/item/machine_wash(obj/machinery/washing_machine/washer)
diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
index 6d71edad180..83ef6e55293 100644
--- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
@@ -207,7 +207,7 @@
return
smoker.drop_all_held_items()
- smoker.adjustOxyLoss(1)
+ smoker.adjust_oxy_loss(1)
smoker.emote("cough")
/**
diff --git a/code/game/objects/items/busts_and_figurines.dm b/code/game/objects/items/busts_and_figurines.dm
index 592302cab67..660fffa2d83 100644
--- a/code/game/objects/items/busts_and_figurines.dm
+++ b/code/game/objects/items/busts_and_figurines.dm
@@ -109,7 +109,7 @@
// Bully the guy for fucking up.
/obj/item/statuebust/hippocratic/proc/fuck_it_up(mob/living/carbon/user)
to_chat(user, span_warning("You forget what comes next like a dumbass. The Hippocrates bust looks down on you, disappointed."))
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2)
COOLDOWN_RESET(src, oath_cd)
/obj/item/maneki_neko
diff --git a/code/game/objects/items/cigarettes.dm b/code/game/objects/items/cigarettes.dm
index 33bd58ea99d..504177cd622 100644
--- a/code/game/objects/items/cigarettes.dm
+++ b/code/game/objects/items/cigarettes.dm
@@ -564,7 +564,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/obj/item/organ/lungs/lungs = smoker.get_organ_slot(ORGAN_SLOT_LUNGS)
if(lungs && IS_ORGANIC_ORGAN(lungs))
var/smoker_resistance = HAS_TRAIT(smoker, TRAIT_SMOKER) ? 0.5 : 1
- smoker.adjustOrganLoss(ORGAN_SLOT_LUNGS, lung_harm * smoker_resistance)
+ smoker.adjust_organ_loss(ORGAN_SLOT_LUNGS, lung_harm * smoker_resistance)
if(!reagents.trans_to(smoker, to_smoke, methods = INHALE, ignore_stomach = TRUE))
reagents.remove_all(to_smoke)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 73684e56eab..485056b85f0 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -508,7 +508,7 @@
busy = TRUE
M.visible_message(span_danger("[user] touches [M] with [src]!"), \
span_userdanger("[user] touches [M] with [src]!"))
- M.adjustStaminaLoss(60)
+ M.adjust_stamina_loss(60)
M.Knockdown(75)
M.set_jitter_if_lower(100 SECONDS)
M.apply_status_effect(/datum/status_effect/convulsing)
@@ -613,20 +613,20 @@
user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - [fail_reason]"))
playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
else
- var/total_brute = H.getBruteLoss()
- var/total_burn = H.getFireLoss()
+ var/total_brute = H.get_brute_loss()
+ var/total_burn = H.get_fire_loss()
var/need_mob_update = FALSE
//If the body has been fixed so that they would not be in crit when defibbed, give them oxyloss to put them back into crit
if (H.health > HALFWAYCRITDEATH)
- need_mob_update += H.adjustOxyLoss(H.health - HALFWAYCRITDEATH, updating_health = FALSE)
+ need_mob_update += H.adjust_oxy_loss(H.health - HALFWAYCRITDEATH, updating_health = FALSE)
else
- var/overall_damage = total_brute + total_burn + H.getToxLoss() + H.getOxyLoss()
+ var/overall_damage = total_brute + total_burn + H.get_tox_loss() + H.get_oxy_loss()
var/mobhealth = H.health
- need_mob_update += H.adjustOxyLoss((mobhealth - HALFWAYCRITDEATH) * (H.getOxyLoss() / overall_damage), updating_health = FALSE)
- need_mob_update += H.adjustToxLoss((mobhealth - HALFWAYCRITDEATH) * (H.getToxLoss() / overall_damage), updating_health = FALSE, forced = TRUE) // force tox heal for toxin lovers too
- need_mob_update += H.adjustFireLoss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), updating_health = FALSE)
- need_mob_update += H.adjustBruteLoss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), updating_health = FALSE)
+ need_mob_update += H.adjust_oxy_loss((mobhealth - HALFWAYCRITDEATH) * (H.get_oxy_loss() / overall_damage), updating_health = FALSE)
+ need_mob_update += H.adjust_tox_loss((mobhealth - HALFWAYCRITDEATH) * (H.get_tox_loss() / overall_damage), updating_health = FALSE, forced = TRUE) // force tox heal for toxin lovers too
+ need_mob_update += H.adjust_fire_loss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), updating_health = FALSE)
+ need_mob_update += H.adjust_brute_loss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), updating_health = FALSE)
if(need_mob_update)
H.updatehealth() // Previous "adjust" procs don't update health, so we do it manually.
user.visible_message(span_notice("[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful."))
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 62ff966c91c..fd9eba7ec27 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -159,7 +159,7 @@
if(AI && AI.loc == src)
to_chat(AI, span_userdanger("Your core files are being wiped!"))
while(AI.stat != DEAD && flush)
- AI.adjustOxyLoss(5)
+ AI.adjust_oxy_loss(5)
AI.updatehealth()
sleep(0.5 SECONDS)
flush = FALSE
diff --git a/code/game/objects/items/devices/blood_scanner.dm b/code/game/objects/items/devices/blood_scanner.dm
index 5292da18148..4a32545b0a4 100644
--- a/code/game/objects/items/devices/blood_scanner.dm
+++ b/code/game/objects/items/devices/blood_scanner.dm
@@ -56,8 +56,8 @@
/obj/item/blood_scanner/proc/scan_blood(mob/living/scanner, mob/living/carbon/scanned_person)
var/render_list = list()
- var/oxy_loss = scanned_person.getOxyLoss()
- var/tox_loss = scanned_person.getToxLoss()
+ var/oxy_loss = scanned_person.get_oxy_loss()
+ var/tox_loss = scanned_person.get_tox_loss()
render_list += span_info("You read the [src]'s screen:\n")
render_list += "Blood Type: [scanned_person?.dna?.blood_type]\n"
if(oxy_loss > 50)//if they have knockout levels of suffocation damage
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 6b58419e50a..afd671594a5 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -231,7 +231,7 @@
. += span_notice_ml("[patient] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [patient.p_their()] teeth.\n")
//assess any suffocation damage
- var/hypoxia_status = patient.getOxyLoss() > 20
+ var/hypoxia_status = patient.get_oxy_loss() > 20
if(patient == user)
if(hypoxia_status)
diff --git a/code/game/objects/items/devices/scanners/autopsy_scanner.dm b/code/game/objects/items/devices/scanners/autopsy_scanner.dm
index b58e9390449..40835bc7920 100644
--- a/code/game/objects/items/devices/scanners/autopsy_scanner.dm
+++ b/code/game/objects/items/devices/scanners/autopsy_scanner.dm
@@ -67,10 +67,10 @@
autopsy_information += "Time of Death - [scanned.station_timestamp_timeofdeath]"
autopsy_information += "Subject has been dead for [DisplayTimeText(round(world.time - scanned.timeofdeath))].
"
- var/oxy_loss = scanned.getOxyLoss()
- var/tox_loss = scanned.getToxLoss()
- var/fire_loss = scanned.getFireLoss()
- var/brute_loss = scanned.getBruteLoss()
+ var/oxy_loss = scanned.get_oxy_loss()
+ var/tox_loss = scanned.get_tox_loss()
+ var/fire_loss = scanned.get_fire_loss()
+ var/brute_loss = scanned.get_brute_loss()
/// "Body Data" portion of the autopsy - damage, wounds, and limbs
var/dmgreport = "Body Data:\
\
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index d26a3e12361..c70ce933df4 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -156,10 +156,10 @@
var/list/render_list = list()
// Damage specifics
- var/oxy_loss = target.getOxyLoss()
- var/tox_loss = target.getToxLoss()
- var/fire_loss = target.getFireLoss()
- var/brute_loss = target.getBruteLoss()
+ var/oxy_loss = target.get_oxy_loss()
+ var/tox_loss = target.get_tox_loss()
+ var/fire_loss = target.get_fire_loss()
+ var/brute_loss = target.get_brute_loss()
var/mob_status = (!target.appears_alive() ? span_alert("Deceased") : "[round(target.health / target.maxHealth, 0.01) * 100]% healthy")
if(HAS_TRAIT(target, TRAIT_FAKEDEATH) && target.stat != DEAD)
@@ -188,9 +188,9 @@
else
render_list += "Subject has been husked.
"
- if(target.getStaminaLoss())
+ if(target.get_stamina_loss())
if(advanced)
- render_list += "Fatigue level: [target.getStaminaLoss()]%.
"
+ render_list += "Fatigue level: [target.get_stamina_loss()]%.
"
else
render_list += "Subject appears to be suffering from fatigue.
"
@@ -695,7 +695,7 @@
show_emotion(AID_EMOTION_HAPPY)
/obj/item/healthanalyzer/simple/proc/violence_damage(mob/living/user)
- user.adjustBruteLoss(4)
+ user.adjust_brute_loss(4)
/obj/item/healthanalyzer/simple/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!isliving(interacting_with))
@@ -763,7 +763,7 @@
scan_for_what = "diseases"
/obj/item/healthanalyzer/simple/disease/violence_damage(mob/living/user)
- user.adjustBruteLoss(1)
+ user.adjust_brute_loss(1)
user.reagents.add_reagent(/datum/reagent/toxin, rand(1, 3))
/obj/item/healthanalyzer/simple/disease/do_the_scan(mob/living/carbon/scanning, mob/living/user)
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index fe0fe2e2913..416abb3064e 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -369,7 +369,7 @@
//Throw
selected_turf.visible_message(span_userdanger("Unseen forces throw [user]!"))
user.Stun(60)
- user.adjustBruteLoss(50)
+ user.adjust_brute_loss(50)
var/throw_dir = pick(GLOB.cardinals)
var/atom/throw_target = get_edge_target_turf(user, throw_dir)
user.throw_at(throw_target, 200, 4)
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index f6edc5da901..3f2aea409c7 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -151,7 +151,7 @@
if(HAS_TRAIT(src, TRAIT_WIELDED))
user.take_bodypart_damage(20,25,check_armor = TRUE)
else
- user.adjustStaminaLoss(25)
+ user.adjust_stamina_loss(25)
/obj/item/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
if(!HAS_TRAIT(src, TRAIT_WIELDED))
diff --git a/code/game/objects/items/frog_statue.dm b/code/game/objects/items/frog_statue.dm
index d1f65dc4b2a..62c13389d1e 100644
--- a/code/game/objects/items/frog_statue.dm
+++ b/code/game/objects/items/frog_statue.dm
@@ -96,7 +96,7 @@
return
if(contained_frog.stat == DEAD)
contained_frog.revive()
- contained_frog.adjustBruteLoss(-5)
+ contained_frog.adjust_brute_loss(-5)
/obj/item/frog_statue/proc/animate_filter(mob/living/frog)
add_filter(STATUE_FILTER, 2, list("type" = "outline", "color" = FILTER_COLOR, "size" = 1))
diff --git a/code/game/objects/items/granters/martial_arts/cqc.dm b/code/game/objects/items/granters/martial_arts/cqc.dm
index 4fff32623c8..4fb39673e9c 100644
--- a/code/game/objects/items/granters/martial_arts/cqc.dm
+++ b/code/game/objects/items/granters/martial_arts/cqc.dm
@@ -24,6 +24,6 @@
to_chat(user, span_warning("[src] explodes!"))
playsound(src,'sound/effects/explosion/explosion1.ogg',40,TRUE)
user.flash_act(1, 1)
- user.adjustBruteLoss(6)
- user.adjustFireLoss(6)
+ user.adjust_brute_loss(6)
+ user.adjust_fire_loss(6)
qdel(src)
diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm
index 6e874f9d864..02fb27777bc 100644
--- a/code/game/objects/items/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/grenades/syndieminibomb.dm
@@ -73,6 +73,6 @@
for (var/turf/open/floor/floor in view(freeze_range, loc))
floor.MakeSlippery(TURF_WET_PERMAFROST, 6 MINUTES)
for(var/mob/living/carbon/victim in floor)
- victim.adjustStaminaLoss(stamina_damage)
+ victim.adjust_stamina_loss(stamina_damage)
victim.adjust_bodytemperature(temp_adjust)
qdel(src)
diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
index ca6aee647f0..1e2332a7aad 100644
--- a/code/game/objects/items/hand_items.dm
+++ b/code/game/objects/items/hand_items.dm
@@ -128,7 +128,7 @@
to_chat(user, span_warning("You can't bring yourself to noogie [target]! You don't want to risk harming anyone..."))
return
- if(!(target?.get_bodypart(BODY_ZONE_HEAD)) || user.pulling != target || user.grab_state < GRAB_AGGRESSIVE || user.getStaminaLoss() > 80)
+ if(!(target?.get_bodypart(BODY_ZONE_HEAD)) || user.pulling != target || user.grab_state < GRAB_AGGRESSIVE || user.get_stamina_loss() > 80)
return FALSE
var/obj/item/bodypart/head/the_head = target.get_bodypart(BODY_ZONE_HEAD)
@@ -174,7 +174,7 @@
if(!(target?.get_bodypart(BODY_ZONE_HEAD)) || user.pulling != target)
return FALSE
- if(user.getStaminaLoss() > 80)
+ if(user.get_stamina_loss() > 80)
to_chat(user, span_warning("You're too tired to continue giving [target] a noogie!"))
to_chat(target, span_danger("[user] is too tired to continue giving you a noogie!"))
return
@@ -190,7 +190,7 @@
log_combat(user, target, "given a noogie to", addition = "([damage] brute before armor)")
target.apply_damage(damage, BRUTE, BODY_ZONE_HEAD)
- user.adjustStaminaLoss(iteration + 5)
+ user.adjust_stamina_loss(iteration + 5)
playsound(get_turf(user), SFX_RUSTLE, 50)
if(prob(33))
@@ -245,7 +245,7 @@
shake_camera(slapped, 2, 2)
slapped.Paralyze(2.5 SECONDS)
slapped.adjust_confusion(7 SECONDS)
- slapped.adjustStaminaLoss(40)
+ slapped.adjust_stamina_loss(40)
else if(user.zone_selected == BODY_ZONE_HEAD || user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
if(user == slapped)
user.visible_message(
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
index 367aba1e864..e9e49d0c6f2 100644
--- a/code/game/objects/items/his_grace.dm
+++ b/code/game/objects/items/his_grace.dm
@@ -157,7 +157,7 @@
master.remove_status_effect(/datum/status_effect/his_grace)
REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT)
master.Paralyze(60)
- master.adjustBruteLoss(master.maxHealth)
+ master.adjust_brute_loss(master.maxHealth)
playsound(master, 'sound/effects/splat.ogg', 100, FALSE)
else
master.apply_status_effect(/datum/status_effect/his_grace,gender)
@@ -181,7 +181,7 @@
do_attack_animation(L, null, src)
playsound(L, 'sound/items/weapons/smash.ogg', 50, TRUE)
playsound(L, 'sound/effects/desecration/desecration-01.ogg', 50, TRUE)
- L.adjustBruteLoss(force)
+ L.adjust_brute_loss(force)
adjust_bloodthirst(-5) //Don't stop attacking they're right there!
else
consume(L)
@@ -235,7 +235,7 @@
return
var/victims = 0
meal.visible_message(span_warning("[src] swings open and devours [meal]!"), "[src] consumes you!")
- meal.adjustBruteLoss(200)
+ meal.adjust_brute_loss(200)
playsound(meal, 'sound/effects/desecration/desecration-02.ogg', 75, TRUE)
playsound(src, 'sound/items/eatfood.ogg', 100, TRUE)
meal.forceMove(src)
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index f6ca7894d07..ba75f0b7a3e 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -998,7 +998,7 @@
randomize_state()
// blocks any melee/throwable attacks
- owner.adjustStaminaLoss(5)
+ owner.adjust_stamina_loss(5)
final_block_chance = 100
// counterattack at melee
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 6db56e872cc..1f97cb21bb2 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -139,11 +139,11 @@
if(!QDELETED(affecting) && !(affecting.bodypart_flags & BODYPART_UNREMOVABLE) && affecting.owner == user && !QDELETED(user))
playsound(user, hitsound, 25, TRUE)
affecting.dismember(BRUTE)
- user.adjustBruteLoss(force * 1.25)
+ user.adjust_brute_loss(force * 1.25)
/obj/item/melee/sabre/proc/manual_suicide(mob/living/user, originally_nodropped)
if(!QDELETED(user))
- user.adjustBruteLoss(200)
+ user.adjust_brute_loss(200)
user.death(FALSE)
REMOVE_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 728e7dbe584..558b5f12b7b 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -66,8 +66,8 @@
/obj/item/banner/proc/inspiration(mob/living/carbon/human/inspired_human)
var/need_mob_update = FALSE
- need_mob_update += inspired_human.adjustBruteLoss(-15, updating_health = FALSE)
- need_mob_update += inspired_human.adjustFireLoss(-15, updating_health = FALSE)
+ need_mob_update += inspired_human.adjust_brute_loss(-15, updating_health = FALSE)
+ need_mob_update += inspired_human.adjust_fire_loss(-15, updating_health = FALSE)
if(need_mob_update)
inspired_human.updatehealth()
inspired_human.AdjustStun(-4 SECONDS)
@@ -129,8 +129,8 @@
/obj/item/banner/medical/special_inspiration(mob/living/carbon/human/inspired_human)
var/need_mob_update = FALSE
- need_mob_update += inspired_human.adjustToxLoss(-15, updating_health = FALSE)
- need_mob_update += inspired_human.setOxyLoss(0, updating_health = FALSE)
+ need_mob_update += inspired_human.adjust_tox_loss(-15, updating_health = FALSE)
+ need_mob_update += inspired_human.set_oxy_loss(0, updating_health = FALSE)
if(need_mob_update)
inspired_human.updatehealth()
inspired_human.reagents.add_reagent(/datum/reagent/medicine/inaprovaline, 5)
diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm
index d709be2067b..aee8274d2b8 100644
--- a/code/game/objects/items/robot/items/generic.dm
+++ b/code/game/objects/items/robot/items/generic.dm
@@ -39,7 +39,7 @@
return
user.do_attack_animation(attacked_mob)
- attacked_mob.adjustStaminaLoss(stamina_damage)
+ attacked_mob.adjust_stamina_loss(stamina_damage)
attacked_mob.set_confusion_if_lower(5 SECONDS)
attacked_mob.adjust_stutter(20 SECONDS)
attacked_mob.set_jitter_if_lower(5 SECONDS)
@@ -174,7 +174,7 @@
)
else
if(!iscyborg(attacked_mob))
- attacked_mob.adjustFireLoss(10)
+ attacked_mob.adjust_fire_loss(10)
user.visible_message(
span_userdanger("[user] shocks [attacked_mob]!"),
span_danger("You shock [attacked_mob]!"),
@@ -201,7 +201,7 @@
span_danger("You crush [attacked_mob]!"),
)
playsound(loc, 'sound/items/weapons/smash.ogg', 50, TRUE, -1)
- attacked_mob.adjustBruteLoss(15)
+ attacked_mob.adjust_brute_loss(15)
user.cell.use(0.3 * STANDARD_CELL_CHARGE, force = TRUE)
COOLDOWN_START(src, crush_cooldown, HUG_CRUSH_COOLDOWN)
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index a44bcd4e487..e8a5a93ea66 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -359,8 +359,8 @@
else
repair_amount = -1
energy_cost = 0.01 * STANDARD_CELL_CHARGE
- cyborg.adjustBruteLoss(repair_amount)
- cyborg.adjustFireLoss(repair_amount)
+ cyborg.adjust_brute_loss(repair_amount)
+ cyborg.adjust_fire_loss(repair_amount)
cyborg.updatehealth()
cyborg.cell.use(energy_cost)
else
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index ba18ab8e06d..83ecad5abd2 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -338,7 +338,7 @@
/// Healing a simple mob, just an adjustbruteloss call
/obj/item/stack/medical/proc/heal_simplemob(mob/living/patient, mob/living/user)
- patient.adjustBruteLoss(-1 * (heal_brute * patient.maxHealth / 100))
+ patient.adjust_brute_loss(-1 * (heal_brute * patient.maxHealth / 100))
user.visible_message(
span_green("[user] applies [src] on [patient]."),
span_green("You apply [src] on [patient]."),
@@ -773,7 +773,7 @@
/obj/item/stack/medical/poultice/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/living/user)
. = ..()
playsound(src, 'sound/misc/soggy.ogg', 30, TRUE)
- healed_mob.adjustOxyLoss(amount_healed)
+ healed_mob.adjust_oxy_loss(amount_healed)
/obj/item/stack/medical/bandage
name = "first aid bandage"
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index 62ac35ec728..79893595bba 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -166,7 +166,7 @@
if(issilicon(interacting_with))
var/mob/living/silicon/robotic_pal = interacting_with
- var/robot_is_damaged = robotic_pal.getBruteLoss()
+ var/robot_is_damaged = robotic_pal.get_brute_loss()
if(!robot_is_damaged)
user.balloon_alert(user, "[robotic_pal] is not damaged!")
@@ -178,7 +178,7 @@
if(!do_after(user, 3 SECONDS, target = robotic_pal))
return ITEM_INTERACT_BLOCKING
- robotic_pal.adjustBruteLoss(-object_repair_value)
+ robotic_pal.adjust_brute_loss(-object_repair_value)
use(1)
to_chat(user, span_notice("You finish repairing [interacting_with] with [src]."))
return ITEM_INTERACT_SUCCESS
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index 74dccf416ee..cf8b1f34128 100644
--- a/code/game/objects/items/toy_mechs.dm
+++ b/code/game/objects/items/toy_mechs.dm
@@ -226,15 +226,15 @@
if(1, 3)
SpinAnimation(5, 0)
playsound(src, 'sound/vehicles/mecha/mechstep.ogg', 30, TRUE)
- user.adjustBruteLoss(25)
- user.adjustStaminaLoss(50)
+ user.adjust_brute_loss(25)
+ user.adjust_stamina_loss(50)
if(2)
user.SpinAnimation(5, 0)
playsound(user, 'sound/items/weapons/smash.ogg', 20, TRUE)
combat_health-- //we scratched it!
if(4)
say(special_attack_cry + "!!")
- user.adjustStaminaLoss(25)
+ user.adjust_stamina_loss(25)
if(!combat_sleep(1 SECONDS, null, user))
say("PATHETIC.")
@@ -243,7 +243,7 @@
return SHAME
sleep(0.5 SECONDS)
- user.adjustBruteLoss(450)
+ user.adjust_brute_loss(450)
in_combat = FALSE
say("AN EASY WIN. MY POWER INCREASES.") // steal a soul, become swole
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 55a6ba57957..d5cb2100575 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -459,7 +459,7 @@
return
if(!user.is_holding(src)) // Half digestion? Start choking to death
user.visible_message(span_suicide("[user] panics and starts choking [user.p_them()]self to death!"))
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE) // unfortunately you have to handle the suiciding yourself with a manual suicide
user.ghostize(FALSE) // get the fuck out of our body
return
@@ -467,13 +467,13 @@
if(CH.cavity_item) // if he's (un)bright enough to have a round and full belly...
user.visible_message(span_danger("[user] regurgitates [src]!")) // I swear i dont have a fetish
user.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 100, distance = 0)
- user.adjustOxyLoss(120)
+ user.adjust_oxy_loss(120)
user.dropItemToGround(src) // incase the crit state doesn't drop the singulo to the floor
user.set_suicide(FALSE)
return
user.transferItemToLoc(src, user, TRUE)
CH.cavity_item = src // The mother came inside and found Andy, dead with a HUGE belly full of toys
- user.adjustOxyLoss(200) // You know how most small toys in the EU have that 3+ onion head icon and a warning that says "Unsuitable for children under 3 years of age due to small parts - choking hazard"? This is why.
+ user.adjust_oxy_loss(200) // You know how most small toys in the EU have that 3+ onion head icon and a warning that says "Unsuitable for children under 3 years of age due to small parts - choking hazard"? This is why.
user.death(FALSE)
user.ghostize(FALSE)
@@ -788,7 +788,7 @@
/obj/item/dualsaber/toy/impale(mob/living/user)//Stops Toy Dualsabers from injuring clowns
to_chat(user, span_warning("You twirl around a bit before losing your balance and impaling yourself on [src]."))
- user.adjustStaminaLoss(25)
+ user.adjust_stamina_loss(25)
/obj/item/toy/katana
name = "replica katana"
diff --git a/code/game/objects/items/virgin_mary.dm b/code/game/objects/items/virgin_mary.dm
index 5ae4d33df2b..cbd63adf7c0 100644
--- a/code/game/objects/items/virgin_mary.dm
+++ b/code/game/objects/items/virgin_mary.dm
@@ -56,5 +56,5 @@
return MANUAL_SUICIDE
/obj/item/virgin_mary/proc/manual_suicide(mob/living/user)
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE)
diff --git a/code/game/objects/items/wiki_manuals.dm b/code/game/objects/items/wiki_manuals.dm
index 671f408557c..e3647434e61 100644
--- a/code/game/objects/items/wiki_manuals.dm
+++ b/code/game/objects/items/wiki_manuals.dm
@@ -200,7 +200,7 @@
part.adjustBleedStacks(5)
H.gib_animation()
sleep(0.3 SECONDS)
- H.adjustBruteLoss(1000) //to make the body super-bloody
+ H.adjust_brute_loss(1000) //to make the body super-bloody
// if we use gib() then the body gets deleted
H.spawn_gibs()
H.spill_organs(DROP_ALL_REMAINS)
diff --git a/code/game/objects/structures/gym/punching_bag.dm b/code/game/objects/structures/gym/punching_bag.dm
index bea51bc1d8c..4c02e08e5be 100644
--- a/code/game/objects/structures/gym/punching_bag.dm
+++ b/code/game/objects/structures/gym/punching_bag.dm
@@ -65,7 +65,7 @@
if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising
stamina_exhaustion *= 0.5
- user.adjustStaminaLoss(stamina_exhaustion)
+ user.adjust_stamina_loss(stamina_exhaustion)
user.mind?.adjust_experience(/datum/skill/athletics, is_heavy_gravity ? 0.6 : 0.3)
user.apply_status_effect(/datum/status_effect/exercised)
diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm
index c9b59efd89f..6644711f2b7 100644
--- a/code/game/objects/structures/gym/weight_machine.dm
+++ b/code/game/objects/structures/gym/weight_machine.dm
@@ -214,7 +214,7 @@
if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising
stamina_exhaustion *= 0.5
- user.adjustStaminaLoss(stamina_exhaustion * seconds_per_tick)
+ user.adjust_stamina_loss(stamina_exhaustion * seconds_per_tick)
return TRUE
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 97b9404b3a4..2d5a67ffe42 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -119,7 +119,7 @@
playsound(src.loc, 'sound/effects/splat.ogg', 25, TRUE)
target.emote("scream")
target.add_splatter_floor()
- target.adjustBruteLoss(30)
+ target.adjust_brute_loss(30)
target.setDir(2)
var/matrix/m180 = matrix(target.transform)
m180.Turn(180)
@@ -142,7 +142,7 @@
buckled_mob.visible_message(span_warning("[buckled_mob] struggles to break free from [src]!"),\
span_notice("You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)"),\
span_hear("You hear a wet squishing noise.."))
- buckled_mob.adjustBruteLoss(30)
+ buckled_mob.adjust_brute_loss(30)
if(!do_after(buckled_mob, 2 MINUTES, target = src, hidden = TRUE))
if(buckled_mob?.buckled)
to_chat(buckled_mob, span_warning("You fail to free yourself!"))
@@ -150,7 +150,7 @@
return ..()
/obj/structure/kitchenspike/post_unbuckle_mob(mob/living/buckled_mob)
- buckled_mob.adjustBruteLoss(30)
+ buckled_mob.adjust_brute_loss(30)
INVOKE_ASYNC(buckled_mob, TYPE_PROC_REF(/mob, emote), "scream")
buckled_mob.AdjustParalyzed(20)
var/matrix/m180 = matrix(buckled_mob.transform)
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 88ee92fa4d8..081bc50dfad 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -374,7 +374,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
to_chat(living, span_warning("[src] is freezing!"))
else if(current_temperature == SHOWER_BOILING)
living.adjust_bodytemperature(35, 0, 500)
- living.adjustFireLoss(5)
+ living.adjust_fire_loss(5)
to_chat(living, span_danger("[src] is searing!"))
diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
index a98871a95b5..e91c77e5a4c 100644
--- a/code/game/objects/structures/spawner.dm
+++ b/code/game/objects/structures/spawner.dm
@@ -221,7 +221,7 @@
/obj/structure/spawner/nether/process(seconds_per_tick)
for(var/mob/living/living_mob in contents)
playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
- living_mob.adjustBruteLoss(60 * seconds_per_tick)
+ living_mob.adjust_brute_loss(60 * seconds_per_tick)
new /obj/effect/gibspawner/generic(get_turf(living_mob), living_mob)
if(living_mob.stat == DEAD)
var/mob/living/basic/blankbody/newmob = new(loc)
@@ -280,7 +280,7 @@
. = ..()
if(!IS_CULTIST(user) && isliving(user))
var/mob/living/living_user = user
- living_user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15)
+ living_user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15)
. += span_danger("The voices of the damned echo relentlessly in your mind, continously rebounding on the walls of your self the more you focus on [src]. Your head pounds, better keep away...")
else
. += span_cult("The gateway will create one weak proteon construct every [spawn_time * 0.1] seconds, up to a total of [max_mobs], that may be controlled by the spirits of the dead.")
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 11f4817b94c..a14a5137b02 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -217,7 +217,7 @@
/obj/structure/trap/damage/trap_effect(mob/living/victim)
to_chat(victim, span_bolddanger("The ground quakes beneath your feet!"))
victim.Paralyze(10 SECONDS)
- victim.adjustBruteLoss(35)
+ victim.adjust_brute_loss(35)
var/obj/structure/flora/rock/style_random/giant_rock = new(get_turf(src))
QDEL_IN(giant_rock, 20 SECONDS)
diff --git a/code/game/objects/structures/water_structures/toilet.dm b/code/game/objects/structures/water_structures/toilet.dm
index cd9fcfe6604..2bc1eb4283a 100644
--- a/code/game/objects/structures/water_structures/toilet.dm
+++ b/code/game/objects/structures/water_structures/toilet.dm
@@ -119,7 +119,7 @@
playsound(src.loc, SFX_SWING_HIT, 25, TRUE)
swirlie.visible_message(span_danger("[user] slams the toilet seat onto [swirlie]'s head!"), span_userdanger("[user] slams the toilet seat onto your head!"), span_hear("You hear reverberating porcelain."))
log_combat(user, swirlie, "swirlied (brute)")
- swirlie.adjustBruteLoss(5)
+ swirlie.adjust_brute_loss(5)
return
if(user.pulling && isliving(user.pulling))
@@ -151,10 +151,10 @@
var/mob/living/carbon/carbon_grabbed = grabbed_mob
if(!carbon_grabbed.internal)
log_combat(user, carbon_grabbed, "swirlied (oxy)")
- carbon_grabbed.adjustOxyLoss(5)
+ carbon_grabbed.adjust_oxy_loss(5)
else
log_combat(user, grabbed_mob, "swirlied (oxy)")
- grabbed_mob.adjustOxyLoss(5)
+ grabbed_mob.adjust_oxy_loss(5)
if(was_alive && swirlie.stat == DEAD && swirlie.client)
swirlie.client.give_award(/datum/award/achievement/misc/swirlie, swirlie) // just like space high school all over again!
swirlie = null
@@ -162,7 +162,7 @@
playsound(src.loc, 'sound/effects/bang.ogg', 25, TRUE)
grabbed_mob.visible_message(span_danger("[user] slams [grabbed_mob.name] into [src]!"), span_userdanger("[user] slams you into [src]!"))
log_combat(user, grabbed_mob, "toilet slammed")
- grabbed_mob.adjustBruteLoss(5)
+ grabbed_mob.adjust_brute_loss(5)
return
if(cistern_open && !cover_open && IsReachableBy(user))
diff --git a/code/game/objects/structures/water_structures/urinal.dm b/code/game/objects/structures/water_structures/urinal.dm
index c337c3900ec..467acd2c30a 100644
--- a/code/game/objects/structures/water_structures/urinal.dm
+++ b/code/game/objects/structures/water_structures/urinal.dm
@@ -37,7 +37,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message(span_danger("[user] slams [grabbed_mob] into [src]!"), span_danger("You slam [grabbed_mob] into [src]!"))
grabbed_mob.emote("scream")
- grabbed_mob.adjustBruteLoss(8)
+ grabbed_mob.adjust_brute_loss(8)
else
to_chat(user, span_warning("You need a tighter grip!"))
return
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index d814fd7d632..b362b8deff7 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -342,7 +342,7 @@
ADD_TRAIT(burn_living, TRAIT_NO_EXTINGUISH, TURF_TRAIT)
burn_living.adjust_fire_stacks(lava_firestacks * seconds_per_tick)
burn_living.ignite_mob()
- burn_living.adjustFireLoss(lava_damage * seconds_per_tick)
+ burn_living.adjust_fire_loss(lava_damage * seconds_per_tick)
return TRUE
return FALSE
@@ -426,8 +426,8 @@
var/mob/living/burn_living = burn_target
var/need_mob_update
// This is from plasma, so it should obey plasma biotype requirements
- need_mob_update += burn_living.adjustToxLoss(15, updating_health = FALSE, required_biotype = MOB_ORGANIC)
- need_mob_update += burn_living.adjustFireLoss(25, updating_health = FALSE)
+ need_mob_update += burn_living.adjust_tox_loss(15, updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ need_mob_update += burn_living.adjust_fire_loss(25, updating_health = FALSE)
if(need_mob_update)
burn_living.updatehealth()
diff --git a/code/modules/admin/smites/brain_damage.dm b/code/modules/admin/smites/brain_damage.dm
index ceafc49df24..1d70bc60f6c 100644
--- a/code/modules/admin/smites/brain_damage.dm
+++ b/code/modules/admin/smites/brain_damage.dm
@@ -4,4 +4,4 @@
/datum/smite/brain_damage/effect(client/user, mob/living/target)
. = ..()
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 1, BRAIN_DAMAGE_DEATH - 1)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 1, BRAIN_DAMAGE_DEATH - 1)
diff --git a/code/modules/admin/smites/bsa.dm b/code/modules/admin/smites/bsa.dm
index 806de644293..b833af12a3a 100644
--- a/code/modules/admin/smites/bsa.dm
+++ b/code/modules/admin/smites/bsa.dm
@@ -22,7 +22,7 @@
if (target.health <= 1)
target.gib(DROP_BODYPARTS)
else
- target.adjustBruteLoss(min(BSA_MAX_DAMAGE, target.health - 1))
+ target.adjust_brute_loss(min(BSA_MAX_DAMAGE, target.health - 1))
target.Paralyze(BSA_PARALYZE_TIME)
target.set_stutter(BSA_STUTTER_TIME)
diff --git a/code/modules/admin/smites/lightning.dm b/code/modules/admin/smites/lightning.dm
index 99cb46bdaac..be015a8a1c1 100644
--- a/code/modules/admin/smites/lightning.dm
+++ b/code/modules/admin/smites/lightning.dm
@@ -11,7 +11,7 @@
/proc/lightningbolt(mob/living/user)
var/turf/lightning_source = get_step(get_step(user, NORTH), NORTH)
lightning_source.Beam(user, icon_state="lightning[rand(1,12)]", time = 5)
- user.adjustFireLoss(LIGHTNING_BOLT_DAMAGE)
+ user.adjust_fire_loss(LIGHTNING_BOLT_DAMAGE)
playsound(get_turf(user), 'sound/effects/magic/lightningbolt.ogg', 50, TRUE)
if(ishuman(user))
var/mob/living/carbon/human/human_target = user
diff --git a/code/modules/admin/tag.dm b/code/modules/admin/tag.dm
index eb4b83184db..f974973fdff 100644
--- a/code/modules/admin/tag.dm
+++ b/code/modules/admin/tag.dm
@@ -44,10 +44,10 @@
#define TAG_MARK(X) "(MARK)"
#define TAG_SIMPLE_HEALTH(X) "Health: [X.health]"
#define TAG_CARBON_HEALTH(X) "Health: [X.health] (\
- [X.getBruteLoss()] \
- [X.getFireLoss()] \
- [X.getToxLoss()] \
- [X.getOxyLoss()]"
+ [X.get_brute_loss()] \
+ [X.get_fire_loss()] \
+ [X.get_tox_loss()] \
+ [X.get_oxy_loss()]"
ADMIN_VERB(display_tags, R_ADMIN, "View Tags", "Display all of the tagged datums.", ADMIN_CATEGORY_GAME)
var/index = 0
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 26bad9934a8..1f8f1f0eb6d 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -714,8 +714,8 @@
if(DEAD)
status = "Dead"
health_description = "Status: [status]"
- health_description += "
Brute: [lifer.getBruteLoss()] - Burn: [lifer.getFireLoss()] - Toxin: [lifer.getToxLoss()] - Suffocation: [lifer.getOxyLoss()]"
- health_description += "
Brain: [lifer.get_organ_loss(ORGAN_SLOT_BRAIN)] - Stamina: [lifer.getStaminaLoss()]"
+ health_description += "
Brute: [lifer.get_brute_loss()] - Burn: [lifer.get_fire_loss()] - Toxin: [lifer.get_tox_loss()] - Suffocation: [lifer.get_oxy_loss()]"
+ health_description += "
Brain: [lifer.get_organ_loss(ORGAN_SLOT_BRAIN)] - Stamina: [lifer.get_stamina_loss()]"
else
health_description = "This mob type has no health to speak of."
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index 69ed6ba935c..7f580e1020c 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -554,7 +554,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Mass Braindamage"))
for(var/mob/living/carbon/human/human_mob in GLOB.player_list)
to_chat(human_mob, span_bolddanger("You suddenly feel stupid."), confidential = TRUE)
- human_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80)
+ human_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 60, 80)
message_admins("[key_name_admin(holder)] made everybody brain damaged")
if("floorlava")
SSweather.run_weather(/datum/weather/floor_is_lava)
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index 31b8eebe679..5bfdee42a83 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -74,23 +74,23 @@
var/newamt
switch(Text)
if("brute")
- L.adjustBruteLoss(amount, forced = TRUE)
- newamt = L.getBruteLoss()
+ L.adjust_brute_loss(amount, forced = TRUE)
+ newamt = L.get_brute_loss()
if("fire")
- L.adjustFireLoss(amount, forced = TRUE)
- newamt = L.getFireLoss()
+ L.adjust_fire_loss(amount, forced = TRUE)
+ newamt = L.get_fire_loss()
if("toxin")
- L.adjustToxLoss(amount, forced = TRUE)
- newamt = L.getToxLoss()
+ L.adjust_tox_loss(amount, forced = TRUE)
+ newamt = L.get_tox_loss()
if("oxygen")
- L.adjustOxyLoss(amount, forced = TRUE)
- newamt = L.getOxyLoss()
+ L.adjust_oxy_loss(amount, forced = TRUE)
+ newamt = L.get_oxy_loss()
if("brain")
- L.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount)
+ L.adjust_organ_loss(ORGAN_SLOT_BRAIN, amount)
newamt = L.get_organ_loss(ORGAN_SLOT_BRAIN)
if("stamina")
- L.adjustStaminaLoss(amount, forced = TRUE)
- newamt = L.getStaminaLoss()
+ L.adjust_stamina_loss(amount, forced = TRUE)
+ newamt = L.get_stamina_loss()
else
to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]", confidential = TRUE)
return
diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm
index 1ab9db5898b..99108afdbcf 100644
--- a/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm
+++ b/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm
@@ -160,7 +160,7 @@
to_chat(loc, span_warning("Combat injection is still recharging."))
return
var/mob/living/carbon/human/wearer = loc
- wearer.adjustStaminaLoss(-75)
+ wearer.adjust_stamina_loss(-75)
wearer.SetUnconscious(0)
wearer.SetStun(0)
wearer.SetKnockdown(0)
diff --git a/code/modules/antagonists/abductor/equipment/glands/chem.dm b/code/modules/antagonists/abductor/equipment/glands/chem.dm
index 54644bd8e9f..5bd5a618e16 100644
--- a/code/modules/antagonists/abductor/equipment/glands/chem.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/chem.dm
@@ -16,5 +16,5 @@
/obj/item/organ/heart/gland/chem/activate()
var/chem_to_add = pick(possible_reagents)
owner.reagents.add_reagent(chem_to_add, 2)
- owner.adjustToxLoss(-5, forced = TRUE)
+ owner.adjust_tox_loss(-5, forced = TRUE)
..()
diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm
index c4e29565fa0..cbac994bc3d 100644
--- a/code/modules/antagonists/abductor/equipment/glands/heal.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm
@@ -59,7 +59,7 @@
replace_limb(zone, limb)
return
- if(owner.getToxLoss() > 40)
+ if(owner.get_tox_loss() > 40)
replace_blood()
return
var/tox_amount = 0
@@ -194,13 +194,13 @@
var/keep_going = FALSE
owner.vomit(vomit_flags = (MOB_VOMIT_BLOOD | MOB_VOMIT_FORCE), lost_nutrition = 0, distance = 3)
owner.Stun(15)
- owner.adjustToxLoss(-15, forced = TRUE)
+ owner.adjust_tox_loss(-15, forced = TRUE)
owner.adjust_blood_volume(20, maximum = BLOOD_VOLUME_NORMAL)
if(owner.get_blood_volume() < BLOOD_VOLUME_NORMAL)
keep_going = TRUE
- if(owner.getToxLoss())
+ if(owner.get_tox_loss())
keep_going = TRUE
for(var/datum/reagent/toxin/R in owner.reagents.reagent_list)
owner.reagents.remove_reagent(R.type, 4)
diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
index 3480d20de4e..d312a4409d0 100644
--- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
@@ -26,7 +26,7 @@
if(2)
to_chat(target, span_warning("You hear an annoying buzz in your head."))
target.adjust_confusion(15 SECONDS)
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 160)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10, 160)
if(3)
target.adjust_hallucinations(150 SECONDS)
diff --git a/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm b/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm
index 64aa9c26f75..43b213a2dd9 100644
--- a/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm
+++ b/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm
@@ -28,8 +28,8 @@
/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/exposed_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = exposed_mob.adjustBruteLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += exposed_mob.adjustFireLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += exposed_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update = exposed_mob.adjust_brute_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += exposed_mob.adjust_fire_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += exposed_mob.adjust_tox_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
diff --git a/code/modules/antagonists/blob/blobstrains/energized_jelly.dm b/code/modules/antagonists/blob/blobstrains/energized_jelly.dm
index 43c18fc8090..585bc830917 100644
--- a/code/modules/antagonists/blob/blobstrains/energized_jelly.dm
+++ b/code/modules/antagonists/blob/blobstrains/energized_jelly.dm
@@ -30,6 +30,6 @@
. = ..()
reac_volume = return_mob_expose_reac_volume(exposed_mob, methods, reac_volume, show_message, touch_protection, overmind)
exposed_mob.losebreath += round(0.2*reac_volume)
- exposed_mob.adjustStaminaLoss(reac_volume * 1.2)
+ exposed_mob.adjust_stamina_loss(reac_volume * 1.2)
if(exposed_mob)
exposed_mob.apply_damage(0.6*reac_volume, OXY)
diff --git a/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm b/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm
index 40019beb013..98dc4279f69 100644
--- a/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm
+++ b/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm
@@ -48,5 +48,5 @@
exposed_mob.adjust_wet_stacks(reac_volume / 10)
exposed_mob.apply_damage(0.4*reac_volume, BRUTE, wound_bonus=CANT_WOUND)
if(exposed_mob)
- exposed_mob.adjustStaminaLoss(reac_volume, FALSE)
+ exposed_mob.adjust_stamina_loss(reac_volume, FALSE)
exposed_mob.apply_damage(0.4 * reac_volume, OXY)
diff --git a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
index 778b1a22784..1275a18b418 100644
--- a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
+++ b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
@@ -42,4 +42,4 @@
/datum/reagent/blob/reactive_spines/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message, touch_protection, mob/eye/blob/overmind)
. = ..()
reac_volume = return_mob_expose_reac_volume(exposed_mob, methods, reac_volume, show_message, touch_protection, overmind)
- exposed_mob.adjustBruteLoss(reac_volume)
+ exposed_mob.adjust_brute_loss(reac_volume)
diff --git a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm
index 101995f23d5..3963a7535a6 100644
--- a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm
+++ b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm
@@ -28,7 +28,7 @@
/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired)
. = ..()
- if(metabolizer.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE))
+ if(metabolizer.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/blob/regenerative_materia/on_mob_metabolize(mob/living/metabolizer)
diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm
index 0b1ad87a7b4..04f59962c01 100644
--- a/code/modules/antagonists/changeling/powers/adrenaline.dm
+++ b/code/modules/antagonists/changeling/powers/adrenaline.dm
@@ -15,7 +15,7 @@
// Get us standing up.
user.SetAllImmobility(0)
- user.setStaminaLoss(0)
+ user.set_stamina_loss(0)
user.set_resting(FALSE, instant = TRUE)
user.reagents.add_reagent(/datum/reagent/medicine/changelingadrenaline, 4) //Tank 5 consecutive baton hits
diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm
index 3ea59f5df08..2c3686f3fe6 100644
--- a/code/modules/antagonists/changeling/powers/strained_muscles.dm
+++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm
@@ -49,7 +49,7 @@
stacks++
- user.adjustStaminaLoss(stacks * 1.3) //At first the changeling may regenerate stamina fast enough to nullify fatigue, but it will stack
+ user.adjust_stamina_loss(stacks * 1.3) //At first the changeling may regenerate stamina fast enough to nullify fatigue, but it will stack
if(stacks == 11) //Warning message that the stacks are getting too high
to_chat(user, span_warning("Our legs are really starting to hurt..."))
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 960be7f9070..cd116c0c97a 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -820,7 +820,7 @@
uses -= round(blood_needed / USES_TO_BLOOD)
to_chat(user,span_warning("Your blood rites have restored [human_bloodbag == user ? "your" : "[human_bloodbag.p_their()]"] blood to safe levels!"))
- var/overall_damage = human_bloodbag.getBruteLoss() + human_bloodbag.getFireLoss() + human_bloodbag.getToxLoss() + human_bloodbag.getOxyLoss()
+ var/overall_damage = human_bloodbag.get_brute_loss() + human_bloodbag.get_fire_loss() + human_bloodbag.get_tox_loss() + human_bloodbag.get_oxy_loss()
if(overall_damage == 0)
if(blood_donor)
return TRUE
@@ -838,10 +838,10 @@
human_bloodbag.visible_message(span_warning("[human_bloodbag] is [uses == 0 ? "partially healed":"fully healed"] by [human_bloodbag == user ? "[human_bloodbag.p_their()]":"[human_bloodbag]'s"] blood magic!"))
var/need_mob_update = FALSE
- need_mob_update += human_bloodbag.adjustOxyLoss(damage_healed * (human_bloodbag.getOxyLoss() / overall_damage), updating_health = FALSE)
- need_mob_update += human_bloodbag.adjustToxLoss(damage_healed * (human_bloodbag.getToxLoss() / overall_damage), updating_health = FALSE)
- need_mob_update += human_bloodbag.adjustFireLoss(damage_healed * (human_bloodbag.getFireLoss() / overall_damage), updating_health = FALSE)
- need_mob_update += human_bloodbag.adjustBruteLoss(damage_healed * (human_bloodbag.getBruteLoss() / overall_damage), updating_health = FALSE)
+ need_mob_update += human_bloodbag.adjust_oxy_loss(damage_healed * (human_bloodbag.get_oxy_loss() / overall_damage), updating_health = FALSE)
+ need_mob_update += human_bloodbag.adjust_tox_loss(damage_healed * (human_bloodbag.get_tox_loss() / overall_damage), updating_health = FALSE)
+ need_mob_update += human_bloodbag.adjust_fire_loss(damage_healed * (human_bloodbag.get_fire_loss() / overall_damage), updating_health = FALSE)
+ need_mob_update += human_bloodbag.adjust_brute_loss(damage_healed * (human_bloodbag.get_brute_loss() / overall_damage), updating_health = FALSE)
if(need_mob_update)
human_bloodbag.updatehealth()
playsound(get_turf(human_bloodbag), 'sound/effects/magic/staff_healing.ogg', 25)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 7ebb633e746..ed423464aa3 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -143,7 +143,7 @@ Striking a noncultist, however, will tear their flesh."}
var/mob/living/carbon/human/miscreant = user
miscreant.apply_damage(rand(force/2, force), BRUTE, pick(GLOB.arm_zones))
else
- user.adjustBruteLoss(rand(force/2,force))
+ user.adjust_brute_loss(rand(force/2,force))
return
..()
@@ -686,7 +686,7 @@ Striking a noncultist, however, will tear their flesh."}
. = ..()
if(!IS_CULTIST(user) && isliving(user))
var/mob/living/living_user = user
- living_user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
+ living_user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5)
. += span_danger("It hurts just to look at it. Better keep away.")
else
. += span_cult("It can be used to create a gateway to Nar'Sie's domain, which will summon weak, sentient constructs over time.")
@@ -1069,7 +1069,7 @@ Striking a noncultist, however, will tear their flesh."}
var/mob/living/L = target
if(L.density)
L.Paralyze(20)
- L.adjustBruteLoss(45)
+ L.adjust_brute_loss(45)
playsound(L, 'sound/effects/hallucinations/wail.ogg', 50, TRUE)
L.emote("scream")
user.Beam(temp_target, icon_state="blood_beam", time = 7, beam_type = /obj/effect/ebeam/blood)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index d4a2b299e02..fbadeba3518 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -290,11 +290,11 @@ structure_check() searches for nearby cultist structures required for the invoca
to_chat(invoker, span_warning("Something is shielding [convertee]'s mind!"))
return FALSE
- var/brutedamage = convertee.getBruteLoss()
- var/burndamage = convertee.getFireLoss()
+ var/brutedamage = convertee.get_brute_loss()
+ var/burndamage = convertee.get_fire_loss()
if(brutedamage || burndamage)
- convertee.adjustBruteLoss(-(brutedamage * 0.75))
- convertee.adjustFireLoss(-(burndamage * 0.75))
+ convertee.adjust_brute_loss(-(brutedamage * 0.75))
+ convertee.adjust_fire_loss(-(burndamage * 0.75))
convertee.visible_message(
span_warning("[convertee] writhes in pain [(brutedamage || burndamage) \
diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm
index b92e8487822..c00fdf10f17 100644
--- a/code/modules/antagonists/heretic/influences.dm
+++ b/code/modules/antagonists/heretic/influences.dm
@@ -156,7 +156,7 @@
return
. += span_userdanger("Your mind burns as you stare at the tear!")
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 190)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10, 190)
user.add_mood_event("gates_of_mansus", /datum/mood_event/gates_of_mansus)
/obj/effect/heretic_influence
diff --git a/code/modules/antagonists/heretic/items/eldritch_painting.dm b/code/modules/antagonists/heretic/items/eldritch_painting.dm
index 15926cfcbeb..54bc953ee1d 100644
--- a/code/modules/antagonists/heretic/items/eldritch_painting.dm
+++ b/code/modules/antagonists/heretic/items/eldritch_painting.dm
@@ -123,7 +123,7 @@
// Gives them some nutrition
examiner.adjust_nutrition(50)
to_chat(examiner, span_warning("You feel a searing pain in your stomach!"))
- examiner.adjustOrganLoss(ORGAN_SLOT_STOMACH, 5)
+ examiner.adjust_organ_loss(ORGAN_SLOT_STOMACH, 5)
to_chat(examiner, span_notice("You feel less hungry."))
to_chat(examiner, span_warning("You should stockpile raw meat and organs, before you get hungry again."))
examiner.add_mood_event("respite_eldritch_hunger", /datum/mood_event/eldritch_painting/desire_examine)
diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm
index 184bc088bb3..35039d3e88f 100644
--- a/code/modules/antagonists/heretic/items/forbidden_book.dm
+++ b/code/modules/antagonists/heretic/items/forbidden_book.dm
@@ -94,7 +94,7 @@
return
var/mob/living/carbon/human/human_user = user
to_chat(human_user, span_userdanger("Your mind burns as you stare at the pages!"))
- human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 190)
+ human_user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10, 190)
human_user.add_mood_event("gates_of_mansus", /datum/mood_event/gates_of_mansus)
/obj/item/codex_cicatrix/morbus/examine_more(mob/user)
diff --git a/code/modules/antagonists/heretic/items/heretic_armor.dm b/code/modules/antagonists/heretic/items/heretic_armor.dm
index e12066cb670..cc2bf66e4fa 100644
--- a/code/modules/antagonists/heretic/items/heretic_armor.dm
+++ b/code/modules/antagonists/heretic/items/heretic_armor.dm
@@ -637,7 +637,7 @@
return COMPONENT_IGNORE_CHANGE
/obj/item/clothing/suit/hooded/cultrobes/eldritch/moon/proc/handle_damage(mob/living/user, damage)
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, damage * damage_modifier)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, damage * damage_modifier)
check_braindeath(user)
/// Gives the health HUD to the wearer
@@ -726,7 +726,7 @@
if(!istype(wearer) || wearer.wear_suit != src || wearer.stat == DEAD)
return ..()
if(!IS_HERETIC_OR_MONSTER(wearer))
- wearer.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20)
+ wearer.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20)
var/brain_damage = wearer.get_organ_loss(ORGAN_SLOT_BRAIN)
var/emote_rng = 0
var/list/emote_list = list()
@@ -762,7 +762,7 @@
return
braindead = TRUE
- wearer.setOrganLoss(ORGAN_SLOT_BRAIN, INFINITY)
+ wearer.set_organ_loss(ORGAN_SLOT_BRAIN, INFINITY)
playsound(wearer, 'sound/effects/pope_entry.ogg', 50)
to_chat(wearer, span_bold(span_hypnophrase("A terrible fate has befallen you.")))
addtimer(CALLBACK(src, PROC_REF(kill_wearer), wearer), 5 SECONDS)
diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm
index fe3eefc5eb3..3d4924d2211 100644
--- a/code/modules/antagonists/heretic/items/heretic_blades.dm
+++ b/code/modules/antagonists/heretic/items/heretic_blades.dm
@@ -279,7 +279,7 @@
else if(prob(15))
to_chat(user, span_big(span_hypnophrase("LW'NAFH'NAHOR UH'ENAH'YMG EPGOKA AH NAFL MGEMPGAH'EHYE")))
to_chat(user, span_danger("Horrible, unintelligible utterances flood your mind!"))
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15) // This can kill you if you ignore it
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15) // This can kill you if you ignore it
return TRUE
/obj/item/melee/sickly_blade/cursed/equipped(mob/user, slot)
diff --git a/code/modules/antagonists/heretic/items/heretic_grenade.dm b/code/modules/antagonists/heretic/items/heretic_grenade.dm
index eb6f4ecf077..47e0817d94f 100644
--- a/code/modules/antagonists/heretic/items/heretic_grenade.dm
+++ b/code/modules/antagonists/heretic/items/heretic_grenade.dm
@@ -72,7 +72,7 @@
. = ..()
if(!ishuman(exposed_mob))
if(issilicon(exposed_mob) || ismecha(exposed_mob) || isbot(exposed_mob))
- exposed_mob.adjustBruteLoss(500)
+ exposed_mob.adjust_brute_loss(500)
return
if(IS_HERETIC(exposed_mob))
return
diff --git a/code/modules/antagonists/heretic/items/heretic_necks.dm b/code/modules/antagonists/heretic/items/heretic_necks.dm
index 23df3695449..ad5ab5f9942 100644
--- a/code/modules/antagonists/heretic/items/heretic_necks.dm
+++ b/code/modules/antagonists/heretic/items/heretic_necks.dm
@@ -82,8 +82,8 @@
return
to_chat(user, span_danger("[src] explodes into a shower of gore and blood, drenching your arm. You can feel the blood seeping into your skin. You inmediately feel better, but soon, the feeling turns hollow as your veins itch."))
new /obj/effect/gibspawner/generic(get_turf(src))
- var/heal_amt = user.adjustBruteLoss(-50)
- user.adjustFireLoss( -(50 - abs(heal_amt)) ) // no double dipping
+ var/heal_amt = user.adjust_brute_loss(-50)
+ user.adjust_fire_loss( -(50 - abs(heal_amt)) ) // no double dipping
// I want it to poison the user but I also think it'd be neat if they got their juice as well. But that cancels most of the damage out. So I dunno.
user.reagents?.add_reagent(/datum/reagent/fuel/unholywater, rand(6, 10))
@@ -232,7 +232,7 @@
var/mob/living/living_target = target
if(!ishuman(target))
- living_target.adjustFireLoss(30)
+ living_target.adjust_fire_loss(30)
return TRUE
var/mob/living/carbon/human/human_target = target
if(IS_HERETIC_OR_MONSTER(human_target))
@@ -240,7 +240,7 @@
return FALSE
if(human_target.has_status_effect(/datum/status_effect/moon_slept) || human_target.has_status_effect(/datum/status_effect/moon_converted))
human_target.balloon_alert(living_user, "causing damage!")
- human_target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 25)
+ human_target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 25)
return FALSE
if(human_target.can_block_magic(MAGIC_RESISTANCE_MOON))
return FALSE
diff --git a/code/modules/antagonists/heretic/items/labyrinth_handbook.dm b/code/modules/antagonists/heretic/items/labyrinth_handbook.dm
index c1f5de8c985..b458a51a9c9 100644
--- a/code/modules/antagonists/heretic/items/labyrinth_handbook.dm
+++ b/code/modules/antagonists/heretic/items/labyrinth_handbook.dm
@@ -62,7 +62,7 @@
if(ishuman(user))
var/mob/living/carbon/human/human_user = user
to_chat(human_user, span_userdanger("Your mind burns as you stare deep into the book, a headache setting in like your brain is on fire!"))
- human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30, 190)
+ human_user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 30, 190)
human_user.add_mood_event("gates_of_mansus", /datum/mood_event/gates_of_mansus)
human_user.dropItemToGround(src)
return ITEM_INTERACT_BLOCKING
diff --git a/code/modules/antagonists/heretic/items/madness_mask.dm b/code/modules/antagonists/heretic/items/madness_mask.dm
index 4a91a69192a..b9721f0501b 100644
--- a/code/modules/antagonists/heretic/items/madness_mask.dm
+++ b/code/modules/antagonists/heretic/items/madness_mask.dm
@@ -68,9 +68,9 @@
if(SPT_PROB(40, seconds_per_tick))
human_in_range.set_jitter_if_lower(10 SECONDS)
- if(human_in_range.getStaminaLoss() <= 85 && SPT_PROB(30, seconds_per_tick))
+ if(human_in_range.get_stamina_loss() <= 85 && SPT_PROB(30, seconds_per_tick))
human_in_range.emote(pick("giggle", "laugh"))
- human_in_range.adjustStaminaLoss(10)
+ human_in_range.adjust_stamina_loss(10)
if(SPT_PROB(25, seconds_per_tick))
human_in_range.set_dizzy_if_lower(10 SECONDS)
diff --git a/code/modules/antagonists/heretic/items/unfathomable_curio.dm b/code/modules/antagonists/heretic/items/unfathomable_curio.dm
index b9a35fc00f1..f30af1fd32e 100644
--- a/code/modules/antagonists/heretic/items/unfathomable_curio.dm
+++ b/code/modules/antagonists/heretic/items/unfathomable_curio.dm
@@ -65,7 +65,7 @@
return
to_chat(wearer, span_warning("Laughter echoes in your mind...."))
- wearer.adjustOrganLoss(ORGAN_SLOT_BRAIN, 40)
+ wearer.adjust_organ_loss(ORGAN_SLOT_BRAIN, 40)
wearer.dropItemToGround(src, TRUE)
wearer.gain_trauma(pick(brain_traumas), TRAUMA_RESILIENCE_MAGIC)
@@ -74,7 +74,7 @@
if(IS_HERETIC(user))
return
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 160)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10, 160)
user.adjust_temp_blindness(5 SECONDS)
. += span_notice("It. It looked. IT WRAPS ITSELF AROUND ME.")
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
index eb449573ca8..6579c857b8d 100644
--- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -73,7 +73,7 @@
return
to_chat(target, span_danger("A bright green light burns your eyes horrifically!"))
- target.adjustOrganLoss(ORGAN_SLOT_EYES, 15)
+ target.adjust_organ_loss(ORGAN_SLOT_EYES, 15)
target.set_eye_blur_if_lower(20 SECONDS)
/datum/heretic_knowledge/limited_amount/starting/base_ash/trigger_mark(mob/living/source, mob/living/target)
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index 89f21584a8d..7acf182d30e 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -161,7 +161,7 @@
var/mob/living/second_target_resolved = second_target?.resolve()
var/mob/living/third_target_resolved = third_target?.resolve()
var/need_mob_update = FALSE
- need_mob_update += target.adjustFireLoss(5, updating_health = FALSE)
+ need_mob_update += target.adjust_fire_loss(5, updating_health = FALSE)
if(need_mob_update)
target.updatehealth()
if(target == second_target_resolved || target == third_target_resolved)
@@ -173,14 +173,14 @@
new /obj/effect/temp_visual/cosmic_explosion(get_turf(second_target_resolved))
playsound(get_turf(second_target_resolved), 'sound/effects/magic/cosmic_energy.ogg', 25, FALSE)
need_mob_update = FALSE
- need_mob_update += second_target_resolved.adjustFireLoss(14, updating_health = FALSE)
+ need_mob_update += second_target_resolved.adjust_fire_loss(14, updating_health = FALSE)
if(need_mob_update)
second_target_resolved.updatehealth()
if(third_target_resolved)
new /obj/effect/temp_visual/cosmic_domain(get_turf(third_target_resolved))
playsound(get_turf(third_target_resolved), 'sound/effects/magic/cosmic_energy.ogg', 50, FALSE)
need_mob_update = FALSE
- need_mob_update += third_target_resolved.adjustFireLoss(28, updating_health = FALSE)
+ need_mob_update += third_target_resolved.adjust_fire_loss(28, updating_health = FALSE)
if(need_mob_update)
third_target_resolved.updatehealth()
if(combo_counter == 3)
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 4db73da4622..d69b0bdb31a 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -164,9 +164,9 @@
target.emote(pick("giggle", "laugh"))
target.mob_mood?.adjust_sanity(-10)
if(target.stat == CONSCIOUS && target.mob_mood?.sanity >= SANITY_NEUTRAL)
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10)
return
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 25)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 25)
/datum/heretic_knowledge/spell/moon_ringleader
name = "Ringleaders Rise"
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index 44b26bb5a45..dfd35ef1073 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -302,11 +302,11 @@
var/need_mob_update = FALSE
var/base_heal_amt = 1 * DELTA_WORLD_TIME(SSmobs)
- need_mob_update += source.adjustBruteLoss(-base_heal_amt, updating_health = FALSE)
- need_mob_update += source.adjustFireLoss(-base_heal_amt, updating_health = FALSE)
- need_mob_update += source.adjustToxLoss(-base_heal_amt, updating_health = FALSE, forced = TRUE)
- need_mob_update += source.adjustOxyLoss(-base_heal_amt, updating_health = FALSE)
- need_mob_update += source.adjustStaminaLoss(-base_heal_amt * 4, updating_stamina = FALSE)
+ need_mob_update += source.adjust_brute_loss(-base_heal_amt, updating_health = FALSE)
+ need_mob_update += source.adjust_fire_loss(-base_heal_amt, updating_health = FALSE)
+ need_mob_update += source.adjust_tox_loss(-base_heal_amt, updating_health = FALSE, forced = TRUE)
+ need_mob_update += source.adjust_oxy_loss(-base_heal_amt, updating_health = FALSE)
+ need_mob_update += source.adjust_stamina_loss(-base_heal_amt * 4, updating_stamina = FALSE)
source.adjust_blood_volume(base_heal_amt, maximum = BLOOD_VOLUME_NORMAL)
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
index 23423ab86ad..041e3223998 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
@@ -66,10 +66,10 @@
owner.losebreath = max(owner.losebreath - (0.5 * seconds_between_ticks), 0)
var/damage_healed = 0
- damage_healed += owner.adjustToxLoss(-amount, updating_health = FALSE, forced = TRUE)
- damage_healed += owner.adjustOxyLoss(-amount, updating_health = FALSE)
- damage_healed += owner.adjustBruteLoss(-amount, updating_health = FALSE)
- damage_healed += owner.adjustFireLoss(-amount, updating_health = FALSE)
+ damage_healed += owner.adjust_tox_loss(-amount, updating_health = FALSE, forced = TRUE)
+ damage_healed += owner.adjust_oxy_loss(-amount, updating_health = FALSE)
+ damage_healed += owner.adjust_brute_loss(-amount, updating_health = FALSE)
+ damage_healed += owner.adjust_fire_loss(-amount, updating_health = FALSE)
if(damage_healed > 0)
owner.updatehealth()
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
index 25843e9f8c3..2463d231311 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -336,7 +336,7 @@
sac_target.equip_to_slot_or_del(new /obj/item/restraints/handcuffs/cult, ITEM_SLOT_HANDCUFFED, indirect_action = TRUE)
sac_target.dropItemToGround(sac_target.legcuffed, TRUE)
- sac_target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 85, 150)
+ sac_target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 85, 150)
sac_target.do_jitter_animation()
log_combat(heretic_mind.current, sac_target, "sacrificed")
@@ -345,7 +345,7 @@
// If our target is dead, try to revive them
// and if we fail to revive them, don't proceede the chain
- sac_target.adjustOxyLoss(-100, FALSE)
+ sac_target.adjust_oxy_loss(-100, FALSE)
if(!sac_target.heal_and_revive(50, span_danger("[sac_target]'s heart begins to beat with an unholy force as they return from death!")))
return
@@ -390,7 +390,7 @@
// If our target died during the (short) wait timer,
// and we fail to revive them (using a lower number than before),
// just disembowel them and stop the chain
- sac_target.adjustOxyLoss(-100, FALSE)
+ sac_target.adjust_oxy_loss(-100, FALSE)
if(!sac_target.heal_and_revive(60, span_danger("[sac_target]'s heart begins to beat with an unholy force as they return from death!")))
disembowel_target(sac_target)
return
@@ -581,7 +581,7 @@
sac_target.set_eye_blur_if_lower(100 SECONDS)
sac_target.set_dizzy_if_lower(1 MINUTES)
sac_target.AdjustKnockdown(80)
- sac_target.adjustStaminaLoss(120)
+ sac_target.adjust_stamina_loss(120)
// Glad i'm outta there, though!
sac_target.add_mood_event("shadow_realm_survived", /datum/mood_event/shadow_realm_live)
diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm
index 7dc39389a56..2cccd61d4e7 100644
--- a/code/modules/antagonists/heretic/magic/ash_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm
@@ -154,7 +154,7 @@
if((L in hit_list) || L == source)
continue
hit_list += L
- L.adjustFireLoss(20)
+ L.adjust_fire_loss(20)
to_chat(L, span_userdanger("You're hit by [source]'s eldritch flames!"))
new /obj/effect/hotspot(T)
diff --git a/code/modules/antagonists/heretic/magic/ash_jaunt.dm b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
index f6c563c305d..1b62e99f0cb 100644
--- a/code/modules/antagonists/heretic/magic/ash_jaunt.dm
+++ b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
@@ -60,7 +60,7 @@
return ..()
empowered_cast = TRUE
- human_owner.setStaminaLoss(0)
+ human_owner.set_stamina_loss(0)
human_owner.SetAllImmobility(0)
var/mob/living/carbon/carbon_owner = owner
carbon_owner.uncuff()
diff --git a/code/modules/antagonists/heretic/magic/blood_siphon.dm b/code/modules/antagonists/heretic/magic/blood_siphon.dm
index 42a1e206088..cb0b4ec355c 100644
--- a/code/modules/antagonists/heretic/magic/blood_siphon.dm
+++ b/code/modules/antagonists/heretic/magic/blood_siphon.dm
@@ -40,8 +40,8 @@
)
var/mob/living/living_owner = owner
- cast_on.adjustBruteLoss(20)
- living_owner.adjustBruteLoss(-20)
+ cast_on.adjust_brute_loss(20)
+ living_owner.adjust_brute_loss(-20)
cast_on.transfer_blood_to(living_owner, 20, ignore_low_blood = TRUE, ignore_incompatibility = TRUE, transfer_viruses = FALSE)
diff --git a/code/modules/antagonists/heretic/magic/crimson_cleave.dm b/code/modules/antagonists/heretic/magic/crimson_cleave.dm
index 8a1e7bd3732..b64a5221a50 100644
--- a/code/modules/antagonists/heretic/magic/crimson_cleave.dm
+++ b/code/modules/antagonists/heretic/magic/crimson_cleave.dm
@@ -53,7 +53,7 @@
)
victim.apply_damage(15, BRUTE, wound_bonus = CANT_WOUND)
- living_owner.adjustBruteLoss(-15)
+ living_owner.adjust_brute_loss(-15)
victim.transfer_blood_to(living_owner, 15, ignore_low_blood = TRUE, ignore_incompatibility = TRUE, transfer_viruses = FALSE)
diff --git a/code/modules/antagonists/heretic/magic/fire_blast.dm b/code/modules/antagonists/heretic/magic/fire_blast.dm
index 36ed3b4caab..69ab3b5688a 100644
--- a/code/modules/antagonists/heretic/magic/fire_blast.dm
+++ b/code/modules/antagonists/heretic/magic/fire_blast.dm
@@ -178,8 +178,8 @@
return TRUE
/datum/status_effect/fire_blasted/tick(seconds_between_ticks)
- owner.adjustFireLoss(tick_damage * seconds_between_ticks)
- owner.adjustStaminaLoss(2 * tick_damage * seconds_between_ticks)
+ owner.adjust_fire_loss(tick_damage * seconds_between_ticks)
+ owner.adjust_stamina_loss(2 * tick_damage * seconds_between_ticks)
// The beam fireblast spits out, causes people to walk through it to be on fire
/obj/effect/ebeam/reacting/fire
diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
index bf99c063e20..78f550ccec2 100644
--- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm
+++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
@@ -65,7 +65,7 @@
carbon_hit.adjust_timed_status_effect(4 SECONDS, /datum/status_effect/speech/slurring/heretic)
carbon_hit.AdjustKnockdown(5 SECONDS, daze_amount = 3 SECONDS)
- carbon_hit.adjustStaminaLoss(80)
+ carbon_hit.adjust_stamina_loss(80)
return TRUE
@@ -127,7 +127,7 @@
return FIRELOSS
if(prob(70))
- carbon_user.adjustFireLoss(20)
+ carbon_user.adjust_fire_loss(20)
playsound(carbon_user, 'sound/effects/wounds/sizzle1.ogg', 70, vary = TRUE)
if(prob(50))
carbon_user.emote("scream")
diff --git a/code/modules/antagonists/heretic/magic/mind_gate.dm b/code/modules/antagonists/heretic/magic/mind_gate.dm
index cf6a48f4a62..2e033ea35e8 100644
--- a/code/modules/antagonists/heretic/magic/mind_gate.dm
+++ b/code/modules/antagonists/heretic/magic/mind_gate.dm
@@ -34,13 +34,13 @@
return FALSE
var/mob/living/living_owner = owner
- living_owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20, 140)
+ living_owner.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20, 140)
cast_on.adjust_confusion(10 SECONDS)
- cast_on.adjustOxyLoss(30)
+ cast_on.adjust_oxy_loss(30)
cast_on.cause_hallucination(get_random_valid_hallucination_subtype(/datum/hallucination/body), "Mind gate, cast by [owner]")
cast_on.cause_hallucination(/datum/hallucination/delusion/preset/heretic/gate, "Caused by mindgate")
- cast_on.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30)
+ cast_on.adjust_organ_loss(ORGAN_SLOT_BRAIN, 30)
/// The duration of these effects are based on sanity, mainly for flavor but also to make it a weaker alpha strike
var/maximum_duration = 15 SECONDS
diff --git a/code/modules/antagonists/heretic/magic/moon_ringleader.dm b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
index 8ef7932a5f5..54702b41171 100644
--- a/code/modules/antagonists/heretic/magic/moon_ringleader.dm
+++ b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
@@ -82,7 +82,7 @@
mob.AdjustStun(1 SECONDS)
mob.AdjustKnockdown(1 SECONDS)
- mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 50, 150)
+ mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 50, 150)
mob.mob_mood?.adjust_sanity(-50)
qdel(victim)
diff --git a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
index a71d45b25ae..2bb5b32c4bc 100644
--- a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
+++ b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
@@ -58,11 +58,11 @@
// Heal the caster for every victim damaged
var/need_mob_update = FALSE
- need_mob_update += caster.adjustBruteLoss(-10, updating_health = FALSE)
- need_mob_update += caster.adjustFireLoss(-10, updating_health = FALSE)
- need_mob_update += caster.adjustToxLoss(-10, updating_health = FALSE, forced = TRUE)
- need_mob_update += caster.adjustOxyLoss(-10, updating_health = FALSE)
- need_mob_update += caster.adjustStaminaLoss(-10, updating_stamina = FALSE)
+ need_mob_update += caster.adjust_brute_loss(-10, updating_health = FALSE)
+ need_mob_update += caster.adjust_fire_loss(-10, updating_health = FALSE)
+ need_mob_update += caster.adjust_tox_loss(-10, updating_health = FALSE, forced = TRUE)
+ need_mob_update += caster.adjust_oxy_loss(-10, updating_health = FALSE)
+ need_mob_update += caster.adjust_stamina_loss(-10, updating_stamina = FALSE)
if(need_mob_update)
caster.updatehealth()
diff --git a/code/modules/antagonists/heretic/magic/realignment.dm b/code/modules/antagonists/heretic/magic/realignment.dm
index 12d751be83a..1f33b8d1e1b 100644
--- a/code/modules/antagonists/heretic/magic/realignment.dm
+++ b/code/modules/antagonists/heretic/magic/realignment.dm
@@ -73,7 +73,7 @@
owner.remove_filter(id)
/datum/status_effect/realignment/tick(seconds_between_ticks)
- owner.adjustStaminaLoss(-10)
+ owner.adjust_stamina_loss(-10)
owner.AdjustAllImmobility(-1 SECONDS)
/atom/movable/screen/alert/status_effect/realignment
diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm
index 2a3043c318a..f3660e2f813 100644
--- a/code/modules/antagonists/heretic/status_effects/buffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/buffs.dm
@@ -100,8 +100,8 @@
return
var/mob/living/carbon/carbie = owner
- carbie.adjustBruteLoss(-0.5 * seconds_between_ticks, updating_health = FALSE)
- carbie.adjustFireLoss(-0.5 * seconds_between_ticks, updating_health = FALSE)
+ carbie.adjust_brute_loss(-0.5 * seconds_between_ticks, updating_health = FALSE)
+ carbie.adjust_fire_loss(-0.5 * seconds_between_ticks, updating_health = FALSE)
for(var/BP in carbie.bodyparts)
var/obj/item/bodypart/part = BP
for(var/W in part.wounds)
@@ -117,9 +117,9 @@
heal_amt = 6
var/datum/wound_pregen_data/pregen_data = GLOB.all_wound_pregen_data[wound.type]
if (pregen_data.wounding_types_valid(WOUND_BURN))
- carbie.adjustFireLoss(-heal_amt)
+ carbie.adjust_fire_loss(-heal_amt)
else
- carbie.adjustBruteLoss(-heal_amt)
+ carbie.adjust_brute_loss(-heal_amt)
carbie.adjust_blood_volume(heal_amt * 3, maximum = BLOOD_VOLUME_NORMAL)
diff --git a/code/modules/antagonists/heretic/status_effects/debuffs.dm b/code/modules/antagonists/heretic/status_effects/debuffs.dm
index 2939f2066a8..063966ba616 100644
--- a/code/modules/antagonists/heretic/status_effects/debuffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/debuffs.dm
@@ -80,25 +80,25 @@
human_owner.set_timed_status_effect(100 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
if(30 to 40)
// Don't fully kill liver that's important
- human_owner.adjustOrganLoss(ORGAN_SLOT_LIVER, 10, 90)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_LIVER, 10, 90)
if(40 to 50)
// Don't fully kill heart that's important
- human_owner.adjustOrganLoss(ORGAN_SLOT_HEART, 10, 90)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_HEART, 10, 90)
if(50 to 60)
// You can fully kill the stomach that's not crucial
- human_owner.adjustOrganLoss(ORGAN_SLOT_STOMACH, 10)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_STOMACH, 10)
if(60 to 70)
// Same with eyes
- human_owner.adjustOrganLoss(ORGAN_SLOT_EYES, 5)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_EYES, 5)
if(70 to 80)
// And same with ears
- human_owner.adjustOrganLoss(ORGAN_SLOT_EARS, 10)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_EARS, 10)
if(80 to 90)
// But don't fully kill lungs that's usually important
- human_owner.adjustOrganLoss(ORGAN_SLOT_LUNGS, 10, 90)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_LUNGS, 10, 90)
if(90 to 95)
// And definitely don't fully kil brains
- human_owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20, 190)
+ human_owner.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20, 190)
if(95 to 100)
human_owner.adjust_confusion_up_to(12 SECONDS, 24 SECONDS)
@@ -191,8 +191,8 @@
/datum/status_effect/moon_converted/on_apply()
RegisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_damaged))
// Heals them so people who are in crit can have this affect applied on them and still be of some use for the heretic
- owner.adjustBruteLoss(-150 + owner.mob_mood.sanity)
- owner.adjustFireLoss(-150 + owner.mob_mood.sanity)
+ owner.adjust_brute_loss(-150 + owner.mob_mood.sanity)
+ owner.adjust_fire_loss(-150 + owner.mob_mood.sanity)
to_chat(owner, span_hypnophrase(("THE MOON SHOWS YOU THE TRUTH AND THE LIARS WISH TO COVER IT, SLAY THEM ALL!!!")))
owner.balloon_alert(owner, "they lie..THEY ALL LIE!!!")
diff --git a/code/modules/antagonists/heretic/status_effects/heretic_passive.dm b/code/modules/antagonists/heretic/status_effects/heretic_passive.dm
index 0a7a0f8b978..8b647c2c5b5 100644
--- a/code/modules/antagonists/heretic/status_effects/heretic_passive.dm
+++ b/code/modules/antagonists/heretic/status_effects/heretic_passive.dm
@@ -226,7 +226,7 @@
. = ..()
if(locate(/obj/effect/forcefield/cosmic_field) in get_turf(owner))
var/delta_time = DELTA_WORLD_TIME(SSmobs) * 0.5 // SSmobs.wait is 2 secs, so this should be halved.
- owner.adjustStaminaLoss(-15 * delta_time, updating_stamina = FALSE)
+ owner.adjust_stamina_loss(-15 * delta_time, updating_stamina = FALSE)
/**
* Creates a cosmic field at a given loc
@@ -301,8 +301,8 @@
/datum/status_effect/heretic_passive/flesh/proc/heal_glutton()
var/healed_amount = owner.heal_overall_damage(2, 2, updating_health = FALSE)
- healed_amount += owner.adjustOxyLoss(-2, FALSE)
- healed_amount += owner.adjustToxLoss(-2, FALSE, TRUE)
+ healed_amount += owner.adjust_oxy_loss(-2, FALSE)
+ healed_amount += owner.adjust_tox_loss(-2, FALSE, TRUE)
owner.adjust_blood_volume(2.5)
if(!iscarbon(owner))
return
@@ -432,7 +432,7 @@
healing_amount = -15 * seconds_between_ticks
if(!amulet_equipped)
healing_amount *= 0.5 // Half healing if you dont have the moon amulet
- owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, healing_amount)
+ owner.adjust_organ_loss(ORGAN_SLOT_BRAIN, healing_amount)
var/obj/item/organ/brain/our_brain = owner.get_organ_slot(ORGAN_SLOT_BRAIN)
if(!our_brain)
@@ -525,9 +525,9 @@
var/main_healing = 1 + 1 * passive_level * delta_time
var/stam_healing = 5 + 5 * passive_level * delta_time
need_mob_update += source.heal_overall_damage(-main_healing, -main_healing, updating_health = FALSE)
- need_mob_update += source.adjustStaminaLoss(-stam_healing, updating_stamina = FALSE)
- need_mob_update += source.adjustToxLoss(-main_healing, updating_health = FALSE, forced = TRUE) // Slimes are people too
- need_mob_update += source.adjustOxyLoss(-main_healing, updating_health = FALSE)
+ need_mob_update += source.adjust_stamina_loss(-stam_healing, updating_stamina = FALSE)
+ need_mob_update += source.adjust_tox_loss(-main_healing, updating_health = FALSE, forced = TRUE) // Slimes are people too
+ need_mob_update += source.adjust_oxy_loss(-main_healing, updating_health = FALSE)
if(need_mob_update)
source.updatehealth()
new /obj/effect/temp_visual/heal(get_turf(owner), COLOR_BROWN)
diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm
index 0812a8dbacd..465ad530d24 100644
--- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm
+++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm
@@ -83,8 +83,8 @@
/datum/status_effect/eldritch/ash/on_effect()
if(iscarbon(owner))
var/mob/living/carbon/carbon_owner = owner
- carbon_owner.adjustStaminaLoss(6 * repetitions) // first one = 30 stam
- carbon_owner.adjustFireLoss(3 * repetitions) // first one = 15 burn
+ carbon_owner.adjust_stamina_loss(6 * repetitions) // first one = 30 stam
+ carbon_owner.adjust_fire_loss(3 * repetitions) // first one = 15 burn
for(var/mob/living/carbon/victim in shuffle(range(1, carbon_owner)))
if(IS_HERETIC(victim) || victim == carbon_owner)
continue
@@ -285,7 +285,7 @@
/datum/status_effect/eldritch/moon/on_effect()
owner.adjust_confusion(30 SECONDS)
- owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 25, 160)
+ owner.adjust_organ_loss(ORGAN_SLOT_BRAIN, 25, 160)
owner.emote(pick("giggle", "laugh"))
owner.add_mood_event("Moon Insanity", /datum/mood_event/moon_insanity)
return ..()
diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm
index 289b1784c4d..3c3e51439d5 100644
--- a/code/modules/antagonists/heretic/structures/carving_knife.dm
+++ b/code/modules/antagonists/heretic/structures/carving_knife.dm
@@ -239,7 +239,7 @@
if(!iscarbon(victim))
return
var/mob/living/carbon/carbon_victim = victim
- carbon_victim.adjustStaminaLoss(80)
+ carbon_victim.adjust_stamina_loss(80)
carbon_victim.adjust_silence(20 SECONDS)
carbon_victim.adjust_stutter(1 MINUTES)
carbon_victim.adjust_confusion(5 SECONDS)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
index 490b598289c..0f7dc33bc6f 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
@@ -112,7 +112,7 @@
/obj/item/disk/nuclear/proc/manual_suicide(mob/living/user)
user.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
user.visible_message(span_suicide("[user] is destroyed by the nuclear blast!"))
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE)
/obj/item/disk/nuclear/fake
diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm
index 13a1ff7e1d6..ac4c66263a2 100644
--- a/code/modules/antagonists/revenant/revenant_blight.dm
+++ b/code/modules/antagonists/revenant/revenant_blight.dm
@@ -37,14 +37,14 @@
if(SPT_PROB(1.5 * stage, seconds_per_tick))
to_chat(affected_mob, span_revennotice("You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]..."))
affected_mob.adjust_confusion(8 SECONDS)
- need_mob_update += affected_mob.adjustStaminaLoss(20, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(20, updating_stamina = FALSE)
new /obj/effect/temp_visual/revenant(affected_mob.loc)
if(stagedamage < stage)
stagedamage++
- need_mob_update += affected_mob.adjustToxLoss(1 * stage * seconds_per_tick, updating_health = FALSE) //should, normally, do about 30 toxin damage.
+ need_mob_update += affected_mob.adjust_tox_loss(1 * stage * seconds_per_tick, updating_health = FALSE) //should, normally, do about 30 toxin damage.
new /obj/effect/temp_visual/revenant(affected_mob.loc)
if(SPT_PROB(25, seconds_per_tick))
- need_mob_update += affected_mob.adjustStaminaLoss(stage, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(stage, updating_stamina = FALSE)
if(need_mob_update)
affected_mob.updatehealth()
@@ -62,7 +62,7 @@
if(!finalstage)
finalstage = TRUE
to_chat(affected_mob, span_revenbignotice("You feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")]."))
- affected_mob.adjustStaminaLoss(22.5 * seconds_per_tick, updating_stamina = FALSE)
+ affected_mob.adjust_stamina_loss(22.5 * seconds_per_tick, updating_stamina = FALSE)
new /obj/effect/temp_visual/revenant(affected_mob.loc)
if(affected_mob.dna && affected_mob.dna.species)
affected_mob.set_haircolor("#1d2953", override = TRUE)
diff --git a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
index f5b12af1a12..afc11f2c3c8 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
@@ -61,7 +61,7 @@
/datum/action/cooldown/spell/pointed/unsettle/proc/spookify(mob/living/carbon/human/target)
target.Paralyze(stun_time)
- target.adjustStaminaLoss(stamina_damage)
+ target.adjust_stamina_loss(stamina_damage)
target.apply_status_effect(/datum/status_effect/speech/slurring/generic)
target.emote("scream")
diff --git a/code/modules/antagonists/voidwalker/voidwalker_mob.dm b/code/modules/antagonists/voidwalker/voidwalker_mob.dm
index efe8aebafac..447389876ea 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_mob.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_mob.dm
@@ -263,7 +263,7 @@
CRASH("[victim] was instantly dumped after being voidwalker kidnapped due to a missing landmark!")
else
victim.heal_and_revive(90)
- victim.adjustOxyLoss(-100, FALSE)
+ victim.adjust_oxy_loss(-100, FALSE)
conversions_remaining++
diff --git a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
index 238aa3cf87f..dc3ddbd6d51 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
@@ -8,7 +8,7 @@
alert_type = /atom/movable/screen/alert/status_effect/veryhighgravity
/datum/status_effect/planet_allergy/tick()
- owner.adjustBruteLoss(1)
+ owner.adjust_brute_loss(1)
/atom/movable/screen/alert/status_effect/veryhighgravity
name = "Crushing Gravity"
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm b/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm
index f0b8ef709ae..6357848b36a 100644
--- a/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm
@@ -37,7 +37,7 @@
[invoker] must die."))
var/datum/brain_trauma/mild/hallucinations/added_trauma = new()
added_trauma.resilience = TRAUMA_RESILIENCE_ABSOLUTE
- crewmate.adjustOrganLoss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 25, BRAIN_DAMAGE_DEATH - 25) //you'd better hope chap didn't pick a hypertool
+ crewmate.adjust_organ_loss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 25, BRAIN_DAMAGE_DEATH - 25) //you'd better hope chap didn't pick a hypertool
crewmate.gain_trauma(added_trauma)
crewmate.add_mood_event("wizard_ritual_finale", /datum/mood_event/madness_despair)
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 7ed1ee93fd5..82522207e51 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -197,7 +197,7 @@
to_chat(flashed, "You're blinded by [src]!")
else
//easy way to make sure that you can only long stun someone who is facing in your direction
- flashed.adjustStaminaLoss(rand(80, 120) * (1 - (deviation * 0.5)))
+ flashed.adjust_stamina_loss(rand(80, 120) * (1 - (deviation * 0.5)))
flashed.Knockdown(rand(25, 50) * (1 - (deviation * 0.5)))
if(user)
visible_message(span_danger("[user] blinds [flashed] with the flash!"), span_userdanger("[user] blinds you with the flash!"))
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 72a2395641d..0c122e7c851 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -45,7 +45,7 @@
return
user.visible_message(span_suicide("[user]'s [src] receives a signal, killing [user.p_them()] instantly!"))
user.set_suicide(TRUE)
- user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
+ user.adjust_oxy_loss(200)//it sends an electrical pulse to their heart, killing them. or something.
user.death(FALSE)
playsound(user, 'sound/machines/beep/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
qdel(src)
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index b0dd20dec23..ddcdfae5745 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -21,7 +21,7 @@
/obj/item/assembly/timer/proc/manual_suicide(mob/living/user)
user.visible_message(span_suicide("[user]'s time is up!"))
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE)
/obj/item/assembly/timer/Initialize(mapload)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index bc3707dabd9..303f905a086 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -570,10 +570,10 @@
occupant_data["health"] = mob_occupant.health
occupant_data["maxHealth"] = mob_occupant.maxHealth
- occupant_data["bruteLoss"] = mob_occupant.getBruteLoss()
- occupant_data["oxyLoss"] = mob_occupant.getOxyLoss()
- occupant_data["toxLoss"] = mob_occupant.getToxLoss()
- occupant_data["fireLoss"] = mob_occupant.getFireLoss()
+ occupant_data["bruteLoss"] = mob_occupant.get_brute_loss()
+ occupant_data["oxyLoss"] = mob_occupant.get_oxy_loss()
+ occupant_data["toxLoss"] = mob_occupant.get_tox_loss()
+ occupant_data["fireLoss"] = mob_occupant.get_fire_loss()
.["occupant"] = occupant_data
var/datum/gas_mixture/air1 = internal_connector.gas_connector.airs[1]
diff --git a/code/modules/basketball/basketball.dm b/code/modules/basketball/basketball.dm
index 274a9602546..cd811f75d59 100644
--- a/code/modules/basketball/basketball.dm
+++ b/code/modules/basketball/basketball.dm
@@ -94,7 +94,7 @@
for(var/i in 1 to 6)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/items/basketball_bounce.ogg', 75, FALSE), 0.25 SECONDS * i)
- addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/carbon/, adjustStaminaLoss), STAMINA_COST_SPINNING), 1.5 SECONDS)
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/carbon/, adjust_stamina_loss), STAMINA_COST_SPINNING), 1.5 SECONDS)
/// Used to calculate our disarm chance based on stamina, direction, and spinning
/// Note - monkeys use attack_paw() and never trigger this signal (so they always have 100% disarm)
@@ -104,12 +104,12 @@
// spinning gives you a lower disarm chance but it drains stamina
var/disarm_chance = HAS_TRAIT(baller, TRAIT_SPINNING) ? 35 : 50
// ballers stamina results in lower disarm, stealer stamina results in higher disarm
- disarm_chance += (baller.getStaminaLoss() - stealer.getStaminaLoss()) / 2
+ disarm_chance += (baller.get_stamina_loss() - stealer.get_stamina_loss()) / 2
// the lowest chance for disarm is 25% and the highest is 75%
disarm_chance = clamp(disarm_chance, MIN_DISARM_CHANCE, MAX_DISARM_CHANCE)
// getting disarmed or shoved while holding the ball drains stamina
- baller.adjustStaminaLoss(STAMINA_COST_DISARMING)
+ baller.adjust_stamina_loss(STAMINA_COST_DISARMING)
if(!prob(disarm_chance))
return // the disarm failed
@@ -188,7 +188,7 @@
if(istype(interacting_with, /obj/structure/hoop) && baller.Adjacent(interacting_with))
return NONE // Do hoop stuff
- baller.adjustStaminaLoss(STAMINA_COST_SHOOTING)
+ baller.adjust_stamina_loss(STAMINA_COST_SHOOTING)
var/dunk_dir = get_dir(baller, interacting_with)
var/dunk_pixel_y = dunk_dir & SOUTH ? -16 : 16
diff --git a/code/modules/basketball/hoop.dm b/code/modules/basketball/hoop.dm
index 14ab028fc48..a00a1f39d99 100644
--- a/code/modules/basketball/hoop.dm
+++ b/code/modules/basketball/hoop.dm
@@ -109,7 +109,7 @@
score(ball, baller, 2)
if(istype(ball, /obj/item/toy/basketball))
- baller.adjustStaminaLoss(STAMINA_COST_DUNKING)
+ baller.adjust_stamina_loss(STAMINA_COST_DUNKING)
/obj/structure/hoop/attack_hand(mob/living/baller, list/modifiers)
. = ..()
@@ -127,7 +127,7 @@
loser.Paralyze(100)
visible_message(span_danger("[baller] dunks [loser] into \the [src]!"))
playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100, FALSE)
- baller.adjustStaminaLoss(STAMINA_COST_DUNKING_MOB)
+ baller.adjust_stamina_loss(STAMINA_COST_DUNKING_MOB)
baller.stop_pulling()
/obj/structure/hoop/click_ctrl(mob/user)
diff --git a/code/modules/bitrunning/components/netpod_healing.dm b/code/modules/bitrunning/components/netpod_healing.dm
index 17fd2a4859b..dd70c29a030 100644
--- a/code/modules/bitrunning/components/netpod_healing.dm
+++ b/code/modules/bitrunning/components/netpod_healing.dm
@@ -34,9 +34,9 @@
return
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-BASE_HEAL * seconds_per_tick, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(-BASE_HEAL * seconds_per_tick, updating_health = FALSE)
- need_mob_update += owner.adjustToxLoss(-BASE_HEAL * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_brute_loss(-BASE_HEAL * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(-BASE_HEAL * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner.adjust_tox_loss(-BASE_HEAL * seconds_per_tick, updating_health = FALSE, forced = TRUE)
owner.adjust_blood_volume(BASE_HEAL * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL)
diff --git a/code/modules/bitrunning/netpod/utils.dm b/code/modules/bitrunning/netpod/utils.dm
index a954652c271..3cb7d53e5ac 100644
--- a/code/modules/bitrunning/netpod/utils.dm
+++ b/code/modules/bitrunning/netpod/utils.dm
@@ -47,7 +47,7 @@
return
mob_occupant.flash_act(override_blindness_check = TRUE, visual = TRUE)
- mob_occupant.adjustOrganLoss(ORGAN_SLOT_BRAIN, disconnect_damage)
+ mob_occupant.adjust_organ_loss(ORGAN_SLOT_BRAIN, disconnect_damage)
INVOKE_ASYNC(mob_occupant, TYPE_PROC_REF(/mob/living, emote), "scream")
to_chat(mob_occupant, span_danger("You've been forcefully disconnected from your avatar! Your thoughts feel scrambled!"))
diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm
index efe9b9d4975..ce79ee7aa5b 100644
--- a/code/modules/bitrunning/server/util.dm
+++ b/code/modules/bitrunning/server/util.dm
@@ -25,10 +25,10 @@
"health" = creature.health,
"name" = creature.name,
"pilot" = pilot,
- "brute" = creature.getBruteLoss(),
- "burn" = creature.getFireLoss(),
- "tox" = creature.getToxLoss(),
- "oxy" = creature.getOxyLoss(),
+ "brute" = creature.get_brute_loss(),
+ "burn" = creature.get_fire_loss(),
+ "tox" = creature.get_tox_loss(),
+ "oxy" = creature.get_oxy_loss(),
))
return hosted_avatars
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 441138cbdae..2488942a9f2 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -338,11 +338,11 @@
sleep(0.1 SECONDS)
if (effectGib) //effectGib is on, that means whatever's underneath us better be fucking oof'd on
- target_living.adjustBruteLoss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
+ target_living.adjust_brute_loss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
if (!QDELETED(target_living))
target_living.gib(DROP_ALL_REMAINS) //After adjusting the fuck outta that brute loss we finish the job with some satisfying gibs
else
- target_living.adjustBruteLoss(damage)
+ target_living.adjust_brute_loss(damage)
if (boom?.len == 4)
boom.len += 1
diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm
index 6e00140b3b4..6599507d6a8 100644
--- a/code/modules/client/verbs/suicide.dm
+++ b/code/modules/client/verbs/suicide.dm
@@ -101,7 +101,7 @@
/// The actual proc that will apply the damage to the suiciding mob. damage_type is the actual type of damage we want to deal, if that matters.
/// Return TRUE if we actually apply any real damage, FALSE otherwise.
/mob/living/proc/apply_suicide_damage(obj/item/suicide_tool, damage_type = NONE)
- adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ adjust_oxy_loss(max(maxHealth * 2 - get_tox_loss() - get_fire_loss() - get_brute_loss() - get_oxy_loss(), 0))
return TRUE
/// If we want to apply multiple types of damage to a carbon mob based on the way they suicide, this is the proc that handles that.
@@ -126,10 +126,10 @@
for(var/filtered_type in filtered_damage_types)
switch(filtered_type)
if(BRUTELOSS)
- adjustBruteLoss(damage_to_apply)
+ adjust_brute_loss(damage_to_apply)
if(FIRELOSS)
- adjustFireLoss(damage_to_apply)
+ adjust_fire_loss(damage_to_apply)
if(OXYLOSS)
- adjustOxyLoss(damage_to_apply)
+ adjust_oxy_loss(damage_to_apply)
if(TOXLOSS)
- adjustToxLoss(damage_to_apply)
+ adjust_tox_loss(damage_to_apply)
diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm
index 6d0fe95bcf5..4207b9eafda 100644
--- a/code/modules/clothing/gloves/special.dm
+++ b/code/modules/clothing/gloves/special.dm
@@ -227,7 +227,7 @@
stamina_exhaustion *= 1.5
experience *= 2
- wearer.adjustStaminaLoss(stamina_exhaustion)
+ wearer.adjust_stamina_loss(stamina_exhaustion)
wearer.mind?.adjust_experience(/datum/skill/athletics, experience)
wearer.apply_status_effect(/datum/status_effect/exercised)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 3aba8a99414..cc18e6dd41f 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -252,7 +252,7 @@
var/mob/living/carbon/carbon_patient = target
var/body_part = carbon_patient.parse_zone_with_bodypart(user.zone_selected)
- var/oxy_loss = carbon_patient.getOxyLoss()
+ var/oxy_loss = carbon_patient.get_oxy_loss()
var/heart_strength
var/pulse_pressure
diff --git a/code/modules/clothing/suits/_lasertag_components.dm b/code/modules/clothing/suits/_lasertag_components.dm
index d80730b1a87..d4ad0bbfb55 100644
--- a/code/modules/clothing/suits/_lasertag_components.dm
+++ b/code/modules/clothing/suits/_lasertag_components.dm
@@ -30,5 +30,5 @@
var/obj/projectile/beam/lasertag/laser = projectile
if (laser.lasertag_team != team_color)
var/mob/living/carbon/human/laser_target = parent
- laser_target.adjustStaminaLoss(laser.lasertag_damage)
+ laser_target.adjust_stamina_loss(laser.lasertag_damage)
diff --git a/code/modules/fishing/fish/types/rift.dm b/code/modules/fishing/fish/types/rift.dm
index 011a1736379..8e2a35e1f1e 100644
--- a/code/modules/fishing/fish/types/rift.dm
+++ b/code/modules/fishing/fish/types/rift.dm
@@ -588,7 +588,7 @@
voice_of_god(psychic_speech, user, list("big", "alertalien"), base_multiplier = 5, include_speaker = TRUE, forced = TRUE, ignore_spam = TRUE)
psy_wail()
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, INFINITY, INFINITY, ORGAN_SLOT_BRAIN)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, INFINITY, INFINITY, ORGAN_SLOT_BRAIN)
user.death()
return MANUAL_SUICIDE
@@ -652,7 +652,7 @@
if(iscarbon(screeched))
var/mob/living/carbon/carbon_screeched = screeched
carbon_screeched.vomit(MOB_VOMIT_MESSAGE)
- carbon_screeched.adjustOrganLoss(ORGAN_SLOT_BRAIN, 50)
+ carbon_screeched.adjust_organ_loss(ORGAN_SLOT_BRAIN, 50)
var/affected = 0
for(var/obj/item/fish/fishie in range(7, src))
diff --git a/code/modules/fishing/sources/subtypes/rifts.dm b/code/modules/fishing/sources/subtypes/rifts.dm
index b151c963bbf..37d84f41662 100644
--- a/code/modules/fishing/sources/subtypes/rifts.dm
+++ b/code/modules/fishing/sources/subtypes/rifts.dm
@@ -166,7 +166,7 @@
return
// Non-heretics instead go crazy
- human_user?.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 190)
+ human_user?.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10, 190)
human_user?.add_mood_event("gates_of_mansus", /datum/mood_event/gates_of_mansus)
human_user?.do_jitter_animation(50)
// Hand fires at them from the location
diff --git a/code/modules/hallucination/blood_flow.dm b/code/modules/hallucination/blood_flow.dm
index 347e2da9414..7805768c252 100644
--- a/code/modules/hallucination/blood_flow.dm
+++ b/code/modules/hallucination/blood_flow.dm
@@ -76,5 +76,5 @@
/datum/hallucination/blood_flow/proc/stamina_loop()
set waitfor = FALSE
while(!QDELETED(src) && !QDELETED(hallucinator))
- hallucinator.adjustStaminaLoss(5)
+ hallucinator.adjust_stamina_loss(5)
sleep(4 SECONDS)
diff --git a/code/modules/hallucination/bubblegum_attack.dm b/code/modules/hallucination/bubblegum_attack.dm
index 66dfa606dc3..64a4f0e2036 100644
--- a/code/modules/hallucination/bubblegum_attack.dm
+++ b/code/modules/hallucination/bubblegum_attack.dm
@@ -82,7 +82,7 @@
if(fake_bubbles.Adjacent(hallucinator))
hallucinator.Paralyze(8 SECONDS)
- hallucinator.adjustStaminaLoss(40)
+ hallucinator.adjust_stamina_loss(40)
step_away(hallucinator, fake_bubbles)
shake_camera(hallucinator, 4, 3)
hallucinator.visible_message(
diff --git a/code/modules/hallucination/hazard.dm b/code/modules/hallucination/hazard.dm
index 81596ee1ea7..7d98c0ef82d 100644
--- a/code/modules/hallucination/hazard.dm
+++ b/code/modules/hallucination/hazard.dm
@@ -63,7 +63,7 @@
return ..()
/obj/effect/client_image_holder/hallucination/danger/lava/on_hallucinator_entered(mob/living/afflicted)
- afflicted.adjustStaminaLoss(20)
+ afflicted.adjust_stamina_loss(20)
afflicted.cause_hallucination(/datum/hallucination/fire, "fake lava hallucination")
/obj/effect/client_image_holder/hallucination/danger/chasm
diff --git a/code/modules/hallucination/on_fire.dm b/code/modules/hallucination/on_fire.dm
index 048d8dcc96c..75534e475c9 100644
--- a/code/modules/hallucination/on_fire.dm
+++ b/code/modules/hallucination/on_fire.dm
@@ -106,7 +106,7 @@
else if(times_to_lower_stamina)
next_action -= seconds_per_tick
if(next_action < 0)
- hallucinator.adjustStaminaLoss(15)
+ hallucinator.adjust_stamina_loss(15)
next_action += 2
times_to_lower_stamina -= 1
diff --git a/code/modules/hallucination/shock.dm b/code/modules/hallucination/shock.dm
index 85f144b050e..c9982fc627d 100644
--- a/code/modules/hallucination/shock.dm
+++ b/code/modules/hallucination/shock.dm
@@ -40,7 +40,7 @@
hallucinator.client?.images |= electrocution_skeleton_anim
hallucinator.playsound_local(get_turf(src), SFX_SPARKS, 100, TRUE)
- hallucinator.adjustStaminaLoss(50)
+ hallucinator.adjust_stamina_loss(50)
hallucinator.Stun(4 SECONDS)
hallucinator.do_jitter_animation(300) // Maximum jitter
hallucinator.adjust_jitter(20 SECONDS)
diff --git a/code/modules/hallucination/stray_bullet.dm b/code/modules/hallucination/stray_bullet.dm
index 5641b6e8cfc..a1c40adf653 100644
--- a/code/modules/hallucination/stray_bullet.dm
+++ b/code/modules/hallucination/stray_bullet.dm
@@ -196,7 +196,7 @@
hit_duration_wall = 5
/obj/projectile/hallucination/bullet/apply_effect_to_hallucinator(mob/living/afflicted)
- afflicted.adjustStaminaLoss(60)
+ afflicted.adjust_stamina_loss(60)
/obj/projectile/hallucination/laser
name = "laser"
@@ -216,7 +216,7 @@
reflectable = TRUE
/obj/projectile/hallucination/laser/apply_effect_to_hallucinator(mob/living/afflicted)
- afflicted.adjustStaminaLoss(20)
+ afflicted.adjust_stamina_loss(20)
afflicted.adjust_eye_blur(4 SECONDS)
/obj/projectile/hallucination/disabler
@@ -236,7 +236,7 @@
reflectable = TRUE
/obj/projectile/hallucination/disabler/apply_effect_to_hallucinator(mob/living/afflicted)
- afflicted.adjustStaminaLoss(30)
+ afflicted.adjust_stamina_loss(30)
/obj/projectile/hallucination/ebow
name = "bolt"
@@ -251,7 +251,7 @@
/obj/projectile/hallucination/ebow/apply_effect_to_hallucinator(mob/living/afflicted)
afflicted.adjust_slurring(10 SECONDS)
afflicted.Knockdown(1 SECONDS)
- afflicted.adjustStaminaLoss(75) // 60 stam + 15 tox
+ afflicted.adjust_stamina_loss(75) // 60 stam + 15 tox
afflicted.adjust_eye_blur(20 SECONDS)
/obj/projectile/hallucination/change
diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm
index efa1ec7db2a..bb99965d368 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain.dm
@@ -79,7 +79,7 @@
holy_bible.deity_name = pick("Dick Powers", "King Cock")
else
holy_bible.deity_name = pick("Gay Space Jesus", "Gandalf", "Dumbledore")
- human_spawned.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // starts off brain damaged as fuck
+ human_spawned.adjust_organ_loss(ORGAN_SLOT_BRAIN, 100) // starts off brain damaged as fuck
if("lol", "wtf", "poo", "badmin", "shitmin", "deadmin", "meme", "memes", "skibidi")
new_bible = pick("Woody's Got Wood: The Aftermath", "Sweet Bro and Hella Jeff: Expanded Edition","F.A.T.A.L. Rulebook", "Toilet Humor")
switch(new_bible)
@@ -91,7 +91,7 @@
holy_bible.deity_name = "Twenty Ten-Sided Dice"
if("Toilet Humor")
holy_bible.deity_name = pick("Skibidi Toilet", "Skibidi Wizard", "Skibidi Bathtub", "John Skibidi", "Skibidi Skibidi", "G-Toilet 1.0", "John Freeman")
- human_spawned.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // also starts off brain damaged as fuck
+ human_spawned.adjust_organ_loss(ORGAN_SLOT_BRAIN, 100) // also starts off brain damaged as fuck
if("servicianism", "partying")
holy_bible.desc = "Happy, Full, Clean. Live it and give it."
if("weeaboo","kawaii")
diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm
index 0478989ee51..950f2c70a5c 100644
--- a/code/modules/library/bibles.dm
+++ b/code/modules/library/bibles.dm
@@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
if(iscarbon(target_mob))
var/mob/living/carbon/carbon_target = target_mob
if(!istype(carbon_target.head, /obj/item/clothing/head/helmet))
- carbon_target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 60)
+ carbon_target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5, 60)
carbon_target.balloon_alert(carbon_target, "you feel dumber!")
target_mob.visible_message(span_danger("[user] beats [target_mob] over the head with [src]!"), \
span_userdanger("[user] beats [target_mob] over the head with [src]!"))
diff --git a/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm b/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm
index eb365c914f4..dee9f5d53c5 100644
--- a/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm
+++ b/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm
@@ -100,7 +100,7 @@
bozo.adjust_confusion(15 SECONDS)
bozo.set_eye_blur_if_lower(10 SECONDS)
// but the rest of the effects will happen either way
- bozo.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20 - get_integrity())
+ bozo.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20 - get_integrity())
sparks.set_up(5, cardinals_only = FALSE, location = get_turf(src))
sparks.start()
diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm
index bcf5a417780..c5fd9bfa5c1 100644
--- a/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm
+++ b/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm
@@ -24,7 +24,7 @@
SIGNAL_HANDLER
if(key != "taunt" || !intentional)
return
- if((source.maxHealth - (source.getStaminaLoss() + TAUNT_STAMINA_COST)) <= source.crit_threshold)
+ if((source.maxHealth - (source.get_stamina_loss() + TAUNT_STAMINA_COST)) <= source.crit_threshold)
source.balloon_alert(source, "too tired!")
return COMPONENT_CANT_EMOTE
@@ -33,7 +33,7 @@
if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT))
return
ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
- source.adjustStaminaLoss(TAUNT_STAMINA_COST)
+ source.adjust_stamina_loss(TAUNT_STAMINA_COST)
addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), TAUNT_EMOTE_DURATION * 1.5)
#undef TAUNT_STAMINA_COST
diff --git a/code/modules/library/skill_learning/generic_skillchips/misc.dm b/code/modules/library/skill_learning/generic_skillchips/misc.dm
index 083f67cb4a0..288b164bc63 100644
--- a/code/modules/library/skill_learning/generic_skillchips/misc.dm
+++ b/code/modules/library/skill_learning/generic_skillchips/misc.dm
@@ -98,7 +98,7 @@
/obj/item/skillchip/brainwashing/on_activate(mob/living/carbon/user, silent = FALSE)
to_chat(user, span_danger("You get a pounding headache as the chip sends corrupt memories into your head!"))
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20)
. = ..()
/obj/item/skillchip/chefs_kiss
diff --git a/code/modules/manufactorio/machines/crusher.dm b/code/modules/manufactorio/machines/crusher.dm
index ee5a61a784f..3317141956a 100644
--- a/code/modules/manufactorio/machines/crusher.dm
+++ b/code/modules/manufactorio/machines/crusher.dm
@@ -77,7 +77,7 @@
return
else if(isliving(victim))
var/mob/living/poor_sap = victim
- poor_sap.adjustBruteLoss(95, TRUE)
+ poor_sap.adjust_brute_loss(95, TRUE)
if(!send_resource(poor_sap, dir))
withholding = poor_sap
return
diff --git a/code/modules/mining/equipment/kinetic_crusher/trophies_megafauna.dm b/code/modules/mining/equipment/kinetic_crusher/trophies_megafauna.dm
index 4799c04ab24..5c69886c371 100644
--- a/code/modules/mining/equipment/kinetic_crusher/trophies_megafauna.dm
+++ b/code/modules/mining/equipment/kinetic_crusher/trophies_megafauna.dm
@@ -35,7 +35,7 @@
playsound(living_target, 'sound/effects/magic/fireball.ogg', 20, TRUE)
new /obj/effect/temp_visual/fire(living_target.loc)
addtimer(CALLBACK(src, PROC_REF(pushback), living_target, user), 1) //no free backstabs, we push AFTER module stuff is done
- living_target.adjustFireLoss(bonus_value, forced = TRUE)
+ living_target.adjust_fire_loss(bonus_value, forced = TRUE)
/obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user)
if(!QDELETED(target) && !QDELETED(user) && (!target.anchored || ismegafauna(target))) //megafauna will always be pushed
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 621b516254b..5616080fa92 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
C.visible_message(span_danger("[C]'s eye protection blocks the sand!"), span_warning("Your eye protection blocks the sand!"))
return
C.adjust_eye_blur(12 SECONDS)
- C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage
+ C.adjust_stamina_loss(15)//the pain from your eyes burning does stamina damage
C.adjust_confusion(5 SECONDS)
to_chat(C, span_userdanger("\The [src] gets into your eyes! The pain, it burns!"))
qdel(src)
@@ -483,7 +483,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
var/index = sideslist.Find(coinflip)
if (index == 2)//tails
user.visible_message(span_suicide("\the [src] lands on [coinflip]! [user] promptly falls over, dead!"))
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE)
user.set_suicide(TRUE)
user.suicide_log()
@@ -664,7 +664,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/coin/eldritch/heads_action(mob/user)
var/mob/living/living_user = user
if(!IS_HERETIC(user))
- living_user.adjustBruteLoss(5)
+ living_user.adjust_brute_loss(5)
return
for(var/obj/machinery/door/airlock/target_airlock in range(airlock_range, user))
if(target_airlock.density)
@@ -675,7 +675,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/coin/eldritch/tails_action(mob/user)
var/mob/living/living_user = user
if(!IS_HERETIC(user))
- living_user.adjustFireLoss(5)
+ living_user.adjust_fire_loss(5)
return
for(var/obj/machinery/door/airlock/target_airlock in range(airlock_range, user))
if(target_airlock.locked)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 45bfca477bb..5030ec91bb9 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -104,7 +104,7 @@
span_notice("You attempt to do a flip while still off balance from the last flip and fall down!")
)
if(prob(fall_over_prob/2))
- flippy_mcgee.adjustBruteLoss(1)
+ flippy_mcgee.adjust_brute_loss(1)
else
flippy_mcgee.visible_message(
span_notice("[flippy_mcgee] stumbles a bit after their flip."),
diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm
index e2d1482c8a5..37552284881 100644
--- a/code/modules/mob/living/basic/basic.dm
+++ b/code/modules/mob/living/basic/basic.dm
@@ -166,7 +166,7 @@
/mob/living/basic/Life(seconds_per_tick = SSMOBS_DT, times_fired)
. = ..()
if(staminaloss > 0)
- adjustStaminaLoss(-stamina_recovery * seconds_per_tick, forced = TRUE)
+ adjust_stamina_loss(-stamina_recovery * seconds_per_tick, forced = TRUE)
/mob/living/basic/get_default_say_verb()
return length(speak_emote) ? pick(speak_emote) : ..()
diff --git a/code/modules/mob/living/basic/boss/boss.dm b/code/modules/mob/living/basic/boss/boss.dm
index d682d254a73..4825e98207f 100644
--- a/code/modules/mob/living/basic/boss/boss.dm
+++ b/code/modules/mob/living/basic/boss/boss.dm
@@ -74,7 +74,7 @@
qdel(victim.get_organ_slot(ORGAN_SLOT_LUNGS))
qdel(victim.get_organ_slot(ORGAN_SLOT_HEART))
qdel(victim.get_organ_slot(ORGAN_SLOT_LIVER))
- victim.adjustBruteLoss(500)
+ victim.adjust_brute_loss(500)
victim.death() //make sure they die
victim.apply_status_effect(/datum/status_effect/gutted)
return TRUE
@@ -87,12 +87,12 @@
/mob/living/basic/boss/ex_act(severity, target)
switch (severity)
if (EXPLODE_DEVASTATE)
- adjustBruteLoss(250)
+ adjust_brute_loss(250)
if (EXPLODE_HEAVY)
- adjustBruteLoss(100)
+ adjust_brute_loss(100)
if (EXPLODE_LIGHT)
- adjustBruteLoss(50)
+ adjust_brute_loss(50)
return TRUE
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 41e4d74eed4..ca0b768d5cb 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -771,7 +771,7 @@ GLOBAL_LIST_INIT(command_strings, list(
update_appearance()
/mob/living/basic/bot/rust_heretic_act()
- adjustBruteLoss(400)
+ adjust_brute_loss(400)
/mob/living/basic/bot/proc/attempt_access(mob/bot, obj/door_attempt)
SIGNAL_HANDLER
diff --git a/code/modules/mob/living/basic/clown/clown.dm b/code/modules/mob/living/basic/clown/clown.dm
index 65352a2de86..dddcb4d9d85 100644
--- a/code/modules/mob/living/basic/clown/clown.dm
+++ b/code/modules/mob/living/basic/clown/clown.dm
@@ -470,10 +470,10 @@
health += 10
if(istype(eaten_atom, /obj/item/food/grown/banana))
var/obj/item/food/grown/banana/banana_morsel = eaten_atom
- adjustBruteLoss(-(banana_morsel.seed.potency / 100 ) * maxHealth * 0.2)
+ adjust_brute_loss(-(banana_morsel.seed.potency / 100 ) * maxHealth * 0.2)
prank_pouch += banana_morsel.generate_trash(src)
else
- adjustBruteLoss(-maxHealth * 0.1)
+ adjust_brute_loss(-maxHealth * 0.1)
qdel(eaten_atom)
playsound(loc,'sound/items/eatfood.ogg', rand(30,50), TRUE)
diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm
index d0825c53722..f7219599d40 100644
--- a/code/modules/mob/living/basic/drone/_drone.dm
+++ b/code/modules/mob/living/basic/drone/_drone.dm
@@ -258,7 +258,7 @@
Stun(70)
to_chat(src, span_danger("ER@%R: MME^RY CO#RU9T! R&$b@0tin)..."))
if(severity == 1)
- adjustBruteLoss(heavy_emp_damage)
+ adjust_brute_loss(heavy_emp_damage)
to_chat(src, span_userdanger("HeAV% DA%^MMA+G TO I/O CIR!%UUT!"))
/mob/living/basic/drone/proc/alarm_triggered(datum/source, alarm_type, area/source_area)
diff --git a/code/modules/mob/living/basic/drone/interaction.dm b/code/modules/mob/living/basic/drone/interaction.dm
index d0c706d0ca0..4dfa3256c5c 100644
--- a/code/modules/mob/living/basic/drone/interaction.dm
+++ b/code/modules/mob/living/basic/drone/interaction.dm
@@ -16,7 +16,7 @@
drone.visible_message(span_notice("[drone] begins to cannibalize parts from [src]."), span_notice("You begin to cannibalize parts from [src]..."))
if(do_after(drone, 6 SECONDS, 0, target = src))
drone.visible_message(span_notice("[drone] repairs itself using [src]'s remains!"), span_notice("You repair yourself using [src]'s remains."))
- drone.adjustBruteLoss(-src.maxHealth)
+ drone.adjust_brute_loss(-src.maxHealth)
new /obj/effect/decal/cleanable/blood/splatter/oil(get_turf(src))
ghostize(can_reenter_corpse = FALSE)
qdel(src)
@@ -93,7 +93,7 @@
to_chat(user, span_warning("You need to remain still to tighten [src]'s screws!"))
return ITEM_INTERACT_SUCCESS
- adjustBruteLoss(-getBruteLoss())
+ adjust_brute_loss(-get_brute_loss())
visible_message(span_notice("[user] tightens [src == user ? "[user.p_their()]" : "[src]'s"] loose screws!"), span_notice("[src == user ? "You tighten" : "[user] tightens"] your loose screws."))
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/mob/living/basic/farm_animals/goat/_goat.dm b/code/modules/mob/living/basic/farm_animals/goat/_goat.dm
index 03582ff2575..9c7d9d783e8 100644
--- a/code/modules/mob/living/basic/farm_animals/goat/_goat.dm
+++ b/code/modules/mob/living/basic/farm_animals/goat/_goat.dm
@@ -72,7 +72,7 @@
if(!(living_target.mob_biotypes & MOB_PLANT))
return
- living_target.adjustBruteLoss(20)
+ living_target.adjust_brute_loss(20)
playsound(src, 'sound/items/eatfood.ogg', rand(30, 50), TRUE)
var/obj/item/bodypart/edible_bodypart
diff --git a/code/modules/mob/living/basic/guardian/guardian.dm b/code/modules/mob/living/basic/guardian/guardian.dm
index a6f2dd10a63..89d5d28a7a4 100644
--- a/code/modules/mob/living/basic/guardian/guardian.dm
+++ b/code/modules/mob/living/basic/guardian/guardian.dm
@@ -191,9 +191,9 @@
gib()
return TRUE
if (EXPLODE_HEAVY)
- adjustBruteLoss(60)
+ adjust_brute_loss(60)
if (EXPLODE_LIGHT)
- adjustBruteLoss(30)
+ adjust_brute_loss(30)
return TRUE
@@ -294,7 +294,7 @@
summoner.visible_message(span_bolddanger("Blood sprays from [summoner] as [src] takes damage!"))
if(summoner.stat == UNCONSCIOUS || summoner.stat == HARD_CRIT)
to_chat(summoner, span_bolddanger("Your head pounds, you can't take the strain of sustaining [src] in this condition!"))
- summoner.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount * 0.5)
+ summoner.adjust_organ_loss(ORGAN_SLOT_BRAIN, amount * 0.5)
/// When our owner is deleted, we go too.
/mob/living/basic/guardian/proc/on_summoner_deletion(mob/living/source)
diff --git a/code/modules/mob/living/basic/guardian/guardian_types/protector.dm b/code/modules/mob/living/basic/guardian/guardian_types/protector.dm
index a7a9e718e54..2205eaf10d1 100644
--- a/code/modules/mob/living/basic/guardian/guardian_types/protector.dm
+++ b/code/modules/mob/living/basic/guardian/guardian_types/protector.dm
@@ -34,7 +34,7 @@
/mob/living/basic/guardian/protector/ex_act(severity)
if(severity >= EXPLODE_DEVASTATE)
- adjustBruteLoss(400) //if in protector mode, will do 20 damage and not actually necessarily kill the summoner
+ adjust_brute_loss(400) //if in protector mode, will do 20 damage and not actually necessarily kill the summoner
return TRUE
return ..()
diff --git a/code/modules/mob/living/basic/health_adjustment.dm b/code/modules/mob/living/basic/health_adjustment.dm
index d35178b9918..499f679cdee 100644
--- a/code/modules/mob/living/basic/health_adjustment.dm
+++ b/code/modules/mob/living/basic/health_adjustment.dm
@@ -23,7 +23,7 @@
return modifier * damage_coeff[damage_type]
return modifier
-/mob/living/basic/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/basic/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!can_adjust_brute_loss(amount, forced, required_bodytype))
return 0
if(forced)
@@ -31,7 +31,7 @@
else if(damage_coeff[BRUTE])
. = adjust_health(amount * damage_coeff[BRUTE] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/basic/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/basic/adjust_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!can_adjust_fire_loss(amount, forced, required_bodytype))
return 0
if(forced)
@@ -39,7 +39,7 @@
else if(damage_coeff[BURN])
. = adjust_health(amount * damage_coeff[BURN] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/basic/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type)
+/mob/living/basic/adjust_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type)
if(!can_adjust_oxy_loss(amount, forced, required_biotype, required_respiration_type))
return 0
if(forced)
@@ -47,7 +47,7 @@
else if(damage_coeff[OXY])
. = adjust_health(amount * damage_coeff[OXY] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/basic/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
+/mob/living/basic/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
if(!can_adjust_tox_loss(amount, forced, required_biotype))
return 0
if(forced)
@@ -55,7 +55,7 @@
else if(damage_coeff[TOX])
. = adjust_health(amount * damage_coeff[TOX] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/basic/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
+/mob/living/basic/adjust_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
if(!can_adjust_stamina_loss(amount, forced, required_biotype))
return 0
. = staminaloss
diff --git a/code/modules/mob/living/basic/heretic/ash_spirit.dm b/code/modules/mob/living/basic/heretic/ash_spirit.dm
index 61735861524..8d23584d32f 100644
--- a/code/modules/mob/living/basic/heretic/ash_spirit.dm
+++ b/code/modules/mob/living/basic/heretic/ash_spirit.dm
@@ -23,4 +23,4 @@
/mob/living/basic/heretic_summon/ash_spirit/Life(seconds_per_tick, times_fired)
. = ..()
- adjustBruteLoss(-3) // 3 health passively healing
+ adjust_brute_loss(-3) // 3 health passively healing
diff --git a/code/modules/mob/living/basic/heretic/flesh_worm.dm b/code/modules/mob/living/basic/heretic/flesh_worm.dm
index 13372c72688..d796560ed6d 100644
--- a/code/modules/mob/living/basic/heretic/flesh_worm.dm
+++ b/code/modules/mob/living/basic/heretic/flesh_worm.dm
@@ -111,8 +111,8 @@
back.on_arm_eaten()
return
- adjustBruteLoss(-maxHealth * 0.5, FALSE)
- adjustFireLoss(-maxHealth * 0.5, FALSE)
+ adjust_brute_loss(-maxHealth * 0.5, FALSE)
+ adjust_fire_loss(-maxHealth * 0.5, FALSE)
if(health < maxHealth * 0.8)
return
diff --git a/code/modules/mob/living/basic/heretic/rust_walker.dm b/code/modules/mob/living/basic/heretic/rust_walker.dm
index 65a41a61838..a4aa2702119 100644
--- a/code/modules/mob/living/basic/heretic/rust_walker.dm
+++ b/code/modules/mob/living/basic/heretic/rust_walker.dm
@@ -44,7 +44,7 @@
return
var/turf/our_turf = get_turf(src)
if(HAS_TRAIT(our_turf, TRAIT_RUSTY))
- adjustBruteLoss(-3 * seconds_per_tick)
+ adjust_brute_loss(-3 * seconds_per_tick)
return ..()
diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm
index 42aedc1106d..1000c919b11 100644
--- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm
+++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm
@@ -87,7 +87,7 @@
if(!do_after(src, 5 SECONDS, target))
return
target.gib(DROP_ALL_REMAINS)
- adjustBruteLoss(-1 * heal_on_cannibalize)
+ adjust_brute_loss(-1 * heal_on_cannibalize)
///Ash whelp, the "lava" variant of ice whelps.
/mob/living/basic/mining/ice_whelp/ash
diff --git a/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm b/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm
index 80e413fb1dd..5a9c39ee760 100644
--- a/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm
+++ b/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm
@@ -66,7 +66,7 @@
. = ..()
if(volume <= 5)
return
- if(poisoned_mob.adjustToxLoss(2.5 * REM * seconds_per_tick, updating_health = FALSE))
+ if(poisoned_mob.adjust_tox_loss(2.5 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
// bubble ability structure
diff --git a/code/modules/mob/living/basic/jungle/seedling/seedling.dm b/code/modules/mob/living/basic/jungle/seedling/seedling.dm
index 8629d6c84cc..129e7d7b2f3 100644
--- a/code/modules/mob/living/basic/jungle/seedling/seedling.dm
+++ b/code/modules/mob/living/basic/jungle/seedling/seedling.dm
@@ -336,7 +336,7 @@
var/mob/living/living_target = target_atom
living_target.adjust_fire_stacks(0.2)
living_target.ignite_mob()
- living_target.adjustFireLoss(30)
+ living_target.adjust_fire_loss(30)
playsound(target_turf, 'sound/effects/magic/lightningbolt.ogg', 50, TRUE)
if(!is_seedling)
diff --git a/code/modules/mob/living/basic/jungle/venus_human_trap.dm b/code/modules/mob/living/basic/jungle/venus_human_trap.dm
index 4ee9932f2dd..87d24472566 100644
--- a/code/modules/mob/living/basic/jungle/venus_human_trap.dm
+++ b/code/modules/mob/living/basic/jungle/venus_human_trap.dm
@@ -110,7 +110,7 @@
if(isliving(AM))
var/mob/living/L = AM
if(!isvineimmune(L))
- L.adjustBruteLoss(5)
+ L.adjust_brute_loss(5)
to_chat(L, span_alert("You cut yourself on the thorny vines."))
/**
@@ -197,7 +197,7 @@
else if(vines_in_range)
alert_shown = FALSE
- adjustBruteLoss(vines_in_range ? -weed_heal : no_weed_damage) //every life tick take 20 damage if not near vines or heal 10 if near vines, 5 times out of weeds = u ded
+ adjust_brute_loss(vines_in_range ? -weed_heal : no_weed_damage) //every life tick take 20 damage if not near vines or heal 10 if near vines, 5 times out of weeds = u ded
/datum/action/cooldown/mob_cooldown/projectile_attack/vine_tangle
name = "Tangle"
diff --git a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
index 5b275843f85..cc9546474ec 100644
--- a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
+++ b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
@@ -47,7 +47,7 @@
continue
balloon_alert(victim, "grabbed")
visible_message(span_danger("[src] grabs hold of [victim]!"))
- victim.adjustBruteLoss(rand(min_damage, max_damage))
+ victim.adjust_brute_loss(rand(min_damage, max_damage))
if (victim.apply_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled, grapple_time, src))
buckle_mob(victim, TRUE)
SEND_SIGNAL(victim, COMSIG_GOLIATH_TENTACLED_GRABBED)
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
index d2fee05e2c7..93522890134 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
@@ -240,8 +240,8 @@
grown.tamed()
for(var/friend in ai_controller?.blackboard?[BB_FRIENDS_LIST])
grown.befriend(friend)
- grown.setBruteLoss(getBruteLoss())
- grown.setFireLoss(getFireLoss())
+ grown.set_brute_loss(get_brute_loss())
+ grown.set_fire_loss(get_fire_loss())
qdel(src) //We called change_mob_type without 'delete_old_mob = TRUE' since we had to pass down friends and damage
/mob/living/basic/mining/lobstrosity/juvenile/lava
diff --git a/code/modules/mob/living/basic/minebots/minebot.dm b/code/modules/mob/living/basic/minebots/minebot.dm
index 4501d83caae..41952c1bf2f 100644
--- a/code/modules/mob/living/basic/minebots/minebot.dm
+++ b/code/modules/mob/living/basic/minebots/minebot.dm
@@ -119,7 +119,7 @@
user.balloon_alert(user, "at full integrity!")
return TRUE
if(welder.use_tool(src, user, 0, volume=40))
- adjustBruteLoss(-15)
+ adjust_brute_loss(-15)
user.balloon_alert(user, "successfully repaired!")
return TRUE
diff --git a/code/modules/mob/living/basic/pets/dog/corgi.dm b/code/modules/mob/living/basic/pets/dog/corgi.dm
index f0c7a1d5f54..7e23791d853 100644
--- a/code/modules/mob/living/basic/pets/dog/corgi.dm
+++ b/code/modules/mob/living/basic/pets/dog/corgi.dm
@@ -517,7 +517,7 @@
visible_message(span_warning("[src] arises again, revived by the dark magicks!"), \
span_cult_large("RISE"))
revive(ADMIN_HEAL_ALL) //also means that a dead Nars-Ian can consume a pet and revive
- adjustBruteLoss(-maxHealth)
+ adjust_brute_loss(-maxHealth)
//LISA! SQUEEEEEEEEE~
/mob/living/basic/pet/dog/corgi/lisa
diff --git a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
index b4a0dc3ad2a..f2444539111 100644
--- a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
+++ b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
@@ -125,7 +125,7 @@
return
if(health < maxHealth)
- adjustBruteLoss(-4 * seconds_per_tick) //Fast life regen
+ adjust_brute_loss(-4 * seconds_per_tick) //Fast life regen
for(var/mob/living/carbon/humanoid_entities in view(3, src)) //Mood aura which stay as long you do not wear Sanallite as hat or carry(I will try to make it work with hat someday(obviously weaker than normal one))
humanoid_entities.add_mood_event("kobun", /datum/mood_event/kobun)
diff --git a/code/modules/mob/living/basic/pets/parrot/_parrot.dm b/code/modules/mob/living/basic/pets/parrot/_parrot.dm
index 31b525e5c8f..5f667857f40 100644
--- a/code/modules/mob/living/basic/pets/parrot/_parrot.dm
+++ b/code/modules/mob/living/basic/pets/parrot/_parrot.dm
@@ -350,7 +350,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
return TRUE // we still ate it
if(health < maxHealth)
- adjustBruteLoss(-10)
+ adjust_brute_loss(-10)
speech_probability_rate *= 1.27
speech_shuffle_rate += 10
update_speech_blackboards()
diff --git a/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm b/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm
index 8602b182a65..4a9fdd8bec3 100644
--- a/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm
+++ b/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm
@@ -288,7 +288,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, typecacheof(list(
if(!.) //dead or deleted
return
if(idledamage && !ckey && !ai_controller?.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) //Objects eventually revert to normal if no one is around to terrorize
- adjustBruteLoss(0.5 * seconds_per_tick)
+ adjust_brute_loss(0.5 * seconds_per_tick)
for(var/mob/living/victim in contents) //a fix for animated statues from the flesh to stone spell
death()
return
diff --git a/code/modules/mob/living/basic/slime/defense.dm b/code/modules/mob/living/basic/slime/defense.dm
index 30e4cb41b4e..598ba3a318a 100644
--- a/code/modules/mob/living/basic/slime/defense.dm
+++ b/code/modules/mob/living/basic/slime/defense.dm
@@ -103,7 +103,7 @@
///Handles the adverse effects of water on slimes
/mob/living/basic/slime/proc/apply_water()
- adjustBruteLoss(rand(15,20))
+ adjust_brute_loss(rand(15,20))
discipline_slime()
///Stops the slime from feeding, and might remove rabidity and targets
diff --git a/code/modules/mob/living/basic/slime/life.dm b/code/modules/mob/living/basic/slime/life.dm
index fc7b5592743..86d5eb02c05 100644
--- a/code/modules/mob/living/basic/slime/life.dm
+++ b/code/modules/mob/living/basic/slime/life.dm
@@ -59,7 +59,7 @@
if(nutrition == 0) //adjust nutrition ensures it can't go below 0
if(SPT_PROB(50, seconds_per_tick))
- adjustBruteLoss(rand(0,5))
+ adjust_brute_loss(rand(0,5))
return
if (SLIME_GROW_NUTRITION <= nutrition)
diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm
index 36a023318c4..dd6c2bd112b 100644
--- a/code/modules/mob/living/basic/slime/slime.dm
+++ b/code/modules/mob/living/basic/slime/slime.dm
@@ -345,7 +345,7 @@
target_slime.adjust_nutrition(-stolen_nutrition)
our_slime.adjust_nutrition(stolen_nutrition)
if(target_slime.health > 0)
- our_slime.adjustBruteLoss(is_adult_slime ? -20 : -10)
+ our_slime.adjust_brute_loss(is_adult_slime ? -20 : -10)
///Spawns a crossed slimecore item
diff --git a/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm b/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm
index a96af0fd952..1cfcf160b2c 100644
--- a/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm
+++ b/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm
@@ -158,9 +158,9 @@
investigate_log("has died from a devastating explosion.", INVESTIGATE_DEATHS)
death()
if(EXPLODE_HEAVY)
- adjustBruteLoss(60)
+ adjust_brute_loss(60)
if(EXPLODE_LIGHT)
- adjustBruteLoss(30)
+ adjust_brute_loss(30)
return TRUE
diff --git a/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm b/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm
index cc05cdbd6d4..a45900ae02e 100644
--- a/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm
+++ b/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm
@@ -72,7 +72,7 @@
return
if(istype(attack_target, /obj/item/food/grown/carrot))
- adjustBruteLoss(-5)
+ adjust_brute_loss(-5)
to_chat(src, span_warning("You eat [attack_target]! It restores some health!"))
qdel(attack_target)
return TRUE
diff --git a/code/modules/mob/living/basic/space_fauna/lightgeist.dm b/code/modules/mob/living/basic/space_fauna/lightgeist.dm
index 1237df72584..1ac90898bef 100644
--- a/code/modules/mob/living/basic/space_fauna/lightgeist.dm
+++ b/code/modules/mob/living/basic/space_fauna/lightgeist.dm
@@ -101,7 +101,7 @@
if (!(heal_biotypes & target.mob_biotypes))
return FALSE
if (!iscarbon(target))
- return target.getBruteLoss() > 0 || target.getFireLoss() > 0
+ return target.get_brute_loss() > 0 || target.get_fire_loss() > 0
var/mob/living/carbon/carbon_target = target
for (var/obj/item/bodypart/part in carbon_target.bodyparts)
if (!part.brute_dam && !part.burn_dam)
diff --git a/code/modules/mob/living/basic/space_fauna/mushroom.dm b/code/modules/mob/living/basic/space_fauna/mushroom.dm
index 16c46674e2f..e6195ba9d9c 100644
--- a/code/modules/mob/living/basic/space_fauna/mushroom.dm
+++ b/code/modules/mob/living/basic/space_fauna/mushroom.dm
@@ -110,7 +110,7 @@
var/level_gain = (consumed.powerlevel - powerlevel)
if(level_gain >= 0 && !ckey && !consumed.bruised)//Player shrooms can't level up to become robust gods.
consumed.level_up(level_gain)
- adjustBruteLoss(-consumed.maxHealth)
+ adjust_brute_loss(-consumed.maxHealth)
qdel(consumed)
/mob/living/basic/mushroom/revive(full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
@@ -144,11 +144,11 @@
if(stat == DEAD)
revive(HEAL_ALL)
else
- adjustBruteLoss(-5)
+ adjust_brute_loss(-5)
COOLDOWN_START(src, recovery_cooldown, 5 MINUTES)
/mob/living/basic/mushroom/proc/level_up(level_gain)
- adjustBruteLoss(-maxHealth) //They'll always heal, even if they don't gain a level
+ adjust_brute_loss(-maxHealth) //They'll always heal, even if they don't gain a level
if(powerlevel > 9)
return
if(level_gain == 0)
diff --git a/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm b/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
index d94b2c71292..cf9f262276c 100644
--- a/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
+++ b/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
@@ -123,7 +123,7 @@
SIGNAL_HANDLER
if(!(attack_flags & (ATTACKER_STAMINA_ATTACK|ATTACKER_SHOVING)))
- attacker.adjustBruteLoss(20)
+ attacker.adjust_brute_loss(20)
to_chat(attacker, span_warning("The clone casts a spell to damage you before he dies!"))
diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm
index 5751a354b4b..c484a8b977c 100644
--- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm
+++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm
@@ -277,7 +277,7 @@
if(mob.reagents)
mob.reagents.add_reagent(/datum/reagent/toxin/plasma, 5)
else
- mob.adjustToxLoss(5)
+ mob.adjust_tox_loss(5)
for(var/obj/structure/spacevine/vine in victim) //Fucking with botanists, the ability.
vine.add_atom_colour("#823abb", TEMPORARY_COLOUR_PRIORITY)
new /obj/effect/temp_visual/revenant(vine.loc)
diff --git a/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm b/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
index 05a2668cfe8..45d023ce744 100644
--- a/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
+++ b/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
@@ -303,7 +303,7 @@
if (severity != EXPLODE_DEVASTATE)
return
var/damage_coefficient = rand(devastation_damage_min_percentage, devastation_damage_max_percentage)
- adjustBruteLoss(initial(maxHealth)*damage_coefficient)
+ adjust_brute_loss(initial(maxHealth)*damage_coefficient)
return COMPONENT_CANCEL_EX_ACT // we handled it
/// Subtype used by the midround/event
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
index 2e7c5db5276..086c0f0a353 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spider.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
@@ -155,8 +155,8 @@
grown.faction = faction.Copy()
grown.directive = directive
grown.set_name()
- grown.setBruteLoss(getBruteLoss())
- grown.setFireLoss(getFireLoss())
+ grown.set_brute_loss(get_brute_loss())
+ grown.set_fire_loss(get_fire_loss())
qdel(src)
/**
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index e3d940141d4..0a10fa8a75f 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -171,9 +171,9 @@
if(prob(50))
to_chat(src, span_danger("You feel [word]. It's getting a bit hard to breathe."))
losebreath += 0.5 * determined_mod * seconds_per_tick
- else if(getStaminaLoss() < 25 * determined_mod)
+ else if(get_stamina_loss() < 25 * determined_mod)
to_chat(src, span_danger("You feel [word]. It's getting a bit hard to focus."))
- adjustStaminaLoss(10 * determined_mod * REM * seconds_per_tick)
+ adjust_stamina_loss(10 * determined_mod * REM * seconds_per_tick)
// Pretty low blood, getting dangerous!
if(BLOOD_VOLUME_RISKY to BLOOD_VOLUME_OKAY)
if(SPT_PROB(5, seconds_per_tick))
@@ -182,9 +182,9 @@
if(prob(50))
to_chat(src, span_bolddanger("You feel very [word]. It's getting hard to breathe!"))
losebreath += 1 * determined_mod * seconds_per_tick
- else if(getStaminaLoss() < 40 * determined_mod)
+ else if(get_stamina_loss() < 40 * determined_mod)
to_chat(src, span_bolddanger("You feel very [word]. It's getting hard to stay awake!"))
- adjustStaminaLoss(15 * determined_mod * REM * seconds_per_tick)
+ adjust_stamina_loss(15 * determined_mod * REM * seconds_per_tick)
// Very low blood, danger!!
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_RISKY)
if(SPT_PROB(5, seconds_per_tick))
@@ -193,9 +193,9 @@
if(prob(50))
to_chat(src, span_userdanger("You feel extremely [word]! It's getting very hard to breathe!"))
losebreath += 1.5 * determined_mod * seconds_per_tick
- else if(getStaminaLoss() < 80 * determined_mod)
+ else if(get_stamina_loss() < 80 * determined_mod)
to_chat(src, span_userdanger("You feel extremely [word]! It's getting very hard to stay awake!"))
- adjustStaminaLoss(20 * determined_mod * REM * seconds_per_tick)
+ adjust_stamina_loss(20 * determined_mod * REM * seconds_per_tick)
// Critically low blood, death is near! Adrenaline won't help you here.
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
if(SPT_PROB(7.5, seconds_per_tick))
@@ -214,10 +214,10 @@
// If your ratio is less than one (you're missing any blood) and your oxyloss is under missing blood %, start getting oxy damage.
// This damage accrues faster the less blood you have.
// If the damage surpasses the KO threshold for oxyloss, then we'll always tick up so you die eventually
- if(target_oxyloss > 0 && (getOxyLoss() < target_oxyloss || (target_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD && stat >= UNCONSCIOUS)))
+ if(target_oxyloss > 0 && (get_oxy_loss() < target_oxyloss || (target_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD && stat >= UNCONSCIOUS)))
// At roughly half blood this equals to 3 oxyloss per tick. At 90% blood it's close to 0.5
var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - modified_blood_volume), 0.25) * seconds_per_tick
- adjustOxyLoss(rounded_oxyloss, updating_health = TRUE)
+ adjust_oxy_loss(rounded_oxyloss, updating_health = TRUE)
/// Has each bodypart update its bleed/wound overlay icon states
/mob/living/carbon/proc/update_bodypart_bleed_overlays()
@@ -625,7 +625,7 @@
return
var/base_bleed_rate = get_bleed_rate()
- var/base_brute = getBruteLoss()
+ var/base_brute = get_brute_loss()
var/brute_ratio = round(base_brute / (maxHealth * 4), 0.1)
var/bleeding_rate = round(base_bleed_rate / 4, 0.1)
@@ -743,7 +743,7 @@
/// Returns how much blood we're losing from being dragged a tile, from [/mob/living/proc/make_blood_trail]
/mob/living/proc/bleed_drag_amount()
- var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1)
+ var/brute_ratio = round(get_brute_loss() / maxHealth, 0.1)
return max(1, brute_ratio * 2)
/mob/living/carbon/bleed_drag_amount()
diff --git a/code/modules/mob/living/carbon/alien/adult/adult_defense.dm b/code/modules/mob/living/carbon/alien/adult/adult_defense.dm
index 3b65549d6d9..09f3d3d3892 100644
--- a/code/modules/mob/living/carbon/alien/adult/adult_defense.dm
+++ b/code/modules/mob/living/carbon/alien/adult/adult_defense.dm
@@ -4,7 +4,7 @@
. = ..()
if(!.)
return
- adjustBruteLoss(15)
+ adjust_brute_loss(15)
var/hitverb = "hit"
if(mob_size < MOB_SIZE_LARGE)
safe_throw_at(get_edge_target_turf(src, get_dir(user, src)), 2, 1, user)
diff --git a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm
index cd8e72a04f7..8a74590fe78 100644
--- a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm
@@ -8,7 +8,7 @@
if(stat == DEAD)
//If we mostly took damage from fire
- if(getFireLoss() > 125)
+ if(get_fire_loss() > 125)
icon_state = "alien[caste]_husked"
else
icon_state = "alien[caste]_dead"
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 3d613d250b7..99766b5bd06 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -31,7 +31,7 @@ In all, this is a lot like the monkey code. /N
visible_message(span_danger("[user.name] bites [src]!"), \
span_userdanger("[user.name] bites you!"), span_hear("You hear a chomp!"), COMBAT_MESSAGE_RANGE, user)
to_chat(user, span_danger("You bite [src]!"))
- adjustBruteLoss(1)
+ adjust_brute_loss(1)
log_combat(user, src, "attacked")
else
to_chat(user, span_warning("[name] is too injured for that."))
diff --git a/code/modules/mob/living/carbon/alien/damage_procs.dm b/code/modules/mob/living/carbon/alien/damage_procs.dm
index 5dbffda9673..62d2b094694 100644
--- a/code/modules/mob/living/carbon/alien/damage_procs.dm
+++ b/code/modules/mob/living/carbon/alien/damage_procs.dm
@@ -1,15 +1,15 @@
///alien immune to tox damage
-/mob/living/carbon/alien/getToxLoss()
+/mob/living/carbon/alien/get_tox_loss()
return FALSE
///alien immune to tox damage
-/mob/living/carbon/alien/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
+/mob/living/carbon/alien/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
return FALSE
///aliens are immune to stamina damage.
-/mob/living/carbon/alien/adjustStaminaLoss(amount, updating_stamina = 1, forced = FALSE, required_biotype)
+/mob/living/carbon/alien/adjust_stamina_loss(amount, updating_stamina = 1, forced = FALSE, required_biotype)
return FALSE
///aliens are immune to stamina damage.
-/mob/living/carbon/alien/setStaminaLoss(amount, updating_stamina = 1, forced = FALSE, required_biotype)
+/mob/living/carbon/alien/set_stamina_loss(amount, updating_stamina = 1, forced = FALSE, required_biotype)
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 537c0cd000c..69b8dd316ac 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -13,7 +13,7 @@
return 0
if(health <= HEALTH_THRESHOLD_CRIT)
- adjustOxyLoss(2)
+ adjust_oxy_loss(2)
var/plasma_used = 0
var/plas_detect_threshold = 0.02
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index 6d14ecefc91..1666209e573 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -62,9 +62,9 @@
if(!isalien(owner))
heal_amt *= 0.2
owner.adjustPlasma(0.5 * plasma_rate * delta_time_capped)
- owner.adjustBruteLoss(-heal_amt * delta_time_capped)
- owner.adjustFireLoss(-heal_amt * delta_time_capped)
- owner.adjustOxyLoss(-heal_amt * delta_time_capped)
+ owner.adjust_brute_loss(-heal_amt * delta_time_capped)
+ owner.adjust_fire_loss(-heal_amt * delta_time_capped)
+ owner.adjust_oxy_loss(-heal_amt * delta_time_capped)
else
owner.adjustPlasma(0.1 * plasma_rate * delta_time)
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index 52e98fcf4fe..e46501a8445 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -52,10 +52,10 @@
if(SPT_PROB(2, seconds_per_tick))
to_chat(owner, span_danger("Your stomach hurts."))
if(prob(20))
- owner.adjustToxLoss(1)
+ owner.adjust_tox_loss(1)
if(6)
to_chat(owner, span_danger("You feel something tearing its way out of your chest..."))
- owner.adjustToxLoss(5 * seconds_per_tick) // Why is this [TOX]?
+ owner.adjust_tox_loss(5 * seconds_per_tick) // Why is this [TOX]?
/// Controls Xenomorph Embryo growth. If embryo is fully grown (or overgrown), stop the proc. If not, increase the stage by one and if it's not fully grown (stage 6), add a timer to do this proc again after however long the growth time variable is.
/obj/item/organ/body_egg/alien_embryo/proc/advance_embryo_stage()
@@ -143,7 +143,7 @@
else
new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_userdanger("You exit [owner], your previous host."))
owner.log_message("had an alien larva within them escape (without being gibbed).", LOG_ATTACK, log_globally = FALSE)
- owner.adjustBruteLoss(40)
+ owner.adjust_brute_loss(40)
owner.cut_overlay(overlay)
qdel(src)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 4b2decf403c..9f82df2cbc2 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -334,14 +334,14 @@
var/turf/location = get_turf(src)
if(!blood)
adjust_nutrition(-lost_nutrition)
- need_mob_update += adjustToxLoss(-3, updating_health = FALSE)
+ need_mob_update += adjust_tox_loss(-3, updating_health = FALSE)
for(var/i = 0 to distance)
if(blood)
if(location)
add_splatter_floor(location)
if(vomit_flags & MOB_VOMIT_HARM)
- need_mob_update += adjustBruteLoss(3, updating_health = FALSE)
+ need_mob_update += adjust_brute_loss(3, updating_health = FALSE)
else
if(location)
location.add_vomit_floor(src, vomit_type, vomit_flags, purge_ratio) // call purge when doing detoxicfication to pump more chems out of the stomach.
@@ -413,7 +413,7 @@
var/obj/item/bodypart/BP = X
total_brute += (BP.brute_dam * BP.body_damage_coeff)
total_burn += (BP.burn_dam * BP.body_damage_coeff)
- set_health(round(maxHealth - getOxyLoss() - getToxLoss() - total_burn - total_brute, DAMAGE_PRECISION))
+ set_health(round(maxHealth - get_oxy_loss() - get_tox_loss() - total_burn - total_brute, DAMAGE_PRECISION))
update_stat()
update_stamina()
@@ -595,7 +595,7 @@
clear_fullscreen("oxy")
//Fire and Brute damage overlay (BSSR)
- var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
+ var/hurtdamage = get_brute_loss() + get_fire_loss() + damageoverlaytemp
if(hurtdamage && !HAS_TRAIT(src, TRAIT_NO_DAMAGE_OVERLAY))
var/severity = 0
switch(hurtdamage)
@@ -661,7 +661,7 @@
else
if(shown_stamina_loss == null)
- shown_stamina_loss = getStaminaLoss()
+ shown_stamina_loss = get_stamina_loss()
if(shown_stamina_loss >= stam_crit_threshold)
hud_used.stamina.icon_state = "stamina_crit"
@@ -822,7 +822,7 @@
if (HAS_TRAIT(src, TRAIT_DEFIB_BLACKLISTED))
return DEFIB_FAIL_BLACKLISTED
- if ((getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) || (getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE))
+ if ((get_brute_loss() >= MAX_REVIVE_BRUTE_DAMAGE) || (get_fire_loss() >= MAX_REVIVE_FIRE_DAMAGE))
return DEFIB_FAIL_TISSUE_DAMAGE
var/heart_status = can_defib_heart(get_organ_by_type(/obj/item/organ/heart))
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 6ed5be63713..88aed972e9c 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -253,7 +253,7 @@
return
else
show_message(span_userdanger("The blob attacks!"))
- adjustBruteLoss(10)
+ adjust_brute_loss(10)
///Adds to the parent by also adding functionality to propagate shocks through pulling and doing some fluff effects.
/mob/living/carbon/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE, jitter_time = 20 SECONDS, stutter_time = 4 SECONDS, stun_duration = 4 SECONDS)
@@ -537,7 +537,7 @@
. = FALSE
-/mob/living/carbon/adjustOxyLoss(amount, updating_health = TRUE, forced, required_biotype, required_respiration_type)
+/mob/living/carbon/adjust_oxy_loss(amount, updating_health = TRUE, forced, required_biotype, required_respiration_type)
if(!forced && HAS_TRAIT(src, TRAIT_NOBREATH))
amount = min(amount, 0) //Prevents oxy damage but not healing
@@ -549,7 +549,7 @@
if(!limb)
return
-/mob/living/carbon/setOxyLoss(amount, updating_health = TRUE, forced, required_biotype, required_respiration_type)
+/mob/living/carbon/set_oxy_loss(amount, updating_health = TRUE, forced, required_biotype, required_respiration_type)
. = ..()
check_passout()
@@ -557,7 +557,7 @@
* Check to see if we should be passed out from oxyloss
*/
/mob/living/carbon/proc/check_passout()
- var/mob_oxyloss = getOxyLoss()
+ var/mob_oxyloss = get_oxy_loss()
if(mob_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD)
if(!HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT))
ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm
index 04cc20fc3dc..191b303f715 100644
--- a/code/modules/mob/living/carbon/damage_procs.dm
+++ b/code/modules/mob/living/carbon/damage_procs.dm
@@ -82,13 +82,13 @@
return final_mod
//These procs fetch a cumulative total damage from all bodyparts
-/mob/living/carbon/getBruteLoss()
+/mob/living/carbon/get_brute_loss()
var/amount = 0
for(var/obj/item/bodypart/bodypart as anything in bodyparts)
amount += bodypart.brute_dam
return round(amount, DAMAGE_PRECISION)
-/mob/living/carbon/getFireLoss()
+/mob/living/carbon/get_fire_loss()
var/amount = 0
for(var/obj/item/bodypart/bodypart as anything in bodyparts)
amount += bodypart.burn_dam
@@ -102,7 +102,7 @@
* Arguments:
* * required_bodytype - The bodytype(s) to match against.
*/
-/mob/living/carbon/proc/getBruteLossForType(required_bodytype = ALL)
+/mob/living/carbon/proc/get_brute_loss_for_type(required_bodytype = ALL)
var/amount = 0
for(var/obj/item/bodypart/bodypart as anything in bodyparts)
if(!(bodypart.bodytype & required_bodytype))
@@ -117,7 +117,7 @@
* Arguments:
* * required_bodytype - The bodytype(s) to match against.
*/
-/mob/living/carbon/proc/getFireLossForType(required_bodytype = ALL)
+/mob/living/carbon/proc/get_fire_loss_for_type(required_bodytype = ALL)
var/amount = 0
for(var/obj/item/bodypart/bodypart as anything in bodyparts)
if(!(bodypart.bodytype & required_bodytype))
@@ -125,7 +125,7 @@
amount += bodypart.burn_dam
return round(amount, DAMAGE_PRECISION)
-/mob/living/carbon/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/carbon/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!can_adjust_brute_loss(amount, forced, required_bodytype))
return 0
if(amount > 0)
@@ -133,16 +133,16 @@
else
. = heal_overall_damage(brute = abs(amount), required_bodytype = required_bodytype, updating_health = updating_health, forced = forced)
-/mob/living/carbon/setBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/carbon/set_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
- var/current = getBruteLoss()
+ var/current = get_brute_loss()
var/diff = amount - current
if(!diff)
return FALSE
- return adjustBruteLoss(diff, updating_health, forced, required_bodytype)
+ return adjust_brute_loss(diff, updating_health, forced, required_bodytype)
-/mob/living/carbon/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/carbon/adjust_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!can_adjust_fire_loss(amount, forced, required_bodytype))
return 0
if(amount > 0)
@@ -150,16 +150,16 @@
else
. = heal_overall_damage(burn = abs(amount), required_bodytype = required_bodytype, updating_health = updating_health, forced = forced)
-/mob/living/carbon/setFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/carbon/set_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
- var/current = getFireLoss()
+ var/current = get_fire_loss()
var/diff = amount - current
if(!diff)
return FALSE
- return adjustFireLoss(diff, updating_health, forced, required_bodytype)
+ return adjust_fire_loss(diff, updating_health, forced, required_bodytype)
-/mob/living/carbon/human/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL)
+/mob/living/carbon/human/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL)
. = ..()
if(. >= 0) // 0 = no damage, + values = healed damage
return .
@@ -167,7 +167,7 @@
if(AT_TOXIN_VOMIT_THRESHOLD(src))
apply_status_effect(/datum/status_effect/tox_vomit)
-/mob/living/carbon/human/setToxLoss(amount, updating_health, forced, required_biotype)
+/mob/living/carbon/human/set_tox_loss(amount, updating_health, forced, required_biotype)
. = ..()
if(. >= 0)
return .
@@ -191,7 +191,7 @@
*
* Returns: The net change in damage from apply_organ_damage()
*/
-/mob/living/carbon/adjustOrganLoss(slot, amount, maximum, required_organ_flag = NONE)
+/mob/living/carbon/adjust_organ_loss(slot, amount, maximum, required_organ_flag = NONE)
var/obj/item/organ/affected_organ = get_organ_slot(slot)
if(!affected_organ || HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
@@ -201,7 +201,7 @@
/**
* If an organ exists in the slot requested, and we are capable of taking damage (we don't have TRAIT_GODMODE), call the set damage proc on that organ, which can
- * set or clear the failing variable on that organ, making it either cease or start functions again, unlike adjustOrganLoss.
+ * set or clear the failing variable on that organ, making it either cease or start functions again, unlike adjust_organ_loss.
*
* Arguments:
* * slot - organ slot, like [ORGAN_SLOT_HEART]
@@ -210,7 +210,7 @@
*
* Returns: The net change in damage from set_organ_damage()
*/
-/mob/living/carbon/setOrganLoss(slot, amount, required_organ_flag = NONE)
+/mob/living/carbon/set_organ_loss(slot, amount, required_organ_flag = NONE)
var/obj/item/organ/affected_organ = get_organ_slot(slot)
if(!affected_organ || HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index b8da1781832..b195e0a9d38 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -106,7 +106,7 @@
if(user == src && has_status_effect(/datum/status_effect/grouped/screwy_hud/fake_crit))//fake damage
temp = 50
else
- temp = getBruteLoss()
+ temp = get_brute_loss()
var/list/damage_desc = get_majority_bodypart_damage_desc()
if(temp)
if(temp < 25)
@@ -116,7 +116,7 @@
else
. += span_bolddanger("[t_He] [t_has] severe [damage_desc[BRUTE]]!")
- temp = getFireLoss()
+ temp = get_fire_loss()
if(temp)
if(temp < 25)
. += span_danger("[t_He] [t_has] minor [damage_desc[BURN]].")
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index 5a312eecbb8..01642d9b37f 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -135,7 +135,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
var/list/inherent_traits = list()
/// List of biotypes the mob belongs to. Used by diseases.
var/inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
- /// The type of respiration the mob is capable of doing. Used by adjustOxyLoss.
+ /// The type of respiration the mob is capable of doing. Used by adjust_oxy_loss.
var/inherent_respiration_type = RESPIRATION_OXYGEN
///List of factions the mob gain upon gaining this species.
var/list/inherent_factions
@@ -541,7 +541,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
/datum/species/proc/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired)
SHOULD_CALL_PARENT(TRUE)
if(HAS_TRAIT(H, TRAIT_NOBREATH) && (H.health < H.crit_threshold) && !HAS_TRAIT(H, TRAIT_NOCRITDAMAGE))
- H.adjustBruteLoss(0.5 * seconds_per_tick)
+ H.adjust_brute_loss(0.5 * seconds_per_tick)
/datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE)
if(no_equip_flags & slot)
@@ -828,10 +828,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
limb_accuracy = floor(limb_accuracy * pummel_bonus)
//Get our puncher's combined brute and burn damage.
- var/puncher_brute_and_burn = (user.getFireLoss() + user.getBruteLoss())
+ var/puncher_brute_and_burn = (user.get_fire_loss() + user.get_brute_loss())
//Get our targets combined brute and burn damage.
- var/target_brute_and_burn = (target.getFireLoss() + target.getBruteLoss())
+ var/target_brute_and_burn = (target.get_fire_loss() + target.get_brute_loss())
// In a brawl, drunkenness can make you swing more wildly and with more force, and thus catch your opponent off guard, but it could also totally throw you off if you're too intoxicated
// But god is it going to make you sick moving too much while drunk
@@ -1233,7 +1233,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
humi.apply_damage(burn_damage, BURN, spread_damage = TRUE, wound_clothing = FALSE)
// For cold damage, we cap at the threshold if you're dead
- if(humi.getFireLoss() >= abs(HEALTH_THRESHOLD_DEAD) && humi.stat == DEAD)
+ if(humi.get_fire_loss() >= abs(HEALTH_THRESHOLD_DEAD) && humi.stat == DEAD)
return
// Apply some burn / brute damage to the body (Dependent if the person is hulk or not)
@@ -1314,7 +1314,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
H.clear_alert(ALERT_PRESSURE)
else
var/pressure_damage = min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) - 1) * PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod * H.physiology.brute_mod * seconds_per_tick
- H.adjustBruteLoss(pressure_damage, required_bodytype = BODYTYPE_ORGANIC)
+ H.adjust_brute_loss(pressure_damage, required_bodytype = BODYTYPE_ORGANIC)
H.throw_alert(ALERT_PRESSURE, /atom/movable/screen/alert/highpressure, 2)
// High pressure, show an alert
@@ -1340,7 +1340,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
H.clear_alert(ALERT_PRESSURE)
else
var/pressure_damage = LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod * H.physiology.brute_mod * seconds_per_tick
- H.adjustBruteLoss(pressure_damage, required_bodytype = BODYTYPE_ORGANIC)
+ H.adjust_brute_loss(pressure_damage, required_bodytype = BODYTYPE_ORGANIC)
H.throw_alert(ALERT_PRESSURE, /atom/movable/screen/alert/lowpressure, 2)
/**
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 3ac68f365e5..91e7939c194 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -29,10 +29,10 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
if(SSticker.HasRoundStarted())
SSblackbox.ReportDeath(src)
- log_message("has died (BRUTE: [src.getBruteLoss()], BURN: [src.getFireLoss()], TOX: [src.getToxLoss()], OXY: [src.getOxyLoss()]", LOG_ATTACK)
+ log_message("has died (BRUTE: [src.get_brute_loss()], BURN: [src.get_fire_loss()], TOX: [src.get_tox_loss()], OXY: [src.get_oxy_loss()]", LOG_ATTACK)
if(key) // Prevents log spamming of keyless mob deaths (like xenobio monkeys)
investigate_log("has died at [loc_name(src)].
\
- BRUTE: [src.getBruteLoss()] BURN: [src.getFireLoss()] TOX: [src.getToxLoss()] OXY: [src.getOxyLoss()] STAM: [src.getStaminaLoss()]
\
+ BRUTE: [src.get_brute_loss()] BURN: [src.get_fire_loss()] TOX: [src.get_tox_loss()] OXY: [src.get_oxy_loss()] STAM: [src.get_stamina_loss()]
\
Brain damage: [src.get_organ_loss(ORGAN_SLOT_BRAIN) || "0"]
\
[get_bloodtype()?.get_blood_name() || "Blood"] volume: [src.get_blood_volume(apply_modifiers = TRUE)]cl ([round((src.get_blood_volume(apply_modifiers = TRUE) / BLOOD_VOLUME_NORMAL) * 100, 0.1)]%)
\
Reagents:
[reagents_readout()]", INVESTIGATE_DEATHS)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index c97a153c677..d50417827cf 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -183,12 +183,12 @@
if(!HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD))
return
if(href_list["evaluation"])
- if(!getBruteLoss() && !getFireLoss() && !getOxyLoss() && getToxLoss() < 20)
+ if(!get_brute_loss() && !get_fire_loss() && !get_oxy_loss() && get_tox_loss() < 20)
to_chat(human_user, "[span_notice("No external injuries detected.")]
")
return
var/span = "notice"
var/status = ""
- if(getBruteLoss())
+ if(get_brute_loss())
to_chat(human_user, "Physical trauma analysis:")
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
@@ -204,7 +204,7 @@
span = "userdanger"
if(brutedamage)
to_chat(human_user, "[BP] appears to have [status]")
- if(getFireLoss())
+ if(get_fire_loss())
to_chat(human_user, "Analysis of skin burns:")
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
@@ -220,9 +220,9 @@
span = "userdanger"
if(burndamage)
to_chat(human_user, "[BP] appears to have [status]")
- if(getOxyLoss())
+ if(get_oxy_loss())
to_chat(human_user, span_danger("Patient has signs of suffocation, emergency treatment may be required!"))
- if(getToxLoss() > 20)
+ if(get_tox_loss() > 20)
to_chat(human_user, span_danger("Gathered data is inconsistent with the analysis, possible cause: poisoning."))
if(!human_user.wear_id) //You require access from here on out.
to_chat(human_user, span_warning("ERROR: Invalid access"))
@@ -560,7 +560,7 @@
else if (!target.get_organ_slot(ORGAN_SLOT_LUNGS))
to_chat(target, span_unconscious("You feel a breath of fresh air... but you don't feel any better..."))
else
- target.adjustOxyLoss(-min(target.getOxyLoss(), 7))
+ target.adjust_oxy_loss(-min(target.get_oxy_loss(), 7))
to_chat(target, span_unconscious("You feel a breath of fresh air enter your lungs... It feels good..."))
if (target.health <= target.crit_threshold)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 90c4ef2db38..2cf92ed199e 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -205,7 +205,7 @@
else if(!HAS_TRAIT(src, TRAIT_INCAPACITATED))
playsound(loc, 'sound/items/weapons/pierce.ogg', 25, TRUE, -1)
var/shovetarget = get_edge_target_turf(user, get_dir(user, get_step_away(src, user)))
- adjustStaminaLoss(35)
+ adjust_stamina_loss(35)
throw_at(shovetarget, 4, 2, user, force = MOVE_FORCE_OVERPOWERING)
log_combat(user, src, "shoved")
visible_message(span_danger("[user] tackles [src] down!"), \
@@ -571,7 +571,7 @@
for(var/t in missing)
combined_msg += span_boldannounce("↳ Your [parse_zone(t)] is missing!")
- var/tox = getToxLoss() + (disgust / 5) + (HAS_TRAIT(src, TRAIT_SELF_AWARE) ? 0 : (rand(-3, 0) * 5))
+ var/tox = get_tox_loss() + (disgust / 5) + (HAS_TRAIT(src, TRAIT_SELF_AWARE) ? 0 : (rand(-3, 0) * 5))
switch(tox)
if(10 to 20)
combined_msg += span_danger("You feel sick.")
@@ -581,7 +581,7 @@
combined_msg += span_danger("You feel very unwell!")
var/cached_blood_volume = get_blood_volume(apply_modifiers = TRUE)
- var/oxy = getOxyLoss() + (losebreath * 4) + (cached_blood_volume < BLOOD_VOLUME_NORMAL ? ((BLOOD_VOLUME_NORMAL - cached_blood_volume) * 0.1) : 0) + (HAS_TRAIT(src, TRAIT_SELF_AWARE) ? 0 : (rand(-3, 0) * 5))
+ var/oxy = get_oxy_loss() + (losebreath * 4) + (cached_blood_volume < BLOOD_VOLUME_NORMAL ? ((BLOOD_VOLUME_NORMAL - cached_blood_volume) * 0.1) : 0) + (HAS_TRAIT(src, TRAIT_SELF_AWARE) ? 0 : (rand(-3, 0) * 5))
switch(oxy)
if(10 to 20)
combined_msg += span_danger("You feel lightheaded.")
@@ -590,8 +590,8 @@
if(40 to INFINITY)
combined_msg += span_danger("You feel like you're about to pass out!")
- if(getStaminaLoss())
- if(getStaminaLoss() > 30)
+ if(get_stamina_loss())
+ if(get_stamina_loss() > 30)
combined_msg += span_info("You're completely exhausted.")
else
combined_msg += span_info("You feel fatigued.")
diff --git a/code/modules/mob/living/carbon/human/human_suicide.dm b/code/modules/mob/living/carbon/human/human_suicide.dm
index e6b4bbac8e0..e710ab2afb4 100644
--- a/code/modules/mob/living/carbon/human/human_suicide.dm
+++ b/code/modules/mob/living/carbon/human/human_suicide.dm
@@ -36,7 +36,7 @@
return ..()
if(damage_type & SHAME)
- adjustStaminaLoss(200)
+ adjust_stamina_loss(200)
set_suicide(FALSE)
add_mood_event("shameful_suicide", /datum/mood_event/shameful_suicide)
return FALSE
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index b6b9e8055db..d659670c369 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -82,9 +82,9 @@
return human_lungs.check_breath(breath, src)
if(health >= crit_threshold)
- adjustOxyLoss(HUMAN_MAX_OXYLOSS + 1)
+ adjust_oxy_loss(HUMAN_MAX_OXYLOSS + 1)
else if(!HAS_TRAIT(src, TRAIT_NOCRITDAMAGE))
- adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
+ adjust_oxy_loss(HUMAN_CRIT_MAX_OXYLOSS)
failed_last_breath = TRUE
@@ -294,10 +294,10 @@
return
if(we_breath)
- adjustOxyLoss(4 * seconds_per_tick)
+ adjust_oxy_loss(4 * seconds_per_tick)
Unconscious(80)
// Tissues die without blood circulation
- adjustBruteLoss(1 * seconds_per_tick)
+ adjust_brute_loss(1 * seconds_per_tick)
#undef THERMAL_PROTECTION_HEAD
#undef THERMAL_PROTECTION_CHEST
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 89462d9730f..32667735f8e 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -69,7 +69,7 @@
// Blood regen thresholds use your real amount of blood.
if(slime.get_blood_volume() <= 0)
slime.adjust_blood_volume(JELLY_REGEN_RATE_EMPTY * slime.physiology.blood_regen_mod * seconds_per_tick)
- slime.adjustBruteLoss(2.5 * seconds_per_tick)
+ slime.adjust_brute_loss(2.5 * seconds_per_tick)
to_chat(slime, span_danger("You feel empty!"))
// Same logic applies here.
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 0a9861d1398..ec80fe52dee 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -52,8 +52,8 @@
if(istype(vampire.loc, /obj/structure/closet/crate/coffin))
var/need_mob_update = FALSE
need_mob_update += vampire.heal_overall_damage(brute = 2 * seconds_per_tick, burn = 2 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += vampire.adjustToxLoss(-2 * seconds_per_tick, updating_health = FALSE,)
- need_mob_update += vampire.adjustOxyLoss(-2 * seconds_per_tick, updating_health = FALSE,)
+ need_mob_update += vampire.adjust_tox_loss(-2 * seconds_per_tick, updating_health = FALSE,)
+ need_mob_update += vampire.adjust_oxy_loss(-2 * seconds_per_tick, updating_health = FALSE,)
if(need_mob_update)
vampire.updatehealth()
return
@@ -65,7 +65,7 @@
var/area/A = get_area(vampire)
if(istype(A, /area/station/service/chapel))
to_chat(vampire, span_warning("You don't belong here!"))
- vampire.adjustFireLoss(10 * seconds_per_tick)
+ vampire.adjust_fire_loss(10 * seconds_per_tick)
vampire.adjust_fire_stacks(3 * seconds_per_tick)
vampire.ignite_mob()
diff --git a/code/modules/mob/living/carbon/human/suicides.dm b/code/modules/mob/living/carbon/human/suicides.dm
index 5917659ede2..11103857f6d 100644
--- a/code/modules/mob/living/carbon/human/suicides.dm
+++ b/code/modules/mob/living/carbon/human/suicides.dm
@@ -1,6 +1,6 @@
/mob/living/carbon/human/proc/delayed_suicide()
suicide_log()
- adjustBruteLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ adjust_brute_loss(max(200 - get_tox_loss() - get_fire_loss() - get_brute_loss() - get_oxy_loss(), 0))
investigate_log("has died from committing suicide.", INVESTIGATE_DEATHS)
death(FALSE)
ghostize(FALSE) // Disallows reentering body and disassociates mind
diff --git a/code/modules/mob/living/carbon/init_signals.dm b/code/modules/mob/living/carbon/init_signals.dm
index 25fbca2790e..415d1f908c0 100644
--- a/code/modules/mob/living/carbon/init_signals.dm
+++ b/code/modules/mob/living/carbon/init_signals.dm
@@ -64,7 +64,7 @@
/mob/living/carbon/proc/on_nobreath_trait_gain(datum/source)
SIGNAL_HANDLER
- setOxyLoss(0, updating_health = TRUE, forced = TRUE)
+ set_oxy_loss(0, updating_health = TRUE, forced = TRUE)
losebreath = 0
failed_last_breath = FALSE
@@ -119,7 +119,7 @@
/mob/living/carbon/proc/on_toximmune_trait_gain(datum/source)
SIGNAL_HANDLER
- setToxLoss(0, updating_health = TRUE, forced = TRUE)
+ set_tox_loss(0, updating_health = TRUE, forced = TRUE)
/**
* On gain of TRAIT_GENELLESS
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index ae0961dc1b3..7062e1e81f2 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -181,7 +181,7 @@
// Simulates breathing zero moles of gas.
has_moles = FALSE
// Extra damage, let God sort ’em out!
- adjustOxyLoss(2)
+ adjust_oxy_loss(2)
/// Minimum O2 before suffocation.
var/safe_oxygen_min = 16
@@ -232,7 +232,7 @@
failed_last_breath = FALSE
// Vacuum-adapted lungs regenerate oxyloss even when breathing nothing.
if(health >= crit_threshold)
- adjustOxyLoss(-5)
+ adjust_oxy_loss(-5)
else
// Can't breathe! Lungs are missing, and/or breath is empty.
. = FALSE
@@ -266,7 +266,7 @@
oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]
// Heal mob if not in crit.
if(health >= crit_threshold)
- adjustOxyLoss(-5)
+ adjust_oxy_loss(-5)
// Exhale equivalent amount of CO2.
if(o2_pp)
breath_gases[/datum/gas/oxygen][MOLES] -= oxygen_used
@@ -287,10 +287,10 @@
throw_alert(ALERT_TOO_MUCH_CO2, /atom/movable/screen/alert/too_much_co2)
Unconscious(6 SECONDS)
// Lets hurt em a little, let them know we mean business.
- adjustOxyLoss(3)
+ adjust_oxy_loss(3)
// They've been in here 30s now, start to kill them for their own good!
if((world.time - co2overloadtime) > 30 SECONDS)
- adjustOxyLoss(8)
+ adjust_oxy_loss(8)
else
// Reset side-effects.
co2overloadtime = 0
@@ -301,7 +301,7 @@
if(plasma_pp > safe_plas_max)
// Plasma side-effects.
var/ratio = (breath_gases[/datum/gas/plasma][MOLES] / safe_plas_max) * 10
- adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
+ adjust_tox_loss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
if(!HAS_TRAIT(src, TRAIT_ANOSMIA))
throw_alert(ALERT_TOO_MUCH_PLASMA, /atom/movable/screen/alert/too_much_plas)
else
@@ -321,7 +321,7 @@
//-- FREON --//
if(freon_pp)
- adjustFireLoss(freon_pp * 0.25)
+ adjust_fire_loss(freon_pp * 0.25)
//-- MIASMA --//
if(!miasma_pp)
@@ -385,9 +385,9 @@
if(nitrium_pp)
var/need_mob_update = FALSE
if(nitrium_pp > 0.5)
- need_mob_update += adjustFireLoss(nitrium_pp * 0.15, updating_health = FALSE)
+ need_mob_update += adjust_fire_loss(nitrium_pp * 0.15, updating_health = FALSE)
if(nitrium_pp > 5)
- need_mob_update += adjustToxLoss(nitrium_pp * 0.05, updating_health = FALSE)
+ need_mob_update += adjust_tox_loss(nitrium_pp * 0.05, updating_health = FALSE)
if(need_mob_update)
updatehealth()
@@ -426,13 +426,13 @@
// Low pressure.
if(breath_pp)
var/ratio = safe_breath_min / breath_pp
- adjustOxyLoss(min(5 * ratio, 3))
+ adjust_oxy_loss(min(5 * ratio, 3))
return true_pp * ratio / 6
// Zero pressure.
if(health >= crit_threshold)
- adjustOxyLoss(3)
+ adjust_oxy_loss(3)
else
- adjustOxyLoss(1)
+ adjust_oxy_loss(1)
/// Fourth and final link in a breath chain
/mob/living/carbon/proc/handle_breath_temperature(datum/gas_mixture/breath)
@@ -770,8 +770,8 @@
if(HAS_TRAIT(src, TRAIT_STABLELIVER) || HAS_TRAIT(src, TRAIT_LIVERLESS_METABOLISM))
return
- adjustToxLoss(0.6 * seconds_per_tick, forced = TRUE)
- adjustOrganLoss(pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_STOMACH, ORGAN_SLOT_EYES, ORGAN_SLOT_EARS), 0.5* seconds_per_tick)
+ adjust_tox_loss(0.6 * seconds_per_tick, forced = TRUE)
+ adjust_organ_loss(pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_STOMACH, ORGAN_SLOT_EYES, ORGAN_SLOT_EARS), 0.5* seconds_per_tick)
/mob/living/carbon/proc/undergoing_liver_failure()
var/obj/item/organ/liver/liver = get_organ_slot(ORGAN_SLOT_LIVER)
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 6a38597a78a..90eba20fc2f 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -64,7 +64,7 @@
update_damage_overlays()
damage_dealt = actual_hit.get_damage() - delta // Unfortunately bodypart receive_damage doesn't return damage dealt so we do it manually
else
- damage_dealt = -1 * adjustBruteLoss(damage_amount, forced = forced)
+ damage_dealt = -1 * adjust_brute_loss(damage_amount, forced = forced)
if(BURN)
if(isbodypart(def_zone))
var/obj/item/bodypart/actual_hit = def_zone
@@ -83,15 +83,15 @@
update_damage_overlays()
damage_dealt = actual_hit.get_damage() - delta // See above
else
- damage_dealt = -1 * adjustFireLoss(damage_amount, forced = forced)
+ damage_dealt = -1 * adjust_fire_loss(damage_amount, forced = forced)
if(TOX)
- damage_dealt = -1 * adjustToxLoss(damage_amount, forced = forced)
+ damage_dealt = -1 * adjust_tox_loss(damage_amount, forced = forced)
if(OXY)
- damage_dealt = -1 * adjustOxyLoss(damage_amount, forced = forced)
+ damage_dealt = -1 * adjust_oxy_loss(damage_amount, forced = forced)
if(STAMINA)
- damage_dealt = -1 * adjustStaminaLoss(damage_amount, forced = forced)
+ damage_dealt = -1 * adjust_stamina_loss(damage_amount, forced = forced)
if(BRAIN)
- damage_dealt = -1 * adjustOrganLoss(ORGAN_SLOT_BRAIN, damage_amount)
+ damage_dealt = -1 * adjust_organ_loss(ORGAN_SLOT_BRAIN, damage_amount)
SEND_SIGNAL(src, COMSIG_MOB_AFTER_APPLY_DAMAGE, damage_dealt, damagetype, def_zone, blocked, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing)
return damage_dealt
@@ -127,15 +127,15 @@
switch(damagetype)
if(BRUTE)
- return adjustBruteLoss(heal_amount)
+ return adjust_brute_loss(heal_amount)
if(BURN)
- return adjustFireLoss(heal_amount)
+ return adjust_fire_loss(heal_amount)
if(TOX)
- return adjustToxLoss(heal_amount)
+ return adjust_tox_loss(heal_amount)
if(OXY)
- return adjustOxyLoss(heal_amount)
+ return adjust_oxy_loss(heal_amount)
if(STAMINA)
- return adjustStaminaLoss(heal_amount)
+ return adjust_stamina_loss(heal_amount)
/// return the damage amount for the type given
/**
@@ -145,19 +145,19 @@
/mob/living/proc/get_current_damage_of_type(damagetype = BRUTE)
switch(damagetype)
if(BRUTE)
- return getBruteLoss()
+ return get_brute_loss()
if(BURN)
- return getFireLoss()
+ return get_fire_loss()
if(TOX)
- return getToxLoss()
+ return get_tox_loss()
if(OXY)
- return getOxyLoss()
+ return get_oxy_loss()
if(STAMINA)
- return getStaminaLoss()
+ return get_stamina_loss()
/// return the total damage of all types which update your health
/mob/living/proc/get_total_damage(precision = DAMAGE_PRECISION)
- return round(getBruteLoss() + getFireLoss() + getToxLoss() + getOxyLoss(), precision)
+ return round(get_brute_loss() + get_fire_loss() + get_tox_loss() + get_oxy_loss(), precision)
/// Applies multiple damages at once via [apply_damage][/mob/living/proc/apply_damage]
/mob/living/proc/apply_damages(
@@ -266,7 +266,7 @@
return HAS_TRAIT(src, TRAIT_TOXIMMUNE) ? 0 : 1
return 1
-/mob/living/proc/getBruteLoss()
+/mob/living/proc/get_brute_loss()
return bruteloss
/mob/living/proc/can_adjust_brute_loss(amount, forced, required_bodytype)
@@ -276,7 +276,7 @@
return FALSE
return TRUE
-/mob/living/proc/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
+/mob/living/proc/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
if (!can_adjust_brute_loss(amount, forced, required_bodytype))
return 0
. = bruteloss
@@ -288,7 +288,7 @@
updatehealth()
-/mob/living/proc/setBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
+/mob/living/proc/set_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
. = bruteloss
@@ -300,7 +300,7 @@
updatehealth()
. -= bruteloss
-/mob/living/proc/getOxyLoss()
+/mob/living/proc/get_oxy_loss()
return oxyloss
/mob/living/proc/can_adjust_oxy_loss(amount, forced, required_biotype, required_respiration_type)
@@ -319,7 +319,7 @@
return FALSE
return TRUE
-/mob/living/proc/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL, required_respiration_type = ALL)
+/mob/living/proc/adjust_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL, required_respiration_type = ALL)
if(!can_adjust_oxy_loss(amount, forced, required_biotype, required_respiration_type))
return 0
. = oxyloss
@@ -330,7 +330,7 @@
if(updating_health)
updatehealth()
-/mob/living/proc/setOxyLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL, required_respiration_type = ALL)
+/mob/living/proc/set_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL, required_respiration_type = ALL)
if(!forced)
if(HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
@@ -350,7 +350,7 @@
if(updating_health)
updatehealth()
-/mob/living/proc/getToxLoss()
+/mob/living/proc/get_tox_loss()
return toxloss
/mob/living/proc/can_adjust_tox_loss(amount, forced, required_biotype = ALL)
@@ -360,7 +360,7 @@
return FALSE
return TRUE
-/mob/living/proc/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL)
+/mob/living/proc/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL)
if(!can_adjust_tox_loss(amount, forced, required_biotype))
return 0
@@ -387,7 +387,7 @@
updatehealth()
-/mob/living/proc/setToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL)
+/mob/living/proc/set_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype = ALL)
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
return FALSE
if(!forced && !(mob_biotypes & required_biotype))
@@ -400,7 +400,7 @@
if(updating_health)
updatehealth()
-/mob/living/proc/getFireLoss()
+/mob/living/proc/get_fire_loss()
return fireloss
/mob/living/proc/can_adjust_fire_loss(amount, forced, required_bodytype)
@@ -410,7 +410,7 @@
return FALSE
return TRUE
-/mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
+/mob/living/proc/adjust_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
if(!can_adjust_fire_loss(amount, forced, required_bodytype))
return 0
. = fireloss
@@ -421,7 +421,7 @@
if(updating_health)
updatehealth()
-/mob/living/proc/setFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
+/mob/living/proc/set_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL)
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
return 0
. = fireloss
@@ -432,16 +432,16 @@
if(updating_health)
updatehealth()
-/mob/living/proc/adjustOrganLoss(slot, amount, maximum, required_organ_flag)
+/mob/living/proc/adjust_organ_loss(slot, amount, maximum, required_organ_flag)
return
-/mob/living/proc/setOrganLoss(slot, amount, maximum, required_organ_flag)
+/mob/living/proc/set_organ_loss(slot, amount, maximum, required_organ_flag)
return
/mob/living/proc/get_organ_loss(slot, required_organ_flag)
return
-/mob/living/proc/getStaminaLoss()
+/mob/living/proc/get_stamina_loss()
return staminaloss
/mob/living/proc/can_adjust_stamina_loss(amount, forced, required_biotype = ALL)
@@ -451,7 +451,7 @@
return FALSE
return TRUE
-/mob/living/proc/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype = ALL)
+/mob/living/proc/adjust_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype = ALL)
if(!can_adjust_stamina_loss(amount, forced, required_biotype))
return 0
var/old_amount = staminaloss
@@ -466,7 +466,7 @@
updatehealth()
return delta
-/mob/living/proc/setStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype = ALL)
+/mob/living/proc/set_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype = ALL)
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
return 0
if(!forced && !(mob_biotypes & required_biotype))
@@ -484,12 +484,12 @@
/// The mob has received stamina damage
///
-/// - current_level: The mob's current stamina damage amount (to save unnecessary getStaminaLoss() calls)
+/// - current_level: The mob's current stamina damage amount (to save unnecessary get_stamina_loss() calls)
/// - amount_actual: The amount of stamina damage received, in actuality
/// For example, if you are taking 50 stamina damage but are at 90, you would actually only receive 30 stamina damage (due to the cap)
/// - amount: The amount of stamina damage received, raw
/mob/living/proc/received_stamina_damage(current_level, amount_actual, amount)
- addtimer(CALLBACK(src, PROC_REF(setStaminaLoss), 0, TRUE, TRUE), stamina_regen_time, TIMER_UNIQUE|TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(set_stamina_loss), 0, TRUE, TRUE), stamina_regen_time, TIMER_UNIQUE|TIMER_OVERRIDE)
/**
* heal ONE external organ, organ gets randomly selected from damaged ones.
@@ -497,7 +497,7 @@
* returns the net change in damage
*/
/mob/living/proc/heal_bodypart_damage(brute = 0, burn = 0, updating_health = TRUE, required_bodytype = NONE, target_zone = null)
- . = (adjustBruteLoss(-abs(brute), updating_health = FALSE) + adjustFireLoss(-abs(burn), updating_health = FALSE))
+ . = (adjust_brute_loss(-abs(brute), updating_health = FALSE) + adjust_fire_loss(-abs(burn), updating_health = FALSE))
if(!.) // no change, no need to update
return FALSE
if(updating_health)
@@ -505,7 +505,7 @@
/// damage ONE external organ, organ gets randomly selected from damaged ones.
/mob/living/proc/take_bodypart_damage(brute = 0, burn = 0, updating_health = TRUE, required_bodytype, check_armor = FALSE, wound_bonus = 0, exposed_wound_bonus = 0, sharpness = NONE)
- . = (adjustBruteLoss(abs(brute), updating_health = FALSE) + adjustFireLoss(abs(burn), updating_health = FALSE))
+ . = (adjust_brute_loss(abs(brute), updating_health = FALSE) + adjust_fire_loss(abs(burn), updating_health = FALSE))
if(!.) // no change, no need to update
return FALSE
if(updating_health)
@@ -513,9 +513,9 @@
/// heal MANY bodyparts, in random order. note: stamina arg nonfunctional for carbon mobs
/mob/living/proc/heal_overall_damage(brute = 0, burn = 0, stamina = 0, required_bodytype, updating_health = TRUE, forced = FALSE)
- . = (adjustBruteLoss(-abs(brute), updating_health = FALSE, forced = forced) + \
- adjustFireLoss(-abs(burn), updating_health = FALSE, forced = forced) + \
- adjustStaminaLoss(-abs(stamina), updating_stamina = FALSE, forced = forced))
+ . = (adjust_brute_loss(-abs(brute), updating_health = FALSE, forced = forced) + \
+ adjust_fire_loss(-abs(burn), updating_health = FALSE, forced = forced) + \
+ adjust_stamina_loss(-abs(stamina), updating_stamina = FALSE, forced = forced))
if(!.) // no change, no need to update
return FALSE
if(updating_health)
@@ -523,9 +523,9 @@
/// damage MANY bodyparts, in random order. note: stamina arg nonfunctional for carbon mobs
/mob/living/proc/take_overall_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, forced = FALSE, required_bodytype)
- . = (adjustBruteLoss(abs(brute), updating_health = FALSE, forced = forced) + \
- adjustFireLoss(abs(burn), updating_health = FALSE, forced = forced) + \
- adjustStaminaLoss(abs(stamina), updating_stamina = FALSE, forced = forced))
+ . = (adjust_brute_loss(abs(brute), updating_health = FALSE, forced = forced) + \
+ adjust_fire_loss(abs(burn), updating_health = FALSE, forced = forced) + \
+ adjust_stamina_loss(abs(stamina), updating_stamina = FALSE, forced = forced))
if(!.) // no change, no need to update
return FALSE
if(updating_health)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 0e5031e2bdc..21ad53291c9 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -118,7 +118,7 @@
message_animal_or_basic = custom_message
. = ..()
message_animal_or_basic = initial(message_animal_or_basic)
- if(!user.can_speak() || user.getOxyLoss() >= 50)
+ if(!user.can_speak() || user.get_oxy_loss() >= 50)
return //stop the sound if oxyloss too high/cant speak
var/mob/living/carbon/carbon_user = user
// For masks that give unique death sounds
@@ -364,7 +364,7 @@
TIMER_COOLDOWN_START(src, "point_verb_emote_cooldown", 2 SECONDS)
else
message_param = "[span_userdanger("bumps [user.p_their()] head on the ground")] trying to motion towards %t."
- our_carbon.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
+ our_carbon.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5)
playsound(user, 'sound/effects/glass/glassbash.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
TIMER_COOLDOWN_START(src, "point_verb_emote_cooldown", 2.5 SECONDS)
return ..()
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 45e3f883482..b385360142e 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -141,7 +141,7 @@
return
var/grav_strength = gravity - GRAVITY_DAMAGE_THRESHOLD
- adjustBruteLoss(min(GRAVITY_DAMAGE_SCALING * grav_strength, GRAVITY_DAMAGE_MAXIMUM) * seconds_per_tick)
+ adjust_brute_loss(min(GRAVITY_DAMAGE_SCALING * grav_strength, GRAVITY_DAMAGE_MAXIMUM) * seconds_per_tick)
/// Proc used for custom metabolization of reagents, if any
/mob/living/proc/reagent_tick(datum/reagent/chem, seconds_per_tick, times_fired)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b24e465087b..9c32b08e295 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -558,7 +558,7 @@
to_chat(src, span_warning("You are unable to succumb to death! This life continues."), type=MESSAGE_TYPE_INFO)
return
log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] with [round(health, 0.1)] points of health!", LOG_ATTACK)
- adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD)
+ adjust_oxy_loss(health - HEALTH_THRESHOLD_DEAD)
updatehealth()
if(!whispered)
to_chat(src, span_notice("You have given up life and succumbed to death."))
@@ -825,7 +825,7 @@
/mob/living/proc/updatehealth()
if(HAS_TRAIT(src, TRAIT_GODMODE))
return
- set_health(maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss())
+ set_health(maxHealth - get_oxy_loss() - get_tox_loss() - get_fire_loss() - get_brute_loss())
update_stat()
med_hud_set_health()
med_hud_set_status()
@@ -883,8 +883,8 @@
// Bro just like, don't ok
return FALSE
if(excess_healing)
- adjustOxyLoss(-excess_healing, updating_health = FALSE)
- adjustToxLoss(-excess_healing, updating_health = FALSE, forced = TRUE) //slime friendly
+ adjust_oxy_loss(-excess_healing, updating_health = FALSE)
+ adjust_tox_loss(-excess_healing, updating_health = FALSE, forced = TRUE) //slime friendly
updatehealth()
grab_ghost(force_grab_ghost)
@@ -928,18 +928,18 @@
/mob/living/proc/heal_and_revive(heal_to = 50, revive_message)
// Heal their brute and burn up to the threshold we're looking for
- var/brute_to_heal = heal_to - getBruteLoss()
- var/burn_to_heal = heal_to - getFireLoss()
- var/oxy_to_heal = heal_to - getOxyLoss()
- var/tox_to_heal = heal_to - getToxLoss()
+ var/brute_to_heal = heal_to - get_brute_loss()
+ var/burn_to_heal = heal_to - get_fire_loss()
+ var/oxy_to_heal = heal_to - get_oxy_loss()
+ var/tox_to_heal = heal_to - get_tox_loss()
if(brute_to_heal < 0)
- adjustBruteLoss(brute_to_heal, updating_health = FALSE)
+ adjust_brute_loss(brute_to_heal, updating_health = FALSE)
if(burn_to_heal < 0)
- adjustFireLoss(burn_to_heal, updating_health = FALSE)
+ adjust_fire_loss(burn_to_heal, updating_health = FALSE)
if(oxy_to_heal < 0)
- adjustOxyLoss(oxy_to_heal, updating_health = FALSE)
+ adjust_oxy_loss(oxy_to_heal, updating_health = FALSE)
if(tox_to_heal < 0)
- adjustToxLoss(tox_to_heal, updating_health = FALSE, forced = TRUE)
+ adjust_tox_loss(tox_to_heal, updating_health = FALSE, forced = TRUE)
// Run updatehealth once to set health for the revival check
updatehealth()
@@ -970,15 +970,15 @@
SHOULD_CALL_PARENT(TRUE)
if(heal_flags & HEAL_TOX)
- setToxLoss(0, updating_health = FALSE, forced = TRUE)
+ set_tox_loss(0, updating_health = FALSE, forced = TRUE)
if(heal_flags & HEAL_OXY)
- setOxyLoss(0, updating_health = FALSE, forced = TRUE)
+ set_oxy_loss(0, updating_health = FALSE, forced = TRUE)
if(heal_flags & HEAL_BRUTE)
- setBruteLoss(0, updating_health = FALSE, forced = TRUE)
+ set_brute_loss(0, updating_health = FALSE, forced = TRUE)
if(heal_flags & HEAL_BURN)
- setFireLoss(0, updating_health = FALSE, forced = TRUE)
+ set_fire_loss(0, updating_health = FALSE, forced = TRUE)
if(heal_flags & HEAL_STAM)
- setStaminaLoss(0, updating_stamina = FALSE, forced = TRUE)
+ set_stamina_loss(0, updating_stamina = FALSE, forced = TRUE)
// I don't really care to keep this under a flag
set_nutrition(NUTRITION_LEVEL_FED + 50)
@@ -1009,16 +1009,16 @@
* It uses the healing amount on brute/fire damage, and then uses the excess healing for revive
*/
/mob/living/proc/do_strange_reagent_revival(healing_amount)
- var/brute_loss = getBruteLoss()
+ var/brute_loss = get_brute_loss()
if(brute_loss)
var/brute_healing = min(healing_amount * 0.5, brute_loss) // 50% of the healing goes to brute
- setBruteLoss(round(brute_loss - brute_healing, DAMAGE_PRECISION), updating_health=FALSE, forced=TRUE)
+ set_brute_loss(round(brute_loss - brute_healing, DAMAGE_PRECISION), updating_health=FALSE, forced=TRUE)
healing_amount = max(0, healing_amount - brute_healing)
- var/fire_loss = getFireLoss()
+ var/fire_loss = get_fire_loss()
if(fire_loss && healing_amount)
var/fire_healing = min(healing_amount, fire_loss) // rest of the healing goes to fire
- setFireLoss(round(fire_loss - fire_healing, DAMAGE_PRECISION), updating_health=TRUE, forced=TRUE)
+ set_fire_loss(round(fire_loss - fire_healing, DAMAGE_PRECISION), updating_health=TRUE, forced=TRUE)
healing_amount = max(0, healing_amount - fire_healing)
revive(NONE, excess_healing=max(healing_amount, 0), force_grab_ghost=FALSE) // and any excess healing is passed along
@@ -1063,7 +1063,7 @@
if(!buckled && !moving_diagonally && loc != old_loc)
var/blood_flow = get_bleed_rate()
- var/health_check = body_position == LYING_DOWN && prob(getBruteLoss() * 200 / maxHealth)
+ var/health_check = body_position == LYING_DOWN && prob(get_brute_loss() * 200 / maxHealth)
var/bleeding_check = blood_flow > 3 && prob(blood_flow * 16)
if(health_check || bleeding_check)
make_blood_trail(newloc, old_loc, old_direction, direct)
@@ -1181,7 +1181,7 @@
if(HAS_TRAIT(src, TRAIT_GRABWEAKNESS)) //If we have grab weakness from some source, treat the grab state as one higher
effective_grab_state++
- if(get_timed_status_effect_duration(/datum/status_effect/staggered) && (getFireLoss() + getBruteLoss()) >= 40) //If we are staggered, and we have at least 40 damage, treat the grab state as one higher.
+ if(get_timed_status_effect_duration(/datum/status_effect/staggered) && (get_fire_loss() + get_brute_loss()) >= 40) //If we are staggered, and we have at least 40 damage, treat the grab state as one higher.
effective_grab_state++
if(HAS_TRAIT(src, TRAIT_GRABRESISTANCE)) //If we have grab resistance from some source, treat the grab state as one lower.
@@ -1199,7 +1199,7 @@
//If our puller is a drunken brawler, they add more damage based on their own damage taken so long as they're drunk and treat the grab state as one higher
var/puller_drunkenness = human_puller.get_drunk_amount()
if(puller_drunkenness && HAS_TRAIT(human_puller, TRAIT_DRUNKEN_BRAWLER))
- damage_on_resist_fail += clamp((human_puller.getFireLoss() + human_puller.getBruteLoss()) / 10, 3, 20)
+ damage_on_resist_fail += clamp((human_puller.get_fire_loss() + human_puller.get_brute_loss()) / 10, 3, 20)
effective_grab_state++
var/datum/martial_art/puller_art = GET_ACTIVE_MARTIAL_ART(human_puller)
@@ -1221,7 +1221,7 @@
pulledby.stop_pulling()
return FALSE
else
- adjustStaminaLoss(damage_on_resist_fail) //Do some stamina damage if we fail to resist
+ adjust_stamina_loss(damage_on_resist_fail) //Do some stamina damage if we fail to resist
visible_message(span_danger("[src] struggles as they fail to break free of [pulledby]'s grip!"), \
span_warning("You struggle as you fail to break free of [pulledby]'s grip!"), null, null, pulledby)
to_chat(pulledby, span_danger("[src] struggles as they fail to break free of your grip!"))
@@ -2075,12 +2075,12 @@ GLOBAL_LIST_EMPTY(fire_appearances)
. += {"
[VV_HREF_TARGETREF(refid, VV_HK_GIVE_DIRECT_CONTROL, "[ckey || "no ckey"]")] / [VV_HREF_TARGETREF_1V(refid, VV_HK_BASIC_EDIT, "[real_name || "no real name"]", NAMEOF(src, real_name))]
- BRUTE:[getBruteLoss()]
- FIRE:[getFireLoss()]
- TOXIN:[getToxLoss()]
- OXY:[getOxyLoss()]
+ BRUTE:[get_brute_loss()]
+ FIRE:[get_fire_loss()]
+ TOXIN:[get_tox_loss()]
+ OXY:[get_oxy_loss()]
BRAIN:[get_organ_loss(ORGAN_SLOT_BRAIN)]
- STAMINA:[getStaminaLoss()]
+ STAMINA:[get_stamina_loss()]
"}
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 2934bdf5725..4cd37546285 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -581,12 +581,12 @@
if(shock_damage < 1)
return FALSE
if(!(flags & SHOCK_ILLUSION))
- adjustFireLoss(shock_damage)
- if(getFireLoss() > 100)
+ adjust_fire_loss(shock_damage)
+ if(get_fire_loss() > 100)
add_shared_particles(/particles/smoke/burning)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, remove_shared_particles), /particles/smoke/burning), 10 SECONDS)
else
- adjustStaminaLoss(shock_damage)
+ adjust_stamina_loss(shock_damage)
if(!(flags & SHOCK_SUPPRESS_MESSAGE))
visible_message(
span_danger("[src] was shocked by \the [source]!"), \
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 1dcd959e13f..3470fcf5e66 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -113,7 +113,7 @@
var/mob_size = MOB_SIZE_HUMAN
/// List of biotypes the mob belongs to. Used by diseases and reagents mainly.
var/mob_biotypes = MOB_ORGANIC
- /// The type of respiration the mob is capable of doing. Used by adjustOxyLoss.
+ /// The type of respiration the mob is capable of doing. Used by adjust_oxy_loss.
var/mob_respiration_type = RESPIRATION_OXYGEN
///more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
var/metabolism_efficiency = 1
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index ba7dd437a54..d9b099eb414 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -13,7 +13,7 @@
/mob/living/silicon/ai/blob_act(obj/structure/blob/B)
if (stat != DEAD)
- adjustBruteLoss(60)
+ adjust_brute_loss(60)
return TRUE
return FALSE
@@ -36,11 +36,11 @@
gib(DROP_ALL_REMAINS)
if(EXPLODE_HEAVY)
if (stat != DEAD)
- adjustBruteLoss(60)
- adjustFireLoss(60)
+ adjust_brute_loss(60)
+ adjust_fire_loss(60)
if(EXPLODE_LIGHT)
if (stat != DEAD)
- adjustBruteLoss(30)
+ adjust_brute_loss(30)
return TRUE
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index 9e58ee04d44..0a7eaf3c5ca 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -12,13 +12,13 @@
else
. += span_notice("[p_Their()] neural network connection could be cut, the access panel cover can be pried back into place.")
if(stat != DEAD)
- if (getBruteLoss())
- if (getBruteLoss() < 30)
+ if (get_brute_loss())
+ if (get_brute_loss() < 30)
. += span_warning("[p_They()] look[p_s()] slightly dented.")
else
. += span_warning("[p_They()] look[p_s()] severely dented!")
- if (getFireLoss())
- if (getFireLoss() < 30)
+ if (get_fire_loss())
+ if (get_fire_loss() < 30)
. += span_warning("[p_They()] look[p_s()] slightly charred.")
else
. += span_warning("[p_Their()] casing is melted and heat-warped!")
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 6de5c807a90..311a700fd15 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -15,7 +15,7 @@
// Handle power damage (oxy)
if (battery <= 0 && lacks_power())
to_chat(src, span_warning("Your backup battery's output drops below usable levels. It takes only a moment longer for your systems to fail, corrupted and unusable."))
- adjustOxyLoss(200)
+ adjust_oxy_loss(200)
if(aiRestorePowerRoutine)
// Lost power
@@ -51,7 +51,7 @@
return
var/old_health = health
- set_health(maxHealth - getOxyLoss() - getToxLoss() - getBruteLoss() - getFireLoss())
+ set_health(maxHealth - get_oxy_loss() - get_tox_loss() - get_brute_loss() - get_fire_loss())
var/old_stat = stat
update_stat()
diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm
index 90a41f1f2bf..d2608e89427 100644
--- a/code/modules/mob/living/silicon/damage_procs.dm
+++ b/code/modules/mob/living/silicon/damage_procs.dm
@@ -1,34 +1,34 @@
/mob/living/silicon/apply_effect(effect = 0,effecttype = EFFECT_STUN, blocked = FALSE)
return FALSE //The only effect that can hit them atm is flashes and they still directly edit so this works for now. (This was written in at least 2016. Help)
-/mob/living/silicon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype) //immune to tox damage
+/mob/living/silicon/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype) //immune to tox damage
return FALSE
-/mob/living/silicon/setToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
+/mob/living/silicon/set_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
return FALSE
-/mob/living/silicon/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype) //immune to stamina damage.
+/mob/living/silicon/adjust_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype) //immune to stamina damage.
return FALSE
-/mob/living/silicon/setStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
+/mob/living/silicon/set_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
return FALSE
/mob/living/silicon/received_stamina_damage(current_level, amount_actual, amount)
return
-/mob/living/silicon/adjustOrganLoss(slot, amount, maximum = 500, required_organ_flag) //immune to organ damage (no organs, duh)
+/mob/living/silicon/adjust_organ_loss(slot, amount, maximum = 500, required_organ_flag) //immune to organ damage (no organs, duh)
return FALSE
-/mob/living/silicon/setOrganLoss(slot, amount)
+/mob/living/silicon/set_organ_loss(slot, amount)
return FALSE
-/mob/living/silicon/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type) //immune to oxygen damage
+/mob/living/silicon/adjust_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type) //immune to oxygen damage
if(isAI(src)) //ais are snowflakes and use oxyloss for being in AI cards and having no battery
return ..()
return FALSE
-/mob/living/silicon/setOxyLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
+/mob/living/silicon/set_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
if(isAI(src)) //ditto
return ..()
diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm
index ea62dcc2a9c..8aff9b59278 100644
--- a/code/modules/mob/living/silicon/death.dm
+++ b/code/modules/mob/living/silicon/death.dm
@@ -33,9 +33,9 @@
/// Plays an animation of the player's hud flavored about their death somewhat
/mob/living/silicon/proc/death_sequence()
var/cause_of_death
- if(getBruteLoss() + getFireLoss() > 100)
+ if(get_brute_loss() + get_fire_loss() > 100)
cause_of_death = "Critical damage sustained."
- if(getOxyLoss() > 100)
+ if(get_oxy_loss() > 100)
cause_of_death = "Critically low power."
var/atom/movable/screen/cyborg_death/deathhud = new(null, hud_used, cause_of_death)
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index a0986cc70ad..be5bc6e95cd 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -10,13 +10,13 @@
if(act_module)
. += "[p_Theyre()] holding [icon2html(act_module, user)] \a [act_module]."
. += get_status_effect_examinations()
- if (getBruteLoss())
- if (getBruteLoss() < maxHealth*0.5)
+ if (get_brute_loss())
+ if (get_brute_loss() < maxHealth*0.5)
. += span_warning("[p_They()] look[p_s()] slightly dented.")
else
. += span_boldwarning("[p_They()] look[p_s()] severely dented!")
- if (getFireLoss() || getToxLoss())
- var/overall_fireloss = getFireLoss() + getToxLoss()
+ if (get_fire_loss() || get_tox_loss())
+ var/overall_fireloss = get_fire_loss() + get_tox_loss()
if (overall_fireloss < maxHealth * 0.5)
. += span_warning("[p_They()] look[p_s()] slightly charred.")
else
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 376ad4300ca..ce0e1aec6f3 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
balloon_alert(user, "expose the wires first!")
return ITEM_INTERACT_BLOCKING
var/obj/item/stack/cable_coil/coil = tool
- if (getFireLoss() <= 0)
+ if (get_fire_loss() <= 0)
balloon_alert(user, "wires are fine!")
return ITEM_INTERACT_BLOCKING
if(src == user)
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
if (!coil.use(1))
balloon_alert(user, "not enough cable!")
return ITEM_INTERACT_BLOCKING
- adjustFireLoss(-30)
+ adjust_fire_loss(-30)
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
balloon_alert(user, "wires repaired")
user.visible_message(
@@ -321,7 +321,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
return NONE
user.changeNext_move(CLICK_CD_MELEE)
- if (!getBruteLoss())
+ if (!get_brute_loss())
balloon_alert(user, "no dents to fix!")
return ITEM_INTERACT_BLOCKING
if (!tool.tool_start_check(user, amount=1, heat_required = HIGH_TEMPERATURE_REQUIRED)) //The welder has 1u of fuel consumed by its afterattack, so we don't need to worry about taking any away.
@@ -334,7 +334,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
if(!tool.use_tool(src, user, delay = 0.5 SECONDS, amount = 1, volume = 50))
return ITEM_INTERACT_BLOCKING
- adjustBruteLoss(-30)
+ adjust_brute_loss(-30)
add_fingerprint(user)
balloon_alert(user, "dents fixed")
user.visible_message(
@@ -498,7 +498,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
/mob/living/silicon/robot/blob_act(obj/structure/blob/B)
if(stat != DEAD)
- adjustBruteLoss(30)
+ adjust_brute_loss(30)
else
investigate_log("has been gibbed by a blob.", INVESTIGATE_DEATHS)
gib(DROP_ALL_REMAINS)
@@ -512,11 +512,11 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
return TRUE
if(EXPLODE_HEAVY)
if (stat != DEAD)
- adjustBruteLoss(60)
- adjustFireLoss(60)
+ adjust_brute_loss(60)
+ adjust_fire_loss(60)
if(EXPLODE_LIGHT)
if (stat != DEAD)
- adjustBruteLoss(30)
+ adjust_brute_loss(30)
return TRUE
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 35dd81f7822..b7f8fd2900f 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -450,7 +450,7 @@
return
/mob/living/silicon/rust_heretic_act()
- adjustBruteLoss(500)
+ adjust_brute_loss(500)
/mob/living/silicon/on_floored_start()
return // Silicons are always standing by default.
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 0a5e3191190..344b71a8fc4 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -17,7 +17,7 @@
to_chat(user, span_danger("You slash at [src]!"))
if(prob(8))
flash_act(affect_silicon = 1)
- adjustBruteLoss(damage)
+ adjust_brute_loss(damage)
log_combat(user, src, "attacked")
else
playsound(loc, 'sound/items/weapons/slashmiss.ogg', 25, TRUE, -1)
@@ -51,7 +51,7 @@
. = ..()
if(!.)
return
- adjustBruteLoss(rand(10, 15))
+ adjust_brute_loss(rand(10, 15))
playsound(loc, SFX_PUNCH, 25, TRUE, -1)
visible_message(span_danger("[user] punches [src]!"), \
span_userdanger("[user] punches you!"), null, COMBAT_MESSAGE_RANGE, user)
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 2c7bc4583e2..ac3637d7fd2 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -50,7 +50,7 @@
visible_message(span_danger("[user] punches [src]!"), \
span_userdanger("You're punched by [user]!"), null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, span_danger("You punch [src]!"))
- adjustBruteLoss(15)
+ adjust_brute_loss(15)
/mob/living/simple_animal/attack_paw(mob/living/carbon/human/user, list/modifiers)
if(..()) //successful monkey bite.
@@ -118,7 +118,7 @@
/mob/living/simple_animal/proc/ex_act_devastate()
var/bomb_armor = getarmor(null, BOMB)
if(prob(bomb_armor))
- adjustBruteLoss(500)
+ adjust_brute_loss(500)
else
investigate_log("has been gibbed by an explosion.", INVESTIGATE_DEATHS)
gib()
@@ -129,7 +129,7 @@
var/bloss = 60
if(prob(bomb_armor))
bloss = bloss / 1.5
- adjustBruteLoss(bloss)
+ adjust_brute_loss(bloss)
/// Called when a light explosive acts on this mob
/mob/living/simple_animal/proc/ex_act_light()
@@ -137,10 +137,10 @@
var/bloss = 30
if(prob(bomb_armor))
bloss = bloss / 1.5
- adjustBruteLoss(bloss)
+ adjust_brute_loss(bloss)
/mob/living/simple_animal/blob_act(obj/structure/blob/B)
- adjustBruteLoss(20)
+ adjust_brute_loss(20)
return
/mob/living/simple_animal/do_attack_animation(atom/A, visual_effect_icon, used_item, no_effect)
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 1dba0cf2f72..1462345ff21 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -1210,7 +1210,7 @@ Pass a positive integer as an argument to override a bot's default speed.
addtimer(CALLBACK(src, PROC_REF(set_path), null), 0.6 SECONDS) // Enough time for the animate to finish
/mob/living/simple_animal/bot/rust_heretic_act()
- adjustBruteLoss(400)
+ adjust_brute_loss(400)
/mob/living/simple_animal/bot/get_hit_area_message(input_area)
// we just get hit, there's no complexity for hitting an arm (if it exists) or anything.
diff --git a/code/modules/mob/living/simple_animal/damage_procs.dm b/code/modules/mob/living/simple_animal/damage_procs.dm
index 78eb0983c50..2d62e8f314f 100644
--- a/code/modules/mob/living/simple_animal/damage_procs.dm
+++ b/code/modules/mob/living/simple_animal/damage_procs.dm
@@ -25,7 +25,7 @@
return modifier * damage_coeff[damage_type]
return modifier
-/mob/living/simple_animal/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/simple_animal/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!can_adjust_brute_loss(amount, forced, required_bodytype))
return 0
if(forced)
@@ -33,7 +33,7 @@
else if(damage_coeff[BRUTE])
. = adjustHealth(amount * damage_coeff[BRUTE] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/simple_animal/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/simple_animal/adjust_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
if(!can_adjust_fire_loss(amount, forced, required_bodytype))
return 0
if(forced)
@@ -41,7 +41,7 @@
else if(damage_coeff[BURN])
. = adjustHealth(amount * damage_coeff[BURN] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/simple_animal/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type)
+/mob/living/simple_animal/adjust_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type)
if(!can_adjust_oxy_loss(amount, forced, required_biotype, required_respiration_type))
return 0
if(forced)
@@ -49,7 +49,7 @@
else if(damage_coeff[OXY])
. = adjustHealth(amount * damage_coeff[OXY] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/simple_animal/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
+/mob/living/simple_animal/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
if(!can_adjust_tox_loss(amount, forced, required_biotype))
return 0
if(forced)
@@ -57,7 +57,7 @@
else if(damage_coeff[TOX])
. = adjustHealth(amount * damage_coeff[TOX] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
-/mob/living/simple_animal/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
+/mob/living/simple_animal/adjust_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
if(!can_adjust_stamina_loss(amount, forced, required_biotype))
return 0
var/old_stamloss = staminaloss
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
index 24f75ff9300..29c84d42bdd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
@@ -147,7 +147,7 @@
qdel(victim.get_organ_slot(ORGAN_SLOT_LUNGS))
qdel(victim.get_organ_slot(ORGAN_SLOT_HEART))
qdel(victim.get_organ_slot(ORGAN_SLOT_LIVER))
- victim.adjustBruteLoss(500)
+ victim.adjust_brute_loss(500)
victim.death() //make sure they die
victim.apply_status_effect(/datum/status_effect/gutted)
LoseTarget()
@@ -170,13 +170,13 @@
/mob/living/simple_animal/hostile/megafauna/ex_act(severity, target)
switch (severity)
if (EXPLODE_DEVASTATE)
- adjustBruteLoss(250)
+ adjust_brute_loss(250)
if (EXPLODE_HEAVY)
- adjustBruteLoss(100)
+ adjust_brute_loss(100)
if (EXPLODE_LIGHT)
- adjustBruteLoss(50)
+ adjust_brute_loss(50)
return TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 29435d817d4..cdd367332ac 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -275,7 +275,7 @@ Difficulty: Hard
set_varspeed(move_to_delay)
handle_automated_action() // need to recheck movement otherwise move_to_delay won't update until the next checking aka will be wrong speed for a bit
-/mob/living/simple_animal/hostile/megafauna/bubblegum/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
. = ..()
anger_modifier = clamp(((maxHealth - health)/60),0,20)
enrage_time = initial(enrage_time) * clamp(anger_modifier / 20, 0.5, 1)
@@ -344,7 +344,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Life(seconds_per_tick = SSMOBS_DT, times_fired)
return
-/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
return
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/OpenFire()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 9449491a67e..79ef2e1bfd3 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -158,7 +158,7 @@ Difficulty: Extremely Hard
adjustHealth(-maxHealth)
/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/ex_act(severity, target)
- adjustBruteLoss(-30 * severity)
+ adjust_brute_loss(-30 * severity)
visible_message(span_danger("[src] absorbs the explosion!"), span_userdanger("You absorb the explosion!"))
return TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index cca2440f122..df31650e2f9 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -154,7 +154,7 @@
/mob/living/simple_animal/hostile/megafauna/dragon/proc/arena_escape_enrage() // you ran somehow / teleported away from my arena attack now i'm mad fucker
SLEEP_CHECK_DEATH(0, src)
visible_message(span_boldwarning("[src] starts to glow vibrantly as its wounds close up!"))
- adjustBruteLoss(-250) // yeah you're gonna pay for that, don't run nerd
+ adjust_brute_loss(-250) // yeah you're gonna pay for that, don't run nerd
add_atom_colour(rgb(255, 255, 0), TEMPORARY_COLOUR_PRIORITY)
move_to_delay = move_to_delay / 2
set_light_range(10)
@@ -221,7 +221,7 @@
for(var/mob/living/L in T.contents - owner)
if(istype(L, /mob/living/simple_animal/hostile/megafauna/dragon))
continue
- L.adjustFireLoss(10)
+ L.adjust_fire_loss(10)
to_chat(L, span_userdanger("You fall directly into the pool of lava!"))
// deals damage to mechs
@@ -296,11 +296,11 @@
if(istype(L, /mob/living/simple_animal/hostile/megafauna/dragon))
continue
if(islist(flame_hit) && !flame_hit[L])
- L.adjustFireLoss(40)
+ L.adjust_fire_loss(40)
to_chat(L, span_userdanger("You're hit by the drake's fire breath!"))
flame_hit[L] = TRUE
else
- L.adjustFireLoss(10) //if we've already hit them, do way less damage
+ L.adjust_fire_loss(10) //if we've already hit them, do way less damage
/mob/living/simple_animal/hostile/megafauna/dragon/lesser
name = "lesser ash drake"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 8541e544350..87d31f57c5c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -730,7 +730,7 @@ Difficulty: Hard
else
H.Goto(get_turf(caster), H.move_to_delay, 3)
if(monster_damage_boost && (ismegafauna(L) || istype(L, /mob/living/simple_animal/hostile/asteroid)))
- L.adjustBruteLoss(damage)
+ L.adjust_brute_loss(damage)
if(caster)
log_combat(caster, L, "struck with a [name]")
for(var/obj/vehicle/sealed/mecha/M in T.contents - hit_things) //also damage mechs.
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
index 92da280342b..4f92eeabdb4 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
@@ -156,13 +156,13 @@
to_chat(trample_target, span_userdanger("[src] tramples you and kicks you away!"))
trample_target.safe_throw_at(throwtarget, 10, 1, src)
trample_target.Paralyze(20)
- trample_target.adjustBruteLoss(melee_damage_upper)
+ trample_target.adjust_brute_loss(melee_damage_upper)
addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), move_dir, (times_ran + 1)), 0.7)
/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/head_detach(target)
ranged_cooldown = world.time + 1 SECONDS
if(myhead != null)
- myhead.adjustBruteLoss(600)
+ myhead.adjust_brute_loss(600)
return
if(has_head)
has_head = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm
index 511300d56ac..542b67ffd2e 100644
--- a/code/modules/mob/living/simple_animal/hostile/ooze.dm
+++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm
@@ -76,7 +76,7 @@
adjust_ooze_nutrition(nutrition_change)
if(ooze_nutrition <= 0)
- adjustBruteLoss(0.25 * seconds_per_tick)
+ adjust_brute_loss(0.25 * seconds_per_tick)
/// Returns an applicable list of actions to grant to the mob. Will return a list or null.
/mob/living/simple_animal/hostile/ooze/proc/get_innate_actions()
@@ -268,7 +268,7 @@
///Gain health for the consumption and dump some brute loss on the target.
/datum/action/consume/process()
var/mob/living/simple_animal/hostile/ooze/gelatinous/ooze = owner
- vored_mob.adjustBruteLoss(5)
+ vored_mob.adjust_brute_loss(5)
ooze.heal_ordered_damage((ooze.maxHealth * 0.03), list(BRUTE, BURN, OXY)) ///Heal 6% of these specific damage types each process
if(istype(ooze))
ooze.adjust_ooze_nutrition(3)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 7381914879f..1d37cc3ce2a 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -215,7 +215,7 @@
/mob/living/simple_animal/Life(seconds_per_tick = SSMOBS_DT, times_fired)
. = ..()
if(staminaloss > 0)
- adjustStaminaLoss(-stamina_recovery * seconds_per_tick, FALSE, TRUE)
+ adjust_stamina_loss(-stamina_recovery * seconds_per_tick, FALSE, TRUE)
/mob/living/simple_animal/Destroy()
QDEL_NULL(access_card)
diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
index 51e9e5cb18a..5816f8bb38b 100644
--- a/code/modules/mob_spawn/mob_spawn.dm
+++ b/code/modules/mob_spawn/mob_spawn.dm
@@ -339,9 +339,9 @@
/obj/effect/mob_spawn/corpse/special(mob/living/spawned_mob, mob/mob_possessor, apply_prefs)
. = ..()
spawned_mob.death(TRUE)
- spawned_mob.adjustOxyLoss(oxy_damage)
- spawned_mob.adjustBruteLoss(brute_damage)
- spawned_mob.adjustFireLoss(burn_damage)
+ spawned_mob.adjust_oxy_loss(oxy_damage)
+ spawned_mob.adjust_brute_loss(brute_damage)
+ spawned_mob.adjust_fire_loss(burn_damage)
if (corpse_description)
spawned_mob.AddComponent(/datum/component/temporary_description, corpse_description, naive_corpse_description)
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index f797fae7e31..ab3e9366db6 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -397,7 +397,7 @@
.["is_user_irradiated"] = mod.wearer ? HAS_TRAIT(mod.wearer, TRAIT_IRRADIATED) : FALSE
.["background_radiation_level"] = perceived_threat_level
.["health_max"] = mod.wearer?.getMaxHealth() || 0
- .["loss_tox"] = mod.wearer?.getToxLoss() || 0
+ .["loss_tox"] = mod.wearer?.get_tox_loss() || 0
/obj/item/mod/module/rad_protection/proc/on_pre_potential_irradiation(datum/source, datum/radiation_pulse_information/pulse_information, insulation_to_target)
SIGNAL_HANDLER
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 921b02c514e..2c3513e39a4 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -264,10 +264,10 @@
.["health"] = mod.wearer?.health || 0
.["health_max"] = mod.wearer?.getMaxHealth() || 0
if(display_detailed_vitals)
- .["loss_brute"] = mod.wearer?.getBruteLoss() || 0
- .["loss_fire"] = mod.wearer?.getFireLoss() || 0
- .["loss_tox"] = mod.wearer?.getToxLoss() || 0
- .["loss_oxy"] = mod.wearer?.getOxyLoss() || 0
+ .["loss_brute"] = mod.wearer?.get_brute_loss() || 0
+ .["loss_fire"] = mod.wearer?.get_fire_loss() || 0
+ .["loss_tox"] = mod.wearer?.get_tox_loss() || 0
+ .["loss_oxy"] = mod.wearer?.get_oxy_loss() || 0
.["body_temperature"] = mod.wearer?.bodytemperature || 0
.["nutrition"] = mod.wearer?.nutrition || 0
if(display_dna)
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index 05c9af1b33d..e1169810723 100644
--- a/code/modules/mod/modules/modules_maint.dm
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -226,7 +226,7 @@
/obj/item/mod/module/balloon/on_use(mob/activator)
if(!do_after(mod.wearer, blowing_time, target = mod))
return FALSE
- mod.wearer.adjustOxyLoss(oxygen_damage)
+ mod.wearer.adjust_oxy_loss(oxygen_damage)
playsound(src, 'sound/items/modsuit/inflate_bloon.ogg', 50, TRUE)
var/obj/item/balloon = new balloon_path(get_turf(src))
mod.wearer.put_in_hands(balloon)
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index f71814fc7db..103b584d094 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -28,10 +28,10 @@
. = ..()
.["health"] = mod.wearer?.health || 0
.["health_max"] = mod.wearer?.getMaxHealth() || 0
- .["loss_brute"] = mod.wearer?.getBruteLoss() || 0
- .["loss_fire"] = mod.wearer?.getFireLoss() || 0
- .["loss_tox"] = mod.wearer?.getToxLoss() || 0
- .["loss_oxy"] = mod.wearer?.getOxyLoss() || 0
+ .["loss_brute"] = mod.wearer?.get_brute_loss() || 0
+ .["loss_fire"] = mod.wearer?.get_fire_loss() || 0
+ .["loss_tox"] = mod.wearer?.get_tox_loss() || 0
+ .["loss_oxy"] = mod.wearer?.get_oxy_loss() || 0
return .
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index 31aecf9ba69..3917e2a2c5d 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -425,7 +425,7 @@
mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
mod.wearer.SetAllImmobility(0)
- mod.wearer.adjustStaminaLoss(-200)
+ mod.wearer.adjust_stamina_loss(-200)
mod.wearer.remove_status_effect(/datum/status_effect/speech/stutter)
mod.wearer.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5)
reagents.remove_reagent(reagent_required, reagents.total_volume * 0.75)
diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm
index 20c01a57978..3bc992ecfe6 100644
--- a/code/modules/mod/modules/modules_timeline.dm
+++ b/code/modules/mod/modules/modules_timeline.dm
@@ -172,7 +172,7 @@
//phasing out
mod.visible_message(span_warning("[mod.wearer] leaps out of the timeline!"))
mod.wearer.SetAllImmobility(0)
- mod.wearer.setStaminaLoss(0)
+ mod.wearer.set_stamina_loss(0)
phased_mob = new(get_turf(mod.wearer.loc), mod.wearer)
RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_block))
else
diff --git a/code/modules/modular_computers/file_system/programs/airestorer.dm b/code/modules/modular_computers/file_system/programs/airestorer.dm
index 0fe930cfd07..ced3798ef6f 100644
--- a/code/modules/modular_computers/file_system/programs/airestorer.dm
+++ b/code/modules/modular_computers/file_system/programs/airestorer.dm
@@ -41,9 +41,9 @@
if(stored_card.flush)
restoring = FALSE
return
- A.adjustOxyLoss(-5, FALSE)
- A.adjustFireLoss(-5, FALSE)
- A.adjustBruteLoss(-5, FALSE)
+ A.adjust_oxy_loss(-5, FALSE)
+ A.adjust_fire_loss(-5, FALSE)
+ A.adjust_brute_loss(-5, FALSE)
// Please don't forget to update health, otherwise the below if statements will probably always fail.
A.updatehealth()
diff --git a/code/modules/pai/defense.dm b/code/modules/pai/defense.dm
index 61fadf820bf..05b1eca4f5f 100644
--- a/code/modules/pai/defense.dm
+++ b/code/modules/pai/defense.dm
@@ -85,8 +85,8 @@
take_holo_damage(amount * ((forced) ? 1 : 0.25))
return COMPONENT_IGNORE_CHANGE
-/mob/living/silicon/pai/getBruteLoss()
+/mob/living/silicon/pai/get_brute_loss()
return HOLOCHASSIS_MAX_HEALTH - holochassis_health
-/mob/living/silicon/pai/getFireLoss()
+/mob/living/silicon/pai/get_fire_loss()
return HOLOCHASSIS_MAX_HEALTH - holochassis_health
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index 3875c5101e8..b921408feba 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -256,7 +256,7 @@
/mob/living/silicon/pai/updatehealth()
if(HAS_TRAIT(src, TRAIT_GODMODE))
return
- set_health(maxHealth - getBruteLoss() - getFireLoss())
+ set_health(maxHealth - get_brute_loss() - get_fire_loss())
update_stat()
SEND_SIGNAL(src, COMSIG_LIVING_HEALTH_UPDATE)
diff --git a/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm b/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
index 3cb6c8fd82c..b883e051a04 100644
--- a/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
@@ -168,7 +168,7 @@
investigate_log("was entered by [key_name(consumed_mob)].", INVESTIGATE_ENGINE)
consumed_mob.forceMove(arrival_turf)
consumed_mob.Paralyze(100)
- consumed_mob.adjustBruteLoss(30)
+ consumed_mob.adjust_brute_loss(30)
consumed_mob.flash_act(1, TRUE, TRUE)
new /obj/effect/particle_effect/sparks(consumed_object)
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index ab4e38dbb95..fdef40f5f0f 100644
--- a/code/modules/projectiles/ammunition/ballistic/rifle.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -145,10 +145,10 @@
casing.heals_left -= seconds_per_tick * 1 SECONDS
var/update_health = FALSE
var/healing = -healing_per_second * seconds_per_tick
- update_health += owner.adjustBruteLoss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- update_health += owner.adjustFireLoss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- update_health += owner.adjustToxLoss(healing, updating_health = FALSE, required_biotype = BODYTYPE_ORGANIC)
- update_health += owner.adjustOxyLoss(healing, updating_health = FALSE, required_biotype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_brute_loss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_fire_loss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_tox_loss(healing, updating_health = FALSE, required_biotype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_oxy_loss(healing, updating_health = FALSE, required_biotype = BODYTYPE_ORGANIC)
if (update_health)
owner.updatehealth()
if (can_sleep && (owner.mob_biotypes & MOB_ORGANIC))
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index b2f5ab1b5be..183cb612ada 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -176,11 +176,11 @@
switch(fail_tick)
if(0 to 200)
fail_tick += (2*(fail_chance))
- M.adjustFireLoss(3)
+ M.adjust_fire_loss(3)
to_chat(M, span_userdanger("Your [name] feels warmer."))
if(201 to INFINITY)
SSobj.processing.Remove(src)
- M.adjustFireLoss(10)
+ M.adjust_fire_loss(10)
reactor_overloaded = TRUE
to_chat(M, span_userdanger("Your [name]'s reactor overloads!"))
diff --git a/code/modules/projectiles/guns/special/medbeam.dm b/code/modules/projectiles/guns/special/medbeam.dm
index 5548433f0fe..0631425f0a7 100644
--- a/code/modules/projectiles/guns/special/medbeam.dm
+++ b/code/modules/projectiles/guns/special/medbeam.dm
@@ -114,10 +114,10 @@
if(target.health != target.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(target), COLOR_HEALING_CYAN)
var/need_mob_update
- need_mob_update = target.adjustBruteLoss(-4, updating_health = FALSE, forced = TRUE)
- need_mob_update += target.adjustFireLoss(-4, updating_health = FALSE, forced = TRUE)
- need_mob_update += target.adjustToxLoss(-1, updating_health = FALSE, forced = TRUE)
- need_mob_update += target.adjustOxyLoss(-1, updating_health = FALSE, forced = TRUE)
+ need_mob_update = target.adjust_brute_loss(-4, updating_health = FALSE, forced = TRUE)
+ need_mob_update += target.adjust_fire_loss(-4, updating_health = FALSE, forced = TRUE)
+ need_mob_update += target.adjust_tox_loss(-1, updating_health = FALSE, forced = TRUE)
+ need_mob_update += target.adjust_oxy_loss(-1, updating_health = FALSE, forced = TRUE)
if(need_mob_update)
target.updatehealth()
return
diff --git a/code/modules/projectiles/guns/special/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm
index 8cdd60ea846..1de98ab47b8 100644
--- a/code/modules/projectiles/guns/special/syringe_gun.dm
+++ b/code/modules/projectiles/guns/special/syringe_gun.dm
@@ -229,5 +229,5 @@
if(!.)
return
visible_message(span_danger("[user] shoots the blowgun!"))
- user.adjustStaminaLoss(20, updating_stamina = FALSE)
- user.adjustOxyLoss(20)
+ user.adjust_stamina_loss(20, updating_stamina = FALSE)
+ user.adjust_oxy_loss(20)
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index 298a9f2164b..1b8bd34088b 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -178,7 +178,7 @@
/obj/projectile/bullet/pea/on_hit(mob/living/carbon/target, blocked = 0, pierce_hit)
if(istype(target) && blocked != 100)
if(iszombie(target)) // https://www.youtube.com/watch?v=ssZoq1eUK-s
- target.adjustBruteLoss(15)
+ target.adjust_brute_loss(15)
if(target.can_inject(target_zone = def_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
..()
reagents.trans_to(target, reagents.total_volume, methods = INJECT)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index b7c761e49bc..54791311f9d 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -354,7 +354,7 @@
. = ..()
if(iscarbon(target))
if(istype(get_area(target), /area/deathmatch))
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 25) // Roughly 8 hits to kill
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 25) // Roughly 8 hits to kill
target.visible_message(span_warning("[target] grips their head in pain!"))
return BULLET_ACT_HIT
for(var/x in target.get_traumas())//checks to see if the victim is already going through possession
diff --git a/code/modules/projectiles/projectile/special/floral.dm b/code/modules/projectiles/projectile/special/floral.dm
index 608679bf6da..32a43cb56ef 100644
--- a/code/modules/projectiles/projectile/special/floral.dm
+++ b/code/modules/projectiles/projectile/special/floral.dm
@@ -28,11 +28,11 @@
/obj/projectile/energy/flora/mut/on_hit_plant_effect(mob/living/hit_plant)
if(prob(85))
- hit_plant.adjustFireLoss(rand(5, 15))
+ hit_plant.adjust_fire_loss(rand(5, 15))
hit_plant.show_message(span_userdanger("The radiation beam singes you!"))
return
- hit_plant.adjustToxLoss(rand(3, 6))
+ hit_plant.adjust_tox_loss(rand(3, 6))
hit_plant.Paralyze(10 SECONDS)
hit_plant.visible_message(
span_warning("[hit_plant] writhes in pain as [hit_plant.p_their()] vacuoles boil."),
diff --git a/code/modules/projectiles/projectile/special/mindflayer.dm b/code/modules/projectiles/projectile/special/mindflayer.dm
index 9f15e9389d5..139ae7f46b7 100644
--- a/code/modules/projectiles/projectile/special/mindflayer.dm
+++ b/code/modules/projectiles/projectile/special/mindflayer.dm
@@ -5,5 +5,5 @@
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/human_hit = target
- human_hit.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20)
+ human_hit.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20)
human_hit.adjust_hallucinations(60 SECONDS)
diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
index 58ed84f53dc..03e391bda39 100644
--- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
@@ -47,9 +47,9 @@
. = ..()
breather.SetSleeping(30 SECONDS)
var/need_mob_update
- need_mob_update = breather.adjustFireLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += breather.adjustToxLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += breather.adjustBruteLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = breather.adjust_fire_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += breather.adjust_tox_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += breather.adjust_brute_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -80,8 +80,8 @@
/datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = breather.adjustStaminaLoss(-4 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
- need_mob_update += breather.adjustToxLoss(0.1 * (current_cycle-1) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) // 1 toxin damage per cycle at cycle 10
+ need_mob_update = breather.adjust_stamina_loss(-4 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += breather.adjust_tox_loss(0.1 * (current_cycle-1) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) // 1 toxin damage per cycle at cycle 10
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -135,9 +135,9 @@
/datum/reagent/zauker/on_mob_life(mob/living/breather, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = breather.adjustBruteLoss(6 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += breather.adjustOxyLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += breather.adjustFireLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += breather.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = breather.adjust_brute_loss(6 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += breather.adjust_oxy_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += breather.adjust_fire_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += breather.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index b5d56394014..01ba8ed7100 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -26,22 +26,22 @@
/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- var/death_is_coming = (affected_mob.getToxLoss() + affected_mob.getOxyLoss() + affected_mob.getFireLoss() + affected_mob.getBruteLoss())*normalise_creation_purity()
+ var/death_is_coming = (affected_mob.get_tox_loss() + affected_mob.get_oxy_loss() + affected_mob.get_fire_loss() + affected_mob.get_brute_loss())*normalise_creation_purity()
var/thou_shall_heal = 0
var/good_kind_of_healing = FALSE
var/need_mob_update = FALSE
switch(affected_mob.stat)
if(CONSCIOUS) //bad
thou_shall_heal = max(death_is_coming/20, 3)
- need_mob_update += affected_mob.adjustOxyLoss(2 * REM * seconds_per_tick, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_oxy_loss(2 * REM * seconds_per_tick, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(SOFT_CRIT) //meh convert
thou_shall_heal = round(death_is_coming/13,0.1)
- need_mob_update += affected_mob.adjustOxyLoss(1 * REM * seconds_per_tick, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_oxy_loss(1 * REM * seconds_per_tick, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
good_kind_of_healing = TRUE
else //no convert
thou_shall_heal = round(death_is_coming/10, 0.1)
good_kind_of_healing = TRUE
- need_mob_update += affected_mob.adjustBruteLoss(-thou_shall_heal * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_brute_loss(-thou_shall_heal * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
@@ -110,8 +110,8 @@
/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update += affected_mob.adjustBruteLoss(-3 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_brute_loss(-3 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -128,28 +128,28 @@
/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(-3 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(-3 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
var/ooo_youaregettingsleepy = 3.5
- switch(round(affected_mob.getStaminaLoss()))
+ switch(round(affected_mob.get_stamina_loss()))
if(10 to 40)
ooo_youaregettingsleepy = 3
if(41 to 60)
ooo_youaregettingsleepy = 2.5
if(61 to 200) //you really can only go to 120
ooo_youaregettingsleepy = 2
- need_mob_update += affected_mob.adjustStaminaLoss(ooo_youaregettingsleepy * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(ooo_youaregettingsleepy * REM * seconds_per_tick, updating_stamina = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/c2/probital/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
- if(affected_mob.getStaminaLoss() >= 80)
+ need_mob_update = affected_mob.adjust_stamina_loss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
+ if(affected_mob.get_stamina_loss() >= 80)
affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick)
- if(affected_mob.getStaminaLoss() >= 100)
+ if(affected_mob.get_stamina_loss() >= 100)
to_chat(affected_mob,span_warning("You feel more tired than you usually do, perhaps if you rest your eyes for a bit..."))
- need_mob_update += affected_mob.adjustStaminaLoss(-100, updating_stamina = FALSE) // Don't add the biotype parameter here as it results in infinite sleep and chat spam.
+ need_mob_update += affected_mob.adjust_stamina_loss(-100, updating_stamina = FALSE) // Don't add the biotype parameter here as it results in infinite sleep and chat spam.
affected_mob.Sleeping(10 SECONDS)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -179,8 +179,8 @@
/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustFireLoss(-3.75 * REM * normalise_creation_purity() * seconds_per_tick, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_fire_loss(-3.75 * REM * normalise_creation_purity() * seconds_per_tick, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_STOMACH, 0.4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -198,8 +198,8 @@
/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustFireLoss(-2 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_fire_loss(-2 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_EYES, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -217,10 +217,10 @@
/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- if(affected_mob.getFireLoss() > 50)
- need_mob_update = affected_mob.adjustFireLoss(-3 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
+ if(affected_mob.get_fire_loss() > 50)
+ need_mob_update = affected_mob.adjust_fire_loss(-3 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
else
- need_mob_update = affected_mob.adjustFireLoss(-2.25 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_fire_loss(-2.25 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
affected_mob.adjust_bodytemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50)
if(ishuman(affected_mob))
var/mob/living/carbon/human/humi = affected_mob
@@ -266,10 +266,10 @@
. = ..()
var/oxycalc = 2.5 * REM * (current_cycle-1)
if(!overdosed)
- oxycalc = min(oxycalc, affected_mob.getOxyLoss() + 0.5) //if NOT overdosing, we lower our toxdamage to only the damage we actually healed with a minimum of 0.1*current_cycle. IE if we only heal 10 oxygen damage but we COULD have healed 20, we will only take toxdamage for the 10. We would take the toxdamage for the extra 10 if we were overdosing.
+ oxycalc = min(oxycalc, affected_mob.get_oxy_loss() + 0.5) //if NOT overdosing, we lower our toxdamage to only the damage we actually healed with a minimum of 0.1*current_cycle. IE if we only heal 10 oxygen damage but we COULD have healed 20, we will only take toxdamage for the 10. We would take the toxdamage for the extra 10 if we were overdosing.
var/need_mob_update
- need_mob_update = affected_mob.adjustOxyLoss(-oxycalc * seconds_per_tick * normalise_creation_purity(), FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustToxLoss(oxycalc * seconds_per_tick / CONVERMOL_RATIO, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_oxy_loss(-oxycalc * seconds_per_tick * normalise_creation_purity(), FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_tox_loss(oxycalc * seconds_per_tick / CONVERMOL_RATIO, updating_health = FALSE, required_biotype = affected_biotype)
if(SPT_PROB((current_cycle-1) / 2, seconds_per_tick) && affected_mob.losebreath)
affected_mob.losebreath--
need_mob_update = TRUE
@@ -297,8 +297,8 @@
/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOxyLoss(-4.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustStaminaLoss(2 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_oxy_loss(-4.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_stamina_loss(2 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(drowsycd && COOLDOWN_FINISHED(src, drowsycd))
affected_mob.adjust_drowsiness(20 SECONDS)
COOLDOWN_START(src, drowsycd, 45 SECONDS)
@@ -340,7 +340,7 @@
var/toxcalc = min(round(5 + ((chemtemp-1000)/175), 0.1), 5) * REM * seconds_per_tick * normalise_creation_purity() //max 2.5 tox healing per second
var/need_mob_update
if(toxcalc > 0)
- need_mob_update = affected_mob.adjustToxLoss(-toxcalc, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_tox_loss(-toxcalc, updating_health = FALSE, required_biotype = affected_biotype)
healypoints += toxcalc
//and you're cold
@@ -349,14 +349,14 @@
radcalc *= normalise_creation_purity()
// extra rad healing if you are SUPER cold
if(chemtemp < rads_heal_threshold*0.1)
- need_mob_update += affected_mob.adjustToxLoss(-radcalc * 0.9, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(-radcalc * 0.9, updating_health = FALSE, required_biotype = affected_biotype)
else if(chemtemp < rads_heal_threshold)
- need_mob_update += affected_mob.adjustToxLoss(-radcalc * 0.75, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(-radcalc * 0.75, updating_health = FALSE, required_biotype = affected_biotype)
healypoints += (radcalc / 5)
//you're yes and... oh no!
healypoints = round(healypoints, 0.1)
- affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, healypoints / 5, required_organ_flag = affected_organ_flags)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, healypoints / 5, required_organ_flag = affected_organ_flags)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -378,8 +378,8 @@
if(creation_purity >= 1) //Perfectly pure multivers gives a bonus of 2!
medibonus += 1
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(-0.5 * min(medibonus, 3 * normalise_creation_purity()) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) //not great at healing but if you have nothing else it will work
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) //kills at 40u
+ need_mob_update = affected_mob.adjust_tox_loss(-0.5 * min(medibonus, 3 * normalise_creation_purity()) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) //not great at healing but if you have nothing else it will work
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) //kills at 40u
if(!holder.has_reagent(/datum/reagent/toxin/anacea))
for(var/datum/reagent/second_reagent as anything in affected_mob.reagents.reagent_list)
if(second_reagent == src)
@@ -412,7 +412,7 @@
return
if(trans_volume >= 0.4) //prevents cheesing with ultralow doses.
- exposed_mob.adjustToxLoss((-3 * min(2, trans_volume) * REM) * normalise_creation_purity(), required_biotype = affected_biotype) //This is to promote iv pole use for that chemotherapy feel.
+ exposed_mob.adjust_tox_loss((-3 * min(2, trans_volume) * REM) * normalise_creation_purity(), required_biotype = affected_biotype) //This is to promote iv pole use for that chemotherapy feel.
var/obj/item/organ/liver/L = exposed_mob.organs_slot[ORGAN_SLOT_LIVER]
if(!L || L.organ_flags & ORGAN_FAILING)
return
@@ -425,8 +425,8 @@
/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update += affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.8 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
for(var/datum/reagent/R in affected_mob.reagents.reagent_list)
if(issyrinormusc(R))
continue
@@ -437,7 +437,7 @@
/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_disgust(3 * REM * seconds_per_tick)
affected_mob.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, 0.225 * REM * seconds_per_tick)
@@ -455,8 +455,8 @@
/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update += affected_mob.adjustToxLoss(-1.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_tox_loss(-1.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype)
for(var/datum/reagent/reagent as anything in affected_mob.reagents.reagent_list)
if(issyrinormusc(reagent))
continue
@@ -476,7 +476,7 @@
/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_disgust(3 * REM * seconds_per_tick)
@@ -498,18 +498,18 @@
if(!(methods & (PATCH|TOUCH|VAPOR)))
return
- var/current_bruteloss = carbies.getBruteLoss() // because this will be changed after calling adjustBruteLoss()
- var/current_fireloss = carbies.getFireLoss() // because this will be changed after calling adjustFireLoss()
+ var/current_bruteloss = carbies.get_brute_loss() // because this will be changed after calling adjust_brute_loss()
+ var/current_fireloss = carbies.get_fire_loss() // because this will be changed after calling adjust_fire_loss()
var/touch_protection_interference = (1 - touch_protection)
if(!touch_protection_interference)
return
- var/harmies = clamp(carbies.adjustBruteLoss(-1.25 * reac_volume * touch_protection_interference, updating_health = FALSE, required_bodytype = affected_bodytype), 0, current_bruteloss)
- var/burnies = clamp(carbies.adjustFireLoss(-1.25 * reac_volume * touch_protection_interference, updating_health = FALSE, required_bodytype = affected_bodytype), 0, current_fireloss)
+ var/harmies = clamp(carbies.adjust_brute_loss(-1.25 * reac_volume * touch_protection_interference, updating_health = FALSE, required_bodytype = affected_bodytype), 0, current_bruteloss)
+ var/burnies = clamp(carbies.adjust_fire_loss(-1.25 * reac_volume * touch_protection_interference, updating_health = FALSE, required_bodytype = affected_bodytype), 0, current_fireloss)
for(var/i in carbies.all_wounds)
var/datum/wound/iter_wound = i
iter_wound.on_synthflesh(reac_volume)
var/need_mob_update = harmies + burnies
- need_mob_update = carbies.adjustToxLoss((harmies + burnies)*(0.5 + (0.25*(1-creation_purity))), updating_health = FALSE, required_biotype = affected_biotype) || need_mob_update //0.5 - 0.75
+ need_mob_update = carbies.adjust_tox_loss((harmies + burnies)*(0.5 + (0.25*(1-creation_purity))), updating_health = FALSE, required_biotype = affected_biotype) || need_mob_update //0.5 - 0.75
if(need_mob_update)
carbies.updatehealth()
@@ -524,7 +524,7 @@
return
//don't try to unhusk mobs above burn damage threshold
- if(carbies.getFireLoss() > UNHUSK_DAMAGE_THRESHOLD)
+ if(carbies.get_fire_loss() > UNHUSK_DAMAGE_THRESHOLD)
if(show_message && !need_mob_update)
carbies.visible_message(span_minoralert("The liquid fails to properly stick on [carbies]. [carbies]'s burns need to be repaired first!"))
return
@@ -597,17 +597,17 @@
/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_STOMACH, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(affected_mob.health <= HEALTH_THRESHOLD_CRIT && affected_mob.health > (affected_mob.crit_threshold + HEALTH_THRESHOLD_FULLCRIT * (2 * normalise_creation_purity()))) //we cannot save someone below our lowered crit threshold.
- need_mob_update += affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustBruteLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-6 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_brute_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-6 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
affected_mob.losebreath = 0
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, max(volume/10, 1) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) // your heart is barely keeping up!
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, max(volume/10, 1) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) // your heart is barely keeping up!
affected_mob.set_jitter_if_lower(rand(0 SECONDS, 4 SECONDS) * REM * seconds_per_tick)
affected_mob.set_dizzy_if_lower(rand(0 SECONDS, 4 SECONDS) * REM * seconds_per_tick)
@@ -635,8 +635,8 @@
. = ..()
REMOVE_TRAIT(affected_mob, TRAIT_STABLEHEART, type)
var/need_mob_update
- need_mob_update = affected_mob.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, 10 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_stamina_loss(10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, 10 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
need_mob_update += affected_mob.set_heartattack(TRUE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index f0d7f4289e1..0672c71e0da 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -263,7 +263,7 @@
eyes.forceMove(get_turf(drinker))
to_chat(drinker, span_userdanger("You double over in pain as you feel your eyeballs liquify in your head!"))
drinker.emote("scream")
- if(drinker.adjustBruteLoss(15 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
+ if(drinker.adjust_brute_loss(15 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
. = UPDATE_MOB_HEALTH
else
to_chat(drinker, span_userdanger("You scream in terror as you go blind!"))
@@ -303,7 +303,7 @@
/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
- if(drinker.getBruteLoss() && SPT_PROB(5, seconds_per_tick))
+ if(drinker.get_brute_loss() && SPT_PROB(5, seconds_per_tick))
if(drinker.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
@@ -557,10 +557,10 @@
. = ..()
var/need_mob_update
if(cubano.mind && cubano.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries.
- need_mob_update = cubano.adjustBruteLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += cubano.adjustFireLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += cubano.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += cubano.adjustOxyLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = cubano.adjust_brute_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += cubano.adjust_fire_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += cubano.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += cubano.adjust_oxy_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -647,7 +647,7 @@
if(HAS_TRAIT(liver, TRAIT_ENGINEER_METABOLISM))
ADD_TRAIT(drinker, TRAIT_HALT_RADIATION_EFFECTS, "[type]")
if (HAS_TRAIT(drinker, TRAIT_IRRADIATED))
- if(drinker.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_end_metabolize(mob/living/drinker)
@@ -771,7 +771,7 @@
var/obj/item/organ/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER)
// if you have a liver and that liver is an officer's liver
if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM))
- if(drinker.adjustStaminaLoss(-10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_stamina_loss(-10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
if(SPT_PROB(10, seconds_per_tick))
drinker.cause_hallucination(get_random_valid_hallucination_subtype(/datum/hallucination/nearby_fake_item), name)
@@ -822,8 +822,8 @@
. = ..()
if(dorf_mode)
var/need_mob_update
- need_mob_update = dwarf.adjustBruteLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += dwarf.adjustFireLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = dwarf.adjust_brute_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += dwarf.adjust_fire_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -946,7 +946,7 @@
if(ishuman(drinker)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes.
var/mob/living/carbon/human/unshoed = drinker
if(!unshoed.shoes)
- if(unshoed.adjustBruteLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
+ if(unshoed.adjust_brute_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/snowwhite
@@ -1356,10 +1356,10 @@
. = ..()
if(drinker.health <= 0)
var/need_mob_update
- need_mob_update = drinker.adjustBruteLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustFireLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustOxyLoss(-4 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += drinker.adjustToxLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = drinker.adjust_brute_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += drinker.adjust_fire_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += drinker.adjust_oxy_loss(-4 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += drinker.adjust_tox_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1393,7 +1393,7 @@
drinker.Sleeping(100 * REM * seconds_per_tick)
if(202 to INFINITY)
drinker.AdjustSleeping(4 SECONDS * REM * seconds_per_tick)
- if(drinker.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/gargle_blaster
@@ -1417,7 +1417,7 @@
if(56 to 201)
drinker.set_drugginess(110 SECONDS * REM * seconds_per_tick)
if(201 to INFINITY)
- if(drinker.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/neurotoxin
@@ -1438,18 +1438,18 @@
drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick)
drinker.adjust_dizzy(4 SECONDS * REM * seconds_per_tick)
var/need_mob_update
- need_mob_update = drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick, 150, required_organ_flag = affected_organ_flags)
+ need_mob_update = drinker.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick, 150, required_organ_flag = affected_organ_flags)
if(SPT_PROB(10, seconds_per_tick))
- need_mob_update += drinker.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_stamina_loss(10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
drinker.drop_all_held_items()
to_chat(drinker, span_notice("You cant feel your hands!"))
if(current_cycle > 6)
if(SPT_PROB(10, seconds_per_tick))
var/paralyzed_limb = pick_paralyzed_limb()
ADD_TRAIT(drinker, paralyzed_limb, type)
- need_mob_update += drinker.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_stamina_loss(10 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(current_cycle > 31)
- need_mob_update += drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += drinker.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(current_cycle > 51 && SPT_PROB(7.5, seconds_per_tick))
if(!drinker.undergoing_cardiac_arrest() && drinker.can_heartattack())
drinker.set_heartattack(TRUE)
@@ -1464,7 +1464,7 @@
REMOVE_TRAIT(drinker, TRAIT_PARALYSIS_R_ARM, type)
REMOVE_TRAIT(drinker, TRAIT_PARALYSIS_R_LEG, type)
REMOVE_TRAIT(drinker, TRAIT_PARALYSIS_L_LEG, type)
- drinker.adjustStaminaLoss(10, required_biotype = affected_biotype)
+ drinker.adjust_stamina_loss(10, required_biotype = affected_biotype)
/datum/reagent/consumable/ethanol/hippies_delight
name = "Hippie's Delight"
@@ -1506,7 +1506,7 @@
if(SPT_PROB(23, seconds_per_tick))
drinker.emote(pick("twitch","giggle"))
if(SPT_PROB(16, seconds_per_tick))
- if(drinker.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/eggnog
@@ -1608,7 +1608,7 @@
if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM))
var/need_mob_update
need_mob_update = drinker.heal_bodypart_damage(2 * REM * seconds_per_tick, 2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustStaminaLoss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_stamina_loss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1649,12 +1649,12 @@
heal_points = 20 //heal more if we're in softcrit
var/need_mob_update
var/heal_amt = min(volume, heal_points) //only heals 1 point of damage per unit on add, for balance reasons
- need_mob_update = drinker.adjustBruteLoss(-heal_amt, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustFireLoss(-heal_amt, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustToxLoss(-heal_amt, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += drinker.adjustOxyLoss(-heal_amt, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = drinker.adjust_brute_loss(-heal_amt, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += drinker.adjust_fire_loss(-heal_amt, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += drinker.adjust_tox_loss(-heal_amt, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_oxy_loss(-heal_amt, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
// heal stamina loss on first metabolization, but only to a max of 20
- need_mob_update += drinker.adjustStaminaLoss(max(-heal_amt * 5, -20), updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_stamina_loss(max(-heal_amt * 5, -20), updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
drinker.updatehealth()
drinker.visible_message(span_warning("[drinker] shivers with renewed vigor!"), span_notice("One taste of [LOWER_TEXT(name)] fills you with energy!"))
@@ -1665,11 +1665,11 @@
. = ..()
if(drinker.health > 0)
var/need_mob_update
- need_mob_update = drinker.adjustBruteLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustFireLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += drinker.adjustToxLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += drinker.adjustOxyLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += drinker.adjustStaminaLoss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update = drinker.adjust_brute_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += drinker.adjust_fire_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += drinker.adjust_tox_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_oxy_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += drinker.adjust_stamina_loss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1720,7 +1720,7 @@
/datum/reagent/consumable/ethanol/crevice_spike/on_mob_metabolize(mob/living/drinker) //damage only applies when drink first enters system and won't again until drink metabolizes out
. = ..()
- drinker.adjustBruteLoss(3 * min(5,volume), required_bodytype = affected_bodytype) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
+ drinker.adjust_brute_loss(3 * min(5,volume), required_bodytype = affected_bodytype) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
/datum/reagent/consumable/ethanol/sake
name = "Sake"
@@ -1822,15 +1822,15 @@
return
var/need_mob_update
- if(drinker.getBruteLoss() && drinker.getFireLoss()) //If you are damaged by both types, slightly increased healing but it only heals one. The more the merrier wink wink.
+ if(drinker.get_brute_loss() && drinker.get_fire_loss()) //If you are damaged by both types, slightly increased healing but it only heals one. The more the merrier wink wink.
if(prob(50))
- need_mob_update = drinker.adjustBruteLoss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = drinker.adjust_brute_loss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
else
- need_mob_update = drinker.adjustFireLoss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- else if(drinker.getBruteLoss()) //If you have only one, it still heals but not as well.
- need_mob_update = drinker.adjustBruteLoss(-0.2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- else if(drinker.getFireLoss())
- need_mob_update = drinker.adjustFireLoss(-0.2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = drinker.adjust_fire_loss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ else if(drinker.get_brute_loss()) //If you have only one, it still heals but not as well.
+ need_mob_update = drinker.adjust_brute_loss(-0.2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ else if(drinker.get_fire_loss())
+ need_mob_update = drinker.adjust_fire_loss(-0.2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1873,7 +1873,7 @@
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
if(drinker.nutrition <= NUTRITION_LEVEL_STARVING)
- if(drinker.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
drinker.adjust_nutrition(-5 * REM * seconds_per_tick)
drinker.overeatduration = 0
@@ -1890,7 +1890,7 @@
/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
if(drinker.nutrition <= NUTRITION_LEVEL_STARVING)
- if(drinker.adjustToxLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
drinker.adjust_nutrition(-3 * REM * seconds_per_tick)
drinker.overeatduration = 0
@@ -1913,7 +1913,7 @@
/datum/reagent/consumable/ethanol/fanciulli/on_mob_metabolize(mob/living/drinker)
. = ..()
if(drinker.health > 0)
- drinker.adjustStaminaLoss(20, required_biotype = affected_biotype)
+ drinker.adjust_stamina_loss(20, required_biotype = affected_biotype)
/datum/reagent/consumable/ethanol/branca_menta
name = "Branca Menta"
@@ -1932,7 +1932,7 @@
/datum/reagent/consumable/ethanol/branca_menta/on_mob_metabolize(mob/living/drinker)
. = ..()
if(drinker.health > 0)
- drinker.adjustStaminaLoss(35, required_biotype = affected_biotype)
+ drinker.adjust_stamina_loss(35, required_biotype = affected_biotype)
/datum/reagent/consumable/ethanol/blank_paper
name = "Blank Paper"
@@ -2081,9 +2081,9 @@
if(drinker?.mind?.has_antag_datum(/datum/antagonist/wizard))
var/need_mob_update
need_mob_update = drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += drinker.adjustOxyLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += drinker.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += drinker.adjustStaminaLoss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_oxy_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += drinker.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += drinker.adjust_stamina_loss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -2104,7 +2104,7 @@
/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
// Does some damage to bug biotypes
- if(drinker.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
// Random chance of causing a screm if we did some damage
if(SPT_PROB(2, seconds_per_tick))
@@ -2140,7 +2140,7 @@
. = ..()
if(SPT_PROB(2, seconds_per_tick))
to_chat(drinker, span_notice("[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]"))
- if(drinker.adjustStaminaLoss(-0.5 * drinker.get_drunk_amount() * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype))
+ if(drinker.adjust_stamina_loss(-0.5 * drinker.get_drunk_amount() * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/old_timer
@@ -2200,7 +2200,7 @@
/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
if(drinker.mind?.holy_role)
- if(drinker.adjustFireLoss(-2.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
+ if(drinker.adjust_fire_loss(-2.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
. = UPDATE_MOB_HEALTH
drinker.adjust_jitter(-2 SECONDS * REM * seconds_per_tick)
drinker.adjust_stutter(-2 SECONDS * REM * seconds_per_tick)
@@ -2340,7 +2340,7 @@
/datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
- if(drinker.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(drinker.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
if(drinker.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE))
return UPDATE_MOB_HEALTH
@@ -2984,7 +2984,7 @@
. = ..()
affected_mob.apply_status_effect(/datum/status_effect/headache_soothed) //prevents headaches
affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) //removes disgust, same with sol dry
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -0.5 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags)) //heals brain damage very slowly, about 12 damage per 5u
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, -0.5 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags)) //heals brain damage very slowly, about 12 damage per 5u
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/ethanol/blue_blazer
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index ad136c4ca78..cfeb3d55a1b 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -9,8 +9,8 @@
/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getOxyLoss() && SPT_PROB(16, seconds_per_tick))
- if(affected_mob.adjustOxyLoss(-1 * REM * seconds_per_tick, FALSE, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
+ if(affected_mob.get_oxy_loss() && SPT_PROB(16, seconds_per_tick))
+ if(affected_mob.adjust_oxy_loss(-1 * REM * seconds_per_tick, FALSE, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/tomatojuice
@@ -23,7 +23,7 @@
/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getFireLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_fire_loss() && SPT_PROB(10, seconds_per_tick))
if(affected_mob.heal_bodypart_damage(brute = 0, burn = 1 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
@@ -38,8 +38,8 @@
/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.get_tox_loss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/carrotjuice
@@ -57,9 +57,9 @@
switch(current_cycle)
if(21 to 110)
if(SPT_PROB(100 * (1 - (sqrt(110 - current_cycle) / 10)), seconds_per_tick))
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, -2 * REM * seconds_per_tick)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_EYES, -2 * REM * seconds_per_tick)
if(110 to INFINITY)
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, -2 * REM * seconds_per_tick)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_EYES, -2 * REM * seconds_per_tick)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -86,7 +86,7 @@
/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/watermelonjuice
@@ -183,7 +183,7 @@
. = ..()
var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER)
if((liver && HAS_TRAIT(liver, TRAIT_CORONER_METABOLISM)))
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/grapejuice
@@ -219,7 +219,7 @@
myseed.adjust_potency(-round(volume * 0.5))
/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
- if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
if(affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE))
. = UPDATE_MOB_HEALTH
if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
@@ -242,7 +242,7 @@
/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
if(affected_mob.heal_bodypart_damage(1, 0))
return UPDATE_MOB_HEALTH
@@ -301,8 +301,8 @@
affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_jitter(-6 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick)
- if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.get_tox_loss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
@@ -400,7 +400,7 @@
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustSleeping(-6 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-7 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/icetea
@@ -417,8 +417,8 @@
affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
- if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.get_tox_loss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
@@ -492,7 +492,7 @@
REMOVE_TRAIT(affected_mob, TRAIT_DOUBLE_TAP, type)
if(current_cycle > 10)
to_chat(affected_mob, span_warning("You feel kinda tired as your sugar rush wears off..."))
- affected_mob.adjustStaminaLoss(min(80, current_cycle * 3), required_biotype = affected_biotype)
+ affected_mob.adjust_stamina_loss(min(80, current_cycle * 3), required_biotype = affected_biotype)
affected_mob.adjust_drowsiness((current_cycle-1) * 2 SECONDS)
/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
@@ -658,11 +658,11 @@
var/need_mob_update
switch(affected_mob.mob_mood.sanity_level)
if (SANITY_LEVEL_GREAT to SANITY_LEVEL_NEUTRAL)
- need_mob_update = affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update = affected_mob.adjust_brute_loss(-1.5 * REM * seconds_per_tick, updating_health = FALSE)
if (SANITY_LEVEL_DISTURBED to SANITY_LEVEL_UNSTABLE)
affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers)
if (SANITY_LEVEL_CRAZY to SANITY_LEVEL_INSANE)
- need_mob_update = affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update = affected_mob.adjust_stamina_loss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -732,7 +732,7 @@
var/need_mob_update
need_mob_update = affected_mob.SetSleeping(0)
affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
- if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
need_mob_update += affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -759,7 +759,7 @@
var/need_mob_update
need_mob_update = affected_mob.SetSleeping(0)
affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
- if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
need_mob_update += affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -775,10 +775,10 @@
/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustToxLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_brute_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_tox_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(affected_mob.nutrition && (affected_mob.nutrition - 2 > 0))
var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER)
if(!(HAS_TRAIT(liver, TRAIT_MEDICAL_METABOLISM)))
@@ -890,7 +890,7 @@
var/need_mob_update
need_mob_update = affected_mob.SetSleeping(0)
affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
- if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
need_mob_update += affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -955,7 +955,7 @@
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
- if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick))
if(affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE))
. = UPDATE_MOB_HEALTH
if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
@@ -1003,8 +1003,8 @@
. = ..()
if(IS_REVOLUTIONARY(drinker))
drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick)
- if(drinker.getStaminaLoss() < 80)
- drinker.adjustStaminaLoss(12, required_biotype = affected_biotype) //The pomegranate stops free radicals! Har har.
+ if(drinker.get_stamina_loss() < 80)
+ drinker.adjust_stamina_loss(12, required_biotype = affected_biotype) //The pomegranate stops free radicals! Har har.
/datum/reagent/consumable/parsnipjuice
name = "Parsnip Juice"
@@ -1113,8 +1113,8 @@
/datum/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getToxLoss() && SPT_PROB(16, seconds_per_tick))
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.get_tox_loss() && SPT_PROB(16, seconds_per_tick))
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/agua_fresca
@@ -1128,8 +1128,8 @@
/datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
- if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
- if(affected_mob.adjustToxLoss(-0.5, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.get_tox_loss() && SPT_PROB(10, seconds_per_tick))
+ if(affected_mob.adjust_tox_loss(-0.5, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/mushroom_tea
@@ -1143,7 +1143,7 @@
/datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(islizard(affected_mob))
- if(affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
+ if(affected_mob.adjust_oxy_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
return UPDATE_MOB_HEALTH
//Moth Stuff
@@ -1230,8 +1230,8 @@
/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired)
. = ..()
doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal())
- if(doll.getToxLoss() && SPT_PROB(10, seconds_per_tick))
- if(doll.adjustToxLoss(-0.5, updating_health = FALSE, required_biotype = affected_biotype))
+ if(doll.get_tox_loss() && SPT_PROB(10, seconds_per_tick))
+ if(doll.adjust_tox_loss(-0.5, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/mississippi_queen
@@ -1267,8 +1267,8 @@
affected_mob.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION)
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
- if(affected_mob.getToxLoss() && SPT_PROB(25, seconds_per_tick))
- if(affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.get_tox_loss() && SPT_PROB(25, seconds_per_tick))
+ if(affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/consumable/hakka_mate
@@ -1333,9 +1333,9 @@
if(found_valid_cooler)
affected_mob.clear_alert("punch_bad")
affected_mob.throw_alert("punch_good", /atom/movable/screen/alert/fruit_punch_good)
- need_mob_update = affected_mob.adjustToxLoss(-0.6 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update = affected_mob.adjustBruteLoss(-0.6 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update = affected_mob.adjustFireLoss(-0.6 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update = affected_mob.adjust_tox_loss(-0.6 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update = affected_mob.adjust_brute_loss(-0.6 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update = affected_mob.adjust_fire_loss(-0.6 * REM * seconds_per_tick, updating_health = FALSE)
affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/punch_punishment)
else
affected_mob.clear_alert("punch_good")
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 39e76fea268..42df93c4d68 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -93,8 +93,8 @@
/datum/reagent/drug/nicotine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOxyLoss(1.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_tox_loss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_oxy_loss(1.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -122,14 +122,14 @@
affected_human.set_facial_hairstyle("Shaved", update = FALSE)
affected_human.set_hairstyle("Bald", update = FALSE)
affected_mob.set_species(/datum/species/human/krokodil_addict)
- if(affected_mob.adjustBruteLoss(50 * REM, updating_health = FALSE, required_bodytype = affected_bodytype)) // holy shit your skin just FELL THE FUCK OFF
+ if(affected_mob.adjust_brute_loss(50 * REM, updating_health = FALSE, required_bodytype = affected_bodytype)) // holy shit your skin just FELL THE FUCK OFF
return UPDATE_MOB_HEALTH
/datum/reagent/drug/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update = affected_mob.adjustToxLoss(0.25 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_tox_loss(0.25 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -176,9 +176,9 @@
affected_mob.add_mood_event("tweaking", /datum/mood_event/stimulant_medium)
affected_mob.AdjustAllImmobility(-40 * REM * seconds_per_tick)
var/need_mob_update
- need_mob_update = affected_mob.adjustStaminaLoss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_stamina_loss(-5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
affected_mob.set_jitter_if_lower(4 SECONDS * REM * seconds_per_tick)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1, 4) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, rand(1, 4) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
if(SPT_PROB(2.5, seconds_per_tick))
@@ -195,8 +195,8 @@
affected_mob.visible_message(span_danger("[affected_mob]'s hands flip out and flail everywhere!"))
affected_mob.drop_all_held_items()
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, (rand(5, 10) / 10) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, (rand(5, 10) / 10) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -233,8 +233,8 @@
to_chat(affected_mob, span_notice("[high_message]"))
affected_mob.add_mood_event("salted", /datum/mood_event/stimulant_heavy)
var/need_mob_update
- need_mob_update = affected_mob.adjustStaminaLoss(-6 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_stamina_loss(-6 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
affected_mob.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
@@ -269,11 +269,11 @@
if(SPT_PROB(2.5, seconds_per_tick))
to_chat(affected_mob, span_notice("[high_message]"))
var/need_mob_update
- need_mob_update = affected_mob.adjustStaminaLoss(-18 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_stamina_loss(-18 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(SPT_PROB(30, seconds_per_tick))
affected_mob.losebreath++
- need_mob_update += affected_mob.adjustOxyLoss(1, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_oxy_loss(1, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -302,7 +302,7 @@
affected_mob.remove_status_effect(/datum/status_effect/jitter)
affected_mob.remove_status_effect(/datum/status_effect/confusion)
affected_mob.disgust = 0
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/drug/happiness/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
@@ -319,7 +319,7 @@
if(3)
affected_mob.emote("frown")
affected_mob.add_mood_event("happiness_drug", /datum/mood_event/happiness_drug_bad_od)
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/drug/pumpup
@@ -347,7 +347,7 @@
to_chat(affected_mob, span_notice("[pick("Go! Go! GO!", "You feel ready...", "You feel invincible...")]"))
if(SPT_PROB(7.5, seconds_per_tick))
affected_mob.losebreath++
- affected_mob.adjustToxLoss(2, updating_health = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_tox_loss(2, updating_health = FALSE, required_biotype = affected_biotype)
return UPDATE_MOB_HEALTH
/datum/reagent/drug/pumpup/overdose_start(mob/living/affected_mob)
@@ -364,10 +364,10 @@
affected_mob.emote(pick("twitch","drool"))
if(SPT_PROB(10, seconds_per_tick))
affected_mob.losebreath++
- affected_mob.adjustStaminaLoss(4, updating_stamina = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_stamina_loss(4, updating_stamina = FALSE, required_biotype = affected_biotype)
need_mob_update = TRUE
if(SPT_PROB(7.5, seconds_per_tick))
- need_mob_update += affected_mob.adjustToxLoss(2, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(2, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -397,7 +397,7 @@
/datum/reagent/drug/maint/powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
// 5x if you want to OD, you can potentially go higher, but good luck managing the brain damage.
var/amt = max(round(volume/3, 0.1), 1)
affected_mob?.mind?.experience_multiplier_reasons |= type
@@ -410,7 +410,7 @@
/datum/reagent/drug/maint/powder/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 6 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 6 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/drug/maint/sludge
@@ -425,7 +425,7 @@
/datum/reagent/drug/maint/sludge/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(0.5 * REM * seconds_per_tick, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/drug/maint/sludge/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
@@ -435,9 +435,9 @@
var/mob/living/carbon/carbie = affected_mob
//You will be vomiting so the damage is really for a few ticks before you flush it out of your system
var/need_mob_update
- need_mob_update = carbie.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = carbie.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(SPT_PROB(5, seconds_per_tick))
- need_mob_update += carbie.adjustToxLoss(5, required_biotype = affected_biotype, updating_health = FALSE)
+ need_mob_update += carbie.adjust_tox_loss(5, required_biotype = affected_biotype, updating_health = FALSE)
carbie.vomit(VOMIT_CATEGORY_DEFAULT)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -453,14 +453,14 @@
/datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.AdjustAllImmobility(-10 * REM * seconds_per_tick)
- affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
return UPDATE_MOB_HEALTH
/datum/reagent/drug/maint/tar/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_update
- need_update = affected_mob.adjustToxLoss(5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_update = affected_mob.adjust_tox_loss(5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(need_update)
return UPDATE_MOB_HEALTH
@@ -613,7 +613,7 @@
/datum/reagent/drug/blastoff/on_mob_life(mob/living/carbon/dancer, seconds_per_tick, times_fired)
. = ..()
- if(dancer.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(dancer.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
dancer.AdjustKnockdown(-20)
@@ -622,7 +622,7 @@
/datum/reagent/drug/blastoff/overdose_process(mob/living/dancer, seconds_per_tick, times_fired)
. = ..()
- if(dancer.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(dancer.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
if(SPT_PROB(BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT * volume, seconds_per_tick))
@@ -685,7 +685,7 @@
/datum/reagent/drug/saturnx/on_mob_life(mob/living/carbon/invisible_man, seconds_per_tick, times_fired)
. = ..()
- if(invisible_man.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(invisible_man.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/drug/saturnx/on_mob_metabolize(mob/living/invisible_man)
@@ -761,7 +761,7 @@
invisible_man.emote("giggle")
if(SPT_PROB(5, seconds_per_tick))
invisible_man.emote("laugh")
- if(invisible_man.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(invisible_man.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/drug/saturnx/stable
@@ -834,13 +834,13 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle,
to_chat(druggo, span_nicegreen(pick("You feel the cowardice melt away...", "You feel unbothered by the judgements of others.", "My life feels lovely!", "You lower your snout... and suddenly feel more charitable!")))
else
stamina_heal_per_unit = 6
- druggo.adjustStaminaLoss(-stamina_heal_per_unit * trans_volume)
+ druggo.adjust_stamina_loss(-stamina_heal_per_unit * trans_volume)
/datum/reagent/drug/kronkaine/on_mob_life(mob/living/carbon/kronkaine_fiend, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
kronkaine_fiend.add_mood_event("tweaking", /datum/mood_event/stimulant_medium)
- if(kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, (0.1 + 0.04 * volume) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(kronkaine_fiend.adjust_organ_loss(ORGAN_SLOT_HEART, (0.1 + 0.04 * volume) * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
need_mob_update = UPDATE_MOB_HEALTH
if(kronkaine_fiend.get_organ_loss(ORGAN_SLOT_HEART) >= 75 && prob(15))
to_chat(kronkaine_fiend, span_userdanger("You feel like your heart is about to explode!"))
@@ -852,7 +852,7 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle,
The reason why I choose to add the adrenal crisis anti-cheese mechanic is because the main combat benefit is so front loaded, you could easily negate all the risk and downsides by mixing it with a small amount of a purger like haloperidol.
I think that level of safety goes against the design we would like achieve with drugs; great rewards but at the cost of great risk.*/
- if(kronkaine_fiend.getStaminaLoss() > 30)
+ if(kronkaine_fiend.get_stamina_loss() > 30)
for(var/possible_purger in kronkaine_fiend.reagents.reagent_list)
if(istype(possible_purger, /datum/reagent/medicine/c2/multiver) || istype(possible_purger, /datum/reagent/medicine/haloperidol))
if(kronkaine_fiend.HasDisease(/datum/disease/adrenal_crisis))
@@ -860,13 +860,13 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle,
kronkaine_fiend.visible_message(span_bolddanger("[kronkaine_fiend.name] suddenly tenses up, it looks like the shock is causing their body to shut down!"), span_userdanger("The sudden shock in combination with the cocktail of drugs and purgatives in your body makes your adrenal system go haywire. Uh oh!"))
kronkaine_fiend.ForceContractDisease(new /datum/disease/adrenal_crisis(), FALSE, TRUE) //We punish players for purging, since unchecked purging would allow players to reap the stamina healing benefits without any drawbacks. This also has the benefit of making haloperidol a counter, like it is supposed to be.
break
- need_mob_update = kronkaine_fiend.adjustStaminaLoss(-0.8 * volume * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update = kronkaine_fiend.adjust_stamina_loss(-0.8 * volume * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
/datum/reagent/drug/kronkaine/overdose_process(mob/living/kronkaine_fiend, seconds_per_tick, times_fired)
. = ..()
- if(kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(kronkaine_fiend.adjust_organ_loss(ORGAN_SLOT_HEART, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
kronkaine_fiend.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(10, seconds_per_tick))
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 0c2e021afd8..69e8ce50a76 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -190,7 +190,7 @@
span_userdanger("You're covered in boiling oil!"))
if(FryLoss)
exposed_mob.emote("scream")
- exposed_mob.adjustFireLoss(FryLoss)
+ exposed_mob.adjust_fire_loss(FryLoss)
playsound(exposed_mob, 'sound/machines/fryer/deep_fryer_emerge.ogg', 25, TRUE)
ADD_TRAIT(exposed_mob, TRAIT_OIL_FRIED, "cooking_oil_react")
addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living, unfry_mob)), 2 SECONDS)
@@ -418,7 +418,7 @@
if(reac_volume < 5)
return
for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
- exposed_slime.adjustToxLoss(rand(15,30))
+ exposed_slime.adjust_tox_loss(rand(15,30))
/datum/reagent/consumable/condensedcapsaicin
name = "Condensed Capsaicin"
@@ -821,10 +821,10 @@
holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick)
var/need_mob_update
if(SPT_PROB(33, seconds_per_tick))
- need_mob_update = affected_mob.adjustBruteLoss(-1, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-1, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustToxLoss(-1, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_brute_loss(-1, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-1, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(-1, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -910,9 +910,9 @@
affected_mob.Unconscious(40 * REM * seconds_per_tick, FALSE)
if(SPT_PROB(10, seconds_per_tick))
affected_mob.losebreath += 4
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM, 150, affected_biotype)
- affected_mob.adjustToxLoss(3*REM, updating_health = FALSE, required_biotype = affected_biotype)
- affected_mob.adjustStaminaLoss(10*REM, updating_stamina = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2*REM, 150, affected_biotype)
+ affected_mob.adjust_tox_loss(3*REM, updating_health = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_stamina_loss(10*REM, updating_stamina = FALSE, required_biotype = affected_biotype)
affected_mob.set_eye_blur_if_lower(10 SECONDS)
need_mob_update = TRUE
if(need_mob_update)
@@ -956,8 +956,8 @@
. = ..()
var/need_mob_update
if(SPT_PROB(55, seconds_per_tick))
- need_mob_update = affected_mob.adjustBruteLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents.dm
index 2330955b4c3..aa2703f46c1 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents.dm
@@ -20,9 +20,9 @@
var/need_mob_update
if(liver)//Though, lets be safe
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, liver_damage * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, liver_damage * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
else
- need_mob_update = affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)//Incase of no liver!
+ need_mob_update = affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)//Incase of no liver!
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -41,7 +41,7 @@
/datum/reagent/inverse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(tox_damage * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(tox_damage * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
//Failed chems - generally use inverse if you want to use a impure subtype for it
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
index a188022c935..02c5553cb32 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
@@ -41,13 +41,13 @@
var/pick = pick("brute", "burn", "tox", "oxy")
switch(pick)
if("brute")
- need_mob_update = affected_mob.adjustBruteLoss(-0.5, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(-0.5, updating_health = FALSE, required_bodytype = affected_bodytype)
if("burn")
- need_mob_update += affected_mob.adjustFireLoss(-0.5, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-0.5, updating_health = FALSE, required_bodytype = affected_bodytype)
if("tox")
- need_mob_update += affected_mob.adjustToxLoss(-0.5, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(-0.5, updating_health = FALSE, required_biotype = affected_biotype)
if("oxy")
- need_mob_update += affected_mob.adjustOxyLoss(-0.5, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_oxy_loss(-0.5, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -132,7 +132,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
/datum/reagent/inverse/libitoil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick)
/datum/reagent/inverse/libitoil/on_mob_add(mob/living/affected_mob, amount)
. = ..()
@@ -192,7 +192,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
/datum/reagent/peptides_failed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * seconds_per_tick, 170))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * seconds_per_tick, 170))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_nutrition(-5 * REAGENTS_METABOLISM * seconds_per_tick)
@@ -224,7 +224,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
tox_damage = 0
/datum/reagent/inverse/aiuri/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired)
- owner.adjustOrganLoss(ORGAN_SLOT_EYES, 0.1 * REM * seconds_per_tick)
+ owner.adjust_organ_loss(ORGAN_SLOT_EYES, 0.1 * REM * seconds_per_tick)
owner.adjust_eye_blur(amount_of_blur_applied * seconds_per_tick)
. = ..()
return TRUE
@@ -264,7 +264,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
/datum/reagent/inverse/hercuri/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) //Makes it so you can't abuse it with pyroxadone very easily (liver dies from 25u unless it's fully upgraded)
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) //Makes it so you can't abuse it with pyroxadone very easily (liver dies from 25u unless it's fully upgraded)
. = UPDATE_MOB_HEALTH
var/heating = 10 * creation_purity * REM * seconds_per_tick * TEMPERATURE_DAMAGE_COEFFICIENT
affected_mob.adjust_bodytemperature(heating) //hot hot
@@ -409,7 +409,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
time_until_next_poison -= seconds_per_tick * (1 SECONDS)
if (time_until_next_poison <= 0)
time_until_next_poison = poison_interval
- if(affected_mob.adjustToxLoss(creation_purity * 1, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(creation_purity * 1, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
//Kind of a healing effect, Presumably you're using syrinver to purge so this helps that
@@ -461,9 +461,9 @@ Basically, we fill the time between now and 2s from now with hands based off the
. = ..()
var/need_mob_update
if(length(affected_mob.reagents.reagent_list) > 1)
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * seconds_per_tick, required_organ_flag = affected_organ_flags) //Hey! It's everyone's favourite drawback from multiver!
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.5 * seconds_per_tick, required_organ_flag = affected_organ_flags) //Hey! It's everyone's favourite drawback from multiver!
else
- need_mob_update = affected_mob.adjustToxLoss(-2 * REM * creation_purity * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_tox_loss(-2 * REM * creation_purity * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -527,8 +527,8 @@ Basically, we fill the time between now and 2s from now with hands based off the
for(var/datum/wound/iter_wound as anything in affected_mob.all_wounds)
iter_wound.adjust_blood_flow(creation_impurity * REM * seconds_per_tick)
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(5 * creation_impurity * REM * seconds_per_tick, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, ((1 + creation_impurity) * REM * seconds_per_tick), required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_brute_loss(5 * creation_impurity * REM * seconds_per_tick, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, ((1 + creation_impurity) * REM * seconds_per_tick), required_organ_flag = affected_organ_flags)
if(affected_mob.health < HEALTH_THRESHOLD_CRIT)
affected_mob.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nooartrium)
if(affected_mob.health < HEALTH_THRESHOLD_FULLCRIT)
@@ -827,7 +827,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
if(SPT_PROB(25, seconds_per_tick))
affected_mob.adjust_bodytemperature(30 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick)
affected_mob.set_jitter_if_lower(3 SECONDS)
- affected_mob.adjustStaminaLoss(5 * REM * seconds_per_tick)
+ affected_mob.adjust_stamina_loss(5 * REM * seconds_per_tick)
else if(SPT_PROB(5, seconds_per_tick))
affected_mob.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 0, distance = 3)
affected_mob.Paralyze(3 SECONDS)
@@ -876,10 +876,10 @@ Basically, we fill the time between now and 2s from now with hands based off the
/datum/reagent/inverse/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, -1 * REM * seconds_per_tick)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, -1 * REM * seconds_per_tick)
- if(affected_mob.getToxLoss() <= 25)
- need_mob_update = affected_mob.adjustToxLoss(-0.5, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_STOMACH, -1 * REM * seconds_per_tick)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, -1 * REM * seconds_per_tick)
+ if(affected_mob.get_tox_loss() <= 25)
+ need_mob_update = affected_mob.adjust_tox_loss(-0.5, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -896,7 +896,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
ORGAN_SLOT_APPENDIX,
ORGAN_SLOT_TONGUE,
)
- affected_mob.adjustOrganLoss(pick(possible_organs) ,2 * seconds_per_tick)
+ affected_mob.adjust_organ_loss(pick(possible_organs) ,2 * seconds_per_tick)
affected_mob.reagents.remove_reagent(type, 1 * REM * seconds_per_tick)
/datum/reagent/inverse/ammoniated_mercury
@@ -1009,10 +1009,10 @@ Basically, we fill the time between now and 2s from now with hands based off the
if(is_simian(affected_mob))
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(holder.has_reagent(/datum/reagent/consumable/monkey_energy))
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
@@ -1034,7 +1034,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
if(overdosed)
return
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -1 * REM * seconds_per_tick)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, -1 * REM * seconds_per_tick)
for(var/datum/wound/iter_wound as anything in affected_mob.all_wounds)
if(iter_wound.blood_flow)
if(holder.has_reagent(/datum/reagent/medicine/coagulant, 3))
@@ -1203,7 +1203,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
/datum/reagent/inverse/baldium/on_mob_delete(mob/living/affected_mob)
. = ..()
affected_mob.log_message("has taken [delayed_burn_damage] burn damage from maldium's aftereffects", LOG_ATTACK)
- affected_mob.adjustFireLoss(delayed_burn_damage, updating_health = TRUE, required_bodytype = affected_bodytype)
+ affected_mob.adjust_fire_loss(delayed_burn_damage, updating_health = TRUE, required_bodytype = affected_bodytype)
/datum/reagent/inverse/colorful_reagent
name = "Dulling Reagent"
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm
index 1e12bdd10e5..4dd80ff4d95 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm
@@ -42,7 +42,7 @@
/datum/reagent/impurity/chloralax/on_mob_life(mob/living/carbon/owner, seconds_per_tick)
. = ..()
- if(owner.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(owner.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
//Mindbreaker Toxin - Impure Version
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index c0dc5c0d196..f1747aef41f 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -68,7 +68,7 @@
/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.heal_bodypart_damage(brute = 5 * REM * seconds_per_tick, burn = 5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- affected_mob.adjustToxLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
+ affected_mob.adjust_tox_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
// Heal everything! That we want to. But really don't heal reagents. Otherwise we'll lose ... us.
affected_mob.fully_heal(full_heal_flags & ~HEAL_ALL_REAGENTS) // there is no need to return UPDATE_MOB_HEALTH because this proc calls updatehealth()
@@ -94,7 +94,7 @@
holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5 * REM * seconds_per_tick)
affected_mob.adjust_hallucinations(-20 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(16, seconds_per_tick))
- if(affected_mob.adjustToxLoss(1, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/synaphydramine
@@ -113,7 +113,7 @@
holder.remove_reagent(/datum/reagent/toxin/histamine, 5 * REM * seconds_per_tick)
affected_mob.adjust_hallucinations(-20 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(16, seconds_per_tick))
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/sansufentanyl
@@ -127,7 +127,7 @@
. = ..()
affected_mob.adjust_confusion_up_to(3 SECONDS * REM * seconds_per_tick, 5 SECONDS)
affected_mob.adjust_dizzy_up_to(6 SECONDS * REM * seconds_per_tick, 12 SECONDS)
- if(affected_mob.adjustStaminaLoss(1 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(affected_mob.adjust_stamina_loss(1 * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
if(SPT_PROB(10, seconds_per_tick))
@@ -152,10 +152,10 @@
return
var/power = -0.00003 * (affected_mob.bodytemperature ** 2) + 3
var/need_mob_update
- need_mob_update = affected_mob.adjustOxyLoss(-3 * power * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustBruteLoss(-power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustToxLoss(-power * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) //heals TOXINLOVERs
+ need_mob_update = affected_mob.adjust_oxy_loss(-3 * power * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_brute_loss(-power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_tox_loss(-power * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) //heals TOXINLOVERs
for(var/i in affected_mob.all_wounds)
var/datum/wound/iter_wound = i
iter_wound.on_xadone(power * REM * seconds_per_tick)
@@ -191,10 +191,10 @@
power *= 2
var/need_mob_update
- need_mob_update = affected_mob.adjustOxyLoss(-2 * power * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustBruteLoss(-power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1.5 * power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustToxLoss(-power * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_oxy_loss(-2 * power * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_brute_loss(-power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1.5 * power * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_tox_loss(-power * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
for(var/i in affected_mob.all_wounds)
@@ -227,7 +227,7 @@
/datum/reagent/medicine/rezadone/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
affected_mob.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick)
affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick)
@@ -240,7 +240,7 @@
var/functional_react_volume = reac_volume * (1 - touch_protection)
var/mob/living/carbon/patient = exposed_mob
- if(functional_react_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, BURN) && patient.getFireLoss() < UNHUSK_DAMAGE_THRESHOLD) //One carp yields 12u rezadone.
+ if(functional_react_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, BURN) && patient.get_fire_loss() < UNHUSK_DAMAGE_THRESHOLD) //One carp yields 12u rezadone.
patient.cure_husk(BURN)
patient.visible_message(span_nicegreen("[patient]'s body rapidly absorbs moisture from the environment, taking on a more healthy appearance."))
@@ -271,17 +271,17 @@
/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- if(affected_mob.getFireLoss() > 25)
- need_mob_update = affected_mob.adjustFireLoss(-4 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) //Twice as effective as AIURI for severe burns
+ if(affected_mob.get_fire_loss() > 25)
+ need_mob_update = affected_mob.adjust_fire_loss(-4 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) //Twice as effective as AIURI for severe burns
else
- need_mob_update = affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) //But only a quarter as effective for more minor ones
+ need_mob_update = affected_mob.adjust_fire_loss(-0.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) //But only a quarter as effective for more minor ones
if(need_mob_update)
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getFireLoss()) //It only makes existing burns worse
- if(affected_mob.adjustFireLoss(4.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)) // it's going to be healing either 4 or 0.5
+ if(affected_mob.get_fire_loss()) //It only makes existing burns worse
+ if(affected_mob.adjust_fire_loss(4.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)) // it's going to be healing either 4 or 0.5
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/salglu_solution
@@ -311,8 +311,8 @@
var/need_mob_update = FALSE
if(SPT_PROB(18, seconds_per_tick))
- need_mob_update = affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
- need_mob_update += affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
+ need_mob_update = affected_mob.adjust_brute_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
+ need_mob_update += affected_mob.adjust_fire_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
// Regen is handled here, dilution is handled in [living/proc/get_blood_volume]
var/datum/blood_type/blood_type = affected_mob.get_bloodtype()
@@ -336,8 +336,8 @@
holder.add_reagent(/datum/reagent/consumable/sugar, 1)
holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
if(SPT_PROB(18, seconds_per_tick))
- need_mob_update = affected_mob.adjustBruteLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
- need_mob_update += affected_mob.adjustFireLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
+ need_mob_update = affected_mob.adjust_brute_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
+ need_mob_update += affected_mob.adjust_fire_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -353,8 +353,8 @@
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -403,20 +403,20 @@
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOxyLoss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustBruteLoss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_tox_loss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_brute_loss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/omnizine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOxyLoss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustBruteLoss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_tox_loss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_oxy_loss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_brute_loss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -445,13 +445,13 @@
continue
affected_mob.reagents.remove_reagent(target_reagent.type, 3 * target_reagent.purge_multiplier * REM * seconds_per_tick)
var/toxin_amount = round(affected_mob.health / 40, 0.1)
- if(affected_mob.adjustToxLoss(toxin_amount * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(toxin_amount * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/calomel/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.reagents.remove_reagent(type, 2 * REM * seconds_per_tick)
- if(affected_mob.adjustToxLoss(2.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(2.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/ammoniated_mercury
@@ -474,8 +474,8 @@
for(var/datum/reagent/toxin/target_reagent in affected_mob.reagents.reagent_list)
toxin_chem_amount += 1
affected_mob.reagents.remove_reagent(target_reagent.type, 5 * target_reagent.purge_multiplier * REM * seconds_per_tick)
- var/toxin_amount = round(affected_mob.getBruteLoss() / 15, 0.1) + round(affected_mob.getFireLoss() / 30, 0.1) - 3
- if(affected_mob.adjustToxLoss(toxin_amount * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ var/toxin_amount = round(affected_mob.get_brute_loss() / 15, 0.1) + round(affected_mob.get_fire_loss() / 30, 0.1) - 3
+ if(affected_mob.adjust_tox_loss(toxin_amount * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
if(toxin_chem_amount == 0)
for(var/datum/reagent/medicine/ammoniated_mercury/target_reagent in affected_mob.reagents.reagent_list)
@@ -483,7 +483,7 @@
/datum/reagent/medicine/ammoniated_mercury/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/potass_iodide
@@ -498,7 +498,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(HAS_TRAIT(affected_mob, TRAIT_IRRADIATED))
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/pen_acid
@@ -514,7 +514,7 @@
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
for(var/datum/reagent/reagent as anything in affected_mob.reagents.reagent_list)
if(reagent != src)
@@ -534,17 +534,17 @@
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- if(affected_mob.getBruteLoss() > 25)
- need_mob_update = affected_mob.adjustBruteLoss(-4 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
+ if(affected_mob.get_brute_loss() > 25)
+ need_mob_update = affected_mob.adjust_brute_loss(-4 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
else
- need_mob_update = affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(-0.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/sal_acid/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.getBruteLoss()) //It only makes existing bruises worse
- if(affected_mob.adjustBruteLoss(4.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)) // it's going to be healing either 4 or 0.5
+ if(affected_mob.get_brute_loss()) //It only makes existing bruises worse
+ if(affected_mob.adjust_brute_loss(4.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)) // it's going to be healing either 4 or 0.5
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/salbutamol
@@ -560,7 +560,7 @@
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOxyLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_oxy_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(affected_mob.losebreath >= 4)
var/obj/item/organ/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS)
var/our_respiration_type = affected_lungs ? affected_lungs.respiration_type : affected_mob.mob_respiration_type // use lungs' respiration type or mob_respiration_type if no lungs
@@ -634,8 +634,8 @@
if (current_cycle > secondary_overdose_effect_cycle_threshold)
if (SPT_PROB(30, seconds_per_tick))
carbon_mob.adjust_eye_blur_up_to(6 SECONDS, 30 SECONDS)
- if (carbon_mob.getStaminaLoss() < maximum_od_stamina_damage)
- carbon_mob.adjustStaminaLoss(seconds_per_tick)
+ if (carbon_mob.get_stamina_loss() < maximum_od_stamina_damage)
+ carbon_mob.adjust_stamina_loss(seconds_per_tick)
/datum/reagent/medicine/albuterol/proc/holder_lost_organ(datum/source, obj/item/organ/lost)
SIGNAL_HANDLER
@@ -684,7 +684,7 @@
affected_mob.set_jitter_if_lower(20 SECONDS)
affected_mob.AdjustAllImmobility(-20 * REM * seconds_per_tick * normalise_creation_purity())
- affected_mob.adjustStaminaLoss(-4 * REM * seconds_per_tick * normalise_creation_purity(), updating_stamina = FALSE)
+ affected_mob.adjust_stamina_loss(-4 * REM * seconds_per_tick * normalise_creation_purity(), updating_stamina = FALSE)
return UPDATE_MOB_HEALTH
@@ -699,7 +699,7 @@
to_chat(affected_mob, span_notice("[pick("Your head pounds.", "You feel a tight pain in your chest.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]"))
if(SPT_PROB(18 * (1 + (1-normalise_creation_purity())), seconds_per_tick))
- affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
affected_mob.losebreath++
return UPDATE_MOB_HEALTH
@@ -851,7 +851,7 @@
/datum/reagent/medicine/oculine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_EYES, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
/datum/reagent/medicine/oculine/flumpuline
@@ -960,10 +960,10 @@
. = ..()
if(affected_mob.health <= affected_mob.crit_threshold)
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustBruteLoss(-2* REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_brute_loss(-2* REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
var/obj/item/organ/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS)
@@ -976,7 +976,7 @@
/datum/reagent/medicine/atropine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
affected_mob.set_dizzy_if_lower(2 SECONDS * REM * seconds_per_tick)
affected_mob.set_jitter_if_lower(2 SECONDS * REM * seconds_per_tick)
@@ -1001,10 +1001,10 @@
var/need_mob_update
if(affected_mob.health <= affected_mob.crit_threshold)
- need_mob_update = affected_mob.adjustToxLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_tox_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_brute_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(affected_mob.losebreath >= 4)
var/obj/item/organ/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS)
var/our_respiration_type = affected_lungs ? affected_lungs.respiration_type : affected_mob.mob_respiration_type
@@ -1014,7 +1014,7 @@
if(affected_mob.losebreath < 0)
affected_mob.losebreath = 0
need_mob_update = TRUE
- need_mob_update += affected_mob.adjustStaminaLoss(-2 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(-2 * REM * seconds_per_tick, updating_stamina = FALSE)
if(SPT_PROB(10, seconds_per_tick))
affected_mob.AdjustAllImmobility(-20)
need_mob_update = TRUE
@@ -1031,8 +1031,8 @@
. = ..()
if(SPT_PROB(18, REM * seconds_per_tick))
var/need_mob_update
- need_mob_update = affected_mob.adjustStaminaLoss(2.5 * REM * seconds_per_tick, updating_stamina = FALSE)
- need_mob_update += affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_stamina_loss(2.5 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
var/obj/item/organ/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS)
var/our_respiration_type = affected_lungs ? affected_lungs.respiration_type : affected_mob.mob_respiration_type
if(our_respiration_type & affected_respiration_type)
@@ -1079,7 +1079,7 @@
/// Calculates the amount of reagent to at a bare minimum make the target not dead
/datum/reagent/medicine/strange_reagent/proc/calculate_amount_needed_to_revive(mob/living/benefactor)
- var/their_health = benefactor.getMaxHealth() - (benefactor.getBruteLoss() + benefactor.getFireLoss())
+ var/their_health = benefactor.getMaxHealth() - (benefactor.get_brute_loss() + benefactor.get_fire_loss())
if(their_health > 0)
return 1
@@ -1087,7 +1087,7 @@
/// Calculates the amount of reagent that will be needed to both revive and full heal the target. Looks at healing_per_reagent_unit and excess_healing_ratio
/datum/reagent/medicine/strange_reagent/proc/calculate_amount_needed_to_full_heal(mob/living/benefactor)
- var/their_health = benefactor.getBruteLoss() + benefactor.getFireLoss()
+ var/their_health = benefactor.get_brute_loss() + benefactor.get_fire_loss()
var/max_health = benefactor.getMaxHealth()
if(their_health >= max_health)
return 1
@@ -1111,7 +1111,7 @@
exposed_mob.visible_message(span_warning("[exposed_mob]'s body lets off a puff of smoke..."))
return
- if((exposed_mob.getBruteLoss() + exposed_mob.getFireLoss()) > (exposed_mob.getMaxHealth() * max_revive_damage_ratio))
+ if((exposed_mob.get_brute_loss() + exposed_mob.get_fire_loss()) > (exposed_mob.getMaxHealth() * max_revive_damage_ratio))
exposed_mob.visible_message(span_warning("[exposed_mob]'s body convulses violently, before falling still..."))
return
@@ -1151,8 +1151,8 @@
. = ..()
var/damage_at_random = rand(0, 250)/100 //0 to 2.5
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(damage_at_random * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(damage_at_random * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(damage_at_random * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(damage_at_random * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1191,7 +1191,7 @@
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, -2 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/mannitol/overdose_start(mob/living/affected_mob)
@@ -1238,7 +1238,7 @@
return
var/mob/living/carbon/affected_carbon = affected_mob
if(initial_bdamage < affected_carbon.get_organ_loss(ORGAN_SLOT_BRAIN))
- affected_carbon.setOrganLoss(ORGAN_SLOT_BRAIN, initial_bdamage)
+ affected_carbon.set_organ_loss(ORGAN_SLOT_BRAIN, initial_bdamage)
/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1249,7 +1249,7 @@
/datum/reagent/medicine/neurine/on_mob_dead(mob/living/carbon/affected_mob, seconds_per_tick)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, -1 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/mutadone
@@ -1304,7 +1304,7 @@
for(var/effect in status_effects_to_clear)
affected_mob.remove_status_effect(effect)
affected_mob.reagents.remove_reagent(/datum/reagent/consumable/ethanol, 8 * REM * seconds_per_tick * normalise_creation_purity(), include_subtypes = TRUE)
- if(affected_mob.adjustToxLoss(-0.2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(-0.2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_drunk_effect(-10 * REM * seconds_per_tick * normalise_creation_purity())
@@ -1339,20 +1339,20 @@
. = ..()
if(affected_mob.health < 50 && affected_mob.health > 0)
var/need_mob_update
- need_mob_update += affected_mob.adjustOxyLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustBruteLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_brute_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
affected_mob.AdjustAllImmobility(-60 * REM * seconds_per_tick)
- affected_mob.adjustStaminaLoss(-12 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_stamina_loss(-12 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
/datum/reagent/medicine/stimulants/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(SPT_PROB(18, seconds_per_tick))
- affected_mob.adjustStaminaLoss(2.5, updating_stamina = FALSE, required_biotype = affected_biotype)
- affected_mob.adjustToxLoss(1, updating_health = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_stamina_loss(2.5, updating_stamina = FALSE, required_biotype = affected_biotype)
+ affected_mob.adjust_tox_loss(1, updating_health = FALSE, required_biotype = affected_biotype)
affected_mob.losebreath++
return UPDATE_MOB_HEALTH
@@ -1405,10 +1405,10 @@
/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustToxLoss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) //heals TOXINLOVERs
+ need_mob_update = affected_mob.adjust_brute_loss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_tox_loss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) //heals TOXINLOVERs
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1423,11 +1423,11 @@
/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(-5 * REM * seconds_per_tick, updating_health = FALSE) //A ton of healing - this is a 50 telecrystal investment.
- need_mob_update += affected_mob.adjustFireLoss(-5 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustOxyLoss(-15 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustToxLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15 * REM * seconds_per_tick)
+ need_mob_update = affected_mob.adjust_brute_loss(-5 * REM * seconds_per_tick, updating_health = FALSE) //A ton of healing - this is a 50 telecrystal investment.
+ need_mob_update += affected_mob.adjust_fire_loss(-5 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(-15 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_tox_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, -15 * REM * seconds_per_tick)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1452,19 +1452,19 @@
. = ..()
var/need_mob_update
if(current_cycle < 25) //10u has to be processed before u get into THE FUN ZONE
- need_mob_update = affected_mob.adjustBruteLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustToxLoss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustStaminaLoss(-2 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick, 150, affected_organ_flags) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
+ need_mob_update = affected_mob.adjust_brute_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_tox_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_stamina_loss(-2 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick, 150, affected_organ_flags) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
else
- need_mob_update = affected_mob.adjustBruteLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) //slow to start, but very quick healing once it gets going
- need_mob_update += affected_mob.adjustFireLoss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustOxyLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustToxLoss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustStaminaLoss(-8 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * seconds_per_tick, 150, affected_organ_flags)
+ need_mob_update = affected_mob.adjust_brute_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) //slow to start, but very quick healing once it gets going
+ need_mob_update += affected_mob.adjust_fire_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_tox_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_stamina_loss(-8 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2 * REM * seconds_per_tick, 150, affected_organ_flags)
affected_mob.adjust_jitter_up_to(6 SECONDS * REM * seconds_per_tick, 1 MINUTES)
if(SPT_PROB(5, seconds_per_tick))
affected_mob.say(return_hippie_line(), forced = /datum/reagent/medicine/earthsblood)
@@ -1477,9 +1477,9 @@
affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS)
var/need_mob_update
if(current_cycle > 26)
- need_mob_update = affected_mob.adjustToxLoss(4 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_tox_loss(4 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(current_cycle > 101) //podpeople get out reeeeeeeeeeeeeeeeeeeee
- need_mob_update += affected_mob.adjustToxLoss(6 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(6 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(iscarbon(affected_mob))
var/mob/living/carbon/hippie = affected_mob
hippie.gain_trauma(/datum/brain_trauma/severe/pacifism)
@@ -1520,13 +1520,13 @@
if (affected_mob.get_timed_status_effect_duration(/datum/status_effect/hallucination) >= 10 SECONDS)
affected_mob.adjust_hallucinations(-10 SECONDS * REM * seconds_per_tick)
- if(affected_mob.getStaminaLoss() >= 100)
+ if(affected_mob.get_stamina_loss() >= 100)
affected_mob.reagents.remove_reagent(type, metabolization_rate * REM * seconds_per_tick)
var/need_mob_update = FALSE
if(SPT_PROB(10, seconds_per_tick))
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 50, affected_organ_flags)
- need_mob_update += affected_mob.adjustStaminaLoss(2.5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1, 50, affected_organ_flags)
+ need_mob_update += affected_mob.adjust_stamina_loss(2.5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1541,7 +1541,7 @@
/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired)
. = ..()
metabolizer.AdjustAllImmobility(-20 * REM * seconds_per_tick)
- if(metabolizer.adjustStaminaLoss(-30 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(metabolizer.adjust_stamina_loss(-30 * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
metabolizer.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick)
metabolizer.set_dizzy_if_lower(20 SECONDS * REM * seconds_per_tick)
@@ -1562,14 +1562,14 @@
/datum/reagent/medicine/changelingadrenaline/proc/on_stamcrit(mob/living/affected_mob)
SIGNAL_HANDLER
- affected_mob?.setStaminaLoss(90, updating_stamina = TRUE)
+ affected_mob?.set_stamina_loss(90, updating_stamina = TRUE)
to_chat(affected_mob, span_changeling("Our gene-stim flares! We are invigorated, but its potency wanes."))
volume -= (min(volume, 1))
return STAMCRIT_CANCELLED
/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/metabolizer, seconds_per_tick, times_fired)
. = ..()
- if(metabolizer.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE))
+ if(metabolizer.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/changelinghaste
@@ -1589,7 +1589,7 @@
/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired)
. = ..()
- if(metabolizer.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE))
+ if(metabolizer.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/higadrite
@@ -1647,7 +1647,7 @@
return
overdose_threshold = overdose_threshold + ((rand(-10, 10) / 10) * REM * seconds_per_tick) // for extra fun
metabolizer.AdjustAllImmobility(-5 * REM * seconds_per_tick)
- metabolizer.adjustStaminaLoss(-3 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ metabolizer.adjust_stamina_loss(-3 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
metabolizer.set_jitter_if_lower(1 SECONDS * REM * seconds_per_tick)
metabolization_rate = 0.005 * REAGENTS_METABOLISM * rand(5, 20) // randomizes metabolism between 0.02 and 0.08 per second
return UPDATE_MOB_HEALTH
@@ -1670,8 +1670,8 @@
affected_mob.losebreath++
need_mob_update = TRUE
if(41 to 80)
- need_mob_update = affected_mob.adjustOxyLoss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustStaminaLoss(0.1 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_oxy_loss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_stamina_loss(0.1 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
affected_mob.adjust_jitter_up_to(2 SECONDS * REM * seconds_per_tick, 40 SECONDS)
affected_mob.adjust_stutter_up_to(2 SECONDS * REM * seconds_per_tick, 40 SECONDS)
affected_mob.set_dizzy_if_lower(20 SECONDS * REM * seconds_per_tick)
@@ -1684,13 +1684,13 @@
affected_mob.Paralyze(20) // you should be in a bad spot at this point unless epipen has been used
if(81)
to_chat(affected_mob, span_userdanger("You feel too exhausted to continue!")) // at this point you will eventually die unless you get charcoal
- need_mob_update = affected_mob.adjustOxyLoss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustStaminaLoss(0.1 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_oxy_loss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_stamina_loss(0.1 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(82 to INFINITY)
REMOVE_TRAIT(affected_mob, TRAIT_SLEEPIMMUNE, type)
affected_mob.Sleeping(100 * REM * seconds_per_tick)
- need_mob_update += affected_mob.adjustOxyLoss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustStaminaLoss(1.5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_oxy_loss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_stamina_loss(1.5 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1716,7 +1716,7 @@
/datum/reagent/medicine/psicodine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS)
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/metafactor
@@ -1747,7 +1747,7 @@
/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) // Add a chance to cure liver trauma once implemented.
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, -2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) // Add a chance to cure liver trauma once implemented.
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/polypyr //This is intended to be an ingredient in advanced chems.
@@ -1762,8 +1762,8 @@
/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all.
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, -0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update += affected_mob.adjustBruteLoss(-0.35 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, -0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_brute_loss(-0.35 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1776,7 +1776,7 @@
/datum/reagent/medicine/polypyr/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/granibitaluri
@@ -1790,18 +1790,18 @@
/datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- var/healamount = max(0.5 - round(0.01 * (affected_mob.getBruteLoss() + affected_mob.getFireLoss()), 0.1), 0) //base of 0.5 healing per cycle and loses 0.1 healing for every 10 combined brute/burn damage you have
+ var/healamount = max(0.5 - round(0.01 * (affected_mob.get_brute_loss() + affected_mob.get_fire_loss()), 0.1), 0) //base of 0.5 healing per cycle and loses 0.1 healing for every 10 combined brute/burn damage you have
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(-healamount * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-healamount * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_brute_loss(-healamount * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-healamount * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
/datum/reagent/medicine/granibitaluri/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update += affected_mob.adjustToxLoss(0.2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) //Only really deadly if you eat over 100u
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += affected_mob.adjust_tox_loss(0.2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) //Only really deadly if you eat over 100u
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1863,12 +1863,12 @@
if(SPT_PROB(7.5, seconds_per_tick))
affected_mob.losebreath += rand(2, 4)
- affected_mob.adjustOxyLoss(rand(1, 3), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ affected_mob.adjust_oxy_loss(rand(1, 3), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(prob(30))
to_chat(affected_mob, span_danger("You can feel your blood clotting up in your veins!"))
else if(prob(10))
to_chat(affected_mob, span_userdanger("You feel like your blood has stopped moving!"))
- affected_mob.adjustOxyLoss(rand(3, 4) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ affected_mob.adjust_oxy_loss(rand(3, 4) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(prob(50))
var/obj/item/organ/lungs/our_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS)
@@ -1923,8 +1923,8 @@
. = ..()
if(SPT_PROB(8, seconds_per_tick))
affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick)
- if(SPT_PROB(15, seconds_per_tick) && !affected_mob.getStaminaLoss())
- if(affected_mob.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(SPT_PROB(15, seconds_per_tick) && !affected_mob.get_stamina_loss())
+ if(affected_mob.adjust_stamina_loss(10 * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_disgust(-10 * REM * seconds_per_tick)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index ca04b7e3468..da2ec3d22f8 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -232,9 +232,9 @@
affected_mob.adjust_drunk_effect(drunkness_restored * REM * seconds_per_tick) // and even sobers you up slowly!!
if(water_adaptation)
var/need_mob_update = FALSE
- need_mob_update = affected_mob.adjustToxLoss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustFireLoss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustBruteLoss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update = affected_mob.adjust_tox_loss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_fire_loss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_brute_loss(-0.25 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
return need_mob_update ? UPDATE_MOB_HEALTH : .
// For weird backwards situations where water manages to get added to trays nutrients, as opposed to being snowflaked away like usual.
@@ -358,7 +358,7 @@
else if(HAS_TRAIT(affected_mob, TRAIT_EVIL) && SPT_PROB(25, seconds_per_tick)) //Congratulations, your committment to evil has now made holy water a deadly poison to you!
if(!IS_CULTIST(affected_mob) || affected_mob.mind?.holy_role != HOLY_ROLE_PRIEST)
affected_mob.emote("scream")
- need_mob_update += affected_mob.adjustFireLoss(3 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_fire_loss(3 * REM * seconds_per_tick, updating_health = FALSE)
if(data["deciseconds_metabolized"] >= (1 MINUTES)) // 24 units
if(IS_CULTIST(affected_mob))
@@ -366,7 +366,7 @@
affected_mob.Unconscious(10 SECONDS)
else if(HAS_TRAIT(affected_mob, TRAIT_EVIL)) //At this much holy water, you're probably going to fucking melt. good luck
if(!IS_CULTIST(affected_mob) || affected_mob.mind?.holy_role != HOLY_ROLE_PRIEST)
- need_mob_update += affected_mob.adjustFireLoss(10 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_fire_loss(10 * REM * seconds_per_tick, updating_health = FALSE)
affected_mob.remove_status_effect(/datum/status_effect/jitter)
affected_mob.remove_status_effect(/datum/status_effect/speech/stutter)
for(var/datum/status_effect/eldritch_painting/eldritch_curses in affected_mob.status_effects)
@@ -434,7 +434,7 @@
var/damage_to_inflict = 2 * max(1 - touch_protection, 0)
if(damage_to_inflict)
- exposed_mob.adjustFireLoss(damage_to_inflict)
+ exposed_mob.adjust_fire_loss(damage_to_inflict)
/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
name = "Unholy Water"
@@ -458,11 +458,11 @@
if(IS_CULTIST(affected_mob))
affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustAllImmobility(-40 * REM * seconds_per_tick)
- need_mob_update += affected_mob.adjustStaminaLoss(-10 * REM * seconds_per_tick, updating_stamina = FALSE)
- need_mob_update += affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustOxyLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustBruteLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustFireLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(-10 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_brute_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_fire_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
need_mob_update = TRUE
if(ishuman(affected_mob))
affected_mob.adjust_blood_volume(3 * REM * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL)
@@ -477,11 +477,11 @@
bloodiest_wound.adjust_blood_flow(-2 * REM * seconds_per_tick)
else // Will deal about 90 damage when 50 units are thrown
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick, 150)
- need_mob_update += affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustFireLoss(1 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustOxyLoss(1 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustBruteLoss(1 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick, 150)
+ need_mob_update += affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_fire_loss(1 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(1 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_brute_loss(1 * REM * seconds_per_tick, updating_health = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -501,9 +501,9 @@
affected_mob.set_fire_stacks(min(affected_mob.fire_stacks + (1.5 * seconds_per_tick), 5))
affected_mob.ignite_mob() //Only problem with igniting people is currently the commonly available fire suits make you immune to being on fire
var/need_mob_update
- need_mob_update = affected_mob.adjustToxLoss(0.5*seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustFireLoss(0.5*seconds_per_tick, updating_health = FALSE) //Hence the other damages... ain't I a bastard?
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2.5*seconds_per_tick, 150)
+ need_mob_update = affected_mob.adjust_tox_loss(0.5*seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_fire_loss(0.5*seconds_per_tick, updating_health = FALSE) //Hence the other damages... ain't I a bastard?
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2.5*seconds_per_tick, 150)
if(holder)
holder.remove_reagent(type, 0.5 * seconds_per_tick)
if(need_mob_update)
@@ -972,7 +972,7 @@
step(affected_mob, pick(GLOB.cardinals))
if(SPT_PROB(3.5, seconds_per_tick))
affected_mob.emote(pick("twitch","drool","moan"))
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5*seconds_per_tick))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.5*seconds_per_tick))
return UPDATE_MOB_HEALTH
/datum/reagent/sulfur
@@ -1038,7 +1038,7 @@
/datum/reagent/fluorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(0.5*REM*seconds_per_tick, updating_health = FALSE))
+ if(affected_mob.adjust_tox_loss(0.5*REM*seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/sodium
@@ -1150,7 +1150,7 @@
var/chance = min(volume / (20 - rad_power * 5), rad_power)
if(SPT_PROB(chance, seconds_per_tick)) // ignore rad protection calculations bc it's inside of us
affected_mob.AddComponent(/datum/component/irradiated)
- if(affected_mob.adjustToxLoss(tox_damage * seconds_per_tick * REM, updating_health = FALSE))
+ if(affected_mob.adjust_tox_loss(tox_damage * seconds_per_tick * REM, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/uranium/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE)
@@ -1296,7 +1296,7 @@
var/obj/item/organ/liver/liver = victim.get_organ_slot(ORGAN_SLOT_LIVER)
if(liver && HAS_TRAIT(liver, TRAIT_HUMAN_AI_METABOLISM))
return
- if(victim.adjustToxLoss(0.5 * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(victim.adjust_tox_loss(0.5 * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/fuel/expose_turf(turf/exposed_turf, reac_volume)
@@ -1335,7 +1335,7 @@
exposed_turf.wash(clean_types, TRUE)
for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
- exposed_slime.adjustToxLoss(rand(5,10))
+ exposed_slime.adjust_tox_loss(rand(5,10))
/datum/reagent/space_cleaner/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection=0)
. = ..()
@@ -1363,9 +1363,9 @@
/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustBruteLoss(1.665*seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustFireLoss(1.665*seconds_per_tick, updating_health = FALSE)
- need_mob_update += affected_mob.adjustToxLoss(1.665*seconds_per_tick, updating_health = FALSE)
+ need_mob_update = affected_mob.adjust_brute_loss(1.665*seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_fire_loss(1.665*seconds_per_tick, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_tox_loss(1.665*seconds_per_tick, updating_health = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1377,8 +1377,8 @@
var/damage_to_inflict = 1.5 * max(1 - touch_protection, 0)
if(damage_to_inflict)
- exposed_mob.adjustBruteLoss(damage_to_inflict)
- exposed_mob.adjustFireLoss(damage_to_inflict)
+ exposed_mob.adjust_brute_loss(damage_to_inflict)
+ exposed_mob.adjust_fire_loss(damage_to_inflict)
/datum/reagent/cryptobiolin
name = "Cryptobiolin"
@@ -1415,7 +1415,7 @@
. = ..()
affected_mob.adjust_jitter(-5 SECONDS * seconds_per_tick)
if(SPT_PROB(55, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2)
. = TRUE
if(SPT_PROB(30, seconds_per_tick))
affected_mob.adjust_drowsiness(6 SECONDS)
@@ -1568,7 +1568,7 @@
var/drowsiness_to_apply = max(round(reac_volume, 1) * 2 SECONDS * (1 - touch_protection), 4 SECONDS)
exposed_mob.adjust_drowsiness(drowsiness_to_apply)
if(methods & INHALE)
- exposed_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * reac_volume, required_organ_flag = affected_organ_flags)
+ exposed_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * reac_volume, required_organ_flag = affected_organ_flags)
exposed_mob.adjust_hallucinations(10 SECONDS * reac_volume)
/datum/reagent/nitrous_oxide/on_mob_metabolize(mob/living/affected_mob)
@@ -1738,7 +1738,7 @@
/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(SPT_PROB(tox_prob, seconds_per_tick))
- if(affected_mob.adjustToxLoss(1, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/plantnutriment/eznutriment
@@ -2101,7 +2101,7 @@
var/damage_to_inflict = 2 * max(1 - touch_protection, 0)
if(damage_to_inflict)
- exposed_mob.adjustFireLoss(damage_to_inflict)
+ exposed_mob.adjust_fire_loss(damage_to_inflict)
exposed_mob.adjust_fire_stacks((reac_volume / 10))
@@ -2663,8 +2663,8 @@
. = ..()
var/healthcomp = (100 - affected_mob.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS.
. = FALSE
- if(affected_mob.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
- if(affected_mob.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(affected_mob.get_stamina_loss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
+ if(affected_mob.adjust_stamina_loss(10 * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
if(SPT_PROB(16, seconds_per_tick))
to_chat(affected_mob, "You should sit down and take a rest...")
@@ -2869,7 +2869,7 @@
for(var/thing in affected_mob.all_wounds)
var/datum/wound/W = thing
stam_crash += (W.severity + 1) * 3 // spike of 3 stam damage per wound severity (moderate = 6, severe = 9, critical = 12) when the determination wears off if it was a combat rush
- affected_mob.adjustStaminaLoss(stam_crash)
+ affected_mob.adjust_stamina_loss(stam_crash)
affected_mob.remove_status_effect(/datum/status_effect/determined)
/datum/reagent/determination/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
@@ -2885,7 +2885,7 @@
var/obj/item/bodypart/wounded_part = W.limb
if(wounded_part)
wounded_part.heal_damage(0.25 * REM * seconds_per_tick, 0.25 * REM * seconds_per_tick)
- if(affected_mob.adjustStaminaLoss(-1 * REM * seconds_per_tick, updating_stamina = FALSE)) // the more wounds, the more stamina regen
+ if(affected_mob.adjust_stamina_loss(-1 * REM * seconds_per_tick, updating_stamina = FALSE)) // the more wounds, the more stamina regen
return UPDATE_MOB_HEALTH
// unholy water, but for heretics.
@@ -2909,11 +2909,11 @@
if(IS_HERETIC_OR_MONSTER(drinker))
drinker.adjust_drowsiness(-10 * REM * seconds_per_tick)
drinker.AdjustAllImmobility(-40 * REM * seconds_per_tick)
- need_mob_update += drinker.adjustStaminaLoss(-10 * REM * seconds_per_tick, updating_stamina = FALSE)
- need_mob_update += drinker.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE)
- need_mob_update += drinker.adjustOxyLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += drinker.adjustBruteLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += drinker.adjustFireLoss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += drinker.adjust_stamina_loss(-10 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += drinker.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ need_mob_update += drinker.adjust_oxy_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += drinker.adjust_brute_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += drinker.adjust_fire_loss(-2 * REM * seconds_per_tick, updating_health = FALSE)
drinker.adjust_blood_volume(3 * REM * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL)
// Slowly regulates your body temp
drinker.adjust_bodytemperature((drinker.get_body_temp_normal() - drinker.bodytemperature) / 5)
@@ -2921,11 +2921,11 @@
if(reagent != src)
drinker.reagents.remove_reagent(reagent.type, 2 * reagent.purge_multiplier * REM * seconds_per_tick)
else
- need_mob_update = drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick, 150)
- need_mob_update += drinker.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += drinker.adjustFireLoss(2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += drinker.adjustOxyLoss(2 * REM * seconds_per_tick, updating_health = FALSE)
- need_mob_update += drinker.adjustBruteLoss(2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update = drinker.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick, 150)
+ need_mob_update += drinker.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += drinker.adjust_fire_loss(2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += drinker.adjust_oxy_loss(2 * REM * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += drinker.adjust_brute_loss(2 * REM * seconds_per_tick, updating_health = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -2984,7 +2984,7 @@
/datum/reagent/ants/on_mob_life(mob/living/carbon/victim, seconds_per_tick)
. = ..()
- victim.adjustBruteLoss(max(0.1, round((ant_ticks * ant_damage),0.1))) //Scales with time. Roughly 32 brute with 100u.
+ victim.adjust_brute_loss(max(0.1, round((ant_ticks * ant_damage),0.1))) //Scales with time. Roughly 32 brute with 100u.
ant_ticks++
if(ant_ticks < 5) // Makes ant food a little more appetizing, since you won't be screaming as much.
return
@@ -3069,7 +3069,7 @@
/datum/reagent/lead/on_mob_life(mob/living/carbon/victim)
. = ..()
- if(victim.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5))
+ if(victim.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.5))
return UPDATE_MOB_HEALTH
//The main feedstock for kronkaine production, also a shitty stamina healer.
@@ -3085,8 +3085,8 @@
/datum/reagent/kronkus_extract/on_mob_life(mob/living/carbon/kronkus_enjoyer, seconds_per_tick)
. = ..()
var/need_mob_update
- need_mob_update = kronkus_enjoyer.adjustOrganLoss(ORGAN_SLOT_HEART, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
- need_mob_update += kronkus_enjoyer.adjustStaminaLoss(-6, updating_stamina = FALSE)
+ need_mob_update = kronkus_enjoyer.adjust_organ_loss(ORGAN_SLOT_HEART, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
+ need_mob_update += kronkus_enjoyer.adjust_stamina_loss(-6, updating_stamina = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -3099,7 +3099,7 @@
/datum/reagent/brimdust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustFireLoss((ispodperson(affected_mob) ? -1 : 1 * seconds_per_tick), updating_health = FALSE))
+ if(affected_mob.adjust_fire_loss((ispodperson(affected_mob) ? -1 : 1 * seconds_per_tick), updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/brimdust/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
@@ -3183,7 +3183,7 @@
affected_mob.AdjustParalyzed(-5 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustImmobilized(-5 SECONDS * REM * seconds_per_tick)
else
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, REM * seconds_per_tick)) //1 heart damage per tick
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, REM * seconds_per_tick)) //1 heart damage per tick
. = UPDATE_MOB_HEALTH
if(SPT_PROB(10, seconds_per_tick))
affected_mob.emote(pick("twitch","choke","shiver","gag"))
@@ -3252,7 +3252,7 @@
added_light = TRUE
if (SPT_PROB(8, seconds_per_tick))
- if(affected_mob.adjustToxLoss(1, updating_health = FALSE))
+ if(affected_mob.adjust_tox_loss(1, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/luminescent_fluid/proc/on_organ_added(mob/living/source, obj/item/organ/eyes/new_eyes)
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index f6e65e95be7..c38e90ead2f 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -13,7 +13,7 @@
/datum/reagent/thermite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustFireLoss(1 * REM * seconds_per_tick, updating_health = FALSE))
+ if(affected_mob.adjust_fire_loss(1 * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/nitroglycerin
@@ -26,7 +26,7 @@
/datum/reagent/nitroglycerin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, -1 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, -1 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags))
return UPDATE_MOB_HEALTH
/datum/reagent/stabilizing_agent
@@ -52,7 +52,7 @@
/datum/reagent/clf3/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.adjust_fire_stacks(2 * REM * seconds_per_tick)
- if(affected_mob.adjustFireLoss(0.3 * max(affected_mob.fire_stacks, 1) * REM * seconds_per_tick, updating_health = FALSE))
+ if(affected_mob.adjust_fire_loss(0.3 * max(affected_mob.fire_stacks, 1) * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/clf3/expose_turf(turf/exposed_turf, reac_volume)
@@ -168,13 +168,13 @@
exposed_mob.adjust_fire_stacks(1)
var/burndmg = max(0.3*exposed_mob.fire_stacks * (1 - touch_protection), 0.3)
if(burndmg)
- exposed_mob.adjustFireLoss(burndmg, 0)
+ exposed_mob.adjust_fire_loss(burndmg, 0)
exposed_mob.ignite_mob()
/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired)
. = ..()
metabolizer.adjust_fire_stacks(1 * REM * seconds_per_tick)
- if(metabolizer.adjustFireLoss(0.3 * max(metabolizer.fire_stacks, 0.15) * REM * seconds_per_tick, updating_health = FALSE))
+ if(metabolizer.adjust_fire_loss(0.3 * max(metabolizer.fire_stacks, 0.15) * REM * seconds_per_tick, updating_health = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/napalm
@@ -256,7 +256,7 @@
if(reac_volume < 5)
return
for(var/mob/living/basic/slime/exposed_slime in exposed_turf)
- exposed_slime.adjustToxLoss(rand(15,30))
+ exposed_slime.adjust_tox_loss(rand(15,30))
#undef CRYO_SPEED_PREFACTOR
#undef CRYO_SPEED_CONSTANT
@@ -338,7 +338,7 @@
if(!isjellyperson(affected_mob)) //everyone but jellypeople get shocked as normal.
return ..()
affected_mob.AdjustAllImmobility(-40 *REM * seconds_per_tick)
- if(affected_mob.adjustStaminaLoss(-10 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(affected_mob.adjust_stamina_loss(-10 * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
if(is_species(affected_mob, /datum/species/jelly/luminescent))
var/mob/living/carbon/human/affected_human = affected_mob
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 3bdbfd45ece..380a007dff6 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -26,7 +26,7 @@
/datum/reagent/toxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(toxpwr && affected_mob.health > health_required)
- if(affected_mob.adjustToxLoss(toxpwr * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(toxpwr * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/amatoxin
@@ -67,7 +67,7 @@
/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(0.5 * seconds_per_tick * REM, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(0.5 * seconds_per_tick * REM, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/mutagen/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
@@ -193,7 +193,7 @@
/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(!HAS_TRAIT(affected_mob, TRAIT_NOBREATH))
- affected_mob.adjustOxyLoss(5 * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ affected_mob.adjust_oxy_loss(5 * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
affected_mob.losebreath += 2 * REM * normalise_creation_purity() * seconds_per_tick
. = UPDATE_MOB_HEALTH
if(SPT_PROB(10, seconds_per_tick))
@@ -225,7 +225,7 @@
. = ..()
if(SPT_PROB(5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your insides are burning!"))
- if(affected_mob.adjustToxLoss(rand(20, 60), updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(rand(20, 60), updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
else if(SPT_PROB(23, seconds_per_tick))
if(affected_mob.heal_bodypart_damage(5))
@@ -280,7 +280,7 @@
/datum/reagent/toxin/zombiepowder/proc/zombify(mob/living/holder_mob)
PRIVATE_PROC(TRUE)
- holder_mob.adjustOxyLoss(0.5*REM, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ holder_mob.adjust_oxy_loss(0.5*REM, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if((data?["method"] & (INGEST|INHALE)) && holder_mob.stat != DEAD)
holder_mob.apply_status_effect(/datum/status_effect/reagent_effect/fakedeath, type)
@@ -303,7 +303,7 @@
affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_slurring(6 SECONDS * REM * seconds_per_tick)
if(6 to 9)
- need_mob_update = affected_mob.adjustStaminaLoss(40 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update = affected_mob.adjust_stamina_loss(40 * REM * seconds_per_tick, updating_stamina = FALSE)
if(10 to INFINITY)
if(affected_mob.stat != DEAD)
affected_mob.fakedeath(type)
@@ -324,7 +324,7 @@
/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOxyLoss(1 * REM * seconds_per_tick, FALSE, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
+ if(affected_mob.adjust_oxy_loss(1 * REM * seconds_per_tick, FALSE, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/mindbreaker
@@ -399,7 +399,7 @@
var/damage = min(round(0.4 * reac_volume, 0.1), 10)
if(exposed_mob.mob_biotypes & MOB_PLANT)
// spray bottle emits 5u so it's dealing ~15 dmg per spray
- if(exposed_mob.adjustToxLoss(damage * 20, required_biotype = affected_biotype))
+ if(exposed_mob.adjust_tox_loss(damage * 20, required_biotype = affected_biotype))
return
if(!(methods & VAPOR) || !iscarbon(exposed_mob))
@@ -407,7 +407,7 @@
var/mob/living/carbon/exposed_carbon = exposed_mob
if(!exposed_carbon.wear_mask)
- exposed_carbon.adjustToxLoss(damage, required_biotype = affected_biotype)
+ exposed_carbon.adjust_tox_loss(damage, required_biotype = affected_biotype)
/datum/reagent/toxin/plantbgone/weedkiller
name = "Weed Killer"
@@ -435,7 +435,7 @@
/datum/reagent/toxin/pestkiller/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustToxLoss(2 * toxpwr * REM * seconds_per_tick, updating_health = FALSE, required_biotype = MOB_BUG))
+ if(affected_mob.adjust_tox_loss(2 * toxpwr * REM * seconds_per_tick, updating_health = FALSE, required_biotype = MOB_BUG))
return UPDATE_MOB_HEALTH
//Pest Spray
@@ -521,7 +521,7 @@
affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick)
if(52 to INFINITY)
affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick)
- if(affected_mob.adjustToxLoss(1 * (current_cycle - 51) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * (current_cycle - 51) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots
@@ -552,7 +552,7 @@
affected_mob.Sleeping(40 * REM * seconds_per_tick)
if(52 to INFINITY)
affected_mob.Sleeping(40 * REM * seconds_per_tick)
- if(affected_mob.adjustToxLoss(1 * (current_cycle - 50) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * (current_cycle - 50) * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/coffeepowder
@@ -611,7 +611,7 @@
/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustStaminaLoss(data * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(affected_mob.adjust_stamina_loss(data * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
data = max(data - 1, 3)
@@ -632,7 +632,7 @@
if(SPT_PROB(chance, seconds_per_tick)) // ignore rad protection calculations bc it's inside of us
affected_mob.AddComponent(/datum/component/irradiated)
else
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/polonium/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE)
@@ -691,15 +691,15 @@
if(4)
if(prob(75))
to_chat(affected_mob, span_danger("You scratch at an itch."))
- if(affected_mob.adjustBruteLoss(2* REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
+ if(affected_mob.adjust_brute_loss(2* REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/histamine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOxyLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update += affected_mob.adjustBruteLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update = affected_mob.adjust_oxy_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update += affected_mob.adjust_brute_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -720,7 +720,7 @@
/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER)
if(liver && HAS_TRAIT(liver, TRAIT_CORONER_METABOLISM)) //mmmm, the forbidden pickle juice
- if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) //it counteracts its own toxin damage.
+ if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) //it counteracts its own toxin damage.
return UPDATE_MOB_HEALTH
return
else if(SPT_PROB(2.5, seconds_per_tick) && !HAS_TRAIT(affected_mob, TRAIT_BLOCK_FORMALDEHYDE_METABOLISM))
@@ -750,7 +750,7 @@
current_size = newsize
toxpwr = 0.1 * volume
- if(affected_mob.adjustBruteLoss((0.3 * volume) * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
+ if(affected_mob.adjust_brute_loss((0.3 * volume) * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
. = UPDATE_MOB_HEALTH
// chance to either decay into histamine or go the normal route of toxin metabolization
@@ -780,9 +780,9 @@
/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * normalise_creation_purity() * seconds_per_tick, 150)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3 * REM * normalise_creation_purity() * seconds_per_tick, 150)
if(affected_mob.toxloss <= 60)
- need_mob_update += affected_mob.adjustToxLoss(1 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(1 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
if(current_cycle > 4)
affected_mob.add_mood_event("smacked out", /datum/mood_event/narcotic_heavy, name)
if(current_cycle > 18)
@@ -810,7 +810,7 @@
if(SPT_PROB(4, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel horrendously weak!"))
affected_mob.Stun(40)
- need_mob_update += affected_mob.adjustToxLoss(2*REM * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_tox_loss(2*REM * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -879,7 +879,7 @@
affected_mob.Paralyze(60)
if(2)
affected_mob.losebreath += 10
- affected_mob.adjustOxyLoss(rand(5,25), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ affected_mob.adjust_oxy_loss(rand(5,25), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
need_mob_update = TRUE
if(3)
if(!affected_mob.undergoing_cardiac_arrest() && affected_mob.can_heartattack())
@@ -888,7 +888,7 @@
affected_mob.visible_message(span_userdanger("[affected_mob] clutches at [affected_mob.p_their()] chest as if [affected_mob.p_their()] heart stopped!"))
else
affected_mob.losebreath += 10
- need_mob_update = affected_mob.adjustOxyLoss(rand(5,25), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_oxy_loss(rand(5,25), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -924,7 +924,7 @@
. = ..()
if(current_cycle > 10)
affected_mob.Sleeping(40 * REM * seconds_per_tick)
- if(affected_mob.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(affected_mob.adjust_stamina_loss(10 * REM * seconds_per_tick, updating_stamina = FALSE))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/sulfonal
@@ -961,7 +961,7 @@
/datum/reagent/toxin/amanitin/on_mob_delete(mob/living/affected_mob)
. = ..()
affected_mob.log_message("has taken [delayed_toxin_damage] toxin damage from amanitin toxin", LOG_ATTACK)
- affected_mob.adjustToxLoss(delayed_toxin_damage, required_biotype = affected_biotype)
+ affected_mob.adjust_tox_loss(delayed_toxin_damage, required_biotype = affected_biotype)
/datum/reagent/toxin/lipolicide
name = "Lipolicide"
@@ -980,7 +980,7 @@
/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(affected_mob.nutrition <= NUTRITION_LEVEL_STARVING)
- if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
affected_mob.adjust_nutrition(-3 * REM * normalise_creation_purity() * seconds_per_tick) // making the chef more valuable, one meme trap at a time
affected_mob.overeatduration = 0
@@ -1042,7 +1042,7 @@
. = ..()
if(current_cycle > 11)
affected_mob.Paralyze(60 * REM * seconds_per_tick)
- if(affected_mob.adjustOxyLoss(0.5*REM*seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
+ if(affected_mob.adjust_oxy_loss(0.5*REM*seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/heparin //Based on a real-life anticoagulant. I'm not a doctor, so this won't be realistic.
@@ -1143,10 +1143,10 @@
return
reac_volume = round(reac_volume,0.1)
if(methods & (INGEST|INHALE))
- exposed_carbon.adjustBruteLoss(min(6*toxpwr, reac_volume * toxpwr), required_bodytype = affected_bodytype)
+ exposed_carbon.adjust_brute_loss(min(6*toxpwr, reac_volume * toxpwr), required_bodytype = affected_bodytype)
return
if(methods & INJECT)
- exposed_carbon.adjustBruteLoss(1.5 * min(6*toxpwr, reac_volume * toxpwr), required_bodytype = affected_bodytype)
+ exposed_carbon.adjust_brute_loss(1.5 * min(6*toxpwr, reac_volume * toxpwr), required_bodytype = affected_bodytype)
return
exposed_carbon.acid_act(acidpwr, reac_volume)
@@ -1183,7 +1183,7 @@
/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustFireLoss(((current_cycle-1)/15) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
+ if(affected_mob.adjust_fire_loss(((current_cycle-1)/15) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype))
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/acid/nitracid
@@ -1199,7 +1199,7 @@
/datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) //here you go nervar
+ if(affected_mob.adjust_fire_loss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) //here you go nervar
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/delayed
@@ -1218,7 +1218,7 @@
return
if(holder)
holder.remove_reagent(type, actual_metaboliztion_rate * affected_mob.metabolism_efficiency * seconds_per_tick)
- if(affected_mob.adjustToxLoss(actual_toxpwr * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
+ if(affected_mob.adjust_tox_loss(actual_toxpwr * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
if(SPT_PROB(5, seconds_per_tick))
affected_mob.Paralyze(20)
@@ -1255,7 +1255,7 @@
/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustStaminaLoss(7.5 * REM * seconds_per_tick, updating_stamina = FALSE))
+ if(affected_mob.adjust_stamina_loss(7.5 * REM * seconds_per_tick, updating_stamina = FALSE))
. = UPDATE_MOB_HEALTH
if(!SPT_PROB(10, seconds_per_tick))
return
@@ -1299,7 +1299,7 @@
/datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, 3 * REM * seconds_per_tick))
+ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, 3 * REM * seconds_per_tick))
. = UPDATE_MOB_HEALTH
// If our mob's currently dizzy from anything else, we will also gain confusion
@@ -1324,8 +1324,8 @@
/datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
var/need_mob_update
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_EARS, 1 * REM * seconds_per_tick)
- need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_EARS, 1 * REM * seconds_per_tick)
+ need_mob_update += affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick)
if(need_mob_update)
. = UPDATE_MOB_HEALTH
if(SPT_PROB(0.5, seconds_per_tick))
@@ -1376,10 +1376,10 @@
liver_tolerance_multiplier = 0
silent_toxin = TRUE
remove_paralysis()
- need_mob_update += affected_mob.adjustOxyLoss(-0.7 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
- need_mob_update = affected_mob.adjustToxLoss(-0.75 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
- need_mob_update += affected_mob.adjustBruteLoss(-1.2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
- need_mob_update += affected_mob.adjustFireLoss(-1.35 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_oxy_loss(-0.7 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
+ need_mob_update = affected_mob.adjust_tox_loss(-0.75 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)
+ need_mob_update += affected_mob.adjust_brute_loss(-1.2 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
+ need_mob_update += affected_mob.adjust_fire_loss(-1.35 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)
return need_mob_update ? UPDATE_MOB_HEALTH : .
liver_tolerance_multiplier = initial(liver_tolerance_multiplier)
@@ -1399,7 +1399,7 @@
if(13 to 21)
silent_toxin = FALSE
toxpwr = 0.5
- need_mob_update = affected_mob.adjustStaminaLoss(2.5 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update = affected_mob.adjust_stamina_loss(2.5 * REM * seconds_per_tick, updating_stamina = FALSE)
if(SPT_PROB(20, seconds_per_tick))
affected_mob.losebreath += 1 * REM * seconds_per_tick
need_mob_update = TRUE
@@ -1407,7 +1407,7 @@
affected_mob.set_jitter_if_lower(rand(2 SECONDS, 3 SECONDS) * REM * seconds_per_tick)
affected_mob.adjust_disgust(3 * REM * seconds_per_tick)
affected_mob.set_slurring_if_lower(1 SECONDS * REM * seconds_per_tick)
- affected_mob.adjustStaminaLoss(2 * REM * seconds_per_tick, updating_stamina = FALSE)
+ affected_mob.adjust_stamina_loss(2 * REM * seconds_per_tick, updating_stamina = FALSE)
if(SPT_PROB(4, seconds_per_tick))
paralyze_limb(affected_mob)
need_mob_update = TRUE
@@ -1415,8 +1415,8 @@
affected_mob.adjust_confusion(rand(6 SECONDS, 8 SECONDS))
if(21 to 29)
toxpwr = 1
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5)
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.7)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.5)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.7)
if(SPT_PROB(40, seconds_per_tick))
affected_mob.losebreath += 2 * REM * seconds_per_tick
need_mob_update = TRUE
@@ -1424,7 +1424,7 @@
affected_mob.set_slurring_if_lower(3 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(5, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel horribly weak."))
- need_mob_update += affected_mob.adjustStaminaLoss(5 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(5 * REM * seconds_per_tick, updating_stamina = FALSE)
if(SPT_PROB(8, seconds_per_tick))
paralyze_limb(affected_mob)
need_mob_update = TRUE
@@ -1432,10 +1432,10 @@
affected_mob.adjust_confusion(rand(6 SECONDS, 8 SECONDS))
if(29 to INFINITY)
toxpwr = 1.5
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, BRAIN_DAMAGE_DEATH)
- need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1.4)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1, BRAIN_DAMAGE_DEATH)
+ need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, 1.4)
affected_mob.set_silence_if_lower(3 SECONDS * REM * seconds_per_tick)
- need_mob_update += affected_mob.adjustStaminaLoss(5 * REM * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(5 * REM * seconds_per_tick, updating_stamina = FALSE)
affected_mob.adjust_disgust(2 * REM * seconds_per_tick)
if(SPT_PROB(15, seconds_per_tick))
paralyze_limb(affected_mob)
diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index 8e7c925e606..85016f87aad 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -433,7 +433,7 @@
if(!grinded)
to_chat(user, span_warning("There is nothing to grind!"))
return ITEM_INTERACT_BLOCKING
- if(user.getStaminaLoss() > 50)
+ if(user.get_stamina_loss() > 50)
to_chat(user, span_warning("You are too tired to work!"))
return ITEM_INTERACT_BLOCKING
var/list/choose_options = list(
@@ -446,7 +446,7 @@
to_chat(user, span_notice("You start grinding..."))
if(!do_after(user, 2.5 SECONDS, target = src))
return ITEM_INTERACT_BLOCKING
- user.adjustStaminaLoss(40)
+ user.adjust_stamina_loss(40)
switch(picked_option)
if("Juice")
return juice_item(grinded, user) ? ITEM_INTERACT_BLOCKING : ITEM_INTERACT_SUCCESS
diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm
index 99adcb65407..f21c08cdb0c 100644
--- a/code/modules/reagents/reagent_containers/medigel.dm
+++ b/code/modules/reagents/reagent_containers/medigel.dm
@@ -107,7 +107,7 @@
/obj/item/reagent_containers/medigel/synthflesh/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(iscarbon(interacting_with) && reagents?.total_volume)
var/mob/living/carbon/carbies = interacting_with
- if(HAS_TRAIT_FROM(carbies, TRAIT_HUSK, BURN) && carbies.getFireLoss() > UNHUSK_DAMAGE_THRESHOLD * 2.5)
+ if(HAS_TRAIT_FROM(carbies, TRAIT_HUSK, BURN) && carbies.get_fire_loss() > UNHUSK_DAMAGE_THRESHOLD * 2.5)
// give them a warning if the mob is a husk but synthflesh won't unhusk yet
carbies.visible_message(span_boldwarning("[carbies]'s burns need to be repaired first before synthflesh will unhusk it!"))
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index b293a527e73..e30529bcd57 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -208,7 +208,7 @@
return
// Check mob damage for synthflesh unhusking
var/mob/living/carbon/carbies = eater
- if(HAS_TRAIT_FROM(carbies, TRAIT_HUSK, BURN) && carbies.getFireLoss() > UNHUSK_DAMAGE_THRESHOLD * 2.5)
+ if(HAS_TRAIT_FROM(carbies, TRAIT_HUSK, BURN) && carbies.get_fire_loss() > UNHUSK_DAMAGE_THRESHOLD * 2.5)
// give them a warning if the mob is a husk but synthflesh won't unhusk yet
carbies.visible_message(span_boldwarning("[carbies]'s burns need to be repaired first before synthflesh will unhusk it!"))
diff --git a/code/modules/religion/festival/instrument_rites.dm b/code/modules/religion/festival/instrument_rites.dm
index 9ac32dd24de..e3f53c10fd8 100644
--- a/code/modules/religion/festival/instrument_rites.dm
+++ b/code/modules/religion/festival/instrument_rites.dm
@@ -173,7 +173,7 @@
if(listener.mind?.holy_role)
damage_dealt *= 0.5
- listener.adjustBruteLoss(damage_dealt)
+ listener.adjust_brute_loss(damage_dealt)
/datum/religion_rites/song_tuner/pain/finish_effect(mob/living/carbon/human/listener, atom/song_source)
var/obj/item/bodypart/sliced_limb = pick(listener.bodyparts)
diff --git a/code/modules/religion/pyre/pyre_rites.dm b/code/modules/religion/pyre/pyre_rites.dm
index 0a6cde9260c..880bd6558cd 100644
--- a/code/modules/religion/pyre/pyre_rites.dm
+++ b/code/modules/religion/pyre/pyre_rites.dm
@@ -90,7 +90,7 @@
to_chat(user, span_warning("The sacrifice has to stay dead for the rite to work!"))
chosen_sacrifice = null
return FALSE
- var/favor_gained = 100 + round(chosen_sacrifice.getFireLoss())
+ var/favor_gained = 100 + round(chosen_sacrifice.get_fire_loss())
GLOB.religious_sect.adjust_favor(favor_gained, user)
to_chat(user, span_notice("[GLOB.deity] absorbs the charred corpse and any trace of fire with it. [GLOB.deity] rewards you with [favor_gained] favor."))
chosen_sacrifice.dust(force = TRUE)
diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm
index b537fac4aec..ba8024fffe2 100644
--- a/code/modules/religion/religion_sects.dm
+++ b/code/modules/religion/religion_sects.dm
@@ -371,17 +371,17 @@
target.cure_husk(BURN)
chaplain.become_husk(BURN)
- var/toxin_damage = target.getToxLoss()
+ var/toxin_damage = target.get_tox_loss()
if(toxin_damage && !HAS_TRAIT(chaplain, TRAIT_TOXIMMUNE))
transferred = TRUE
- target.adjustToxLoss(-toxin_damage)
- chaplain.adjustToxLoss(toxin_damage * burden_modifier, forced = TRUE)
+ target.adjust_tox_loss(-toxin_damage)
+ chaplain.adjust_tox_loss(toxin_damage * burden_modifier, forced = TRUE)
- var/suffocation_damage = target.getOxyLoss()
+ var/suffocation_damage = target.get_oxy_loss()
if(suffocation_damage && !HAS_TRAIT(chaplain, TRAIT_NOBREATH))
transferred = TRUE
- target.adjustOxyLoss(-suffocation_damage)
- chaplain.adjustOxyLoss(suffocation_damage * burden_modifier, forced = TRUE)
+ target.adjust_oxy_loss(-suffocation_damage)
+ chaplain.adjust_oxy_loss(suffocation_damage * burden_modifier, forced = TRUE)
var/cached_blood_volume = target.get_blood_volume()
if (cached_blood_volume < BLOOD_VOLUME_SAFE)
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 40270fed287..5b08cd876c3 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -187,10 +187,10 @@
/datum/status_effect/slime_clone_decay/tick(seconds_between_ticks)
var/need_mob_update
- need_mob_update = owner.adjustToxLoss(1, updating_health = FALSE)
- need_mob_update += owner.adjustOxyLoss(1, updating_health = FALSE)
- need_mob_update += owner.adjustBruteLoss(1, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(1, updating_health = FALSE)
+ need_mob_update = owner.adjust_tox_loss(1, updating_health = FALSE)
+ need_mob_update += owner.adjust_oxy_loss(1, updating_health = FALSE)
+ need_mob_update += owner.adjust_brute_loss(1, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(1, updating_health = FALSE)
if(need_mob_update)
owner.updatehealth()
owner.color = "#007BA7"
@@ -212,7 +212,7 @@
/datum/status_effect/bloodchill/tick(seconds_between_ticks)
if(prob(50))
- owner.adjustFireLoss(2)
+ owner.adjust_fire_loss(2)
/datum/status_effect/bloodchill/on_remove()
owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
@@ -228,7 +228,7 @@
/datum/status_effect/bonechill/tick(seconds_between_ticks)
if(prob(50))
- owner.adjustFireLoss(1)
+ owner.adjust_fire_loss(1)
owner.set_jitter_if_lower(6 SECONDS)
owner.adjust_bodytemperature(-10)
if(ishuman(owner))
@@ -250,7 +250,7 @@
alert_type = null
/datum/status_effect/rebreathing/tick(seconds_between_ticks)
- owner.adjustOxyLoss(-6, 0) //Just a bit more than normal breathing.
+ owner.adjust_oxy_loss(-6, 0) //Just a bit more than normal breathing.
///////////////////////////////////////////////////////
//////////////////CONSUMING EXTRACTS///////////////////
@@ -526,17 +526,17 @@
healed_last_tick = FALSE
var/need_mob_update = FALSE
- if(owner.getBruteLoss() > 0)
- need_mob_update += owner.adjustBruteLoss(-0.2, updating_health = FALSE)
+ if(owner.get_brute_loss() > 0)
+ need_mob_update += owner.adjust_brute_loss(-0.2, updating_health = FALSE)
healed_last_tick = TRUE
- if(owner.getFireLoss() > 0)
- need_mob_update += owner.adjustFireLoss(-0.2, updating_health = FALSE)
+ if(owner.get_fire_loss() > 0)
+ need_mob_update += owner.adjust_fire_loss(-0.2, updating_health = FALSE)
healed_last_tick = TRUE
- if(owner.getToxLoss() > 0)
+ if(owner.get_tox_loss() > 0)
// Forced, so slimepeople are healed as well.
- need_mob_update += owner.adjustToxLoss(-0.2, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_tox_loss(-0.2, updating_health = FALSE, forced = TRUE)
healed_last_tick = TRUE
if(need_mob_update)
@@ -1008,11 +1008,11 @@
return
var/list/healing_types = list()
- if(owner.getBruteLoss() > 0)
+ if(owner.get_brute_loss() > 0)
healing_types += BRUTE
- if(owner.getFireLoss() > 0)
+ if(owner.get_fire_loss() > 0)
healing_types += BURN
- if(owner.getToxLoss() > 0)
+ if(owner.get_tox_loss() > 0)
healing_types += TOX
if(length(healing_types))
diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
index f114d3ad55d..6977d4ca8e6 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -100,7 +100,7 @@ Burning extracts:
if(istype(C))
C.electrocute_act(25,src)
else
- M.adjustFireLoss(25)
+ M.adjust_fire_loss(25)
to_chat(M, span_danger("You feel a sharp electrical pulse!"))
..()
diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm
index 8ce36ccd818..22c645ace71 100644
--- a/code/modules/research/xenobiology/crossbreeding/consuming.dm
+++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm
@@ -122,11 +122,11 @@ Consuming extracts:
/obj/item/slime_cookie/purple/do_effect(mob/living/M, mob/user)
var/need_mob_update = FALSE
- need_mob_update += M.adjustBruteLoss(-5, updating_health = FALSE)
- need_mob_update += M.adjustFireLoss(-5, updating_health = FALSE)
- need_mob_update += M.adjustToxLoss(-5, updating_health = FALSE, forced = TRUE) //To heal slimepeople.
- need_mob_update += M.adjustOxyLoss(-5, updating_health = FALSE)
- need_mob_update += M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -5)
+ need_mob_update += M.adjust_brute_loss(-5, updating_health = FALSE)
+ need_mob_update += M.adjust_fire_loss(-5, updating_health = FALSE)
+ need_mob_update += M.adjust_tox_loss(-5, updating_health = FALSE, forced = TRUE) //To heal slimepeople.
+ need_mob_update += M.adjust_oxy_loss(-5, updating_health = FALSE)
+ need_mob_update += M.adjust_organ_loss(ORGAN_SLOT_BRAIN, -5)
if(need_mob_update)
M.updatehealth()
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index f90fc7ed6f6..4cc1784b8d0 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -254,9 +254,9 @@ Regenerative extracts:
carbon_dummy.real_name = carbon_target.real_name
carbon_target.dna.copy_dna(carbon_dummy.dna, COPY_DNA_SE|COPY_DNA_SPECIES)
carbon_dummy.updateappearance(mutcolor_update = TRUE)
- dummy.adjustBruteLoss(target.getBruteLoss())
- dummy.adjustFireLoss(target.getFireLoss())
- dummy.adjustToxLoss(target.getToxLoss())
+ dummy.adjust_brute_loss(target.get_brute_loss())
+ dummy.adjust_fire_loss(target.get_fire_loss())
+ dummy.adjust_tox_loss(target.get_tox_loss())
dummy.death()
/obj/item/slimecross/regenerative/lightpink
diff --git a/code/modules/spells/spell_types/aoe_spell/repulse.dm b/code/modules/spells/spell_types/aoe_spell/repulse.dm
index df52547f28f..4de1e3a93c9 100644
--- a/code/modules/spells/spell_types/aoe_spell/repulse.dm
+++ b/code/modules/spells/spell_types/aoe_spell/repulse.dm
@@ -48,7 +48,7 @@
if(isliving(victim))
var/mob/living/victim_living = victim
victim_living.Paralyze(10 SECONDS)
- victim_living.adjustBruteLoss(5)
+ victim_living.adjust_brute_loss(5)
to_chat(victim, span_userdanger("You're slammed into the floor by [caster]!"))
else
if(sparkle_path)
diff --git a/code/modules/spells/spell_types/jaunt/shadow_walk.dm b/code/modules/spells/spell_types/jaunt/shadow_walk.dm
index 33215acb1e9..5dea6785d04 100644
--- a/code/modules/spells/spell_types/jaunt/shadow_walk.dm
+++ b/code/modules/spells/spell_types/jaunt/shadow_walk.dm
@@ -48,7 +48,7 @@
playsound(get_turf(owner), 'sound/effects/nightmare_poof.ogg', 50, TRUE, -1, ignore_walls = FALSE)
cast_on.visible_message(span_boldwarning("[cast_on] melts into the shadows!"))
cast_on.SetAllImmobility(0)
- cast_on.setStaminaLoss(0, FALSE)
+ cast_on.set_stamina_loss(0, FALSE)
enter_jaunt(cast_on)
/obj/effect/dummy/phased_mob/shadow
diff --git a/code/modules/spells/spell_types/self/basic_heal.dm b/code/modules/spells/spell_types/self/basic_heal.dm
index d22b38cba8b..1676fa27e62 100644
--- a/code/modules/spells/spell_types/self/basic_heal.dm
+++ b/code/modules/spells/spell_types/self/basic_heal.dm
@@ -27,7 +27,7 @@
span_notice("You wreath yourself in healing light!"),
)
var/need_mob_update = FALSE
- need_mob_update += cast_on.adjustBruteLoss(-brute_to_heal, updating_health = FALSE)
- need_mob_update += cast_on.adjustFireLoss(-burn_to_heal, updating_health = FALSE)
+ need_mob_update += cast_on.adjust_brute_loss(-brute_to_heal, updating_health = FALSE)
+ need_mob_update += cast_on.adjust_fire_loss(-burn_to_heal, updating_health = FALSE)
if(need_mob_update)
cast_on.updatehealth()
diff --git a/code/modules/spells/spell_types/self/rod_form.dm b/code/modules/spells/spell_types/self/rod_form.dm
index 6f26ab16719..2dfe7a70e81 100644
--- a/code/modules/spells/spell_types/self/rod_form.dm
+++ b/code/modules/spells/spell_types/self/rod_form.dm
@@ -104,7 +104,7 @@
span_userdanger("The [src] penetrates you!"),
span_danger("You hear a CLANG!"),
)
- penetrated.adjustBruteLoss(70 + damage_bonus)
+ penetrated.adjust_brute_loss(70 + damage_bonus)
/obj/effect/immovablerod/wizard/suplex_rod(mob/living/strongman)
var/mob/living/wizard = our_wizard?.resolve()
diff --git a/code/modules/surgery/advanced/bioware/cortex_folding.dm b/code/modules/surgery/advanced/bioware/cortex_folding.dm
index 3a58f697cba..503c10919c4 100644
--- a/code/modules/surgery/advanced/bioware/cortex_folding.dm
+++ b/code/modules/surgery/advanced/bioware/cortex_folding.dm
@@ -73,7 +73,7 @@
span_notice("[user] completes the surgery on [target]'s brain."),
)
display_pain(target, "Your brain throbs with intense pain; thinking hurts!")
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 60)
target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY)
else
user.visible_message(span_warning("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore."), span_warning("You suddenly notice that the brain you were working on is not there anymore."))
diff --git a/code/modules/surgery/advanced/bioware/cortex_imprint.dm b/code/modules/surgery/advanced/bioware/cortex_imprint.dm
index 78f6ba40f0f..a168224c7b0 100644
--- a/code/modules/surgery/advanced/bioware/cortex_imprint.dm
+++ b/code/modules/surgery/advanced/bioware/cortex_imprint.dm
@@ -74,7 +74,7 @@
span_notice("[user] completes the surgery on [target]'s brain."),
)
display_pain(target, "Your brain throbs with intense pain; Thinking hurts!")
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 60)
target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY)
else
user.visible_message(span_warning("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore."), span_warning("You suddenly notice that the brain you were working on is not there anymore."))
diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm
index fb12ecd6e35..90a81bc3797 100644
--- a/code/modules/surgery/advanced/brainwashing.dm
+++ b/code/modules/surgery/advanced/brainwashing.dm
@@ -110,7 +110,7 @@
span_notice("[user] completes the surgery on [target]'s brain."),
)
display_pain(target, "Your head throbs with horrible pain!")
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 40)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 40)
else
user.visible_message(span_warning("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore."), span_warning("You suddenly notice that the brain you were working on is not there anymore."))
return FALSE
diff --git a/code/modules/surgery/autopsy.dm b/code/modules/surgery/autopsy.dm
index 8d5ae45d817..f04f45fe582 100644
--- a/code/modules/surgery/autopsy.dm
+++ b/code/modules/surgery/autopsy.dm
@@ -63,4 +63,4 @@
span_warning("[user] screws up, brusing [target]'s chest!"),
span_warning("[user] screws up!"),
)
- target.adjustBruteLoss(5)
+ target.adjust_brute_loss(5)
diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm
index 8e321f63fe7..7cebacd1606 100644
--- a/code/modules/surgery/blood_filter.dm
+++ b/code/modules/surgery/blood_filter.dm
@@ -103,4 +103,4 @@
span_warning("[user] screws up, brusing [target]'s chest!"),
span_warning("[user] screws up!"),
)
- target.adjustBruteLoss(5)
+ target.adjust_brute_loss(5)
diff --git a/code/modules/surgery/bodyparts/bodypart_effects.dm b/code/modules/surgery/bodyparts/bodypart_effects.dm
index 496f0768097..b1d6daa31b2 100644
--- a/code/modules/surgery/bodyparts/bodypart_effects.dm
+++ b/code/modules/surgery/bodyparts/bodypart_effects.dm
@@ -104,8 +104,8 @@
var/need_mob_update = FALSE
need_mob_update += owner.heal_overall_damage(brute = 0.5 * bodypart_coefficient, \
burn = 0.5 * bodypart_coefficient, updating_health = FALSE, required_bodytype = BODYTYPE_PLANT)
- need_mob_update += owner.adjustToxLoss(-0.5 * bodypart_coefficient, updating_health = FALSE)
- need_mob_update += owner.adjustOxyLoss(-0.5 * bodypart_coefficient, updating_health = FALSE)
+ need_mob_update += owner.adjust_tox_loss(-0.5 * bodypart_coefficient, updating_health = FALSE)
+ need_mob_update += owner.adjust_oxy_loss(-0.5 * bodypart_coefficient, updating_health = FALSE)
if(need_mob_update)
owner.updatehealth()
diff --git a/code/modules/surgery/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm
index c3a9baafde1..0b1c3862627 100644
--- a/code/modules/surgery/brain_surgery.dm
+++ b/code/modules/surgery/brain_surgery.dm
@@ -69,7 +69,7 @@
display_pain(target, "The pain in your head receeds, thinking becomes a bit easier!")
if(target.mind?.has_antag_datum(/datum/antagonist/brainwashed))
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
- target.setOrganLoss(ORGAN_SLOT_BRAIN, target.get_organ_loss(ORGAN_SLOT_BRAIN) - 50) //we set damage in this case in order to clear the "failing" flag
+ target.set_organ_loss(ORGAN_SLOT_BRAIN, target.get_organ_loss(ORGAN_SLOT_BRAIN) - 50) //we set damage in this case in order to clear the "failing" flag
target.cure_all_traumas(TRAUMA_RESILIENCE_SURGERY)
if(target.get_organ_loss(ORGAN_SLOT_BRAIN) > 0)
to_chat(user, "[target]'s brain looks like it could be fixed further.")
@@ -85,7 +85,7 @@
span_notice("[user] completes the surgery on [target]'s brain."),
)
display_pain(target, "Your head throbs with horrible pain; thinking hurts!")
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 60)
target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY)
else
user.visible_message(span_warning("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore."), span_warning("You suddenly notice that the brain you were working on is not there anymore."))
diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
index 75357ba4908..0f6136ad4e1 100644
--- a/code/modules/surgery/coronary_bypass.dm
+++ b/code/modules/surgery/coronary_bypass.dm
@@ -81,7 +81,7 @@
)
var/obj/item/bodypart/target_bodypart = target_human.get_bodypart(target_zone)
target_bodypart.adjustBleedStacks(10)
- target_human.adjustBruteLoss(10)
+ target_human.adjust_brute_loss(10)
return ..()
/datum/surgery_step/incise_heart/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -97,8 +97,8 @@
)
var/obj/item/bodypart/target_bodypart = target_human.get_bodypart(target_zone)
target_bodypart.adjustBleedStacks(10)
- target_human.adjustOrganLoss(ORGAN_SLOT_HEART, 10)
- target_human.adjustBruteLoss(10)
+ target_human.adjust_organ_loss(ORGAN_SLOT_HEART, 10)
+ target_human.adjust_brute_loss(10)
//grafts a coronary bypass onto the individual's heart, success chance is 90% base again
/datum/surgery_step/coronary_bypass
@@ -135,7 +135,7 @@
display_pain(target, "The pain in your chest is unbearable! You can barely take it anymore!")
/datum/surgery_step/coronary_bypass/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
- target.setOrganLoss(ORGAN_SLOT_HEART, 60)
+ target.set_organ_loss(ORGAN_SLOT_HEART, 60)
var/obj/item/organ/heart/target_heart = target.get_organ_slot(ORGAN_SLOT_HEART)
if(target_heart) //slightly worrying if we lost our heart mid-operation, but that's life
target_heart.operated = TRUE
@@ -162,7 +162,7 @@
span_warning("[user] screws up, causing blood to spurt out of [target_human]'s chest profusely!"),
)
display_pain(target, "Your chest burns; you feel like you're going insane!")
- target_human.adjustOrganLoss(ORGAN_SLOT_HEART, 20)
+ target_human.adjust_organ_loss(ORGAN_SLOT_HEART, 20)
var/obj/item/bodypart/target_bodypart = target_human.get_bodypart(target_zone)
target_bodypart.adjustBleedStacks(30)
return FALSE
diff --git a/code/modules/surgery/ear_surgery.dm b/code/modules/surgery/ear_surgery.dm
index 41afe23eb5f..bbe98395078 100644
--- a/code/modules/surgery/ear_surgery.dm
+++ b/code/modules/surgery/ear_surgery.dm
@@ -61,7 +61,7 @@
span_warning("[user] accidentally stabs [target] right in the brain!"),
)
display_pain(target, "You feel a visceral stabbing pain right through your head, into your brain!")
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 70)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 70)
else
display_results(
user,
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 31a4fe261d4..92f883e3e21 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -59,7 +59,7 @@
span_warning("[user] accidentally stabs [target] right in the brain!"),
)
display_pain(target, "You feel a visceral stabbing pain right through your head, into your brain!")
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 70)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 70)
else
display_results(
user,
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index caae23b2552..69634b688b1 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -71,7 +71,7 @@
/datum/surgery_step/gastrectomy/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/mob/living/carbon/human/target_human = target
var/obj/item/organ/stomach/target_stomach = target.get_organ_slot(ORGAN_SLOT_STOMACH)
- target_human.setOrganLoss(ORGAN_SLOT_STOMACH, 20) // Stomachs have a threshold for being able to even digest food, so I might tweak this number
+ target_human.set_organ_loss(ORGAN_SLOT_STOMACH, 20) // Stomachs have a threshold for being able to even digest food, so I might tweak this number
if(target_stomach)
target_stomach.operated = TRUE
if(target_stomach.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
@@ -88,7 +88,7 @@
/datum/surgery_step/gastrectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery)
var/mob/living/carbon/human/target_human = target
- target_human.adjustOrganLoss(ORGAN_SLOT_STOMACH, 15)
+ target_human.adjust_organ_loss(ORGAN_SLOT_STOMACH, 15)
display_results(
user,
target,
diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm
index dfabe24234d..3516c74840e 100644
--- a/code/modules/surgery/healing.dm
+++ b/code/modules/surgery/healing.dm
@@ -76,7 +76,7 @@
/datum/surgery_step/heal/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE)
if(!..())
return
- while((brutehealing && target.getBruteLoss()) || (burnhealing && target.getFireLoss()))
+ while((brutehealing && target.get_brute_loss()) || (burnhealing && target.get_fire_loss()))
if(!..())
break
@@ -87,12 +87,12 @@
var/burn_healed = burnhealing
var/dead_patient = FALSE
if(target.stat == DEAD) //dead patients get way less additional heal from the damage they have.
- brute_healed += round((target.getBruteLoss() * (brute_multiplier * 0.2)),0.1)
- burn_healed += round((target.getFireLoss() * (burn_multiplier * 0.2)),0.1)
+ brute_healed += round((target.get_brute_loss() * (brute_multiplier * 0.2)),0.1)
+ burn_healed += round((target.get_fire_loss() * (burn_multiplier * 0.2)),0.1)
dead_patient = TRUE
else
- brute_healed += round((target.getBruteLoss() * brute_multiplier),0.1)
- burn_healed += round((target.getFireLoss() * burn_multiplier),0.1)
+ brute_healed += round((target.get_brute_loss() * brute_multiplier),0.1)
+ burn_healed += round((target.get_fire_loss() * burn_multiplier),0.1)
dead_patient = FALSE
if(!get_location_accessible(target, target_zone))
brute_healed *= 0.55
@@ -130,8 +130,8 @@
)
var/brute_dealt = brutehealing * 0.8
var/burn_dealt = burnhealing * 0.8
- brute_dealt += round((target.getBruteLoss() * (brute_multiplier * 0.5)),0.1)
- burn_dealt += round((target.getFireLoss() * (burn_multiplier * 0.5)),0.1)
+ brute_dealt += round((target.get_brute_loss() * (brute_multiplier * 0.5)),0.1)
+ burn_dealt += round((target.get_fire_loss() * (burn_multiplier * 0.5)),0.1)
target.take_bodypart_damage(brute_dealt, burn_dealt, wound_bonus=CANT_WOUND)
return FALSE
@@ -164,11 +164,11 @@
if(!brute_healed)
return
- var/estimated_remaining_steps = target.getBruteLoss() / brute_healed
+ var/estimated_remaining_steps = target.get_brute_loss() / brute_healed
var/progress_text
if(locate(/obj/item/healthanalyzer) in user.held_items)
- progress_text = ". Remaining brute: [target.getBruteLoss()]"
+ progress_text = ". Remaining brute: [target.get_brute_loss()]"
else
switch(estimated_remaining_steps)
if(-INFINITY to 1)
@@ -229,11 +229,11 @@
/datum/surgery_step/heal/burn/get_progress(mob/user, mob/living/carbon/target, brute_healed, burn_healed)
if(!burn_healed)
return
- var/estimated_remaining_steps = target.getFireLoss() / burn_healed
+ var/estimated_remaining_steps = target.get_fire_loss() / burn_healed
var/progress_text
if(locate(/obj/item/healthanalyzer) in user.held_items)
- progress_text = ". Remaining burn: [target.getFireLoss()]"
+ progress_text = ". Remaining burn: [target.get_fire_loss()]"
else
switch(estimated_remaining_steps)
if(-INFINITY to 1)
@@ -294,17 +294,17 @@
/datum/surgery_step/heal/combo/get_progress(mob/user, mob/living/carbon/target, brute_healed, burn_healed)
var/estimated_remaining_steps = 0
if(brute_healed > 0)
- estimated_remaining_steps = max(0, (target.getBruteLoss() / brute_healed))
+ estimated_remaining_steps = max(0, (target.get_brute_loss() / brute_healed))
if(burn_healed > 0)
- estimated_remaining_steps = max(estimated_remaining_steps, (target.getFireLoss() / burn_healed)) // whichever is higher between brute or burn steps
+ estimated_remaining_steps = max(estimated_remaining_steps, (target.get_fire_loss() / burn_healed)) // whichever is higher between brute or burn steps
var/progress_text
if(locate(/obj/item/healthanalyzer) in user.held_items)
- if(target.getBruteLoss())
- progress_text = ". Remaining brute: [target.getBruteLoss()]"
- if(target.getFireLoss())
- progress_text += ". Remaining burn: [target.getFireLoss()]"
+ if(target.get_brute_loss())
+ progress_text = ". Remaining brute: [target.get_brute_loss()]"
+ if(target.get_fire_loss())
+ progress_text += ". Remaining burn: [target.get_fire_loss()]"
else
switch(estimated_remaining_steps)
if(-INFINITY to 1)
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index ebde9505214..e9b7e94eae4 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -70,7 +70,7 @@
/datum/surgery_step/hepatectomy/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/mob/living/carbon/human/human_target = target
var/obj/item/organ/liver/target_liver = target.get_organ_slot(ORGAN_SLOT_LIVER)
- human_target.setOrganLoss(ORGAN_SLOT_LIVER, 10) //not bad, not great
+ human_target.set_organ_loss(ORGAN_SLOT_LIVER, 10) //not bad, not great
if(target_liver)
target_liver.operated = TRUE
if(target_liver.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
@@ -87,7 +87,7 @@
/datum/surgery_step/hepatectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery)
var/mob/living/carbon/human/human_target = target
- human_target.adjustOrganLoss(ORGAN_SLOT_LIVER, 15)
+ human_target.adjust_organ_loss(ORGAN_SLOT_LIVER, 15)
display_results(
user,
target,
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 4f1c32873d8..da9bb7a278e 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -68,7 +68,7 @@
if(ishuman(target))
var/mob/living/carbon/human/human_target = target
var/obj/item/organ/lungs/target_lungs = human_target.get_organ_slot(ORGAN_SLOT_LUNGS)
- human_target.setOrganLoss(ORGAN_SLOT_LUNGS, 60)
+ human_target.set_organ_loss(ORGAN_SLOT_LUNGS, 60)
if(target_lungs)
target_lungs.operated = TRUE
if(target_lungs.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
@@ -95,5 +95,5 @@
)
display_pain(target, "You feel a sharp stab in your chest; the wind is knocked out of you and it hurts to catch your breath!")
human_target.losebreath += 4
- human_target.adjustOrganLoss(ORGAN_SLOT_LUNGS, 10)
+ human_target.adjust_organ_loss(ORGAN_SLOT_LUNGS, 10)
return FALSE
diff --git a/code/modules/surgery/organs/internal/appendix/_appendix.dm b/code/modules/surgery/organs/internal/appendix/_appendix.dm
index 1b7df505799..2668e96d9ba 100644
--- a/code/modules/surgery/organs/internal/appendix/_appendix.dm
+++ b/code/modules/surgery/organs/internal/appendix/_appendix.dm
@@ -34,7 +34,7 @@
if(organ_flags & ORGAN_FAILING)
// forced to ensure people don't use it to gain tox as slime person
- owner.adjustToxLoss(2 * seconds_per_tick, forced = TRUE)
+ owner.adjust_tox_loss(2 * seconds_per_tick, forced = TRUE)
else if(inflamation_stage)
inflamation(seconds_per_tick)
else if(SPT_PROB(APPENDICITIS_PROB, seconds_per_tick) && !HAS_TRAIT(owner, TRAIT_TEMPORARY_BODY))
@@ -68,13 +68,13 @@
if(2)
if(SPT_PROB(1.5, seconds_per_tick))
to_chat(organ_owner, span_warning("You feel a stabbing pain in your abdomen!"))
- organ_owner.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 5)
+ organ_owner.adjust_organ_loss(ORGAN_SLOT_APPENDIX, 5)
organ_owner.Stun(rand(40, 60))
- organ_owner.adjustToxLoss(1, forced = TRUE)
+ organ_owner.adjust_tox_loss(1, forced = TRUE)
if(3)
if(SPT_PROB(0.5, seconds_per_tick))
organ_owner.vomit(VOMIT_CATEGORY_DEFAULT, lost_nutrition = 95)
- organ_owner.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 15)
+ organ_owner.adjust_organ_loss(ORGAN_SLOT_APPENDIX, 15)
/obj/item/organ/appendix/feel_for_damage(self_aware)
var/effective_stage = floor(inflamation_stage + (damage / maxHealth))
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
index 5d176683eda..9d83f3c7cff 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
@@ -244,7 +244,7 @@
to_chat(owner, span_userdanger("You feel an explosion erupt inside your [parse_zone(zone)] as your implant breaks!"))
owner.adjust_fire_stacks(20)
owner.ignite_mob()
- owner.adjustFireLoss(25)
+ owner.adjust_fire_loss(25)
organ_flags |= ORGAN_FAILING
/obj/item/organ/cyberimp/arm/toolkit/gun/laser
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
index 9c4b23d71f3..7b869624e28 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
@@ -90,19 +90,19 @@
/// boolean that stands for if PHYSICAL damage being patched
var/body_damage_patched = FALSE
var/need_mob_update = FALSE
- if(owner.getOxyLoss())
- need_mob_update += owner.adjustOxyLoss(-5, updating_health = FALSE)
+ if(owner.get_oxy_loss())
+ need_mob_update += owner.adjust_oxy_loss(-5, updating_health = FALSE)
revive_cost += 5
- if(owner.getBruteLoss())
- need_mob_update += owner.adjustBruteLoss(-2, updating_health = FALSE)
+ if(owner.get_brute_loss())
+ need_mob_update += owner.adjust_brute_loss(-2, updating_health = FALSE)
revive_cost += 40
body_damage_patched = TRUE
- if(owner.getFireLoss())
- need_mob_update += owner.adjustFireLoss(-2, updating_health = FALSE)
+ if(owner.get_fire_loss())
+ need_mob_update += owner.adjust_fire_loss(-2, updating_health = FALSE)
revive_cost += 40
body_damage_patched = TRUE
- if(owner.getToxLoss())
- need_mob_update += owner.adjustToxLoss(-1, updating_health = FALSE)
+ if(owner.get_tox_loss())
+ need_mob_update += owner.adjust_tox_loss(-1, updating_health = FALSE)
revive_cost += 40
if(need_mob_update)
owner.updatehealth()
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
index 18a77821228..67daf45f89b 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
@@ -202,8 +202,8 @@
owner.SetKnockdown(0)
owner.SetImmobilized(0)
owner.SetParalyzed(0)
- owner.setStaminaLoss(0)
- addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living, setStaminaLoss), 0), stun_resistance_time)
+ owner.set_stamina_loss(0)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living, set_stamina_loss), 0), stun_resistance_time)
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(5, 1, src)
diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm
index 116a19c5c41..48d52f7c1e0 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/internal/heart/_heart.dm
@@ -254,7 +254,7 @@
wounded_owner.adjust_blood_volume(2 * seconds_per_tick)
if(toxification_probability && prob(toxification_probability))
- wounded_owner.adjustToxLoss(1 * seconds_per_tick, updating_health = FALSE)
+ wounded_owner.adjust_tox_loss(1 * seconds_per_tick, updating_health = FALSE)
var/datum/wound/bloodiest_wound
diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
index 1a002103027..843317e2902 100644
--- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
+++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
@@ -188,8 +188,8 @@
if(owner.health <= owner.crit_threshold)
owner.heal_overall_damage(5, 5)
- owner.adjustOxyLoss(-5)
- owner.adjustToxLoss(-5)
+ owner.adjust_oxy_loss(-5)
+ owner.adjust_tox_loss(-5)
/datum/status_effect/voltaic_overdrive/on_apply()
. = ..()
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm
index a8b0ee54f85..df443868e4c 100755
--- a/code/modules/surgery/organs/internal/liver/_liver.dm
+++ b/code/modules/surgery/organs/internal/liver/_liver.dm
@@ -165,17 +165,17 @@
switch(failure_time)
//After 60 seconds we begin to feel the effects
if(1 * LIVER_FAILURE_STAGE_SECONDS to 2 * LIVER_FAILURE_STAGE_SECONDS - 1)
- owner.adjustToxLoss(0.2 * seconds_per_tick,forced = TRUE)
+ owner.adjust_tox_loss(0.2 * seconds_per_tick,forced = TRUE)
owner.adjust_disgust(0.1 * seconds_per_tick)
if(2 * LIVER_FAILURE_STAGE_SECONDS to 3 * LIVER_FAILURE_STAGE_SECONDS - 1)
- owner.adjustToxLoss(0.4 * seconds_per_tick,forced = TRUE)
+ owner.adjust_tox_loss(0.4 * seconds_per_tick,forced = TRUE)
owner.adjust_drowsiness(0.5 SECONDS * seconds_per_tick)
owner.adjust_disgust(0.3 * seconds_per_tick)
if(3 * LIVER_FAILURE_STAGE_SECONDS to 4 * LIVER_FAILURE_STAGE_SECONDS - 1)
- owner.adjustToxLoss(0.6 * seconds_per_tick,forced = TRUE)
- owner.adjustOrganLoss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.2 * seconds_per_tick)
+ owner.adjust_tox_loss(0.6 * seconds_per_tick,forced = TRUE)
+ owner.adjust_organ_loss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.2 * seconds_per_tick)
owner.adjust_drowsiness(1 SECONDS * seconds_per_tick)
owner.adjust_disgust(0.6 * seconds_per_tick)
@@ -183,8 +183,8 @@
owner.emote("drool")
if(4 * LIVER_FAILURE_STAGE_SECONDS to INFINITY)
- owner.adjustToxLoss(0.8 * seconds_per_tick,forced = TRUE)
- owner.adjustOrganLoss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.5 * seconds_per_tick)
+ owner.adjust_tox_loss(0.8 * seconds_per_tick,forced = TRUE)
+ owner.adjust_organ_loss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.5 * seconds_per_tick)
owner.adjust_drowsiness(1.6 SECONDS * seconds_per_tick)
owner.adjust_disgust(1.2 * seconds_per_tick)
@@ -247,7 +247,7 @@
if(. & EMP_PROTECT_SELF)
return
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
- owner.adjustToxLoss(10)
+ owner.adjust_tox_loss(10)
COOLDOWN_START(src, severe_cooldown, 10 SECONDS)
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags |= ORGAN_EMP //Starts organ faliure - gonna need replacing soon.
@@ -302,7 +302,7 @@
if(!(organ_owner.mob_biotypes & MOB_PLANT))
return
if(chem.type == /datum/reagent/toxin/plantbgone)
- organ_owner.adjustToxLoss(3 * REM * seconds_per_tick)
+ organ_owner.adjust_tox_loss(3 * REM * seconds_per_tick)
/obj/item/organ/liver/snail
name = "snail liver"
@@ -328,7 +328,7 @@
return
if(istype(chem, /datum/reagent/consumable/salt))
playsound(organ_owner, SFX_SEAR, 30, TRUE)
- organ_owner.adjustFireLoss(2 * REM * seconds_per_tick)
+ organ_owner.adjust_fire_loss(2 * REM * seconds_per_tick)
organ_owner.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick)
return COMSIG_MOB_STOP_REAGENT_TICK
diff --git a/code/modules/surgery/organs/internal/liver/liver_skeleton.dm b/code/modules/surgery/organs/internal/liver/liver_skeleton.dm
index b067e68ad3d..fe5d9764e54 100644
--- a/code/modules/surgery/organs/internal/liver/liver_skeleton.dm
+++ b/code/modules/surgery/organs/internal/liver/liver_skeleton.dm
@@ -19,8 +19,8 @@
if((. & COMSIG_MOB_STOP_REAGENT_TICK) || (organ_flags & ORGAN_FAILING))
return
if(istype(chem, /datum/reagent/toxin/bonehurtingjuice))
- organ_owner.adjustStaminaLoss(7.5 * REM * seconds_per_tick, updating_stamina = FALSE)
- organ_owner.adjustBruteLoss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
+ organ_owner.adjust_stamina_loss(7.5 * REM * seconds_per_tick, updating_stamina = FALSE)
+ organ_owner.adjust_brute_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE)
if(SPT_PROB(10, seconds_per_tick))
switch(rand(1, 3))
if(1)
diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm
index 50c5eadaddb..98ed1165653 100644
--- a/code/modules/surgery/organs/internal/lungs/_lungs.dm
+++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm
@@ -263,7 +263,7 @@
breathe_gas_volume(breath, /datum/gas/oxygen, /datum/gas/carbon_dioxide)
// Heal mob if not in crit.
if(breather.health >= breather.crit_threshold && breather.oxyloss)
- breather.adjustOxyLoss(-5)
+ breather.adjust_oxy_loss(-5)
/// Maximum Oxygen effects. "Too much O2!"
/obj/item/organ/lungs/proc/too_much_oxygen(mob/living/carbon/breather, datum/gas_mixture/breath, o2_pp, old_o2_pp)
@@ -310,7 +310,7 @@
breathe_gas_volume(breath, /datum/gas/nitrogen, /datum/gas/carbon_dioxide)
// Heal mob if not in crit.
if(breather.health >= breather.crit_threshold && breather.oxyloss)
- breather.adjustOxyLoss(-5)
+ breather.adjust_oxy_loss(-5)
/// Maximum CO2 effects. "Too much CO2!"
/obj/item/organ/lungs/proc/too_much_co2(mob/living/carbon/breather, datum/gas_mixture/breath, co2_pp, old_co2_pp)
@@ -364,7 +364,7 @@
breathe_gas_volume(breath, /datum/gas/plasma, /datum/gas/carbon_dioxide)
// Heal mob if not in crit.
if(breather.health >= breather.crit_threshold && breather.oxyloss)
- breather.adjustOxyLoss(-5)
+ breather.adjust_oxy_loss(-5)
/// Maximum Plasma effects. "Too much Plasma!"
/obj/item/organ/lungs/proc/too_much_plasma(mob/living/carbon/breather, datum/gas_mixture/breath, plasma_pp, old_plasma_pp)
@@ -390,7 +390,7 @@
if(bz_pp > BZ_trip_balls_min)
breather.reagents.add_reagent(/datum/reagent/bz_metabolites, clamp(bz_pp, 1, 5))
if(bz_pp > BZ_brain_damage_min && prob(33))
- breather.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150, ORGAN_ORGANIC)
+ breather.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3, 150, ORGAN_ORGANIC)
/// Breathing in refridgerator coolent, shit's caustic
/obj/item/organ/lungs/proc/too_much_freon(mob/living/carbon/breather, datum/gas_mixture/breath, freon_pp, old_freon_pp)
@@ -402,12 +402,12 @@
to_chat(breather, span_alert("Your mouth feels like it's burning!"))
if (freon_pp > 40)
breather.emote("gasp")
- breather.adjustFireLoss(15)
+ breather.adjust_fire_loss(15)
if (prob(freon_pp / 2))
to_chat(breather, span_alert("Your throat closes up!"))
breather.set_silence_if_lower(6 SECONDS)
else
- breather.adjustFireLoss(freon_pp / 4)
+ breather.adjust_fire_loss(freon_pp / 4)
/// Breathing in halon, convert it to a reagent
/obj/item/organ/lungs/proc/too_much_halon(mob/living/carbon/breather, datum/gas_mixture/breath, halon_pp, old_halon_pp)
@@ -415,7 +415,7 @@
breathe_gas_volume(breath, /datum/gas/halon)
// Metabolize to reagent.
if(halon_pp > gas_stimulation_min)
- breather.adjustOxyLoss(5)
+ breather.adjust_oxy_loss(5)
breather.reagents.add_reagent(/datum/reagent/halon, max(0, 1 - breather.reagents.get_reagent_amount(/datum/reagent/halon)))
/// Sleeping gas with healing properties.
@@ -555,7 +555,7 @@
// Random chance to inflict side effects increases with pressure.
if((prob(nitrium_pp) && (nitrium_pp > 15)))
// Nitrium side-effect.
- breather.adjustOrganLoss(ORGAN_SLOT_LUNGS, nitrium_pp * 0.1)
+ breather.adjust_organ_loss(ORGAN_SLOT_LUNGS, nitrium_pp * 0.1)
to_chat(breather, span_notice("You feel a burning sensation in your chest"))
// Metabolize to reagents.
if (nitrium_pp > 5)
@@ -572,7 +572,7 @@
// Tritium side-effects.
if(gas_breathed > moles_visible)
var/ratio = gas_breathed * 15
- breather.adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
+ breather.adjust_tox_loss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
// If you're breathing in half an atmosphere of radioactive gas, you fucked up.
if((trit_pp > tritium_irradiation_moles_min) && SSradiation.can_irradiate_basic(breather))
var/lerp_scale = min(tritium_irradiation_moles_max, trit_pp - tritium_irradiation_moles_min) / (tritium_irradiation_moles_max - tritium_irradiation_moles_min)
@@ -629,7 +629,7 @@
breather.failed_last_breath = FALSE
// Vacuum-adapted lungs regenerate oxyloss even when breathing nothing.
if(breather.health >= breather.crit_threshold && breather.oxyloss)
- breather.adjustOxyLoss(-5)
+ breather.adjust_oxy_loss(-5)
else
// Can't breathe!
breather.failed_last_breath = TRUE
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index 61cad459a1c..dabe94251c0 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -134,7 +134,7 @@
if(bodypart_to_attach.check_for_frankenstein(target))
bodypart_to_attach.bodypart_flags |= BODYPART_IMPLANTED
if(organ_rejection_dam)
- target.adjustToxLoss(organ_rejection_dam)
+ target.adjust_tox_loss(organ_rejection_dam)
display_results(
user, target,
span_notice("You succeed in replacing [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index 65c8116769d..8f8120e09b8 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -111,7 +111,7 @@
span_notice("[user] send a powerful shock to [target]'s brain with [tool]..."),
)
target.grab_ghost()
- target.adjustOxyLoss(-50)
+ target.adjust_oxy_loss(-50)
if(iscarbon(target))
var/mob/living/carbon/carbon_target = target
carbon_target.set_heartattack(FALSE)
@@ -154,8 +154,8 @@
/datum/surgery_step/revive/carbon/on_revived(mob/surgeon, mob/living/patient)
. = ..()
- patient.adjustOrganLoss(ORGAN_SLOT_BRAIN, 50, 199) // MAD SCIENCE
+ patient.adjust_organ_loss(ORGAN_SLOT_BRAIN, 50, 199) // MAD SCIENCE
/datum/surgery_step/revive/carbon/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
. = ..()
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 180)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15, 180)
diff --git a/code/modules/surgery/stomachpump.dm b/code/modules/surgery/stomachpump.dm
index be298cfd45c..ea9a9314464 100644
--- a/code/modules/surgery/stomachpump.dm
+++ b/code/modules/surgery/stomachpump.dm
@@ -71,5 +71,5 @@
span_warning("[user] screws up, brusing [target_human]'s chest!"),
span_warning("[user] screws up!"),
)
- target_human.adjustOrganLoss(ORGAN_SLOT_STOMACH, 5)
- target_human.adjustBruteLoss(5)
+ target_human.adjust_organ_loss(ORGAN_SLOT_STOMACH, 5)
+ target_human.adjust_brute_loss(5)
diff --git a/code/modules/unit_tests/combat.dm b/code/modules/unit_tests/combat.dm
index 5bc27037c42..80ccbaf8dad 100644
--- a/code/modules/unit_tests/combat.dm
+++ b/code/modules/unit_tests/combat.dm
@@ -8,7 +8,7 @@
puncher.set_combat_mode(TRUE)
victim.attack_hand(puncher, list(RIGHT_CLICK = FALSE))
- TEST_ASSERT(victim.getBruteLoss() > 0, "Victim took no brute damage after being punched")
+ TEST_ASSERT(victim.get_brute_loss() > 0, "Victim took no brute damage after being punched")
/datum/unit_test/harm_melee/Run()
var/mob/living/carbon/human/tider = allocate(/mob/living/carbon/human/consistent)
@@ -19,7 +19,7 @@
tider.set_combat_mode(TRUE)
victim.attackby(toolbox, tider)
- TEST_ASSERT(victim.getBruteLoss() > 0, "Victim took no brute damage after being hit by a toolbox")
+ TEST_ASSERT(victim.get_brute_loss() > 0, "Victim took no brute damage after being hit by a toolbox")
/datum/unit_test/harm_different_damage/Run()
var/mob/living/carbon/human/attacker = allocate(/mob/living/carbon/human/consistent)
@@ -32,8 +32,8 @@
welding_tool.attack_self(attacker) // Turn it on
victim.attackby(welding_tool, attacker)
- TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took brute damage from a lit welding tool")
- TEST_ASSERT(victim.getFireLoss() > 0, "Victim took no burn damage after being hit by a lit welding tool")
+ TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took brute damage from a lit welding tool")
+ TEST_ASSERT(victim.get_fire_loss() > 0, "Victim took no burn damage after being hit by a lit welding tool")
/datum/unit_test/attack_chain
var/attack_hit
@@ -108,7 +108,7 @@
ADD_TRAIT(dummy, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
dummy.set_combat_mode(TRUE)
dummy.ClickOn(dummy)
- TEST_ASSERT_NOTEQUAL(dummy.getBruteLoss(), 0, "Dummy took no brute damage after self-punching")
+ TEST_ASSERT_NOTEQUAL(dummy.get_brute_loss(), 0, "Dummy took no brute damage after self-punching")
/// Tests handcuffed (HANDS_BLOCKED) mobs cannot punch
/datum/unit_test/handcuff_punch
@@ -120,11 +120,11 @@
ADD_TRAIT(attacker, TRAIT_HANDS_BLOCKED, TRAIT_SOURCE_UNIT_TESTS)
attacker.set_combat_mode(TRUE)
attacker.ClickOn(victim)
- TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took brute damage from being punched by a handcuffed attacker")
+ TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took brute damage from being punched by a handcuffed attacker")
attacker.next_move = -1
attacker.next_click = -1
attacker.ClickOn(attacker)
- TEST_ASSERT_EQUAL(attacker.getBruteLoss(), 0, "Attacker took brute damage from self-punching while handcuffed")
+ TEST_ASSERT_EQUAL(attacker.get_brute_loss(), 0, "Attacker took brute damage from self-punching while handcuffed")
/// Tests handcuffed (HANDS_BLOCKED) monkeys can still bite despite being cuffed
/datum/unit_test/handcuff_bite
@@ -137,7 +137,7 @@
attacker.set_combat_mode(TRUE)
attacker.set_species(/datum/species/monkey)
attacker.ClickOn(victim)
- TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim took no brute damage from being bit by a handcuffed monkey, which is incorrect, as it's a bite attack")
+ TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim took no brute damage from being bit by a handcuffed monkey, which is incorrect, as it's a bite attack")
/// Tests that soundbang_act (and therefore sound_damage) works correctly
/datum/unit_test/soundbang
diff --git a/code/modules/unit_tests/combat_blocking.dm b/code/modules/unit_tests/combat_blocking.dm
index 45c14507085..17e2da816db 100644
--- a/code/modules/unit_tests/combat_blocking.dm
+++ b/code/modules/unit_tests/combat_blocking.dm
@@ -11,7 +11,7 @@
ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
click_wrapper(attacker, victim)
- TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took damage from being punched despite having a 100% block chance chair in their hands.")
+ TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took damage from being punched despite having a 100% block chance chair in their hands.")
/// Test that items can block weapon attacks
/datum/unit_test/armed_blocking
@@ -26,10 +26,10 @@
ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
click_wrapper(attacker, victim)
- TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took damage from being punched despite having a 100% block chance shield in their hands.")
+ TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took damage from being punched despite having a 100% block chance shield in their hands.")
var/obj/item/storage/toolbox/weapon = EASY_ALLOCATE()
attacker.put_in_active_hand(weapon, forced = TRUE)
click_wrapper(attacker, victim)
- TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took damage from being hit with a weapon despite having a 100% block chance shield in their hands.")
+ TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took damage from being hit with a weapon despite having a 100% block chance shield in their hands.")
diff --git a/code/modules/unit_tests/combat_eyestab.dm b/code/modules/unit_tests/combat_eyestab.dm
index bb1126ae40d..d065607bec2 100644
--- a/code/modules/unit_tests/combat_eyestab.dm
+++ b/code/modules/unit_tests/combat_eyestab.dm
@@ -11,7 +11,7 @@
attacker.set_combat_mode(TRUE)
click_wrapper(attacker, victim)
- TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim should have taken some brute damage from an eyestab with combat mode on")
+ TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim should have taken some brute damage from an eyestab with combat mode on")
var/obj/item/organ/eyes/eyes = victim.get_organ_slot(ORGAN_SLOT_EYES)
TEST_ASSERT_NOTEQUAL(eyes.damage, 0, "Victim's eyes should have taken some damage from an eyestab with combat mode on")
diff --git a/code/modules/unit_tests/combat_flash.dm b/code/modules/unit_tests/combat_flash.dm
index 815be27f486..b30ea772160 100644
--- a/code/modules/unit_tests/combat_flash.dm
+++ b/code/modules/unit_tests/combat_flash.dm
@@ -18,7 +18,7 @@
victim.face_atom(attacker)
/datum/unit_test/flash_click/proc/check_results(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
- TEST_ASSERT_NOTEQUAL(victim.getStaminaLoss(), 0, "Victim should have sustained stamina loss from being flashed head-on [apply_verb].")
+ TEST_ASSERT_NOTEQUAL(victim.get_stamina_loss(), 0, "Victim should have sustained stamina loss from being flashed head-on [apply_verb].")
/// Tests that flashes flash on combat mode.
/datum/unit_test/flash_click/combat_mode
@@ -38,4 +38,4 @@
victim.equip_to_appropriate_slot(glasses)
/datum/unit_test/flash_click/flash_protection/check_results(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
- TEST_ASSERT_EQUAL(victim.getStaminaLoss(), 0, "Victim should not have sustained stamina loss from being flashed head-on [apply_verb].")
+ TEST_ASSERT_EQUAL(victim.get_stamina_loss(), 0, "Victim should not have sustained stamina loss from being flashed head-on [apply_verb].")
diff --git a/code/modules/unit_tests/combat_pistol_whip.dm b/code/modules/unit_tests/combat_pistol_whip.dm
index 4783d94242b..f67a57f9841 100644
--- a/code/modules/unit_tests/combat_pistol_whip.dm
+++ b/code/modules/unit_tests/combat_pistol_whip.dm
@@ -18,14 +18,14 @@
// Combat mode in melee range with RMB -> pistol whip
attacker.set_combat_mode(TRUE)
click_wrapper(attacker, victim, list(RIGHT_CLICK = TRUE, BUTTON = RIGHT_CLICK))
- TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim did not take brute damage from being pistol-whipped.")
+ TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim did not take brute damage from being pistol-whipped.")
TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo, "The gun fired a shot when it was used for a pistol whip.")
victim.fully_heal()
// Combat mode LMB -> point blank shot
attacker.set_combat_mode(TRUE)
click_wrapper(attacker, victim)
- TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim did not take brute damage from being fired upon point-blank.")
+ TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim did not take brute damage from being fired upon point-blank.")
TEST_ASSERT(locate(/obj/item/ammo_casing/c9mm) in attacker.loc, "The gun did not eject a casing when it was used for a point-blank shot.")
TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo - 1, "The gun did not fire a shot when it was used for a point-blank shot.")
victim.fully_heal()
@@ -36,7 +36,7 @@
attacker.set_combat_mode(TRUE)
click_wrapper(attacker, victim, list(RIGHT_CLICK = TRUE, BUTTON = RIGHT_CLICK))
- TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim did not take brute damage from being bayonet stabbed.")
+ TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim did not take brute damage from being bayonet stabbed.")
victim.fully_heal()
/// Test that bayonetted weapons can be used to butcher
diff --git a/code/modules/unit_tests/combat_stamina.dm b/code/modules/unit_tests/combat_stamina.dm
index 7c84f8281ae..d45633f5c33 100644
--- a/code/modules/unit_tests/combat_stamina.dm
+++ b/code/modules/unit_tests/combat_stamina.dm
@@ -6,9 +6,9 @@
var/mob/living/carbon/human/consistent/tider = allocate(__IMPLIED_TYPE__)
tider.stamina_regen_time = 0.2 SECONDS
var/stamloss_to_reach_crit_threshold = tider.maxHealth
- tider.adjustStaminaLoss(stamloss_to_reach_crit_threshold - 1)
+ tider.adjust_stamina_loss(stamloss_to_reach_crit_threshold - 1)
TEST_ASSERT(!tider.has_status_effect(/datum/status_effect/incapacitating/stamcrit), "Stamcrit should not be applied at [stamloss_to_reach_crit_threshold - 1] stamina damage")
- tider.adjustStaminaLoss(1)
+ tider.adjust_stamina_loss(1)
TEST_ASSERT(tider.has_status_effect(/datum/status_effect/incapacitating/stamcrit), "Stamcrit should be applied at [stamloss_to_reach_crit_threshold] stamina damage")
sleep(tider.stamina_regen_time * 2)
TEST_ASSERT(!tider.has_status_effect(/datum/status_effect/incapacitating/stamcrit), "Stamcrit should be removed after regen time")
@@ -20,6 +20,6 @@
/datum/unit_test/stam_regen/Run()
var/mob/living/carbon/human/consistent/tider = allocate(__IMPLIED_TYPE__)
tider.stamina_regen_time = 0.2 SECONDS
- tider.adjustStaminaLoss(50)
+ tider.adjust_stamina_loss(50)
sleep(tider.stamina_regen_time * 2)
- TEST_ASSERT_EQUAL(tider.getStaminaLoss(), 0, "Stamina should be fully regenerated after regen time")
+ TEST_ASSERT_EQUAL(tider.get_stamina_loss(), 0, "Stamina should be fully regenerated after regen time")
diff --git a/code/modules/unit_tests/combat_welder.dm b/code/modules/unit_tests/combat_welder.dm
index b44022fe049..764eb9e2216 100644
--- a/code/modules/unit_tests/combat_welder.dm
+++ b/code/modules/unit_tests/combat_welder.dm
@@ -10,7 +10,7 @@
weapon.attack_self(tider)
weapon.melee_attack_chain(tider, victim)
- TEST_ASSERT_NOTEQUAL(victim.getFireLoss(), 0, "Victim did not get burned by welder.")
+ TEST_ASSERT_NOTEQUAL(victim.get_fire_loss(), 0, "Victim did not get burned by welder.")
TEST_ASSERT_EQUAL(weapon.get_fuel(), weapon.max_fuel - 1, "Welder did not consume fuel on attacking a mob")
var/obj/structure/blob/blobby = EASY_ALLOCATE()
diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm
index 2b24d33e9e6..5300f667b3e 100644
--- a/code/modules/unit_tests/emoting.dm
+++ b/code/modules/unit_tests/emoting.dm
@@ -12,7 +12,7 @@
human.say("*beep")
TEST_ASSERT_EQUAL(emotes_used, 1, "Human beeped, when that should be restricted to silicons")
- human.setOxyLoss(140)
+ human.set_oxy_loss(140)
TEST_ASSERT(human.stat != CONSCIOUS, "Human is somehow conscious after receiving suffocation damage")
diff --git a/code/modules/unit_tests/explosion_action.dm b/code/modules/unit_tests/explosion_action.dm
index 6af3bc466f7..6e9abb3c2dc 100644
--- a/code/modules/unit_tests/explosion_action.dm
+++ b/code/modules/unit_tests/explosion_action.dm
@@ -205,6 +205,6 @@
/// Proc to lessen the amount of copypasta we do for the alien tests, simply sets the rolling vars we have.
/datum/unit_test/explosion_action/proc/read_alien_damages(mob/living/carbon/alien/subject)
- alien_brute_loss = subject.getBruteLoss()
- alien_burn_loss = subject.getFireLoss()
+ alien_brute_loss = subject.get_brute_loss()
+ alien_burn_loss = subject.get_fire_loss()
alien_ear_damage = subject.get_organ_loss(ORGAN_SLOT_EARS)
diff --git a/code/modules/unit_tests/full_heal.dm b/code/modules/unit_tests/full_heal.dm
index 7449d2aeb4c..d81256211a7 100644
--- a/code/modules/unit_tests/full_heal.dm
+++ b/code/modules/unit_tests/full_heal.dm
@@ -46,13 +46,13 @@
dummy.apply_damages(brute = 10, burn = 10, tox = 10, oxy = 10, stamina = 10)
dummy.fully_heal(HEAL_DAMAGE)
- if(dummy.getBruteLoss())
+ if(dummy.get_brute_loss())
TEST_FAIL("The dummy still had brute damage after a fully heal!")
- if(dummy.getFireLoss())
+ if(dummy.get_fire_loss())
TEST_FAIL("The dummy still had burn damage after a fully heal!")
- if(dummy.getToxLoss())
+ if(dummy.get_tox_loss())
TEST_FAIL("The dummy still had toxins damage after a fully heal!")
- if(dummy.getOxyLoss())
+ if(dummy.get_oxy_loss())
TEST_FAIL("The dummy still had oxy damage after a fully heal!")
- if(dummy.getStaminaLoss())
+ if(dummy.get_stamina_loss())
TEST_FAIL("The dummy still had stamina damage after a fully heal!")
diff --git a/code/modules/unit_tests/hulk.dm b/code/modules/unit_tests/hulk.dm
index bb4d5f06c4f..aed8c145906 100644
--- a/code/modules/unit_tests/hulk.dm
+++ b/code/modules/unit_tests/hulk.dm
@@ -17,7 +17,7 @@
TEST_ASSERT_EQUAL(hulk_hits, 1, "Hulk should have hit the dummy once.")
TEST_ASSERT_EQUAL(hand_hits, 0, "Hulk should not have hit the dummy with attack_hand.")
- TEST_ASSERT(dummy.getBruteLoss(), "Dummy should have taken brute damage from being hulk punched.")
+ TEST_ASSERT(dummy.get_brute_loss(), "Dummy should have taken brute damage from being hulk punched.")
/datum/unit_test/hulk_attack/proc/hulk_sig_fire()
SIGNAL_HANDLER
diff --git a/code/modules/unit_tests/human_through_recycler.dm b/code/modules/unit_tests/human_through_recycler.dm
index c51b9a0e30b..1f62a022c05 100644
--- a/code/modules/unit_tests/human_through_recycler.dm
+++ b/code/modules/unit_tests/human_through_recycler.dm
@@ -13,7 +13,7 @@
if(assistant.stat < UNCONSCIOUS)
TEST_FAIL("Assistant was not made unconscious by the emagged recycler!") // crush_living() on the recycler should have made the assistant unconscious or worse.
// crush_living() on the recycler should have applied the crush_damage to the assistant.
- var/damage_incurred = assistant.getBruteLoss()
+ var/damage_incurred = assistant.get_brute_loss()
TEST_ASSERT_EQUAL(damage_incurred, chewer.crush_damage, "Assistant did not take the expected amount of brute damage ([chewer.crush_damage]) from the emagged recycler! Took ([damage_incurred]) instead.")
TEST_ASSERT(chewer.bloody, "The emagged recycler did not become bloody after crushing the assistant!")
diff --git a/code/modules/unit_tests/interaction_silicon.dm b/code/modules/unit_tests/interaction_silicon.dm
index 4b4efe85ee4..bc3a8ba59b8 100644
--- a/code/modules/unit_tests/interaction_silicon.dm
+++ b/code/modules/unit_tests/interaction_silicon.dm
@@ -34,5 +34,5 @@
borgo.forceMove(locate(attacker.x + 1, attacker.y, attacker.z))
attacker.set_combat_mode(TRUE)
click_wrapper(attacker, borgo)
- TEST_ASSERT_EQUAL(borgo.getBruteLoss(), 0, "Cyborg took damage from an unarmed punched - \
+ TEST_ASSERT_EQUAL(borgo.get_brute_loss(), 0, "Cyborg took damage from an unarmed punched - \
their unarmed damage threshold should be too high for this to happen.")
diff --git a/code/modules/unit_tests/liver.dm b/code/modules/unit_tests/liver.dm
index f2f5dcfd00f..5843df40638 100644
--- a/code/modules/unit_tests/liver.dm
+++ b/code/modules/unit_tests/liver.dm
@@ -23,15 +23,15 @@
var/expected_stamina_damage = (7.5 * REM * SECONDS_PER_TICK)
var/expected_brute_damage = (0.5 * REM * SECONDS_PER_TICK)
- TEST_ASSERT_EQUAL(mrbones.getStaminaLoss(), expected_stamina_damage,
- "Skeleton took [mrbones.getStaminaLoss() > expected_stamina_damage ? "more" : "less"] stamina damage than expected")
- TEST_ASSERT_EQUAL(mrbones.getBruteLoss(), expected_brute_damage,
- "Skeleton took [mrbones.getBruteLoss() > expected_brute_damage ? "more" : "less"] brute damage than expected")
+ TEST_ASSERT_EQUAL(mrbones.get_stamina_loss(), expected_stamina_damage,
+ "Skeleton took [mrbones.get_stamina_loss() > expected_stamina_damage ? "more" : "less"] stamina damage than expected")
+ TEST_ASSERT_EQUAL(mrbones.get_brute_loss(), expected_brute_damage,
+ "Skeleton took [mrbones.get_brute_loss() > expected_brute_damage ? "more" : "less"] brute damage than expected")
mrbones.reagents.remove_all(mrbones.reagents.total_volume)
mrbones.fully_heal()
- TEST_ASSERT_EQUAL(mrbones.getStaminaLoss(), 0, "Skeleton did not fully heal stamina damage")
- TEST_ASSERT_EQUAL(mrbones.getBruteLoss(), 0, "Skeleton did not fully heal brute damage")
+ TEST_ASSERT_EQUAL(mrbones.get_stamina_loss(), 0, "Skeleton did not fully heal stamina damage")
+ TEST_ASSERT_EQUAL(mrbones.get_brute_loss(), 0, "Skeleton did not fully heal brute damage")
// Test milk reactions
diff --git a/code/modules/unit_tests/mob_damage.dm b/code/modules/unit_tests/mob_damage.dm
index 5567e3aa454..46c108502d9 100644
--- a/code/modules/unit_tests/mob_damage.dm
+++ b/code/modules/unit_tests/mob_damage.dm
@@ -52,7 +52,7 @@
*/
/datum/unit_test/mob_damage/proc/test_apply_damage(mob/living/testing_mob, amount, expected = -amount, amount_after, included_types, biotypes, bodytypes, forced)
if(isnull(amount_after))
- amount_after = testing_mob.getStaminaLoss() - expected // stamina loss applies to both carbon and basic mobs the same way, so that's why we're using it here
+ amount_after = testing_mob.get_stamina_loss() - expected // stamina loss applies to both carbon and basic mobs the same way, so that's why we're using it here
if(!apply_damage(testing_mob, amount, expected, included_types, biotypes, bodytypes, forced))
return FALSE
if(!verify_damage(testing_mob, amount_after, included_types))
@@ -77,7 +77,7 @@
*/
/datum/unit_test/mob_damage/proc/test_set_damage(mob/living/testing_mob, amount, expected, amount_after, included_types, biotypes, bodytypes, forced)
if(isnull(amount_after))
- amount_after = testing_mob.getStaminaLoss() - expected
+ amount_after = testing_mob.get_stamina_loss() - expected
if(!set_damage(testing_mob, amount, expected, included_types, biotypes, bodytypes, forced))
return FALSE
if(!verify_damage(testing_mob, amount_after, included_types))
@@ -95,28 +95,28 @@
*/
/datum/unit_test/mob_damage/proc/verify_damage(mob/living/carbon/testing_mob, amount, included_types = ALL)
if(included_types & TOXLOSS)
- TEST_ASSERT_EQUAL(testing_mob.getToxLoss(), amount, \
- "[testing_mob] should have [amount] toxin damage, instead they have [testing_mob.getToxLoss()]!")
+ TEST_ASSERT_EQUAL(testing_mob.get_tox_loss(), amount, \
+ "[testing_mob] should have [amount] toxin damage, instead they have [testing_mob.get_tox_loss()]!")
if(included_types & BRUTELOSS)
- TEST_ASSERT_EQUAL(round(testing_mob.getBruteLoss(), 1), amount, \
- "(Testing getBruteLoss()) [testing_mob] should have [amount] brute damage, instead they have [testing_mob.getBruteLoss()]!")
- TEST_ASSERT_EQUAL(round(testing_mob.getBruteLossForType(BODYTYPE_ORGANIC), 1), amount, \
- "(Testing getBruteLossForType(BODYTYPE_ORGANIC)) [testing_mob] should have [amount] brute damage, instead they have [testing_mob.getBruteLossForType(BODYTYPE_ORGANIC)]!")
+ TEST_ASSERT_EQUAL(round(testing_mob.get_brute_loss(), 1), amount, \
+ "(Testing get_brute_loss()) [testing_mob] should have [amount] brute damage, instead they have [testing_mob.get_brute_loss()]!")
+ TEST_ASSERT_EQUAL(round(testing_mob.get_brute_loss_for_type(BODYTYPE_ORGANIC), 1), amount, \
+ "(Testing get_brute_loss_for_type(BODYTYPE_ORGANIC)) [testing_mob] should have [amount] brute damage, instead they have [testing_mob.get_brute_loss_for_type(BODYTYPE_ORGANIC)]!")
if(included_types & FIRELOSS)
- TEST_ASSERT_EQUAL(round(testing_mob.getFireLoss(), 1), amount, \
- "(Testing getFireLoss()) [testing_mob] should have [amount] burn damage, instead they have [testing_mob.getFireLoss()]!")
- TEST_ASSERT_EQUAL(round(testing_mob.getFireLossForType(BODYTYPE_ORGANIC), 1), amount, \
- "(Testing getFireLossForType(BODYTYPE_ORGANIC)) [testing_mob] should have [amount] burn damage, instead they have [testing_mob.getFireLossForType(BODYTYPE_ORGANIC)]!")
+ TEST_ASSERT_EQUAL(round(testing_mob.get_fire_loss(), 1), amount, \
+ "(Testing get_fire_loss()) [testing_mob] should have [amount] burn damage, instead they have [testing_mob.get_fire_loss()]!")
+ TEST_ASSERT_EQUAL(round(testing_mob.get_fire_loss_for_type(BODYTYPE_ORGANIC), 1), amount, \
+ "(Testing get_fire_loss_for_type(BODYTYPE_ORGANIC)) [testing_mob] should have [amount] burn damage, instead they have [testing_mob.get_fire_loss_for_type(BODYTYPE_ORGANIC)]!")
if(included_types & OXYLOSS)
- TEST_ASSERT_EQUAL(testing_mob.getOxyLoss(), amount, \
- "[testing_mob] should have [amount] oxy damage, instead they have [testing_mob.getOxyLoss()]!")
+ TEST_ASSERT_EQUAL(testing_mob.get_oxy_loss(), amount, \
+ "[testing_mob] should have [amount] oxy damage, instead they have [testing_mob.get_oxy_loss()]!")
if(included_types & STAMINALOSS)
- TEST_ASSERT_EQUAL(testing_mob.getStaminaLoss(), amount, \
- "[testing_mob] should have [amount] stamina damage, instead they have [testing_mob.getStaminaLoss()]!")
+ TEST_ASSERT_EQUAL(testing_mob.get_stamina_loss(), amount, \
+ "[testing_mob] should have [amount] stamina damage, instead they have [testing_mob.get_stamina_loss()]!")
return TRUE
/**
- * Apply a specific amount of damage to the mob using adjustBruteLoss(), adjustToxLoss(), etc.
+ * Apply a specific amount of damage to the mob using adjust_brute_loss(), adjust_tox_loss(), etc.
*
* By default this applies damage of every type to the mob, and checks that the damage procs return the value
* Arguments:
@@ -131,29 +131,29 @@
/datum/unit_test/mob_damage/proc/apply_damage(mob/living/carbon/testing_mob, amount, expected = -amount, included_types = ALL, biotypes = ALL, bodytypes = ALL, forced = FALSE)
var/damage_returned
if(included_types & TOXLOSS)
- damage_returned = testing_mob.adjustToxLoss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
+ damage_returned = testing_mob.adjust_tox_loss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "adjustToxLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "adjust_tox_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & BRUTELOSS)
- damage_returned = round(testing_mob.adjustBruteLoss(amount, updating_health = FALSE, forced = forced, required_bodytype = bodytypes), 1)
+ damage_returned = round(testing_mob.adjust_brute_loss(amount, updating_health = FALSE, forced = forced, required_bodytype = bodytypes), 1)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "adjustBruteLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "adjust_brute_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & FIRELOSS)
- damage_returned = round(testing_mob.adjustFireLoss(amount, updating_health = FALSE, forced = forced, required_bodytype = bodytypes), 1)
+ damage_returned = round(testing_mob.adjust_fire_loss(amount, updating_health = FALSE, forced = forced, required_bodytype = bodytypes), 1)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "adjustFireLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "adjust_fire_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & OXYLOSS)
- damage_returned = testing_mob.adjustOxyLoss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
+ damage_returned = testing_mob.adjust_oxy_loss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "adjustOxyLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "adjust_oxy_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & STAMINALOSS)
- damage_returned = testing_mob.adjustStaminaLoss(amount, updating_stamina = FALSE, forced = forced, required_biotype = biotypes)
+ damage_returned = testing_mob.adjust_stamina_loss(amount, updating_stamina = FALSE, forced = forced, required_biotype = biotypes)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "adjustStaminaLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "adjust_stamina_loss() should have returned [expected], but returned [damage_returned] instead!")
return TRUE
/**
- * Set a specific amount of damage for the mob using setBruteLoss(), setToxLoss(), etc.
+ * Set a specific amount of damage for the mob using set_brute_loss(), set_tox_loss(), etc.
*
* By default this sets every type of damage to for the mob, and checks that the damage procs return the value
* Arguments:
@@ -168,28 +168,28 @@
/datum/unit_test/mob_damage/proc/set_damage(mob/living/carbon/testing_mob, amount, expected = -amount, included_types = ALL, biotypes = ALL, bodytypes = ALL, forced = FALSE)
var/damage_returned
if(included_types & TOXLOSS)
- damage_returned = testing_mob.setToxLoss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
+ damage_returned = testing_mob.set_tox_loss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "setToxLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "set_tox_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & BRUTELOSS)
- damage_returned = round(testing_mob.setBruteLoss(amount, updating_health = FALSE, forced = forced), 1)
+ damage_returned = round(testing_mob.set_brute_loss(amount, updating_health = FALSE, forced = forced), 1)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "setBruteLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "set_brute_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & FIRELOSS)
- damage_returned = round(testing_mob.setFireLoss(amount, updating_health = FALSE, forced = forced), 1)
+ damage_returned = round(testing_mob.set_fire_loss(amount, updating_health = FALSE, forced = forced), 1)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "setFireLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "set_fire_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & OXYLOSS)
- damage_returned = testing_mob.setOxyLoss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
+ damage_returned = testing_mob.set_oxy_loss(amount, updating_health = FALSE, forced = forced, required_biotype = biotypes)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "setOxyLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "set_oxy_loss() should have returned [expected], but returned [damage_returned] instead!")
if(included_types & STAMINALOSS)
- damage_returned = testing_mob.setStaminaLoss(amount, updating_stamina = FALSE, forced = forced, required_biotype = biotypes)
+ damage_returned = testing_mob.set_stamina_loss(amount, updating_stamina = FALSE, forced = forced, required_biotype = biotypes)
TEST_ASSERT_EQUAL(damage_returned, expected, \
- "setStaminaLoss() should have returned [expected], but returned [damage_returned] instead!")
+ "set_stamina_loss() should have returned [expected], but returned [damage_returned] instead!")
return TRUE
-/// Sanity tests damage and healing using adjustToxLoss, adjustBruteLoss, etc
+/// Sanity tests damage and healing using adjust_tox_loss, adjust_brute_loss, etc
/datum/unit_test/mob_damage/proc/test_sanity_simple(mob/living/carbon/human/consistent/dummy)
// Apply 5 damage and then heal it
if(!test_apply_damage(dummy, amount = 5))
@@ -230,10 +230,10 @@
TEST_ASSERT_EQUAL(damage_returned, -7, \
"take_bodypart_damage() should have returned -7, but returned [damage_returned] instead!")
- TEST_ASSERT_EQUAL(round(dummy.getBruteLoss(), 1), 5, \
- "Dummy should have 5 brute damage, instead they have [dummy.getBruteLoss()]!")
- TEST_ASSERT_EQUAL(round(dummy.getFireLoss(), 1), 2, \
- "Dummy should have 2 burn damage, instead they have [dummy.getFireLoss()]!")
+ TEST_ASSERT_EQUAL(round(dummy.get_brute_loss(), 1), 5, \
+ "Dummy should have 5 brute damage, instead they have [dummy.get_brute_loss()]!")
+ TEST_ASSERT_EQUAL(round(dummy.get_fire_loss(), 1), 2, \
+ "Dummy should have 2 burn damage, instead they have [dummy.get_fire_loss()]!")
// heal 4 brute, 1 burn
damage_returned = round(dummy.heal_bodypart_damage(4, 1, updating_health = FALSE), 1)
@@ -356,14 +356,14 @@
// TRAIT_NOBREATH is supposed to prevent oxyloss damage (but not healing). Let's make sure that's the case.
ADD_TRAIT(dummy, TRAIT_NOBREATH, TRAIT_SOURCE_UNIT_TESTS)
// force some oxyloss here
- dummy.setOxyLoss(2, updating_health = FALSE, forced = TRUE)
+ dummy.set_oxy_loss(2, updating_health = FALSE, forced = TRUE)
// Try to take more oxyloss damage with TRAIT_NOBREATH. It should not work.
- if(!test_apply_damage(dummy, 2, expected = 0, amount_after = dummy.getOxyLoss(), included_types = OXYLOSS))
+ if(!test_apply_damage(dummy, 2, expected = 0, amount_after = dummy.get_oxy_loss(), included_types = OXYLOSS))
TEST_FAIL("ABOVE FAILURE: failed test_nobreath! mob took oxyloss damage while having TRAIT_NOBREATH")
// Make sure we are still be able to heal the oxyloss. This should work.
- if(!test_apply_damage(dummy, -2, amount_after = dummy.getOxyLoss()-2, included_types = OXYLOSS))
+ if(!test_apply_damage(dummy, -2, amount_after = dummy.get_oxy_loss()-2, included_types = OXYLOSS))
TEST_FAIL("ABOVE FAILURE: failed test_nobreath! mob could not heal oxyloss damage while having TRAIT_NOBREATH")
REMOVE_TRAIT(dummy, TRAIT_NOBREATH, TRAIT_SOURCE_UNIT_TESTS)
@@ -376,28 +376,28 @@
// TRAIT_TOXINLOVER is supposed to invert toxin damage and healing. Things that would normally cause toxloss now heal it, and vice versa.
ADD_TRAIT(dummy, TRAIT_TOXINLOVER, TRAIT_SOURCE_UNIT_TESTS)
// force some toxloss here
- dummy.setToxLoss(2, updating_health = FALSE, forced = TRUE)
+ dummy.set_tox_loss(2, updating_health = FALSE, forced = TRUE)
// Try to take more toxloss damage with TRAIT_TOXINLOVER. It should heal instead.
- if(!test_apply_damage(dummy, 2, expected = 2, amount_after = dummy.getToxLoss()-2, included_types = TOXLOSS))
+ if(!test_apply_damage(dummy, 2, expected = 2, amount_after = dummy.get_tox_loss()-2, included_types = TOXLOSS))
TEST_FAIL("ABOVE FAILURE: failed test_toxintraits! mob did not heal from toxin damage with TRAIT_TOXINLOVER")
// If we try to heal the toxloss we should take damage instead
- if(!test_apply_damage(dummy, -2, expected = -2, amount_after = dummy.getToxLoss()+2, included_types = TOXLOSS))
+ if(!test_apply_damage(dummy, -2, expected = -2, amount_after = dummy.get_tox_loss()+2, included_types = TOXLOSS))
TEST_FAIL("ABOVE FAILURE: failed test_toxintraits! mob did not take damage from toxin healing with TRAIT_TOXINLOVER")
// TOXIMMUNE trait should prevent the damage you get from being healed by toxins medicines while having TRAIT_TOXINLOVER
ADD_TRAIT(dummy, TRAIT_TOXIMMUNE, TRAIT_SOURCE_UNIT_TESTS)
// need to force apply some toxin damage since the TOXIMUNNE trait sets toxloss to 0 upon being added
- dummy.setToxLoss(2, updating_health = FALSE, forced = TRUE)
+ dummy.set_tox_loss(2, updating_health = FALSE, forced = TRUE)
// try to 'heal' again - this time it should just do nothing because we should be immune to any sort of toxin damage - including from inverted healing
- if(!test_apply_damage(dummy, -2, expected = 0, amount_after = dummy.getToxLoss(), included_types = TOXLOSS))
+ if(!test_apply_damage(dummy, -2, expected = 0, amount_after = dummy.get_tox_loss(), included_types = TOXLOSS))
TEST_FAIL("ABOVE FAILURE: failed test_toxintraits! mob should not have taken any damage or healing with TRAIT_TOXINLOVER + TRAIT_TOXIMMUNE")
// ok, let's try taking 'damage'. The inverted damage should still heal mobs with the TOXIMMUNE trait.
- if(!test_apply_damage(dummy, 2, expected = 2, amount_after = dummy.getToxLoss()-2, included_types = TOXLOSS))
+ if(!test_apply_damage(dummy, 2, expected = 2, amount_after = dummy.get_tox_loss()-2, included_types = TOXLOSS))
TEST_FAIL("ABOVE FAILURE: failed test_toxintraits! mob did not heal from taking toxin damage with TRAIT_TOXINLOVER + TRAIT_TOXIMMUNE")
REMOVE_TRAIT(dummy, TRAIT_TOXINLOVER, TRAIT_SOURCE_UNIT_TESTS)
@@ -418,12 +418,12 @@
"heal_ordered_damage() should have returned 30, but returned [damage_returned] instead!")
// Should have 10 burn damage and 20 toxins damage remaining, let's check
- TEST_ASSERT_EQUAL(dummy.getBruteLoss(), 0, \
- "[src] should have 0 brute damage, but has [dummy.getBruteLoss()] instead!")
- TEST_ASSERT_EQUAL(dummy.getFireLoss(), 10, \
- "[src] should have 10 burn damage, but has [dummy.getFireLoss()] instead!")
- TEST_ASSERT_EQUAL(dummy.getToxLoss(), 20, \
- "[src] should have 20 toxin damage, but has [dummy.getToxLoss()] instead!")
+ TEST_ASSERT_EQUAL(dummy.get_brute_loss(), 0, \
+ "[src] should have 0 brute damage, but has [dummy.get_brute_loss()] instead!")
+ TEST_ASSERT_EQUAL(dummy.get_fire_loss(), 10, \
+ "[src] should have 10 burn damage, but has [dummy.get_fire_loss()] instead!")
+ TEST_ASSERT_EQUAL(dummy.get_tox_loss(), 20, \
+ "[src] should have 20 toxin damage, but has [dummy.get_tox_loss()] instead!")
// Now heal the remaining 30, overhealing by 5.
damage_returned = round(dummy.heal_ordered_damage(35, list(BRUTE, BURN, TOX)), 1)
@@ -431,12 +431,12 @@
"heal_ordered_damage() should have returned 30, but returned [damage_returned] instead!")
// Should have no damage remaining
- TEST_ASSERT_EQUAL(dummy.getBruteLoss(), 0, \
- "[src] should have 0 brute damage, but has [dummy.getBruteLoss()] instead!")
- TEST_ASSERT_EQUAL(dummy.getFireLoss(), 0, \
- "[src] should have 0 burn damage, but has [dummy.getFireLoss()] instead!")
- TEST_ASSERT_EQUAL(dummy.getToxLoss(), 0, \
- "[src] should have 0 toxin damage, but has [dummy.getToxLoss()] instead!")
+ TEST_ASSERT_EQUAL(dummy.get_brute_loss(), 0, \
+ "[src] should have 0 brute damage, but has [dummy.get_brute_loss()] instead!")
+ TEST_ASSERT_EQUAL(dummy.get_fire_loss(), 0, \
+ "[src] should have 0 burn damage, but has [dummy.get_fire_loss()] instead!")
+ TEST_ASSERT_EQUAL(dummy.get_tox_loss(), 0, \
+ "[src] should have 0 toxin damage, but has [dummy.get_tox_loss()] instead!")
/// Tests that mob damage procs are working as intended for basic and simple mobs
/datum/unit_test/mob_damage/animal
@@ -475,20 +475,20 @@
*/
/datum/unit_test/mob_damage/animal/verify_damage(mob/living/carbon/testing_mob, amount, expected, included_types = ALL)
if(included_types & TOXLOSS)
- TEST_ASSERT_EQUAL(testing_mob.getToxLoss(), 0, \
- "[testing_mob] should have [0] toxin damage, instead they have [testing_mob.getToxLoss()]!")
+ TEST_ASSERT_EQUAL(testing_mob.get_tox_loss(), 0, \
+ "[testing_mob] should have [0] toxin damage, instead they have [testing_mob.get_tox_loss()]!")
if(included_types & BRUTELOSS)
- TEST_ASSERT_EQUAL(round(testing_mob.getBruteLoss(), 1), expected || amount * 4, \
- "[testing_mob] should have [expected || amount * 4] brute damage, instead they have [testing_mob.getBruteLoss()]!")
+ TEST_ASSERT_EQUAL(round(testing_mob.get_brute_loss(), 1), expected || amount * 4, \
+ "[testing_mob] should have [expected || amount * 4] brute damage, instead they have [testing_mob.get_brute_loss()]!")
if(included_types & FIRELOSS)
- TEST_ASSERT_EQUAL(round(testing_mob.getFireLoss(), 1), 0, \
- "[testing_mob] should have [0] burn damage, instead they have [testing_mob.getFireLoss()]!")
+ TEST_ASSERT_EQUAL(round(testing_mob.get_fire_loss(), 1), 0, \
+ "[testing_mob] should have [0] burn damage, instead they have [testing_mob.get_fire_loss()]!")
if(included_types & OXYLOSS)
- TEST_ASSERT_EQUAL(testing_mob.getOxyLoss(), 0, \
- "[testing_mob] should have [0] oxy damage, instead they have [testing_mob.getOxyLoss()]!")
+ TEST_ASSERT_EQUAL(testing_mob.get_oxy_loss(), 0, \
+ "[testing_mob] should have [0] oxy damage, instead they have [testing_mob.get_oxy_loss()]!")
if(included_types & STAMINALOSS)
- TEST_ASSERT_EQUAL(testing_mob.getStaminaLoss(), amount, \
- "[testing_mob] should have [amount] stamina damage, instead they have [testing_mob.getStaminaLoss()]!")
+ TEST_ASSERT_EQUAL(testing_mob.get_stamina_loss(), amount, \
+ "[testing_mob] should have [amount] stamina damage, instead they have [testing_mob.get_stamina_loss()]!")
return TRUE
/datum/unit_test/mob_damage/animal/test_sanity_simple(mob/living/carbon/test_mob)
@@ -603,15 +603,15 @@
/datum/unit_test/human_tox_damage/Run()
// Spawn a dummy, give it a bunch of tox damage. It should get the status effect.
var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
- dummy.setToxLoss(75)
+ dummy.set_tox_loss(75)
var/datum/status_effect/tox_effect = dummy.has_status_effect(/datum/status_effect/tox_vomit)
- TEST_ASSERT_NOTNULL(tox_effect, "Dummy didn't get tox_vomit status effect despite at [dummy.getToxLoss()] toxin damage (Method: SET)!")
+ TEST_ASSERT_NOTNULL(tox_effect, "Dummy didn't get tox_vomit status effect despite at [dummy.get_tox_loss()] toxin damage (Method: SET)!")
// Clear the toxin damage away, and force a status effect tick: It should delete itself
- dummy.setToxLoss(0)
+ dummy.set_tox_loss(0)
tox_effect.tick(tox_effect.tick_interval)
- TEST_ASSERT(QDELETED(tox_effect), "Dummy still has tox_vomit status effect despite at [dummy.getToxLoss()] toxin damage (Method: SET)!")
+ TEST_ASSERT(QDELETED(tox_effect), "Dummy still has tox_vomit status effect despite at [dummy.get_tox_loss()] toxin damage (Method: SET)!")
// Test another method of gaining tox damage, use an entirely clean slate just to be sure
var/mob/living/carbon/human/dummy_two = allocate(/mob/living/carbon/human/consistent)
- dummy_two.adjustToxLoss(75)
+ dummy_two.adjust_tox_loss(75)
var/datum/status_effect/tox_effect_two = dummy_two.has_status_effect(/datum/status_effect/tox_vomit)
- TEST_ASSERT_NOTNULL(tox_effect_two, "Dummy didn't get tox_vomit status effect at [dummy_two.getToxLoss()] toxin damage (METHOD: ADJUST)!")
+ TEST_ASSERT_NOTNULL(tox_effect_two, "Dummy didn't get tox_vomit status effect at [dummy_two.get_tox_loss()] toxin damage (METHOD: ADJUST)!")
diff --git a/code/modules/unit_tests/novaflower_burn.dm b/code/modules/unit_tests/novaflower_burn.dm
index ae7d61b34ad..165a738fda3 100644
--- a/code/modules/unit_tests/novaflower_burn.dm
+++ b/code/modules/unit_tests/novaflower_burn.dm
@@ -14,18 +14,18 @@
// They are not wearing botany gloves (have plant protection), so they should take damage = the flower's force.
weapon.attack_hand(botanist)
TEST_ASSERT_EQUAL(botanist.get_active_held_item(), weapon, "The botanist failed to pick up [weapon].")
- TEST_ASSERT_EQUAL(botanist.getFireLoss(), weapon.force, "The botanist picked up [weapon] with their bare hands, and took an incorrect amount of fire damage.")
+ TEST_ASSERT_EQUAL(botanist.get_fire_loss(), weapon.force, "The botanist picked up [weapon] with their bare hands, and took an incorrect amount of fire damage.")
// Heal our attacker for easy comparison later
- botanist.adjustFireLoss(-100)
+ botanist.adjust_fire_loss(-100)
// And give them the plant safe trait so we don't have to worry about attacks being cancelled
ADD_TRAIT(botanist, TRAIT_PLANT_SAFE, "unit_test")
// Now, let's get a smack with the novaflower and see what happens.
weapon.melee_attack_chain(botanist, victim)
- TEST_ASSERT(botanist.getFireLoss() <= 0, "The botanist took fire damage from [weapon], even though they were plant safe.")
- TEST_ASSERT_EQUAL(victim.getFireLoss(), initial_force, "The target took an incorrect amount of fire damage after being hit with [weapon].")
+ TEST_ASSERT(botanist.get_fire_loss() <= 0, "The botanist took fire damage from [weapon], even though they were plant safe.")
+ TEST_ASSERT_EQUAL(victim.get_fire_loss(), initial_force, "The target took an incorrect amount of fire damage after being hit with [weapon].")
TEST_ASSERT(weapon.force < initial_force, "[weapon] didn't lose any force after an attack.")
TEST_ASSERT(victim.fire_stacks > 0, "[weapon] didn't apply any firestacks to the target after an attack.")
TEST_ASSERT(victim.on_fire, "[weapon] didn't set the target on fire after an attack.")
diff --git a/code/modules/unit_tests/organs.dm b/code/modules/unit_tests/organs.dm
index 816447bdb52..32b47460f38 100644
--- a/code/modules/unit_tests/organs.dm
+++ b/code/modules/unit_tests/organs.dm
@@ -78,8 +78,8 @@
/datum/unit_test/organ_damage/proc/test_organ(mob/living/carbon/human/dummy, obj/item/organ/test_organ)
var/slot_to_use = test_organ.slot
- // Tests [mob/living/proc/adjustOrganLoss]
- TEST_ASSERT_EQUAL(dummy.adjustOrganLoss(slot_to_use, test_organ.maxHealth * 10), -test_organ.maxHealth, \
+ // Tests [mob/living/proc/adjust_organ_loss]
+ TEST_ASSERT_EQUAL(dummy.adjust_organ_loss(slot_to_use, test_organ.maxHealth * 10), -test_organ.maxHealth, \
"Mob level \"apply organ damage\" returned the wrong value for [slot_to_use] organ with default arguments.")
TEST_ASSERT_EQUAL(dummy.get_organ_loss(slot_to_use), test_organ.maxHealth, \
"Mob level \"apply organ damage\" can exceed the [slot_to_use] organ's damage cap with default arguments.")
@@ -89,14 +89,14 @@
dummy.fully_heal(HEAL_ORGANS)
// Tests [mob/living/proc/set_organ_damage]
- TEST_ASSERT_EQUAL(dummy.setOrganLoss(slot_to_use, test_organ.maxHealth * 10), -test_organ.maxHealth, \
+ TEST_ASSERT_EQUAL(dummy.set_organ_loss(slot_to_use, test_organ.maxHealth * 10), -test_organ.maxHealth, \
"Mob level \"set organ damage\" returned the wrong value for [slot_to_use] organ with default arguments.")
TEST_ASSERT_EQUAL(dummy.get_organ_loss(slot_to_use), test_organ.maxHealth, \
"Mob level \"set organ damage\" can exceed the [slot_to_use] organ's damage cap with default arguments.")
dummy.fully_heal(HEAL_ORGANS)
- // Tests [mob/living/proc/adjustOrganLoss] with a large max supplied
- TEST_ASSERT_EQUAL(dummy.adjustOrganLoss(slot_to_use, test_organ.maxHealth * 10, INFINITY), -test_organ.maxHealth, \
+ // Tests [mob/living/proc/adjust_organ_loss] with a large max supplied
+ TEST_ASSERT_EQUAL(dummy.adjust_organ_loss(slot_to_use, test_organ.maxHealth * 10, INFINITY), -test_organ.maxHealth, \
"Mob level \"apply organ damage\" returned the wrong value for [slot_to_use] organ with a large maximum supplied.")
TEST_ASSERT_EQUAL(dummy.get_organ_loss(slot_to_use), test_organ.maxHealth, \
"Mob level \"apply organ damage\" can exceed the [slot_to_use] organ's damage cap with a large maximum supplied.")
diff --git a/code/modules/unit_tests/oxyloss_suffocation.dm b/code/modules/unit_tests/oxyloss_suffocation.dm
index a44911ebbba..94d234b4bb6 100644
--- a/code/modules/unit_tests/oxyloss_suffocation.dm
+++ b/code/modules/unit_tests/oxyloss_suffocation.dm
@@ -4,7 +4,7 @@
/datum/unit_test/oxyloss_suffocation/Run()
var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
- dummy.setOxyLoss(75)
+ dummy.set_oxy_loss(75)
TEST_ASSERT(HAS_TRAIT_FROM(dummy, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT), "Dummy should have been knocked out from taking oxy damage.")
- dummy.setOxyLoss(0)
+ dummy.set_oxy_loss(0)
TEST_ASSERT(!HAS_TRAIT_FROM(dummy, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT), "Dummy should have woken up from KO when healing to 0 oxy damage.")
diff --git a/code/modules/unit_tests/projectiles.dm b/code/modules/unit_tests/projectiles.dm
index 7c2b1c00aa8..6980fc6247c 100644
--- a/code/modules/unit_tests/projectiles.dm
+++ b/code/modules/unit_tests/projectiles.dm
@@ -28,7 +28,7 @@
loaded_bullet.def_zone = BODY_ZONE_CHEST
var/did_we_shoot = test_gun.melee_attack_chain(gunner, victim)
TEST_ASSERT(did_we_shoot, "Gun does not appeared to have successfully fired.")
- TEST_ASSERT_EQUAL(victim.getBruteLoss(), expected_damage, "Victim took incorrect amount of damage, expected [expected_damage], got [victim.getBruteLoss()].")
+ TEST_ASSERT_EQUAL(victim.get_brute_loss(), expected_damage, "Victim took incorrect amount of damage, expected [expected_damage], got [victim.get_brute_loss()].")
var/obj/item/bodypart/expected_part = victim.get_bodypart(BODY_ZONE_CHEST)
TEST_ASSERT_EQUAL(expected_part.brute_dam, expected_damage, "Intended bodypart took incorrect amount of damage, either it hit another bodypart or armor was incorrectly applied. Expected [expected_damage], got [expected_part.brute_dam].")
diff --git a/code/modules/unit_tests/reagent_mob_expose.dm b/code/modules/unit_tests/reagent_mob_expose.dm
index 383225d3fab..47350dffb85 100644
--- a/code/modules/unit_tests/reagent_mob_expose.dm
+++ b/code/modules/unit_tests/reagent_mob_expose.dm
@@ -6,9 +6,9 @@
/datum/reagent/method_patch_test/expose_mob(mob/living/target, methods = PATCH, reac_volume, show_message = TRUE)
. = ..()
if(methods & PATCH)
- target.setBruteLoss(20)
+ target.set_brute_loss(20)
if(methods & INJECT)
- target.setBruteLoss(10)
+ target.set_brute_loss(10)
/datum/unit_test/reagent_mob_expose/Run()
// Life() is handled just by tests
@@ -47,18 +47,18 @@
// PATCH
human.fully_heal(ALL)
- TEST_ASSERT_EQUAL(human.getBruteLoss(), 0, "Human health did not set properly")
+ TEST_ASSERT_EQUAL(human.get_brute_loss(), 0, "Human health did not set properly")
patch.reagents.add_reagent(/datum/reagent/method_patch_test, 1)
patch.self_delay = 0
patch.interact_with_atom(human, human)
patch.get_embed().process(SSdcs.wait / 10)
human.Life(SSMOBS_DT)
- TEST_ASSERT_EQUAL(human.getBruteLoss(), 20, "Human health did not update after patch was applied")
+ TEST_ASSERT_EQUAL(human.get_brute_loss(), 20, "Human health did not update after patch was applied")
// INJECT
syringe.reagents.add_reagent(/datum/reagent/method_patch_test, 1)
syringe.melee_attack_chain(human, human)
- TEST_ASSERT_EQUAL(human.getBruteLoss(), 10, "Human health did not update after injection from syringe")
+ TEST_ASSERT_EQUAL(human.get_brute_loss(), 10, "Human health did not update after injection from syringe")
// INHALE
human.fully_heal(ALL)
diff --git a/code/modules/unit_tests/strange_reagent.dm b/code/modules/unit_tests/strange_reagent.dm
index bcdf89f0a9c..deb46c96a0d 100644
--- a/code/modules/unit_tests/strange_reagent.dm
+++ b/code/modules/unit_tests/strange_reagent.dm
@@ -74,15 +74,15 @@
/datum/unit_test/strange_reagent/proc/damage_target_to_percentage(mob/living/target, percent)
var/damage = target_max_health * percent * 0.5
- target.setBruteLoss(damage, updating_health=FALSE) // no point running health update logic here
- target.setFireLoss(damage, updating_health=TRUE) // since we do it here
+ target.set_brute_loss(damage, updating_health=FALSE) // no point running health update logic here
+ target.set_fire_loss(damage, updating_health=TRUE) // since we do it here
update_amounts(target)
if(percent >= 1)
target.death()
return TRUE
/datum/unit_test/strange_reagent/proc/get_target_organic_health_manual(mob/living/target)
- return target.getMaxHealth() - (target.getBruteLoss() + target.getFireLoss())
+ return target.getMaxHealth() - (target.get_brute_loss() + target.get_fire_loss())
/datum/unit_test/strange_reagent/proc/test_damage_but_no_death(target_type)
var/mob/living/target = allocate_new_target(target_type)
diff --git a/code/modules/unit_tests/surgeries.dm b/code/modules/unit_tests/surgeries.dm
index ab02d33244f..dbec8532ecb 100644
--- a/code/modules/unit_tests/surgeries.dm
+++ b/code/modules/unit_tests/surgeries.dm
@@ -15,7 +15,7 @@
/datum/unit_test/brain_surgery/Run()
var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
patient.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY)
- patient.setOrganLoss(ORGAN_SLOT_BRAIN, 20)
+ patient.set_organ_loss(ORGAN_SLOT_BRAIN, 20)
TEST_ASSERT(patient.has_trauma_type(), "Patient does not have any traumas, despite being given one")
@@ -113,11 +113,11 @@
// Test that tending wounds actually lowers damage
var/datum/surgery_step/heal/brute/basic/basic_brute_heal = new
basic_brute_heal.success(user, patient, BODY_ZONE_CHEST)
- TEST_ASSERT(patient.getBruteLoss() < 100, "Tending brute wounds didn't lower brute damage ([patient.getBruteLoss()])")
+ TEST_ASSERT(patient.get_brute_loss() < 100, "Tending brute wounds didn't lower brute damage ([patient.get_brute_loss()])")
var/datum/surgery_step/heal/burn/basic/basic_burn_heal = new
basic_burn_heal.success(user, patient, BODY_ZONE_CHEST)
- TEST_ASSERT(patient.getFireLoss() < 100, "Tending burn wounds didn't lower burn damage ([patient.getFireLoss()])")
+ TEST_ASSERT(patient.get_fire_loss() < 100, "Tending burn wounds didn't lower burn damage ([patient.get_fire_loss()])")
// Test that wearing clothing lowers heal amount
var/mob/living/carbon/human/naked_patient = allocate(/mob/living/carbon/human/consistent)
@@ -130,7 +130,7 @@
basic_brute_heal.success(user, naked_patient, BODY_ZONE_CHEST)
basic_brute_heal.success(user, clothed_patient, BODY_ZONE_CHEST)
- TEST_ASSERT(naked_patient.getBruteLoss() < clothed_patient.getBruteLoss(), "Naked patient did not heal more from wounds tending than a clothed patient")
+ TEST_ASSERT(naked_patient.get_brute_loss() < clothed_patient.get_brute_loss(), "Naked patient did not heal more from wounds tending than a clothed patient")
/// Tests items-as-prosthetic-limbs can apply
/datum/unit_test/prosthetic_item
diff --git a/code/modules/unit_tests/tail_wag.dm b/code/modules/unit_tests/tail_wag.dm
index 595e3189521..03b921ac01b 100644
--- a/code/modules/unit_tests/tail_wag.dm
+++ b/code/modules/unit_tests/tail_wag.dm
@@ -92,7 +92,7 @@
TEST_FAIL("Tail did not start wagging when it should have!")
// kill the mob, see if it stops wagging
- dummy.adjustBruteLoss(9001)
+ dummy.adjust_brute_loss(9001)
if(dummy_tail.wag_flags & WAG_WAGGING)
TEST_FAIL("A mob's tail was still wagging after being killed!")
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index eeacfbc1776..67424be210d 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -157,7 +157,7 @@
carbon_occupant.set_eye_blur_if_lower(rand(10 SECONDS, 20 SECONDS))
hittarget_living.add_splatter_floor(small_drip = FALSE)
- hittarget_living.adjustBruteLoss(200)
+ hittarget_living.adjust_brute_loss(200)
log_combat(src, hittarget_living, "rammed into", null, "injuring all passengers and killing the [hittarget_living]")
dump_mobs(TRUE)
playsound(src, 'sound/vehicles/car_crash.ogg', 100)
diff --git a/code/modules/vehicles/cars/speedwagon.dm b/code/modules/vehicles/cars/speedwagon.dm
index ee3eac8a595..24c5f885fc0 100644
--- a/code/modules/vehicles/cars/speedwagon.dm
+++ b/code/modules/vehicles/cars/speedwagon.dm
@@ -35,7 +35,7 @@
return
var/mob/living/carbon/human/rammed = bumped
rammed.Paralyze(100)
- rammed.adjustStaminaLoss(30)
+ rammed.adjust_stamina_loss(30)
rammed.apply_damage(rand(20,35), BRUTE)
if(!crash_all)
rammed.throw_at(get_edge_target_turf(bumped, dir), 4, 3)
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index 15585e9caa5..40f40f621e6 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -208,14 +208,14 @@
to_chat(crushed_victim, span_userdanger("The tremors from [chassis] landing sends you flying!"))
var/fly_away_direction = get_dir(chassis, crushed_victim)
crushed_victim.throw_at(get_edge_target_turf(crushed_victim, fly_away_direction), 4, 3)
- crushed_victim.adjustBruteLoss(15)
+ crushed_victim.adjust_brute_loss(15)
continue
to_chat(crushed_victim, span_userdanger("[chassis] crashes down on you from above!"))
if(crushed_victim.stat != CONSCIOUS)
crushed_victim.investigate_log("has been gibbed by a falling Savannah Ivanov mech.", INVESTIGATE_DEATHS)
crushed_victim.gib(DROP_ALL_REMAINS)
continue
- crushed_victim.adjustBruteLoss(80)
+ crushed_victim.adjust_brute_loss(80)
/**
* ## abort_skyfall
diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
index 4cef8d0bf13..15a60fbb6d5 100644
--- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
@@ -116,10 +116,10 @@
"patient_health" = patient.health/patient.maxHealth,
"patient_state" = patient_state,
"core_temp" = core_temp,
- "brute_loss" = patient.getBruteLoss(),
- "burn_loss" = patient.getFireLoss(),
- "toxin_loss" = patient.getToxLoss(),
- "oxygen_loss" = patient.getOxyLoss(),
+ "brute_loss" = patient.get_brute_loss(),
+ "burn_loss" = patient.get_fire_loss(),
+ "toxin_loss" = patient.get_tox_loss(),
+ "oxygen_loss" = patient.get_oxy_loss(),
)
data["contained_reagents"] = get_reagent_data(patient.reagents.reagent_list)
data["has_brain_damage"] = patient.get_organ_loss(ORGAN_SLOT_BRAIN) != 0
@@ -147,7 +147,7 @@
log_message("[patient] no longer detected - Life support functions disabled.", LOG_MECHA)
STOP_PROCESSING(SSobj, src)
patient = null
- ex_patient.adjustOxyLoss(-2 * seconds_per_tick)
+ ex_patient.adjust_oxy_loss(-2 * seconds_per_tick)
ex_patient.AdjustStun(-4 SECONDS * seconds_per_tick)
ex_patient.AdjustKnockdown(-4 SECONDS * seconds_per_tick)
ex_patient.AdjustParalyzed(-4 SECONDS * seconds_per_tick)
diff --git a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
index 759a513c828..f8e49cf0949 100644
--- a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
@@ -190,7 +190,7 @@
target.visible_message(span_danger("[chassis] is drilling [target] with [src]!"), \
span_userdanger("[chassis] is drilling you with [src]!"))
log_combat(user, target, "drilled", "[name]", "Combat mode: [user.combat_mode ? "On" : "Off"])(DAMTYPE: [uppertext(damtype)])")
- if(target.stat == DEAD && target.getBruteLoss() >= (target.maxHealth * 2))
+ if(target.stat == DEAD && target.get_brute_loss() >= (target.maxHealth * 2))
log_combat(user, target, "gibbed", name)
if(LAZYLEN(target.butcher_results) || LAZYLEN(target.guaranteed_butcher_results))
SEND_SIGNAL(src, COMSIG_MECHA_DRILL_MOB, chassis, target)
diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index 7d11155bbab..ac8afa1a79a 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -197,13 +197,13 @@
unbuckle_mob(disabled)
disabled.throw_at(throw_target, 2, 3)
disabled.Knockdown(10 SECONDS)
- disabled.adjustStaminaLoss(40)
+ disabled.adjust_stamina_loss(40)
if(isliving(bumped_atom))
var/mob/living/ramtarget = bumped_atom
throw_target = get_edge_target_turf(ramtarget, pick(GLOB.cardinals))
ramtarget.throw_at(throw_target, 2, 3)
ramtarget.Knockdown(8 SECONDS)
- ramtarget.adjustStaminaLoss(35)
+ ramtarget.adjust_stamina_loss(35)
visible_message(span_danger("[src] crashes into [ramtarget], sending [disabled] and [ramtarget] flying!"))
else
visible_message(span_danger("[src] crashes into [bumped_atom], sending [disabled] flying!"))
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 7a4100f753e..9c15c7382dc 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -94,9 +94,9 @@
return
next_crash = world.time + 10
- rider.adjustStaminaLoss(instability*6)
+ rider.adjust_stamina_loss(instability*6)
playsound(src, 'sound/effects/bang.ogg', 40, TRUE)
- if(!iscarbon(rider) || rider.getStaminaLoss() >= 100 || grinding || iscarbon(bumped_thing))
+ if(!iscarbon(rider) || rider.get_stamina_loss() >= 100 || grinding || iscarbon(bumped_thing))
var/atom/throw_target = get_edge_target_turf(rider, pick(GLOB.cardinals))
unbuckle_mob(rider)
if((istype(bumped_thing, /obj/machinery/disposal/bin)))
@@ -108,7 +108,7 @@
rider.throw_at(throw_target, 3, 2)
var/head_slot = rider.get_item_by_slot(ITEM_SLOT_HEAD)
if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/utility/hardhat)))
- rider.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
+ rider.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5)
rider.updatehealth()
visible_message(span_danger("[src] crashes into [bumped_thing], sending [rider] flying!"))
rider.Paralyze(8 SECONDS)
@@ -133,8 +133,8 @@
return
var/mob/living/skater = buckled_mobs[1]
- skater.adjustStaminaLoss(instability*0.3)
- if(skater.getStaminaLoss() >= 100)
+ skater.adjust_stamina_loss(instability*0.3)
+ if(skater.get_stamina_loss() >= 100)
obj_flags = CAN_BE_HIT
playsound(src, 'sound/effects/bang.ogg', 20, TRUE)
unbuckle_mob(skater)
@@ -157,7 +157,7 @@
playsound(location, 'sound/items/trayhit/trayhit2.ogg', 40)
victim.apply_damage(damage = 25, damagetype = BRUTE, def_zone = victim.get_random_valid_zone(even_weights = TRUE), wound_bonus = 20)
victim.Paralyze(1.5 SECONDS)
- skater.adjustStaminaLoss(instability)
+ skater.adjust_stamina_loss(instability)
victim.visible_message(span_danger("[victim] straight up gets grinded into the ground by [skater]'s [src]! Radical!"))
addtimer(CALLBACK(src, PROC_REF(grind)), 0.1 SECONDS)
diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm
index 4028b8a02d2..5acd193d923 100644
--- a/code/modules/vehicles/vehicle_actions.dm
+++ b/code/modules/vehicles/vehicle_actions.dm
@@ -340,8 +340,8 @@
return
var/mob/living/rider = owner
var/turf/landing_turf = get_step(vehicle.loc, vehicle.dir)
- rider.adjustStaminaLoss(vehicle.instability* 0.75)
- if (rider.getStaminaLoss() >= 100)
+ rider.adjust_stamina_loss(vehicle.instability* 0.75)
+ if (rider.get_stamina_loss() >= 100)
vehicle.obj_flags &= ~CAN_BE_HIT
playsound(src, 'sound/effects/bang.ogg', 20, TRUE)
vehicle.unbuckle_mob(rider)
@@ -379,8 +379,8 @@
var/obj/vehicle/ridden/scooter/skateboard/board = vehicle_target
var/mob/living/rider = owner
- rider.adjustStaminaLoss(board.instability)
- if (rider.getStaminaLoss() >= 100)
+ rider.adjust_stamina_loss(board.instability)
+ if (rider.get_stamina_loss() >= 100)
playsound(src, 'sound/effects/bang.ogg', 20, vary = TRUE)
board.unbuckle_mob(rider)
rider.Paralyze(50)
@@ -390,7 +390,7 @@
span_userdanger("You smack against the board, hard."),
)
rider.emote("scream")
- rider.adjustBruteLoss(10) // thats gonna leave a mark
+ rider.adjust_brute_loss(10) // thats gonna leave a mark
return
rider.visible_message(
span_danger("[rider] misses the landing and falls on [rider.p_their()] face!"),
diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm
index 783c2baf4a5..69097acc256 100644
--- a/code/modules/vehicles/vehicle_key.dm
+++ b/code/modules/vehicles/vehicle_key.dm
@@ -77,7 +77,7 @@
user.visible_message(span_suicide("[user] forgot [user.p_they()] isn't actually a janicart! That's a paddlin'!"))
if(user.mind?.get_skill_level(/datum/skill/cleaning) >= SKILL_LEVEL_LEGENDARY) //Janny janny janny janny janny
playsound(src, 'sound/effects/adminhelp.ogg', 50, TRUE, -1)
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE)
/obj/item/key/lasso
diff --git a/code/modules/wiremod/components/atom/health.dm b/code/modules/wiremod/components/atom/health.dm
index 49798930d97..5f071d2758f 100644
--- a/code/modules/wiremod/components/atom/health.dm
+++ b/code/modules/wiremod/components/atom/health.dm
@@ -52,9 +52,9 @@
health.set_output(null)
return
- brute.set_output(organism.getBruteLoss())
- burn.set_output(organism.getFireLoss())
- toxin.set_output(organism.getToxLoss())
- oxy.set_output(organism.getOxyLoss())
+ brute.set_output(organism.get_brute_loss())
+ burn.set_output(organism.get_fire_loss())
+ toxin.set_output(organism.get_tox_loss())
+ oxy.set_output(organism.get_oxy_loss())
health.set_output(organism.health)
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index 71d3d6169a6..7e98f95695f 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -71,10 +71,10 @@
target.investigate_log("has been devoured by a zombie.", INVESTIGATE_DEATHS)
target.gib(DROP_ALL_REMAINS)
var/need_mob_update
- need_mob_update = user.adjustBruteLoss(-hp_gained, updating_health = FALSE)
- need_mob_update += user.adjustToxLoss(-hp_gained, updating_health = FALSE)
- need_mob_update += user.adjustFireLoss(-hp_gained, updating_health = FALSE)
- need_mob_update += user.adjustOrganLoss(ORGAN_SLOT_BRAIN, -hp_gained) // Zom Bee gibbers "BRAAAAISNSs!1!"
+ need_mob_update = user.adjust_brute_loss(-hp_gained, updating_health = FALSE)
+ need_mob_update += user.adjust_tox_loss(-hp_gained, updating_health = FALSE)
+ need_mob_update += user.adjust_fire_loss(-hp_gained, updating_health = FALSE)
+ need_mob_update += user.adjust_organ_loss(ORGAN_SLOT_BRAIN, -hp_gained) // Zom Bee gibbers "BRAAAAISNSs!1!"
user.set_nutrition(min(user.nutrition + hp_gained, NUTRITION_LEVEL_FULL))
if(need_mob_update)
user.updatehealth()
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index 10f1b5cf1c8..30d0fd98429 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -61,7 +61,7 @@
if(owner.mob_biotypes & MOB_MINERAL)//does not process in inorganic things
return
if (causes_damage && !iszombie(owner) && owner.stat != DEAD)
- owner.adjustToxLoss(0.5 * seconds_per_tick)
+ owner.adjust_tox_loss(0.5 * seconds_per_tick)
if (SPT_PROB(5, seconds_per_tick))
to_chat(owner, span_danger("You feel sick..."))
if(timer_id || HAS_TRAIT(owner, TRAIT_SUICIDED) || !owner.get_organ_by_type(/obj/item/organ/brain))