Skip to content

Commit

Permalink
Spelling Error fix and death knell logging for the Vorpal Scythe (#124)
Browse files Browse the repository at this point in the history
Spelling Error fix and death knell logging for the Vorpal Scythe (#80587)

## About The Pull Request

Fixes a spelling error in the death knell windup chat message for the
Vorpal Scythe.

Adds logging for starting the windup of a death knell, and on a
successful death knell for the Vorpal Scythe.

## Why It's Good For The Game

Oops, this was unlogged. Fixes
tgstation/tgstation#80458

## Changelog
:cl:
spellcheck: Fixes a typo in chat message when starting a Death Knell
with the Vorpal Scythe
admin: Adds logging for the death knell, both when starts and when it is
completed successfully.
/:cl:

Co-authored-by: necromanceranne <[email protected]>
  • Loading branch information
2 people authored and Iajret committed Dec 28, 2023
1 parent e4e792b commit 648153a
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and

var/death_knell_speed_mod = 1

potential_reaping.visible_message(span_danger("[user] begins to raise [src] arove [potential_reaping]'s [head_name]."), span_userdanger("[user] begins to raise [src], aiming to slice off your [head_name]!"))
potential_reaping.visible_message(span_danger("[user] begins to raise [src] above [potential_reaping]'s [head_name]."), span_userdanger("[user] begins to raise [src], aiming to slice off your [head_name]!"))
if(potential_reaping.stat >= UNCONSCIOUS || HAS_TRAIT(potential_reaping, TRAIT_INCAPACITATED)) //if the victim is incapacitated (due to paralysis, a stun, being in staminacrit, etc.), critted, unconscious, or dead, it's much easier to properly behead
death_knell_speed_mod *= 0.5
if(potential_reaping.stat != DEAD && potential_reaping.has_status_effect(/datum/status_effect/jitter)) //jittering will make it harder to perform the death knell, even if they're still
Expand All @@ -149,6 +149,8 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and
if(ispodperson(potential_reaping) || ismonkey(potential_reaping)) //And if they're a podperson or monkey, they can just die.
death_knell_speed_mod *= 0.5

log_combat(user, potential_reaping, "prepared to use [src] to decapitate")

if(do_after(user, 15 SECONDS * death_knell_speed_mod, target = potential_reaping))
playsound(get_turf(potential_reaping), 'sound/weapons/bladeslice.ogg', 250, TRUE)
reaped_head.dismember()
Expand All @@ -165,6 +167,7 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and
)

scythe_empowerment(potential_empowerment)
log_combat(user, potential_reaping, "used [src] to decapitate")

if(HAS_MIND_TRAIT(user, TRAIT_MORBID)) //You feel good about yourself, pal?
user.add_mood_event("morbid_dismemberment", /datum/mood_event/morbid_dismemberment)
Expand Down

0 comments on commit 648153a

Please sign in to comment.