From c3c8b9cc1f131f5e230e281b4e2fdab52a454672 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 22 Sep 2022 20:55:17 -0400 Subject: [PATCH 1/2] Merge pull request #13770 from Heroman3003/borgfix Fixes dogborg inbuilt belly deaths not counting as vore deaths --- code/modules/mob/living/carbon/human/death_vr.dm | 2 +- .../modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/death_vr.dm b/code/modules/mob/living/carbon/human/death_vr.dm index 24bae5c7c2..d29f660946 100644 --- a/code/modules/mob/living/carbon/human/death_vr.dm +++ b/code/modules/mob/living/carbon/human/death_vr.dm @@ -25,7 +25,7 @@ //Technically allows metagaming by allowing buddies to turn on digestion for like 2 seconds // to finish off critically wounded friends to avoid resleeving sickness, but like // *kill those people* ok? - if(B.digest_mode == DM_DIGEST) + if(B.digest_mode == DM_DIGEST || B.digest_mode == DM_SELECT) H.mind?.vore_death = TRUE //Hooks need to return true otherwise they're considered having failed diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 2678af4853..26ab8389a4 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -598,9 +598,12 @@ volume = T.reagents.total_volume if(water) water.add_charge(volume) + if(T.ckey) + GLOB.prey_digested_roundstat++ if(patient == T) patient_laststat = null patient = null + T.mind?.vore_death = TRUE qdel(T) //Pick a random item to deal with (if there are any)