From e71c275f81987a747d0f2b3e3bb2aa68d6211e52 Mon Sep 17 00:00:00 2001
From: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:32:37 +0000
Subject: [PATCH] Makes toilet bashing apply damage to the head. (#15302)
* Skull+toilet
* Mochi+Review
---
code/game/objects/structures/watercloset.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 6feb3255822..d513b4e2920 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -27,7 +27,7 @@
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, "swing_hit", 25, 1)
swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.")
- swirlie.adjustBruteLoss(5)
+ swirlie.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
return
if(cistern && !open)
@@ -101,8 +101,8 @@
swirlie = null
else
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
- GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!")
- GM.adjustBruteLoss(5)
+ GM.visible_message("[user] slams [GM.name]'s head into [src]!", "[user] slams [GM.name]'s head into [src]!")
+ GM.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
else
to_chat(user, "You need a tighter grip!")
@@ -212,8 +212,8 @@
return
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
- user.visible_message("[user] slams [GM] into [src]!", "You slam [GM] into [src]!")
- GM.adjustBruteLoss(8)
+ user.visible_message("[user] slams [GM]'s head into [src]!", "You slam [GM]'s head into [src]!")
+ GM.apply_damage(8, BRUTE, BODY_ZONE_HEAD)
else
to_chat(user, "You need a tighter grip!")