From e76eb297d53cda362e161272f984ff6c9d4ff466 Mon Sep 17 00:00:00 2001
From: S34N <12197162+S34NW@users.noreply.github.com>
Date: Sat, 6 Nov 2021 17:22:28 +0000
Subject: [PATCH] Reactive armour now logs any damage done (#17030)
* fire from reactive incendiary now logs
* other armours too
---
code/modules/clothing/suits/armor.dm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index d3708923c7d..4e28f22965d 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -373,6 +373,7 @@
if(C != owner)
C.fire_stacks += 8
C.IgniteMob()
+ add_attack_logs(owner, C, "[C] was ignited by [owner]'s [src]", ATKLOG_ALMOSTALL) //lord have mercy on almost_all attack log admins
return TRUE
return FALSE
@@ -412,6 +413,7 @@
owner.Beam(M,icon_state="lightning[rand(1, 12)]",icon='icons/effects/effects.dmi',time=5)
M.adjustFireLoss(20)
playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
+ add_attack_logs(owner, M, "[M] was shocked by [owner]'s [src]", ATKLOG_ALMOSTALL)
disable(rand(2, 5)) // let's not have buckshot set it off 4 times and do 80 burn damage.
return TRUE
@@ -447,11 +449,13 @@
var/mob/living/M = AM
M.Weaken(3)
to_chat(M, "You're slammed into the floor by [owner]'s reactive armor!")
+ add_attack_logs(owner, M, "[M] was thrown by [owner]'s [src]", ATKLOG_ALMOSTALL)
else
new sparkle_path(get_turf(AM), get_dir(owner, AM))
if(isliving(AM))
var/mob/living/M = AM
to_chat(M, "You're thrown back by [owner]'s reactive armor!")
+ add_attack_logs(owner, M, "[M] was thrown by [owner]'s [src]", ATKLOG_ALMOSTALL)
INVOKE_ASYNC(AM, /atom/movable/.proc/throw_at, throw_target, ((clamp((repulse_power - (clamp(dist_from_user - 2, 0, dist_from_user))), 3, repulse_power))), 1) //So stuff gets tossed around at the same time.
disable(rand(2, 5))
return TRUE