Merge pull request #11158 from Fox-McCloud/delayed-gibbing

Makes Delayed Gibbing a Proc
This commit is contained in:
variableundefined
2019-04-01 23:07:17 +08:00
committed by GitHub
5 changed files with 13 additions and 16 deletions
@@ -685,8 +685,7 @@
if(method == INGEST)
if(M.stat == DEAD)
if(M.getBruteLoss()+M.getFireLoss()+M.getCloneLoss() >= 150)
M.visible_message("<span class='warning'>[M]'s body starts convulsing!</span>")
M.gib()
M.delayed_gib()
return
var/mob/dead/observer/ghost = M.get_ghost()
if(ghost)
@@ -506,19 +506,11 @@
M.fakevomit()
update_flags |= M.adjustToxLoss(2, FALSE)
update_flags |= M.adjustBruteLoss(2, FALSE)
if(volume > 40 && prob(4))
M.delayed_gib()
return
return ..() | update_flags
/datum/reagent/venom/overdose_process(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(volume >= 40)
if(prob(4))
M.visible_message("<span class='danger'><B>[M]</B> starts convulsing violently!</span>", "You feel as if your body is tearing itself apart!")
update_flags |= M.Weaken(15, FALSE)
M.AdjustJitter(1000)
spawn(rand(20, 100))
M.gib()
return list(0, update_flags)
/datum/reagent/neurotoxin2
name = "Neurotoxin"
id = "neurotoxin2"