cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 8ac3c5dedb16e64fc44ae598f2cfb718f7b15865
Author: Verkister <superverkelian@hotmail.com>
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 <superverkelian@hotmail.com>
Date:   Tue Mar 6 12:36:59 2018 +0200

    Update bellymodes_vr.dm

commit 2668e41def96e3d25ead01991b013f9b2c4ce7b2
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Mar 5 18:31:09 2018 +0200

    pref protection

commit ce8d48d907605f3c46eaf9d8b532b0d002516d0c
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Mar 5 14:41:28 2018 +0200

    whoops
This commit is contained in:
Verkister
2018-03-06 13:03:34 +02:00
parent 6e816a3517
commit ea911b0024
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/vore/deathclaw.dm
-1
View File
@@ -19,7 +19,6 @@
old_x = -16
old_y = 0
default_pixel_x = -16
default_pixel_y = -16
pixel_x = -16
pixel_y = 0
code/modules/vore/eating/belly_obj_vr.dm
+2
View File
@@ -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)
code/modules/vore/eating/bellymodes_vr.dm
+1 -3
View File
@@ -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