From 10b99691dffcaa062d9571fe3bf1c7dc37e80776 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 2 Dec 2021 14:40:12 -0500 Subject: [PATCH] More appropriate stack digestion --- code/modules/vore/eating/digest_act_vr.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 377ee6b134..3b81fc7e13 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -75,7 +75,21 @@ qdel(O) else if(item_storage) O.forceMove(item_storage) +<<<<<<< HEAD qdel(src) +======= + if(istype(src,/obj/item/stack)) + var/obj/item/stack/S = src + if(S.get_amount() <= 1) + qdel(src) + else + S.use(1) + digest_stage = w_class + else + qdel(src) + if(g_damage > w_class) + return w_class +>>>>>>> 04c4c68140... Merge pull request #11918 from Verkister/patch-102 return g_damage /////////////