DarkPack13 · Magisterium2022 · Apr 3, 2026 · Apr 3, 2026 · Apr 3, 2026 · Apr 3, 2026
@@ -377,7 +377,9 @@ SUBSYSTEM_DEF(ticker)
 
 		iter_human.increment_scar_slot()
 		iter_human.load_persistent_scars()
+
 		iter_human.load_guestbook() // DARKPACK EDIT ADD
+		iter_human.update_soak() // DARKPACK EDIT ADDITION
 
 		if(!iter_human.hardcore_survival_score)
 			continue

@@ -256,7 +256,9 @@
 
 		humanc.increment_scar_slot()
 		humanc.load_persistent_scars()
+
 		humanc.load_guestbook() // DARKPACK EDIT ADD
+		humanc.update_soak() // DARKPACK EDIT ADD
 
 		if(GLOB.curse_of_madness_triggered)
 			give_madness(humanc, GLOB.curse_of_madness_triggered)

@@ -94,7 +94,7 @@
 		. += span_info("Someone appears to have attached a saddle to this one.")
 
 // Goliaths can summon tentacles more frequently as they take damage, scary.
-/mob/living/basic/mining/goliath/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing)
+/mob/living/basic/mining/goliath/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing, soak_difficulty = 6, unsoakable = FALSE)
 	. = ..()
 	if (. <= 0)
 		return

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
@@ -5,6 +5,7 @@
 	living_flags &= ~STOP_OVERLAY_UPDATE_BODY_PARTS
 
 	register_context()
+	update_soak() // DARKPACK EDIT ADDITION
 
 	GLOB.carbon_list += src
 	ADD_TRAIT(src, TRAIT_CAN_HOLD_ITEMS, INNATE_TRAIT) // Carbons are assumed to be innately capable of having arms, we check their arms count instead
@@ -1413,3 +1414,8 @@
 	if (overeatduration >= 200 SECONDS)
 		to_chat(src, span_danger("You suddenly feel blubbery!"))
 		add_traits(list(TRAIT_FAT, TRAIT_OFF_BALANCE_TACKLER), OBESITY)
+
+// DARKPACK EDIT START
+/mob/living/carbon/proc/update_soak() //Pretty basic calculation for the average person/being, soak is Bashing only using Stamina.
+	soak_dice_bashing = st_get_stat(STAT_STAMINA)
+// DARKPACK EDIT END
@@ -11,7 +11,13 @@
 	attack_direction = null,
 	attacking_item,
 	wound_clothing = TRUE,
+	soak_difficulty = 6,
+	unsoakable = FALSE,
 )
+
+	if(!forced && unsoakable == FALSE) //If the damage isn't forced and isn't unsoakable, run it through the soak proc.
+		damage = soak_roll(damage, damagetype, def_zone, sharpness, attacking_item, soak_difficulty)
+
 	// Spread damage should always have def zone be null
 	if(spread_damage)
 		def_zone = null
@@ -35,6 +41,7 @@
 	var/species_mod = (100 - dna.species.damage_modifier) / 100
 	return ..() * species_mod
 
+
 /mob/living/carbon/human/apply_damage(
 	damage = 0,
 	damagetype = BRUTE,
@@ -48,6 +55,8 @@
 	attack_direction = null,
 	attacking_item,
 	wound_clothing = TRUE,
+	soak_difficulty = 6,
+	unsoakable = FALSE,
 )
 
 	// Add relevant DR modifiers into blocked value to pass to parent
@@ -390,3 +399,51 @@
 		updatehealth()
 	if(update)
 		update_damage_overlays()
+// DARKPACK EDIT ADD START - (soak)
+/mob/living/carbon/proc/soak_roll(
+	damage = 0,
+	damagetype = BRUTE,
+	def_zone = null,
+	sharpness = NONE,
+	attacking_item,
+	soak_difficulty = 6)
+
+	var/roll_used = soak_dice_bashing
+	switch(damagetype)
+		if(BRUTE)
+			if(isprojectile(attacking_item))	
+				if(get_kindred_splat(src) && !def_zone == HEAD)
+					roll_used = soak_dice_bashing //Kindred take bullets as bashing unless they're to the head.
+				else 
+					roll_used = soak_dice_lethal //Otherwise it's lethal damage.
+			else if(!sharpness == NONE)	
+				roll_used = soak_dice_lethal //Sharp or piercing objects deal lethal to every splat.
+			else
+				roll_used = soak_dice_bashing //Everything else should take Bashing.
+		if(BURN)
+			roll_used = soak_dice_aggravated //Burning is always Agg.
+		if(TOX)
+			roll_used = soak_dice_lethal //Poisons can vary from Bashing to Lethal, but the vast majority are Lethal.
+		if(OXY)
+			roll_used = 0 //Oxygen damage is applied automatically and cannot be soaked.
+		if(STAMINA)
+			roll_used = soak_dice_bashing //Stamina damage is a little weird, but as per exhaustion rules for rituals and the like, you can soak it like Bashing. Not too sure about it though.
+		if(BRAIN)
+			roll_used = soak_dice_lethal //Not many situations where you'd take direct brain damage really, but it'd be lethal in this case.
+		if(AGGRAVATED)
+			roll_used = soak_dice_aggravated //Well, obviously.
+
+	if(roll_used < 1)
+		return damage //Skip the roll if it can't be soaked. Covers negative numbers too, in case of edge cases.
+
+	var/datum/storyteller_roll/soak/soak_roll = new()
+
+	soak_roll.difficulty = soak_difficulty //Overrides difficulty for adjustments when soak difficulty is different.
+	var/successes = soak_roll.st_roll(src, src, roll_used)
+
+	if(successes > 0)
+		damage = (max(0, damage - (successes * 10)))
+		to_chat(src, span_warning("You stand firm and are able to absorb some of the damage!"))
+
+	return damage 
+// DARKPACK EDIT ADD END
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
@@ -444,7 +444,11 @@ GLOBAL_LIST_EMPTY(features_by_species)
 
 	human_who_gained_species.living_flags &= ~STOP_OVERLAY_UPDATE_BODY_PARTS
 
-	//we don't allow it to update during species transition, so update it now
+//we don't allow it to update during species transition, so update it now
+// DARKPACK EDIT ADD START - (soak)
+	human_who_gained_species.update_soak() //Updates Soak values.
+// DARKPACK EDIT ADD END
+
 	human_who_gained_species.hud_used?.screen_objects[HUD_MOB_HEALTHDOLL]?.update_appearance()
 
 /**

@@ -17,6 +17,8 @@
  * * attack_direction - Direction of the attack from the attacker to [src].
  * * attacking_item - Item that is attacking [src].
  * * wound_clothing - If this should cause damage to clothing.
+ * * soak_difficulty - The difficulty of soaking an attack. Base is 6, adjusted by some unique effects, rare disciplines, and more. Only reference this if you've used the proper path and checked iscarbon() for apply_damage() or it'll throw up errors.
+ * * unsoakable - Whether an attack is soakable or not. By default off, some damage types and specific effects are unsoakable.
  *
  * Returns the amount of damage dealt.
  */
@@ -33,6 +35,8 @@
 	attack_direction = null,
 	attacking_item,
 	wound_clothing = TRUE,
+	soak_difficulty = 6,
+	unsoakable = FALSE,
 )
 	SHOULD_CALL_PARENT(TRUE)
 	var/damage_amount = damage

@@ -537,7 +537,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 		. = TRUE
 	return ..() || .
 
-/mob/living/silicon/robot/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing)
+/mob/living/silicon/robot/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing, soak_difficulty = 6, unsoakable = FALSE)
 	var/mob/living/silicon/robot/borg = src
 	var/obj/item/shield_module/shield = locate() in borg
 	if(!shield)

@@ -15,6 +15,7 @@
 /datum/unit_test/baton/Run()
 	var/mob/living/carbon/human/consistent/secoff = EASY_ALLOCATE()
 	var/mob/living/carbon/human/consistent/tider = EASY_ALLOCATE()
+	tider.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 	ADD_TRAIT(secoff, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
 
 	var/obj/item/melee/baton/stun_baton = allocate(baton_type)

@@ -3,6 +3,7 @@
 	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
 
 	puncher.st_set_stat(STAT_STRENGTH, 1) // DARKPACK EDIT ADD
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 	// Avoid all randomness in tests
 	ADD_TRAIT(puncher, TRAIT_PERFECT_ATTACKER, INNATE_TRAIT)
 
@@ -16,6 +17,9 @@
 	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
 	var/obj/item/storage/toolbox/toolbox = allocate(/obj/item/storage/toolbox)
 
+
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
+
 	tider.put_in_active_hand(toolbox, forced = TRUE)
 	tider.set_combat_mode(TRUE)
 	victim.attackby(toolbox, tider)
@@ -27,6 +31,8 @@
 	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
 	var/obj/item/weldingtool/welding_tool = allocate(/obj/item/weldingtool)
 
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Prevents potential issue with soak absorbing hit and causing this to fail to runtime properly.
+
 	attacker.put_in_active_hand(welding_tool, forced = TRUE)
 	attacker.set_combat_mode(TRUE)
 
@@ -106,6 +112,7 @@
 
 /datum/unit_test/self_punch/Run()
 	var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
+	dummy.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 	ADD_TRAIT(dummy, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
 	dummy.set_combat_mode(TRUE)
 	dummy.ClickOn(dummy)
@@ -119,6 +126,7 @@
 	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
 	ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
 	ADD_TRAIT(attacker, TRAIT_HANDS_BLOCKED, TRAIT_SOURCE_UNIT_TESTS)
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Prevents potential issue with soak absorbing hit and causing this to fail to runtime properly.
 	attacker.set_combat_mode(TRUE)
 	attacker.ClickOn(victim)
 	TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took brute damage from being punched by a handcuffed attacker")
@@ -133,6 +141,7 @@
 /datum/unit_test/handcuff_bite/Run()
 	var/mob/living/carbon/human/attacker = allocate(/mob/living/carbon/human/consistent)
 	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 	ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
 	ADD_TRAIT(attacker, TRAIT_HANDS_BLOCKED, TRAIT_SOURCE_UNIT_TESTS)
 	attacker.set_combat_mode(TRUE)

@@ -9,6 +9,7 @@
 	victim.put_in_active_hand(chair, forced = TRUE)
 	attacker.set_combat_mode(TRUE)
 	ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Prevents potential issue with soak absorbing hit and causing this to fail to runtime properly.
 
 	click_wrapper(attacker, victim)
 	TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took damage from being punched despite having a 100% block chance chair in their hands.")
@@ -24,6 +25,7 @@
 	victim.put_in_active_hand(shield, forced = TRUE)
 	attacker.set_combat_mode(TRUE)
 	ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Prevents potential issue with soak absorbing hit and causing this to fail to runtime properly.
 
 	click_wrapper(attacker, victim)
 	TEST_ASSERT_EQUAL(victim.get_brute_loss(), 0, "Victim took damage from being punched despite having a 100% block chance shield in their hands.")

@@ -6,6 +6,8 @@
 	var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
 	var/obj/item/screwdriver/stabber = EASY_ALLOCATE()
 
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
+
 	attacker.zone_selected = BODY_ZONE_PRECISE_EYES
 	attacker.put_in_active_hand(stabber, forced = TRUE)
 

@@ -8,6 +8,7 @@
 
 	attacker.put_in_active_hand(gun, forced = TRUE)
 	victim.forceMove(locate(attacker.x + 1, attacker.y, attacker.z))
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	var/expected_ammo = gun.magazine.max_ammo + 1
 	// These assertions are just here because I don't understand gun code

@@ -23,6 +23,7 @@
 	var/mob/living/simple_animal/test_simple_animal = allocate(/mob/living/simple_animal)
 	test_simple_animal.maxHealth = MAX_LIVING_HEALTH
 	test_simple_animal.health = MAX_LIVING_HEALTH
+	test_simple_animal.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	EX_ACT(test_simple_animal, EXPLODE_NONE) // should do nothing.
 	TEST_ASSERT_EQUAL(test_simple_animal.health, MAX_LIVING_HEALTH, "EX_ACT() with EXPLODE_NONE severity should not affect the health of a simple animal! Something has gone terribly wrong!")
@@ -62,6 +63,8 @@
 	var/mob/living/carbon/alien/test_alien = allocate(/mob/living/carbon/alien)
 	test_alien.maxHealth = MAX_LIVING_HEALTH
 	test_alien.health = MAX_LIVING_HEALTH
+	test_alien.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
+
 
 	EX_ACT(test_alien, EXPLODE_NONE) // should do nothing.
 	read_alien_damages(test_alien)
@@ -84,6 +87,7 @@
 
 	// Let's check to make sure the armor system works as expected. Corgi dogs are the only one that have this implemented on the basic level, so let's use that.
 	var/mob/living/basic/pet/dog/corgi/test_dog = set_up_test_dog()
+	test_dog.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	// those two items should give us a 100% armor rating, so let's test that to make sure it works (all ex_act checks should now be prob(100)), no room for error.
 	EX_ACT(test_dog, EXPLODE_LIGHT) // should do 20 damage (basic animals do a prob() check based on the armor rating, and divide the expected brute loss by 1.5).

@@ -7,6 +7,7 @@
 	var/mob/living/carbon/human/hulk = allocate(/mob/living/carbon/human/consistent)
 	var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
 
+	dummy.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	RegisterSignal(dummy, COMSIG_ATOM_HULK_ATTACK, PROC_REF(hulk_sig_fire))
 	RegisterSignal(dummy, COMSIG_ATOM_ATTACK_HAND, PROC_REF(hand_sig_fire))

@@ -8,6 +8,8 @@
 	var/turf/open/stage = get_turf(chewer)
 	assistant.forceMove(stage) // put the assistant in the recycler, to ensure that the recycler still registers incoming input.
 
+	assistant.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
+
 	// okay, let's first test the basics of how an emagged recycler should operate
 	TEST_ASSERT_NULL(QDELETED(assistant), "Assistant was deleted by the emagged recycler!") // The assistant should not be deleted by the recycler.
 	if(assistant.stat < UNCONSCIOUS)

@@ -16,6 +16,8 @@
 	TEST_ASSERT_EQUAL(mrbones.has_reagent(/datum/reagent/toxin/bonehurtingjuice), FALSE, "Skeleton somehow has bone hurting juice before drinking")
 	TEST_ASSERT_EQUAL(mrbones.has_reagent(/datum/reagent/consumable/milk), FALSE, "Skeleton somehow has milk before drinking")
 
+	mrbones.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
+
 	// Test bone hurting juice reactions
 
 	mrbones.reagents.add_reagent(bonehurting, 40)

@@ -1,6 +1,7 @@
 /// This test is used to make sure a flesh-and-bone base human can suffer all the types of wounds, and that suffering more severe wounds removes and replaces the lesser wound. Also tests that [/mob/living/carbon/proc/fully_heal] removes all wounds
 /datum/unit_test/test_human_base/Run()
 	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
+	victim.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	/// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm
 	var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM)

@@ -10,6 +10,7 @@
 	SSmobs.pause()
 	var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
 	dummy.maxHealth = 200 // tank mode
+	dummy.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	/* The sanity tests: here we make sure that:
 	1) That damage procs are returning the expected values. They should be returning the actual amount of damage taken/healed.

@@ -7,6 +7,7 @@
 	var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
 	var/obj/item/organ/tail/cat/dummy_tail = allocate(/obj/item/organ/tail/cat)
 	dummy_tail.Insert(dummy, special = TRUE, movement_flags = DELETE_IF_REPLACED)
+	dummy.st_set_stat(STAT_STAMINA, 0) // DARKPACK EDIT ADD //Avoids reading as broken because damage was soaked.
 
 	// SANITY TEST
 

@@ -9,3 +9,8 @@
 	var/fakediablerist = FALSE
 	var/can_be_embraced = TRUE
 
+	///The number of dice available to soak bashing, lethal, and aggravated damage
+	var/soak_dice_bashing = 0
+	var/soak_dice_lethal = 0
+	var/soak_dice_aggravated = 0
+
@@ -33,3 +33,34 @@
 
 
 	. = ..()
+
+/mob/living/carbon/human/update_soak() //Fairly complex list here. Kindred can soak lethal with Stamina, and Agg with Fortitude. Garou can soak everything in every form except their breed form, in which they can only soak Lethal and Bashing.
+	. = ..()
+	if(get_kindred_splat(src))
+		soak_dice_bashing = st_get_stat(STAT_STAMINA) //Stamina already has the Fortitude bonus added for Bashing and Lethal.
+		soak_dice_lethal = st_get_stat(STAT_STAMINA)
+		soak_dice_aggravated = 0 //Reset it beforehand in case you had leftover agg dice.
+		var/datum/discipline/soak_visceratika = get_discipline(/datum/discipline/visceratika)
+		var/datum/discipline/soak_fortitude = get_discipline(/datum/discipline/fortitude)
+		if(soak_visceratika && soak_visceratika.level >= 4)
+			soak_dice_aggravated += 1 //1 Agg and Lethal soak, 2 Bashing from Armour of Terra.
+			soak_dice_lethal += 1
+			soak_dice_bashing += 2
+		if(soak_fortitude)
+			soak_dice_aggravated += soak_fortitude.level
+
+	if(get_garou_splat(src))
+		soak_dice_bashing = st_get_stat(STAT_STAMINA)
+		soak_dice_lethal = st_get_stat(STAT_STAMINA)
+		var/datum/splat/werewolf/shifter/shifter_splat = get_shifter_splat(src)
+		if(shifter_splat.is_breed_form() && (shifter_splat.get_breed_form_species() != /datum/species/human/shifter/war)) //Garou don't soak Agg in breed form except for
+			soak_dice_aggravated = 0
+			return
+		soak_dice_aggravated = st_get_stat(STAT_STAMINA)
+
+	if(get_ghoul_splat(src))
+		var/datum/discipline/soak_fortitude = src.get_discipline(/datum/discipline/fortitude)
+		if(!soak_fortitude)
+			return
+		soak_dice_lethal = soak_fortitude.level //Ghouls can soak lethal and agg via fortitude.
+		soak_dice_aggravated = soak_fortitude.level
@@ -241,8 +241,6 @@
 	fully_replace_character_name(name, real_name)
 
 
-	maxHealth = round(initial(maxHealth)+(initial(maxHealth)/3)*(st_get_stat(STAT_STAMINA)))
-	health = round(initial(health)+(initial(health)/3)*(st_get_stat(STAT_STAMINA)))
 	last_health = health
 
 	is_criminal = socialrole.is_criminal

@@ -68,7 +68,7 @@
 	if(mortal.mind)
 		vamp.mind = mortal.mind
 
-	vamp.adjust_brute_loss(50)
+	vamp.apply_damage(50)
 	vamp.visible_message(span_danger("[vamp] suddenly convulses violently and falls into what appears to be a coma!"))
 	to_chat(vamp, span_boldwarning("The psychic shock of your host's death sends you into torpor!"))
 	vamp.torpor(DAMAGE_TRAIT)