From 4be014147e66f3af277da41e4408ce334fe4bea6 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 11 Feb 2018 14:34:55 +0200 Subject: [PATCH] Fixes belly contents showing up on screen inventory -Fixes prey backpack contents popping up on pred's screen after getting dumped. -Adds an automatic closing of prey's storage for pred upon ingestion to prevent "secret backpacks" -Also makes trash vorings use selected belly sound while at it. --- code/modules/vore/eating/belly_vr.dm | 3 +++ code/modules/vore/eating/digest_act_vr.dm | 5 +++++ code/modules/vore/eating/living_vr.dm | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm index 45ef4e173ca..e97310dd16e 100644 --- a/code/modules/vore/eating/belly_vr.dm +++ b/code/modules/vore/eating/belly_vr.dm @@ -186,6 +186,9 @@ if(inside_flavor) prey << "[inside_flavor]" + for(var/obj/item/weapon/storage/S in prey) + S.hide_from(owner) + // Get the line that should show up in Examine message if the owner of this belly // is examined. By making this a proc, we not only take advantage of polymorphism, // but can easily make the message vary based on how many people are inside, etc. diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 7be094f6a0a..a789c886e71 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -92,6 +92,11 @@ if((. = ..())) . += 70 //Organs give a little more +/obj/item/weapon/storage/digest_act(var/list/internal_contents = null, var/atom/movable/item_storage = null) + for(var/obj/item/I in contents) + I.screen_loc = null + .=..() + ///////////// // Some more complicated stuff ///////////// diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 65c76d4c35d..ed9fe0ae168 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -599,10 +599,10 @@ to_chat(src, "You are not holding anything.") return if(is_type_in_list(I,edible_trash)) - playsound(src.loc,'sound/vore/gulp.ogg', 20, 1) drop_item() var/belly = vore_selected var/datum/belly/selected = vore_organs[belly] + playsound(src.loc, selected.vore_sound, 20, 1) I.forceMove(src) selected.internal_contents |= I updateVRPanel()