Vampires can now gain blood for a minute after someone succumbs to death (#24236)

* Vampires can now gain blood for a minute after someone succumbs to death

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* status effect it

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2024-02-27 17:13:54 -05:00
committed by GitHub
co-authored by DGamerL
parent 94cefc61f4
commit dd8cf5a92c
4 changed files with 10 additions and 2 deletions
+2
View File
@@ -170,6 +170,8 @@
#define STATUS_EFFECT_IMPACT_IMMUNE /datum/status_effect/impact_immune
#define STATUS_EFFECT_RECENTLY_SUCCUMBED /datum/status_effect/recently_succumbed
//#define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark
#define STATUS_EFFECT_CRUSHERDAMAGETRACKING /datum/status_effect/crusher_damage //tracks total kinetic crusher damage on a target
+6
View File
@@ -202,6 +202,12 @@
id = "impact_immune"
alert_type = null
/datum/status_effect/recently_succumbed
id = "recently_succumbed"
alert_type = null
duration = 1 MINUTES
status_type = STATUS_EFFECT_REFRESH
#define LWAP_LOCK_CAP 10
/datum/status_effect/lwap_scope
@@ -135,7 +135,7 @@
continue
if(H.stat < DEAD)
if(H.stat != DEAD || H.has_status_effect(STATUS_EFFECT_RECENTLY_SUCCUMBED))
if(H.ckey || H.player_ghosted) //Requires ckey regardless if monkey or humanoid, or the body has been ghosted before it died
blood = min(20, H.blood_volume)
adjust_blood(H, blood * BLOOD_GAINED_MODIFIER)
+1 -1
View File
@@ -320,7 +320,7 @@
else
death()
to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
apply_status_effect(STATUS_EFFECT_RECENTLY_SUCCUMBED)
/mob/living/proc/InCritical()
return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && stat == UNCONSCIOUS)