From 955d73d07b20ee0b3dded2ed33d4ece58d1df6f7 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 18 Jul 2017 22:28:27 +0300 Subject: [PATCH] Should fix the double ID bug I think. -Seems like the code pulled an entry of the ID as the PDA's subitem. -Moved the PDA handling part above the subitem part. --- code/modules/vore/eating/bellymodes_vr.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 0249775215..35a48e9a56 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -129,6 +129,15 @@ if(istype(T, /obj/item) && _is_digestable(T) && !(T in items_preserved)) if(T in items_preserved)// Doublecheck just in case. return + if(istype(T, /obj/item/device/pda)) + var/obj/item/device/pda/PDA = T + if(PDA.id) + PDA.id.forceMove(owner) + internal_contents += PDA.id + PDA.id = null + owner.nutrition += (1 * PDA.w_class) + internal_contents -= PDA + qdel(PDA) for(var/obj/item/SubItem in T) if(istype(SubItem,/obj/item/weapon/storage/internal)) var/obj/item/weapon/storage/internal/SI = SubItem @@ -139,15 +148,6 @@ else SubItem.forceMove(owner) internal_contents += SubItem - if(istype(T, /obj/item/device/pda)) - var/obj/item/device/pda/PDA = T - if(PDA.id) - PDA.id.forceMove(owner) - internal_contents += PDA.id - PDA.id = null - owner.nutrition += (1 * PDA.w_class) - internal_contents -= PDA - qdel(PDA) if(istype(T,/obj/item/weapon/card/id))// In case the ID didn't come from gurgle drop. var/obj/item/weapon/card/id/ID = T ID.desc = "A partially digested card that has seen better days. Much of it's data has been destroyed."