All disc rolls use applicable stats for better behavoir

code/modules/mob/living/carbon/carbon.dm

@@ -61,17 +61,9 @@
 // DARKPACK EDIT ADD START
 		if(isliving(thrower))
 			var/mob/living/attacker = thrower
-			var/attacker_strengthbrawl = attacker.st_get_stat(STAT_STRENGTH) + attacker.st_get_stat(STAT_BRAWL)
-			var/attacker_dexathletics = attacker.st_get_stat(STAT_DEXTERITY) + attacker.st_get_stat(STAT_ATHLETICS)
-			var/attacker_keephigher = max(attacker_strengthbrawl, attacker_dexathletics)
 
-			var/victim_stamina = victim.st_get_stat(STAT_STAMINA)
-			var/victim_stambrawl = victim_stamina + victim.st_get_stat(STAT_BRAWL)
-			var/victim_stamathletics = victim_stamina + victim.st_get_stat(STAT_ATHLETICS)
-			var/victim_keephigher = max(victim_stambrawl, victim_stamathletics)
-
-			var/attacker_roll = SSroll.storyteller_roll(dice = attacker_keephigher, difficulty = 6, roller = thrower, numerical = TRUE)
-			var/victim_roll = SSroll.storyteller_roll(dice = victim_keephigher, difficulty = 6, roller = victim, numerical = TRUE)
+			var/attacker_roll = SSroll.storyteller_roll_datum(attacker, victim, /datum/storyteller_roll/tackle_attacker)
+			var/victim_roll = SSroll.storyteller_roll_datum(victim, attacker, /datum/storyteller_roll/tackle_defender)
 
 			if(victim_roll > attacker_roll)
 				blocked = TRUE

modular_darkpack/modules/battering_ram/code/battering_ram.dm

@@ -22,7 +22,7 @@
 		var/obj/structure/vampdoor/target_door = target
 		if(target_door.door_broken)
 			return COMPONENT_CANCEL_ATTACK_CHAIN
-		var/dice_result = SSroll.storyteller_roll(user.st_get_stat(STAT_STRENGTH)+user.st_get_stat(STAT_MELEE), 6, user, TRUE)
+		var/dice_result = SSroll.storyteller_roll_datum(user, applic_stats = list(STAT_STRENGTH, STAT_MELEE), numerical = TRUE)
 		if(!do_after(user, ((1 TURNS) / max(1, dice_result)), target))
 			return COMPONENT_CANCEL_ATTACK_CHAIN
 		if(prob(80 / max(1, dice_result)) || !dice_result)

modular_darkpack/modules/npc/code/nonhuman/hostile/abyss_tentacle.dm

@@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY(global_tentacle_grabs)
 	if(get_dist(source, src) > 0)
 		if(world.time >= source.tentacle_escape_attempt)
 			source.tentacle_escape_attempt = world.time + 1 TURNS
-			var/rollcheck = SSroll.storyteller_roll(source.st_get_stat(STAT_STRENGTH), 6, source)
+			var/rollcheck = SSroll.storyteller_roll_datum(source, applic_stats = list(STAT_STRENGTH))
 			switch(rollcheck)
 				if(ROLL_SUCCESS)
 					to_chat(source, span_notice("You break free from the tentacle's grasp!"))

modular_darkpack/modules/powers/code/discipline/auspex/auspex.dm

@@ -393,7 +393,7 @@
 
 /datum/discipline_power/auspex/psychic_projection/activate()
 	. = ..()
-	var/roll = SSroll.storyteller_roll(owner.st_get_stat(STAT_PERCEPTION) + owner.st_get_stat(STAT_AWARENESS), 7, owner)
+	var/roll = SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_PERCEPTION, STAT_AWARENESS))
 	if(roll == ROLL_SUCCESS)
 		owner.enter_avatar()
 	else

modular_darkpack/modules/powers/code/discipline/dementation.dm

@@ -57,7 +57,7 @@ Presence powers, etc
 
 /datum/discipline_power/dementation/passion/pre_activation_checks(mob/living/carbon/human/target)
 	//var/theirpower = target.st_get_stat(STAT_MORALITY)
-	var/mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_CHARISMA) + target.st_get_stat(STAT_EMPATHY), 6, owner)
+	var/mypower = SSroll.storyteller_roll_datum(owner, applic_stats = list(STAT_CHARISMA, STAT_EMPATHY))
 	switch(mypower)
 		if(ROLL_FAILURE, ROLL_BOTCH)
 			to_chat(owner, span_warning("[target]'s mind is too powerful to influence!"))
@@ -142,7 +142,7 @@ pools for a turn or two after the manifestation.
 	if(get_kindred_splat(target))
 		resistence_stat = target.st_get_stat(owner.is_enlightenment() ? STAT_CONVICTION : STAT_SELF_CONTROL)
 	var/theirpower = target.st_get_stat(STAT_PERCEPTION) + resistence_stat
-	mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_SUBTERFUGE), theirpower, owner, numerical = TRUE)
+	mypower = SSroll.storyteller_roll_datum(owner, difficulty = theirpower, applic_stats = list(STAT_MANIPULATION, STAT_SUBTERFUGE), numerical = TRUE)
 	if(mypower <= 0)
 		to_chat(owner, span_warning("[target]'s mind is too powerful to influence!"))
 		return FALSE
@@ -270,7 +270,7 @@ Methuselah.”
 
 
 /datum/discipline_power/dementation/eyes_of_chaos/pre_activation_checks(mob/living/carbon/human/target)
-	var/mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_PERCEPTION) + owner.st_get_stat(STAT_OCCULT), 7, owner, numerical = FALSE)
+	var/mypower = SSroll.storyteller_roll_datum(owner, target, difficulty = 7, applic_stats = list(STAT_PERCEPTION, STAT_OCCULT), numerical = FALSE)
 	switch(mypower)
 		if(ROLL_SUCCESS)
 			return TRUE
@@ -356,7 +356,7 @@ normal. If the roll to invoke this power is a botch, the
 frenzy or Rötschreck response is automatic.
 */
 /datum/discipline_power/dementation/voice_of_madness/pre_activation_checks(mob/living/target)
-	successes = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_EMPATHY), 7, owner, numerical = TRUE)
+	successes = SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_MANIPULATION, STAT_EMPATHY), numerical = TRUE)
 	if(successes >= 0)
 		dementation_phrase = tgui_input_text(owner, "What will you say to cause people nearby to flee?")
 		if(!dementation_phrase)
@@ -430,7 +430,7 @@ determines the duration.
 
 /datum/discipline_power/dementation/total_insanity/pre_activation_checks(mob/living/carbon/human/target)
 	theirpower = target.st_get_stat(STAT_TEMPORARY_WILLPOWER)
-	mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_INTIMIDATION), theirpower, owner, numerical = TRUE)
+	mypower = SSroll.storyteller_roll_datum(owner, difficulty = theirpower, applic_stats = list(STAT_MANIPULATION, STAT_INTIMIDATION), numerical = TRUE)
 	if(mypower <= 0)
 		to_chat(owner, span_warning("[target]'s mind is too powerful to corrupt!"))
 		return FALSE

modular_darkpack/modules/powers/code/discipline/dominate/dominate.dm

@@ -72,7 +72,7 @@
 
 //dicerolling
 //all dominate rolls involve rolling some stat against the victim's permanent willpower with many caveats. this proc rolls and considers those caveats
-/datum/discipline_power/dominate/proc/dominate_check(mob/living/carbon/human/owner, mob/living/carbon/human/target, owner_stat, numerical = FALSE)
+/datum/discipline_power/dominate/proc/dominate_check(mob/living/carbon/human/owner, mob/living/carbon/human/target, owner_stat = list(), numerical = FALSE)
 	var/datum/discipline/dominate/parent_disc = discipline
 
 	if(HAS_TRAIT(owner, TRAIT_NO_EYE_CONTACT))
@@ -105,7 +105,7 @@
 			return TRUE
 
 	var/theirpower = target.st_get_stat(STAT_TEMPORARY_WILLPOWER)
-	var/mypower = SSroll.storyteller_roll(owner_stat, difficulty = theirpower, roller = owner, numerical = TRUE)
+	var/mypower = SSroll.storyteller_roll_datum(owner, target, difficulty = theirpower, applic_stats = owner_stat, numerical = TRUE)
 
 	//tremere have built-in safeguards to easily dominate their stone servitors
 	if(HAS_TRAIT(target, TRAIT_WEAK_TO_DOMINATE))
@@ -213,7 +213,7 @@
 	custom_command = tgui_input_text(owner, "Dominate Command", "What is your command?", encode = FALSE)
 	owner.say(custom_command)
 
-	successes = dominate_check(owner, target, owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_INTIMIDATION), numerical = TRUE)
+	successes = dominate_check(owner, target, list(STAT_MANIPULATION, STAT_INTIMIDATION), numerical = TRUE)
 	if(successes > 0)
 		var/command_strength = get_success_message(successes)
 		to_chat(owner, span_notice("You have the power to Command your target with [command_strength]!"))
@@ -266,7 +266,7 @@
 		to_chat(owner, span_warning("You already have an active mesmerization!"))
 		return FALSE
 
-	var/successes = dominate_check(owner, target, owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_LEADERSHIP), numerical = TRUE)
+	var/successes = dominate_check(owner, target, list(STAT_MANIPULATION, STAT_LEADERSHIP), numerical = TRUE)
 	if(successes > 0)
 		custom_message = tgui_input_text(owner, "Hypnotic Suggestion", "What hypnotic message will echo in their mind?", encode = FALSE)
 		if(!custom_message)
@@ -403,7 +403,7 @@
 
 /datum/discipline_power/dominate/the_forgetful_mind/pre_activation_checks(mob/living/carbon/human/target)
 
-	successes = dominate_check(owner, target, owner.st_get_stat(STAT_WITS) + owner.st_get_stat(STAT_SUBTERFUGE), numerical = TRUE)
+	successes = dominate_check(owner, target, list(STAT_WITS, STAT_SUBTERFUGE), numerical = TRUE)
 	if(successes > 0)
 		var/mindwipe_strength = get_success_message(successes)
 		to_chat(owner, span_notice("Your hypnotic glare captures [target] to the point where [mindwipe_strength]"))
@@ -443,7 +443,7 @@
 
 /datum/discipline_power/dominate/conditioning/pre_activation_checks(mob/living/carbon/human/target)
 
-	var/roll_success = dominate_check(owner, target, owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_LEADERSHIP))
+	var/roll_success = dominate_check(owner, target, list(STAT_CHARISMA, STAT_LEADERSHIP))
 	if(!roll_success)
 		to_chat(owner, span_warning("[target]'s mind has resisted your domination!"))
 		do_cooldown(cooldown_length)
@@ -484,7 +484,7 @@
 		to_chat(owner, span_warning("This mortal is already possessed!"))
 		return FALSE
 
-	var/roll_success = dominate_check(owner, target, owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_INTIMIDATION))
+	var/roll_success = dominate_check(owner, target, list(STAT_CHARISMA, STAT_INTIMIDATION))
 	if(!roll_success)
 		to_chat(owner, span_warning("[target] has resisted your domination!"))
 		to_chat(target, span_warning("[owner] intensely stares at you."))

modular_darkpack/modules/powers/code/discipline/melpominee.dm

@@ -212,12 +212,12 @@
 
 /datum/discipline_power/melpominee/madrigal/activate()
 	. = ..()
-	var/our_power = SSroll.storyteller_roll(owner.st_get_stat(STAT_WITS) + owner.st_get_stat(STAT_PERFORMANCE), 7, owner, numerical = TRUE)
+	var/our_power = SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_WITS, STAT_PERFORMANCE), numerical = TRUE)
 	var/emotion = tgui_input_list(owner, "What emotion do you wish to incite?", "Madrigal", GLOB.emotion_to_quality)
 
 	for(var/mob/living/carbon/member in ohearers(7, owner))
 		audience += member
-		var/their_power = SSroll.storyteller_roll(member.st_get_stat(STAT_WITS) + member.st_get_stat(STAT_AWARENESS), 7, member, numerical = TRUE)
+		var/their_power = SSroll.storyteller_roll_datum(member, difficulty = 7, applic_stats = list(STAT_WITS, STAT_AWARENESS), numerical = TRUE)
 		if(our_power > their_power)
 			set_emotion(member, emotion)
 

modular_darkpack/modules/powers/code/discipline/necromancy.dm

@@ -22,7 +22,7 @@
 
 /datum/discipline_power/necromancy/pre_activation_checks(mob/living/target)
 	. = ..()
-	return SSroll.storyteller_roll(owner.st_get_stat(STAT_WITS) + owner.st_get_stat(STAT_OCCULT), 6, owner)
+	return SSroll.storyteller_roll_datum(owner, applic_stats = list(STAT_WITS, STAT_OCCULT))
 
 /datum/discipline_power/necromancy
 	name = "Necromancy power name"

modular_darkpack/modules/powers/code/discipline/obfuscate/obfuscate.dm

@@ -223,7 +223,7 @@
 	if(!is_seen_check())
 		return FALSE
 
-	var/roll = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_PERFORMANCE), 7, owner)
+	var/roll = SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_MANIPULATION, STAT_PERFORMANCE))
 	if(roll == ROLL_SUCCESS)
 		return TRUE
 
@@ -313,7 +313,7 @@
 	)
 
 /datum/discipline_power/obfuscate/vanish_from_the_minds_eye/pre_activation_checks(atom/target)
-	var/roll = SSroll.storyteller_roll(owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_STEALTH), 6, owner)
+	var/roll = SSroll.storyteller_roll_datum(owner, applic_stats = list(STAT_CHARISMA, STAT_STEALTH))
 	if(roll == ROLL_SUCCESS)
 		return TRUE
 	return FALSE

modular_darkpack/modules/powers/code/discipline/obtenebration/obtenebration.dm

@@ -96,7 +96,7 @@
 	cooldown_length = 5 SECONDS
 
 /datum/discipline_power/obtenebration/shroud_of_night/pre_activation_checks(atom/target)
-	if(SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_OCCULT), 7, owner))
+	if(SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_MANIPULATION, STAT_OCCULT)))
 		return TRUE
 	return FALSE
 
@@ -124,7 +124,6 @@
 /datum/discipline_power/obtenebration/arms_of_the_abyss/activate(atom/target)
 	. = ..()
 	var/turf/target_turf = get_turf(target)
-	var/dice = (owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_OCCULT))
 
 	if(target_turf && target_turf.get_lumcount() <= 0.4)
 		// Remove any existing tentacles first
@@ -134,7 +133,7 @@
 				qdel(T)
 		active_tentacles.Cut()
 
-		var/roll = SSroll.storyteller_roll(dice, 7, owner, numerical = TRUE)
+		var/roll = SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_MANIPULATION, STAT_OCCULT), numerical = TRUE)
 		var/has_action = !!(locate(/datum/action/aggro_mode) in owner.actions)
 
 		if(!has_action)
@@ -200,7 +199,7 @@
 /datum/discipline_power/obtenebration/black_metamorphosis/activate()
 	. = ..()
 	activating = FALSE
-	var/roll = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_COURAGE), 7, owner)
+	var/roll = SSroll.storyteller_roll_datum(owner, difficulty = 7, applic_stats = list(STAT_MANIPULATION, STAT_COURAGE))
 	switch(roll)
 		if(ROLL_SUCCESS)
 			successful = TRUE

modular_darkpack/modules/powers/code/discipline/presence/presence.dm

@@ -19,7 +19,7 @@
 //lets not have people be able to cast this through walls
 
 
-/datum/discipline_power/presence/proc/presence_check(mob/living/carbon/human/owner, mob/living/carbon/human/target, owner_stat, difficulty)
+/datum/discipline_power/presence/proc/presence_check(mob/living/carbon/human/owner, mob/living/carbon/human/target, using_stats, difficulty)
 	if(!ishuman(target))
 		return FALSE
 
@@ -30,7 +30,7 @@
 	//is the difficulty pre-defined? if not, its probably their willpower.
 	var/theirpower = difficulty || target.st_get_stat(STAT_TEMPORARY_WILLPOWER)
 
-	var/successes = SSroll.storyteller_roll(owner_stat, difficulty = theirpower, roller = owner, numerical = TRUE)
+	var/successes = SSroll.storyteller_roll_datum(owner, target, difficulty = theirpower, applic_stats = using_stats, numerical = TRUE)
 
 	//botch
 	if(successes < 0)
@@ -67,6 +67,12 @@
 			sorted += target
 	return sorted
 
+
+/datum/storyteller_roll/presence_awe
+	difficulty = 7
+	applicable_stats = list(STAT_CHARISMA, STAT_PERFORMANCE)
+	numerical = TRUE
+
 // AWE
 /datum/discipline_power/presence/awe
 	name = "Awe"
@@ -83,10 +89,10 @@
 	var/list/affected_targets = list()
 
 /datum/discipline_power/presence/awe/pre_activation_checks()
-	.=..()
+	. = ..()
 
 	//charisma + performance
-	successes = SSroll.storyteller_roll(owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_PERFORMANCE), difficulty = 7, roller = owner, numerical = TRUE)
+	successes = SSroll.storyteller_roll_datum(owner, roll_datum = /datum/storyteller_roll/presence_awe)
 	if(successes > 0)
 		return TRUE
 
@@ -149,7 +155,7 @@
 /datum/discipline_power/presence/dread_gaze/pre_activation_checks(mob/living/target)
 
 	//charisma + intimidation, difficulty equal to the victims wits + courage
-	successes = presence_check(owner, target, owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_INTIMIDATION), difficulty = (target.st_get_stat(STAT_WITS) + target.st_get_stat(STAT_COURAGE)))
+	successes = presence_check(owner, target, list(STAT_CHARISMA, STAT_INTIMIDATION), difficulty = (target.st_get_stat(STAT_WITS) + target.st_get_stat(STAT_COURAGE)))
 	if(successes > 0)
 		return TRUE
 
@@ -203,7 +209,7 @@
 
 /datum/discipline_power/presence/entrancement/pre_activation_checks(mob/living/target)
 
-	successes = presence_check(owner, target, owner.st_get_stat(STAT_APPEARANCE) + owner.st_get_stat(STAT_EMPATHY))
+	successes = presence_check(owner, target, list(STAT_APPEARANCE, STAT_EMPATHY))
 	if(successes > 0)
 		return TRUE
 
@@ -262,7 +268,7 @@
 
 	//this ability has a difficulty of 4 or 5 or something for people the summoner has met, and 8 for those they've only met briefly.
 	//i thought that was too low and the ability for the misuse of this disc caused me to raise it to 7 difficulty
-	successes = presence_check(owner, summon_target, owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_SUBTERFUGE), 7)
+	successes = presence_check(owner, summon_target, list(STAT_CHARISMA, STAT_SUBTERFUGE), 7)
 	if(successes > 0)
 		return TRUE
 
@@ -325,8 +331,9 @@
 		if(hearer == owner)
 			continue
 
+		var/roll_difficulty = owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_INTIMIDATION)
 		//'the victim must make a courage roll with a difficulty equal to the caster's charisma + intimidation to a maximum of 10'
-		var/hearer_successes = SSroll.storyteller_roll(hearer.st_get_stat(STAT_COURAGE), difficulty = owner.st_get_stat(STAT_CHARISMA) + owner.st_get_stat(STAT_INTIMIDATION), roller = hearer, numerical = TRUE)
+		var/hearer_successes = SSroll.storyteller_roll_datum(hearer, owner, difficulty = roll_difficulty, applic_stats = list(STAT_COURAGE), numerical = TRUE)
 		hearer_successes = max(0, hearer_successes)
 
 		apply_presence_overlay(hearer, 3 MINUTES)

modular_darkpack/modules/powers/code/discipline/quietus/components/scorptions_touch.dm

@@ -34,16 +34,21 @@
 /datum/component/scorpions_touch_poison/UnregisterFromParent()
 	UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK)
 
+
+/datum/storyteller_roll/scorpions_touch_poison
+	applicable_stats = list(STAT_STAMINA)
+	numerical = TRUE
+
+
 /datum/component/scorpions_touch_poison/proc/apply_poison(obj/item/source, atom/target, mob/user, list/modifiers, list/attack_modifiers)
 	SIGNAL_HANDLER
 
-	if(!ishuman(target))
+	var/mob/living/carbon/human/victim = astype(target)
+	if(!victim)
 		return
 
-	var/mob/living/carbon/human/victim = target
-
 	// victim resists the posion with stamina + fortitude
-	var/resistance = SSroll.storyteller_roll(dice = (victim.st_get_stat(STAT_STAMINA)/* + victim.st_get_stat(STAT_FORTITUDE)*/), difficulty = 6, numerical = TRUE, roller = victim)
+	var/resistance = SSroll.storyteller_roll_datum(victim, roll_datum = /datum/storyteller_roll/scorpions_touch_poison, bonus = victim.get_discipline_dots(/datum/discipline/fortitude))
 
 	// each resistance success subtracts from the duration
 	var/effective_duration = max(0, poison_duration - resistance)

modular_darkpack/modules/powers/code/discipline/quietus/quietus.dm

@@ -34,6 +34,11 @@
 	. = ..()
 	QDEL_NULL(silence_field)
 
+
+/datum/storyteller_roll/scorpions_touch
+	applicable_stats = list(STAT_PERMANENT_WILLPOWER)
+	numerical = TRUE
+
 //SCORPIONS TOUCH
 /datum/discipline_power/quietus/scorpions_touch
 	name = "Scorpion's Touch"
@@ -49,7 +54,7 @@
 
 /datum/discipline_power/quietus/scorpions_touch/pre_activation_checks(atom/target)
 	. = ..()
-	var/success_count = SSroll.storyteller_roll(dice = owner.st_get_stat(STAT_PERMANENT_WILLPOWER), difficulty = 6, roller = owner, numerical = TRUE)
+	var/success_count = SSroll.storyteller_roll_datum(owner, roll_datum = /datum/storyteller_roll/scorpions_touch)
 
 	if(success_count <= 0)
 		to_chat(owner, span_warning("Your blood fails to transform into poison!"))
@@ -188,13 +193,10 @@
 	strike_victim(victim)
 
 /datum/discipline_power/quietus/dagons_call/proc/strike_victim(mob/living/carbon/human/victim)
-	var/attacker_stamina = owner.st_get_stat(STAT_STAMINA)
-	var/victim_stamina = victim.st_get_stat(STAT_STAMINA)
 	var/victim_willpower = victim.st_get_stat(STAT_PERMANENT_WILLPOWER)
 
-	var/attacker_successes = SSroll.storyteller_roll(attacker_stamina, victim_willpower, numerical = TRUE, roller = owner)
-
-	var/victim_successes = SSroll.storyteller_roll(victim_stamina, victim_willpower, numerical = TRUE, roller = victim)
+	var/attacker_successes = SSroll.storyteller_roll_datum(owner, victim, difficulty = victim_willpower, applic_stats = list(STAT_STAMINA), numerical = TRUE)
+	var/victim_successes = SSroll.storyteller_roll_datum(victim, owner, difficulty = victim_willpower, applic_stats = list(STAT_STAMINA), numerical = TRUE)
 
 	var/net_successes = attacker_successes - victim_successes
 
@@ -324,6 +326,10 @@
 			H.remove_overlay(POWERS_LAYER)
 */
 
+
+/datum/storyteller_roll/taste_of_death
+	applicable_stats = list(STAT_STAMINA, STAT_ATHLETICS)
+
 /datum/discipline_power/quietus/taste_of_death
 	name = "Taste of Death"
 	desc = "Spit a glob of caustic blood at your enemies."
@@ -341,7 +347,7 @@
 
 /datum/discipline_power/quietus/taste_of_death/pre_activation_checks(atom/target)
 	. = ..()
-	var/roll = SSroll.storyteller_roll(owner.st_get_stat(STAT_STAMINA) + owner.st_get_stat(STAT_ATHLETICS), 6, owner, numerical = FALSE)
+	var/roll = SSroll.storyteller_roll_datum(owner, target, /datum/storyteller_roll/taste_of_death)
 	if(roll == ROLL_SUCCESS)
 		return TRUE
 	else