Merge pull request #6573 from Heroman3003/hard-safety

Prevents resleeving sickness from affecting hardvore victims
This commit is contained in:
Novacat
2020-02-14 09:35:58 -05:00
committed by GitHub
2 changed files with 27 additions and 1 deletions

View File

@@ -745,6 +745,8 @@
to_chat(src,"<span class='warning'>Looks like you lost your chance...</span>")
return
T.add_modifier(/datum/modifier/gory_devourment, 10 SECONDS)
//Removing an internal organ
if(T_int && T_int.damage >= 25) //Internal organ and it's been severely damaged
T.apply_damage(15, BRUTE, T_ext) //Damage the external organ they're going through.

View File

@@ -21,4 +21,28 @@
stacks = MODIFIER_STACK_EXTEND
on_created_text = "<span class='warning'>You feel slightly weak and unfocused.</span>"
on_expired_text = "<span class='notice'>You feel your strength and focus return to you.</span>"
on_expired_text = "<span class='notice'>You feel your strength and focus return to you.</span>"
/datum/modifier/gory_devourment
name = "gory devourment"
desc = "You are being devoured! Dying right now would definitely be same as dying as food."
stacks = MODIFIER_STACK_EXTEND
hidden = TRUE
var/datum/mind/cached_mind = null
/datum/modifier/gory_devourment/can_apply(var/mob/living/L)
if(L.stat == DEAD)
return FALSE
else
return TRUE
/datum/modifier/gory_devourment/on_applied()
if(holder.ckey)
if(holder.mind)
cached_mind = holder.mind
return
/datum/modifier/gory_devourment/on_expire()
if(holder.stat == DEAD)
cached_mind.vore_death = TRUE
return