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

[MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710)

Browse Source 
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
This commit is contained in:
CitadelStationBot
2017-05-18 01:39:16 -05:00
committed by Poojawa
parent fd778d9810
commit 47fa8353eb
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Hallucination.dm
+4 -4
View File
@@ -356,9 +356,9 @@ Gunshots/explosions/opening doors/less rare audio (done)
for(var/i=0,i<hits,i++)
target.playsound_local(null, 'sound/weapons/Laser.ogg', 25, 1)
if(prob(75))
addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, 'sound/weapons/sear.ogg', 25, 1), rand(10,20))
addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/sear.ogg', 25, 1), rand(10,20))
else
addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(10,20))
addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(10,20))
sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 8))
target.playsound_local(null, get_sfx("bodyfall"), 25, 1)
if(2) //Esword fight
@@ -372,9 +372,9 @@ Gunshots/explosions/opening doors/less rare audio (done)
for(var/i=0,i<hits,i++)
target.playsound_local(null, get_sfx("gunshot"), 25)
if(prob(75))
addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, 'sound/weapons/pierce.ogg', 25, 1), rand(10,20))
addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/pierce.ogg', 25, 1), rand(10,20))
else
addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, "ricochet", 25, 1), rand(10,20))
addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, "ricochet", 25, 1), rand(10,20))
sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 8))
target.playsound_local(null, get_sfx("bodyfall"), 25, 1)
if(4) //Stunprod + cablecuff
code/modules/vore/eating/belly_vr.dm
+1 -1
View File
@@ -290,7 +290,7 @@
R.visible_message( "<span class='alert'>[struggle_outer_message]</span>", "<span class='alert'>[struggle_user_message]</span>")
playsound(get_turf(owner),"struggle_sound",75,0,-5,1,channel=51)
R.stop_sound_channel(51)
R.playsound_direct("prey_struggle_sound",60)
R.playsound_local("prey_struggle_sound",60)
if(escapable && R.a_intent != "help") //If the stomach has escapable enabled and the person is actually trying to kick out
to_chat(R, "<span class='warning'>You attempt to climb out of \the [name].</span>")
code/modules/vore/eating/bellymodes_vr.dm
+3 -3
View File
@@ -23,7 +23,7 @@
M.stop_sound_channel(CHANNEL_PRED)
playsound(get_turf(owner),"digest_pred",75,0,-6,1,channel=CHANNEL_PRED)
M.stop_sound_channel(CHANNEL_PRED)
M.playsound_direct("digest_prey",60)
M.playsound_local("digest_prey",60)
//Pref protection!
if (!M.digestable)
@@ -51,7 +51,7 @@
M.stop_sound_channel(CHANNEL_PRED)
playsound(get_turf(owner),"death_pred",50,0,-6,1,channel=CHANNEL_PRED)
M.stop_sound_channel(CHANNEL_PRED)
M.playsound_direct("death_prey",60)
M.playsound_local("death_prey",60)
digestion_death(M)
owner.update_icons()
continue
@@ -70,7 +70,7 @@
M.stop_sound_channel(CHANNEL_PRED)
playsound(get_turf(owner),"digest_pred",50,0,-6,1,channel=CHANNEL_PRED)
M.stop_sound_channel(CHANNEL_PRED)
M.playsound_direct("digest_prey",60)
M.playsound_local("digest_prey",60)
if(M.stat != DEAD)
if(owner.nutrition >= NUTRITION_LEVEL_STARVING && (M.health < M.maxHealth))