diff --git a/code/modules/emotes/definitions/audible_scream_vr.dm b/code/modules/emotes/definitions/audible_scream_vr.dm new file mode 100644 index 0000000000..7114d0eb66 --- /dev/null +++ b/code/modules/emotes/definitions/audible_scream_vr.dm @@ -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 ..() diff --git a/vorestation.dme b/vorestation.dme index 11cb71f75c..f2effad819 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -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"