cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-25 13:46:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "revert emote sounds"

Browse Source 
This reverts commit 86939b19ec.
This commit is contained in:
quotefox
2022-03-25 10:32:41 +00:00
parent 0dc8a99277
commit 6799e3eda3
82 changed files with 98 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/cit_emotes.dm
+3 -3
View File
@@ -46,9 +46,9 @@
sound = 'sound/creatures/gorilla.ogg'
if(ishuman(user))
user.adjustOxyLoss(5)
sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
sound = pick('hyperstation/sound/voice/emotes/male_scream1.ogg', 'hyperstation/sound/voice/emotes/male_scream2.ogg', 'hyperstation/sound/voice/emotes/male_scream3.ogg')
if(user.gender == FEMALE)
sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg')
sound = pick('hyperstation/sound/voice/emotes/female_scream1.ogg', 'hyperstation/sound/voice/emotes/female_scream1b.ogg')
if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc) || is_species(user, /datum/species/synthliz))
sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
if(is_species(user, /datum/species/lizard))
@@ -279,7 +279,7 @@
emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE
restraint_check = FALSE
/datum/emote/living/cackle
key = "cackle"
key_third_person = "cackles"