Merge pull request #4492 from Verkister/yalldumphungry

Some trash eater tweaks and additions.

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/device/mmi/digital/posibrain,
-				/obj/item/weapon/cigbutt,
+				/obj/item/device/paicard,
-				/obj/item/weapon/bananapeel,
+				/obj/item/device/pda,
-				/obj/item/stack/material/cardboard,
+				/obj/item/device/radio/headset,
-				/obj/item/weapon/light,
-				/obj/item/weapon/paper,
-				/obj/item/weapon/broken_bottle,
-				/obj/item/weapon/reagent_containers/food,
 				/obj/item/inflatable/torn,
-				/obj/item/weapon/flame/match,
+				/obj/item/organ,
-				/obj/item/clothing/mask/smokable,
+				/obj/item/stack/material/cardboard,
-				/obj/item/weapon/storage/wallet,
+				/obj/item/toy,
-				/obj/item/weapon/spacecash,
+				/obj/item/trash,
-				/obj/item/broken_device,
+				/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/reagent_containers/food,
-				/obj/item/weapon/storage/box/matches,
+				/obj/item/weapon/reagent_containers/glass/bottle,
-				/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/glass/rag,
-				/obj/item/weapon/lipstick,
 				/obj/item/weapon/soap,
-				/obj/item/weapon/material/shard,
+				/obj/item/weapon/spacecash,
-				/obj/item/device/paicard,
+				/obj/item/weapon/storage/box/khcrystal,
-				/obj/item/device/mmi/digital/posibrain,
+				/obj/item/weapon/storage/box/matches,
-				/obj/item/device/aicard)
+				/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,

code/modules/vore/eating/contaminate_vr.dm

@@ -44,12 +44,6 @@ var/image/gurgled_overlay = image('icons/effects/sludgeoverlay_vr.dmi')
 	if(gurgled)
 		decontaminate()
 
-/obj/item/device/pda/can_use() //Get your rice bowl ready.
-	if(gurgled)
-		return FALSE
-	else
-		return ..()
-
 /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) //Wash the soggy item before it can interact with the sink.
 	if(O.gurgled)
 		var/turf/location = user.loc
@@ -121,7 +115,3 @@ var/image/gurgled_overlay = image('icons/effects/sludgeoverlay_vr.dmi')
 	if((. = ..()))
 		name = "soggy [cleanname]"
 		desc = "This soggy box is about to fall apart any time."
-
-/obj/item/device/pda/gurgle_contaminate(var/atom/movable/item_storage = null)
-	if((. = ..()))
-		desc = "This device seems completely unresponsive while drenched with sludge. Perhaps you could still wash it."

code/modules/vore/eating/digest_act_vr.dm

@@ -67,8 +67,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)
+		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)

code/modules/vore/eating/living_vr.dm

@@ -554,6 +554,40 @@
 		return
 
 	if(is_type_in_list(I,edible_trash))
+		if(I.hidden_uplink)
+			to_chat(src, "<span class='warning'>You really should not be eating this.</span>")
+			message_admins("[key_name(src)] has attempted to ingest an uplink item. ([src ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>" : "null"])")
+			return
+		if(istype(I,/obj/item/device/pda))
+			var/obj/item/device/pda/P = I
+			if(P.owner)
+				var/watching = FALSE
+				for(var/mob/living/carbon/human/H in view(src))
+					if(H.real_name == P.owner && H.client)
+						watching = TRUE
+						break
+				if(!watching)
+					return
+				else
+					visible_message("<span class='warning'>[src] is threatening to make [P] disappear!</span>")
+					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, 100, P))
+						return
+					visible_message("<span class='warning'>[src] successfully makes [P] disappear!</span>")
+			to_chat(src, "<span class='notice'>You can taste the sweet flavor of delicious technology.</span>")
+			drop_item()
+			I.forceMove(vore_selected)
+			updateVRPanel()
+			return
+		if(istype(I,/obj/item/clothing/shoes))
+			var/obj/item/clothing/shoes/S = I
+			if(S.holding)
+				to_chat(src, "<span class='warning'>There's something inside!</span>")
+				return
+
 		drop_item()
 		I.forceMove(vore_selected)
 		updateVRPanel()
@@ -588,7 +622,7 @@
 				to_chat(src, "<span class='notice'>You can taste the flavor of pain. This can't possibly be healthy for your guts.</span>")
 			else
 				to_chat(src, "<span class='notice'>You can taste the flavor of really bad ideas.</span>")
-		else if(istype(I,/obj/item/toy/figure))
+		else if(istype(I,/obj/item/toy))
 			visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
 		else if(istype(I,/obj/item/device/paicard) || istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard))
 			visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")