diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 8c4d62a605..fa755e6eeb 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -127,41 +127,54 @@ var/global/list/tf_egg_types = list( "Xenochimera" = /obj/structure/closet/secure_closet/egg/scree, "Xenomorph" = /obj/structure/closet/secure_closet/egg/xenomorph) -var/global/list/edible_trash = list(/obj/item/trash, +var/global/list/edible_trash = list(/obj/item/broken_device, + /obj/item/clothing/mask, + /obj/item/clothing/glasses, + /obj/item/clothing/gloves, + /obj/item/clothing/head, + /obj/item/clothing/shoes, + /obj/item/device/aicard, /obj/item/device/flashlight, - /obj/item/toy/figure, - /obj/item/weapon/cigbutt, - /obj/item/weapon/bananapeel, - /obj/item/stack/material/cardboard, - /obj/item/weapon/light, - /obj/item/weapon/paper, - /obj/item/weapon/broken_bottle, - /obj/item/weapon/reagent_containers/food, + /obj/item/device/mmi/digital/posibrain, + /obj/item/device/paicard, + /obj/item/device/pda, + /obj/item/device/radio/headset, /obj/item/inflatable/torn, - /obj/item/weapon/flame/match, - /obj/item/clothing/mask/smokable, - /obj/item/weapon/storage/wallet, - /obj/item/weapon/spacecash, - /obj/item/broken_device, + /obj/item/organ, + /obj/item/stack/material/cardboard, + /obj/item/toy, + /obj/item/trash, + /obj/item/weapon/bananapeel, + /obj/item/weapon/bone, + /obj/item/weapon/broken_bottle, + /obj/item/weapon/card/emag_broken, + /obj/item/weapon/cigbutt, + /obj/item/weapon/circuitboard/broken, + /obj/item/weapon/clipboard, /obj/item/weapon/corncob, + /obj/item/weapon/dice, + /obj/item/weapon/flame, + /obj/item/weapon/light, + /obj/item/weapon/lipstick, + /obj/item/weapon/material/shard, + /obj/item/weapon/newspaper, + /obj/item/weapon/paper, /obj/item/weapon/paperplane, /obj/item/weapon/pen, /obj/item/weapon/photo, - /obj/item/weapon/storage/box/wings, - /obj/item/weapon/storage/box/matches, - /obj/item/weapon/storage/fancy/cigarettes, - /obj/item/weapon/storage/fancy/egg_box, - /obj/item/weapon/storage/fancy/candle_box, - /obj/item/weapon/storage/fancy/crayons, - /obj/item/weapon/dice, - /obj/item/weapon/newspaper, + /obj/item/weapon/reagent_containers/food, + /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/lipstick, /obj/item/weapon/soap, - /obj/item/weapon/material/shard, - /obj/item/device/paicard, - /obj/item/device/mmi/digital/posibrain, - /obj/item/device/aicard) + /obj/item/weapon/spacecash, + /obj/item/weapon/storage/box/khcrystal, + /obj/item/weapon/storage/box/matches, + /obj/item/weapon/storage/box/wings, + /obj/item/weapon/storage/fancy/candle_box, + /obj/item/weapon/storage/fancy/cigarettes, + /obj/item/weapon/storage/fancy/crayons, + /obj/item/weapon/storage/fancy/egg_box, + /obj/item/weapon/storage/wallet) var/global/list/cont_flavors = list( "Generic" = cont_flavors_generic, diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 2641a43700..83f73d6151 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -65,8 +65,8 @@ //PDAs need to lose their ID to not take it with them, so we can get a digested ID /obj/item/device/pda/digest_act(var/atom/movable/item_storage = null) if(id) - id = null - + if(istype(item_storage,/obj/item/device/dogborg/sleeper) || (!isnull(digest_stage) && digest_stage <= 0)) + id = null . = ..() /obj/item/weapon/card/id/digest_act(var/atom/movable/item_storage = null) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index d993f336f0..f7f0f4cdd4 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -554,6 +554,23 @@ return if(is_type_in_list(I,edible_trash)) + if(istype(I,/obj/item/device/pda)) + var/obj/item/device/pda/P = I + if(P.owner) + visible_message("[src] threatens to make [P] disappear!") + if(P.id) + var/confirm = alert(src, "The PDA you're holding contains a vulnerable ID card. Will you risk it?", "Confirmation", "Definitely", "Cancel") + if(confirm != "Definitely") + return + if(!do_after(src, 50, P)) + return + visible_message("[src] successfully makes [P] disappear!") + to_chat(src, "You can taste the sweet flavor of delicious technology.") + drop_item() + I.forceMove(vore_selected) + updateVRPanel() + return + drop_item() I.forceMove(vore_selected) updateVRPanel() @@ -588,7 +605,7 @@ to_chat(src, "You can taste the flavor of pain. This can't possibly be healthy for your guts.") else to_chat(src, "You can taste the flavor of really bad ideas.") - else if(istype(I,/obj/item/toy/figure)) + else if(istype(I,/obj/item/toy)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") else if(istype(I,/obj/item/device/paicard) || istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!")