From 5d2c3da593c81a88cc516acb21d832cce0aae00b Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 7 Nov 2020 06:05:57 +0100
Subject: [PATCH] [MIRROR] Adds record of toilet combat (#1600)
* Adds record of toilet combat (#54836)
Logs a direct method of dealing damage to a person that wasn't logged previously
* Adds record of toilet combat
Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
---
code/game/objects/structures/watercloset.dm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index c6947926ecc..f20b2daf354 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -26,6 +26,7 @@
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, "swing_hit", 25, TRUE)
swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto your head!", "You hear reverberating porcelain.")
+ log_combat(user, swirlie, "swirlied (brute)")
swirlie.adjustBruteLoss(5)
else if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling))
@@ -45,8 +46,10 @@
if(iscarbon(GM))
var/mob/living/carbon/C = GM
if(!C.internal)
+ log_combat(user, C, "swirlied (oxy)")
C.adjustOxyLoss(5)
else
+ log_combat(user, GM, "swirlied (oxy)")
GM.adjustOxyLoss(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!
@@ -54,6 +57,7 @@
else
playsound(src.loc, 'sound/effects/bang.ogg', 25, TRUE)
GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams you into [src]!")
+ log_combat(user, GM, "toilet slammed")
GM.adjustBruteLoss(5)
else
to_chat(user, "You need a tighter grip!")