cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Spelling Error fix and death knell logging for the Vorpal Scythe (#80587)

Browse Source 
## 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
https://github.com/tgstation/tgstation/issues/80458

## Changelog
🆑
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.
/🆑
This commit is contained in:
necromanceranne
2023-12-27 14:35:58 +01:00
committed by GitHub
parent f77fa385c4
commit e0a7c12ef5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm
+4 -1
View File
@@ -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
@@ -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()
@@ -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)