From ea911b00245e514d498d4e48de624af4eb6f99c2 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 6 Mar 2018 13:03:34 +0200 Subject: [PATCH] Squashed commit of the following: commit 8ac3c5dedb16e64fc44ae598f2cfb718f7b15865 Author: Verkister Date: Tue Mar 6 12:45:18 2018 +0200 Disables ejection on empty bellies while at it Found it kinda bothersome during some tests where any mob getting killed, digested, or deleted would do a loud and nasty ejection for each forementioned action despite being empty. commit 4efc1fb84e1057b31a9c8c37cefc7f74941d5e1c Author: Verkister Date: Tue Mar 6 12:36:59 2018 +0200 Update bellymodes_vr.dm commit 2668e41def96e3d25ead01991b013f9b2c4ce7b2 Author: Verkister Date: Mon Mar 5 18:31:09 2018 +0200 pref protection commit ce8d48d907605f3c46eaf9d8b532b0d002516d0c Author: Verkister Date: Mon Mar 5 14:41:28 2018 +0200 whoops --- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/simple_animal/vore/deathclaw.dm | 1 - code/modules/vore/eating/belly_obj_vr.dm | 2 ++ code/modules/vore/eating/bellymodes_vr.dm | 4 +--- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8f6382ba691..edc49641fe6 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -904,7 +904,7 @@ if(noisy == TRUE && nutrition < 250 && prob(10)) //VOREStation edit for hunger noises. var/growlsound = pick(hunger_sounds) var/growlmultiplier = 100 - (nutrition / 250 * 100) - playsound(src, growlsound, vol = growlmultiplier, vary = 1, falloff = 0.1, ignore_walls = FALSE, preference = /datum/client_preference/digestion_noises) + playsound(src, growlsound, vol = growlmultiplier, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) if(!isSynthetic() && (species.flags & IS_PLANT) && (!light_organ || light_organ.is_broken())) if(nutrition < 200) diff --git a/code/modules/mob/living/simple_animal/vore/deathclaw.dm b/code/modules/mob/living/simple_animal/vore/deathclaw.dm index 436b3c008cd..2f99179bd96 100644 --- a/code/modules/mob/living/simple_animal/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_animal/vore/deathclaw.dm @@ -19,7 +19,6 @@ old_x = -16 old_y = 0 default_pixel_x = -16 - default_pixel_y = -16 pixel_x = -16 pixel_y = 0 diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index f77ddf1f611..77cf2adb6f3 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -173,6 +173,8 @@ // If that location is another mob, contents are transferred into whichever of its bellies the owning mob is in. // Returns the number of mobs so released. /obj/belly/proc/release_all_contents(var/include_absorbed = FALSE) + if(!contents.len) + return 0 var/atom/destination = drop_location() var/count = 0 for(var/thing in contents) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 02fb73dffa3..0c8898a7ac1 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -472,7 +472,5 @@ put_in_egg(P,1) if(play_sound) - for (var/mob/living/M in contents) - M << sound(play_sound) - playsound(src, play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, ignore_walls = FALSE, preference = /datum/client_preference/digestion_noises) + playsound(src, play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) return SSBELLIES_PROCESSED