diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index c119b62ab3..9972962207 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -149,6 +149,7 @@ /obj/belly/Entered(var/atom/movable/thing,var/atom/OldLoc) if(OldLoc in contents) return //Someone dropping something (or being stripdigested) + //Generic entered message to_chat(owner,"[thing] slides into your [lowertext(name)].") @@ -349,8 +350,7 @@ for(var/slot in slots) var/obj/item/thingy = M.get_equipped_item(slot = slot) if(thingy) - M.u_equip(thingy) - thingy.forceMove(src) + M.remove_from_mob(thingy, M.drop_location()) //Reagent transfer if(ishuman(owner)) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 2a65d9e1b9..7c622d1716 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -120,19 +120,14 @@ continue for(var/slot in slots) var/obj/item/thingy = M.get_equipped_item(slot = slot) - if(thingy) - if(!M.canUnEquip(thingy)) - continue - if(thingy == M.get_equipped_item(slot_w_uniform)) + if(thingy && M.canUnEquip(thingy)) + if(slot == slot_w_uniform) var/list/stash = list(slot_r_store,slot_l_store,slot_wear_id,slot_belt) for(var/stashslot in stash) var/obj/item/SL = M.get_equipped_item(stashslot) if(SL) - SL.forceMove(src) - contents |= SL - M.u_equip(thingy) - thingy.forceMove(src) - contents |= thingy + M.remove_from_mob(SL, M.drop_location()) + M.remove_from_mob(thingy, M.drop_location()) digest_item(thingy) break