[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>
This commit is contained in:
SkyratBot
2020-11-07 05:05:57 +00:00
committed by GitHub
co-authored by ArcaneDefence
parent dc64381d7a
commit 5d2c3da593
@@ -26,6 +26,7 @@
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, "swing_hit", 25, TRUE)
swirlie.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "<span class='userdanger'>[user] slams the toilet seat onto your head!</span>", "<span class='hear'>You hear reverberating porcelain.</span>")
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("<span class='danger'>[user] slams [GM.name] into [src]!</span>", "<span class='userdanger'>[user] slams you into [src]!</span>")
log_combat(user, GM, "toilet slammed")
GM.adjustBruteLoss(5)
else
to_chat(user, "<span class='warning'>You need a tighter grip!</span>")