From 6ffbe499737ae39b2ffad7d8a329f770b38c85bd Mon Sep 17 00:00:00 2001
From: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Mon, 17 Jul 2023 09:21:28 -0500
Subject: [PATCH] stamina damage logging (#21576)
* stamina damage logging
* use a gun
* bam
---
code/datums/log_record.dm | 3 ++-
code/modules/projectiles/projectile_base.dm | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/code/datums/log_record.dm b/code/datums/log_record.dm
index cf437c86dbd..b550c24fc43 100644
--- a/code/datums/log_record.dm
+++ b/code/datums/log_record.dm
@@ -42,7 +42,8 @@
var/TX = L.getToxLoss() > 50 ? "[L.getToxLoss()]" : L.getToxLoss()
var/BU = L.getFireLoss() > 50 ? "[L.getFireLoss()]" : L.getFireLoss()
var/BR = L.getBruteLoss() > 50 ? "[L.getBruteLoss()]" : L.getBruteLoss()
- return " ([L.health]: [OX] - [TX] - [BU] - [BR])"
+ var/ST = L.getStaminaLoss() > 50 ? "[L.getStaminaLoss()]" : L.getStaminaLoss()
+ return " ([L.health]: [OX] - [TX] - [BU] - [BR] - [ST])"
/datum/log_record/proc/should_log_health(log_type)
if(log_type == ATTACK_LOG || log_type == DEFENSE_LOG)
diff --git a/code/modules/projectiles/projectile_base.dm b/code/modules/projectiles/projectile_base.dm
index 2129f44d1e8..ac0d0e905e2 100644
--- a/code/modules/projectiles/projectile_base.dm
+++ b/code/modules/projectiles/projectile_base.dm
@@ -177,9 +177,12 @@
reagent_note += num2text(R.volume) + ") "
additional_log_text = "[additional_log_text] (containing [reagent_note])"
+ var/were_affects_applied = L.apply_effects(stun, weaken, knockdown, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
+
if(!log_override && firer && !alwayslog)
add_attack_logs(firer, L, "Shot with a [type][additional_log_text]")
- return L.apply_effects(stun, weaken, knockdown, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
+
+ return were_affects_applied
/obj/item/projectile/proc/get_splatter_blockage(turf/step_over, atom/target, splatter_dir, target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows).
var/turf/step_cardinal = !(splatter_dir in list(NORTH, SOUTH, EAST, WEST)) ? get_step(target_loca, get_cardinal_dir(target_loca, step_over)) : null