mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Fixes Scream sounds
This commit is contained in:
13
code/modules/emotes/definitions/audible_scream_vr.dm
Normal file
13
code/modules/emotes/definitions/audible_scream_vr.dm
Normal 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 ..()
|
||||
@@ -2225,7 +2225,12 @@
|
||||
#include "code\modules\emotes\definitions\audible_cough.dm"
|
||||
#include "code\modules\emotes\definitions\audible_furry_vr.dm"
|
||||
#include "code\modules\emotes\definitions\audible_scream.dm"
|
||||
<<<<<<< HEAD
|
||||
#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_snap.dm"
|
||||
#include "code\modules\emotes\definitions\audible_sneeze.dm"
|
||||
|
||||
Reference in New Issue
Block a user