cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Scream sounds

Browse Source
This commit is contained in:
Chompstation Bot
2021-05-13 15:07:59 +00:00
parent 83a2fdc561
commit 3837c57c0d
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/emotes/definitions/audible_scream_vr.dm Normal file
View File

@@ -0,0 +1,13 @@
/decl/emote/audible/scream/get_emote_sound(var/atom/user)
var/mob/living/carbon/human/H = user
if(H.get_gender() == FEMALE)
return list(
"sound" = H.species.female_scream_sound,
"vol" = emote_volume
)
else
return list(
"sound" = H.species.male_scream_sound,
"vol" = emote_volume
)
return ..()

5
vorestation.dme
View File

@@ -2225,7 +2225,12 @@
#include "code\modules\emotes\definitions\audible_cough.dm" #include "code\modules\emotes\definitions\audible_cough.dm"
#include "code\modules\emotes\definitions\audible_furry_vr.dm" #include "code\modules\emotes\definitions\audible_furry_vr.dm"
#include "code\modules\emotes\definitions\audible_scream.dm" #include "code\modules\emotes\definitions\audible_scream.dm"
<<<<<<< HEAD
#include "code\modules\emotes\definitions\audible_scream_ch.dm" #include "code\modules\emotes\definitions\audible_scream_ch.dm"
||||||| parent of f765cae30d... Merge pull request #10309 from Novacat/nova-basicfixes
=======
#include "code\modules\emotes\definitions\audible_scream_vr.dm"
>>>>>>> f765cae30d... Merge pull request #10309 from Novacat/nova-basicfixes
#include "code\modules\emotes\definitions\audible_slap.dm" #include "code\modules\emotes\definitions\audible_slap.dm"
#include "code\modules\emotes\definitions\audible_snap.dm" #include "code\modules\emotes\definitions\audible_snap.dm"
#include "code\modules\emotes\definitions\audible_sneeze.dm" #include "code\modules\emotes\definitions\audible_sneeze.dm"