shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actually fix the god-damned sound issues. fuck

Browse Source
This commit is contained in:
Poojawa
2019-03-27 10:33:06 -05:00
parent e6190fa141
commit 88d6cf7da8
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/death.dm
+3
View File
@@ -8,6 +8,8 @@
spill_organs(no_brain, no_organs, no_bodyparts)
release_vore_contents(silent = TRUE) // return of the bomb safe internals.
if(!no_bodyparts)
spread_bodyparts(no_brain, no_organs)
@@ -36,6 +38,7 @@
buckled.unbuckle_mob(src, force = TRUE)
dust_animation()
release_vore_contents(silent = TRUE) //technically grief protection, I guess? if they're SM'd it doesn't matter seconds after anyway.
spawn_dust(just_ash)
QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes.
modular_citadel/code/modules/vore/eating/belly_obj_vr.dm
+8 -4
View File
@@ -170,7 +170,8 @@
if(is_wet && !recent_sound)
for(var/mob/M in get_hearers_in_view(2, get_turf(owner)))
if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
playsound(get_turf(owner),"[src.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
var/sound/devourments = GLOB.vore_sounds[vore_sound]
playsound(get_turf(owner),devourments,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
recent_sound = TRUE
//Messages if it's a mob
@@ -207,7 +208,8 @@
count++
for(var/mob/M in get_hearers_in_view(2, get_turf(owner)))
if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
playsound(get_turf(owner),"[src.release_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
var/sound/releasement = GLOB.release_sounds[release_sound]
playsound(get_turf(owner),releasement,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
//Clean up our own business
items_preserved.Cut()
@@ -232,7 +234,8 @@
items_preserved -= M
for(var/mob/H in get_hearers_in_view(2, get_turf(owner)))
if(H.client && (H.client.prefs.cit_toggles & EATING_NOISES))
playsound(get_turf(owner),"[src.release_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
var/sound/releasement = GLOB.release_sounds[release_sound]
playsound(get_turf(owner),releasement,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
if(istype(M,/mob/living))
var/mob/living/ML = M
@@ -315,7 +318,8 @@
if(!silent)
for(var/mob/M in get_hearers_in_view(5, get_turf(owner)))
if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
playsound(get_turf(owner),"[src.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
var/sound/devourments = GLOB.vore_sounds[vore_sound]
playsound(get_turf(owner),devourments,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
owner.updateVRPanel()
for(var/mob/living/M in contents)
M.updateVRPanel()
modular_citadel/code/modules/vore/eating/vorepanel_vr.dm
+8 -6
View File
@@ -116,6 +116,8 @@
spanstyle = "color:purple;"
if(DM_ABSORB)
spanstyle = "color:purple;"
if(DM_DRAGON)
spanstyle = "color:blue;"
dat += "<span style='[spanstyle]'> ([B.contents.len])</span></a></li>"
@@ -550,9 +552,9 @@
selected.release_sound = choice
if(href_list["b_releasesoundtest"])
var/soundfile = selected.release_sound
if(soundfile)
user << soundfile
var/sound/releasetest = GLOB.release_sounds[selected.release_sound]
if(releasetest)
user << releasetest
if(href_list["b_sound"])
var/choice = input(user,"Currently set to [selected.vore_sound]","Select Sound") as null|anything in GLOB.vore_sounds
@@ -563,9 +565,9 @@
selected.vore_sound = choice
if(href_list["b_soundtest"])
var/soundfile = selected.vore_sound
if(soundfile)
user << soundfile
var/sound/voretest = GLOB.vore_sounds[selected.vore_sound]
if(voretest)
user << voretest
if(href_list["b_tastes"])
selected.can_taste = !selected.can_taste