mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Added TGstation screams, and tweaked scream code
Added 4 default screams for male, and 4 default screams for female. Also added 1 easteregg scream for male. Also did a bit of tweaking to scream code so it can pick from a list.
This commit is contained in:
@@ -694,13 +694,11 @@
|
||||
if(!muzzled)
|
||||
message = "[species.scream_verb]!"
|
||||
m_type = 2
|
||||
//CHOMPStation Edit Start. Uncommented block. Why was it commented in the first place?
|
||||
//The offending content was commented out as well anyway.
|
||||
if(get_gender() == FEMALE)
|
||||
playsound(src, "[species.female_scream_sound]", 80, 1)
|
||||
if(get_gender() == FEMALE) //CHOMPedit start : fixed scream sounds by giving them the ability to grab from a list, and a way to turn them off in preferences
|
||||
playsound(src, pick(species.female_scream_sound), 80, preference = /datum/client_preference/emote_noises)
|
||||
else
|
||||
playsound(src, "[species.male_scream_sound]", 80, 1) //default to male screams if no gender is present.
|
||||
//CHOMPStation Edit End.
|
||||
playsound(src, pick(species.male_scream_sound), 80, preference = /datum/client_preference/emote_noises) //default to male screams if no gender is present.
|
||||
//CHOMPedit end
|
||||
else
|
||||
message = "makes a very loud noise."
|
||||
m_type = 2
|
||||
|
||||
@@ -75,8 +75,8 @@
|
||||
|
||||
//Soundy emotey things.
|
||||
var/scream_verb = "screams"
|
||||
var/male_scream_sound //= 'sound/goonstation/voice/male_scream.ogg' Removed due to licensing, replace!
|
||||
var/female_scream_sound //= 'sound/goonstation/voice/female_scream.ogg' Removed due to licensing, replace!
|
||||
var/male_scream_sound = list('sound/effects/mob_effects/m_scream_1.ogg','sound/effects/mob_effects/m_scream_2.ogg','sound/effects/mob_effects/m_scream_3.ogg','sound/effects/mob_effects/m_scream_4.ogg','sound/effects/mob_effects/wilhelm_scream.ogg') //CHOMpedit start : Added tgstation screams
|
||||
var/female_scream_sound = list('sound/effects/mob_effects/f_scream_1.ogg','sound/effects/mob_effects/f_scream_2.ogg','sound/effects/mob_effects/f_scream_3.ogg','sound/effects/mob_effects/f_scream_4.ogg') //CHOMPedit end
|
||||
var/male_cough_sounds = list('sound/effects/mob_effects/m_cougha.ogg','sound/effects/mob_effects/m_coughb.ogg', 'sound/effects/mob_effects/m_coughc.ogg')
|
||||
var/female_cough_sounds = list('sound/effects/mob_effects/f_cougha.ogg','sound/effects/mob_effects/f_coughb.ogg')
|
||||
var/male_sneeze_sound = 'sound/effects/mob_effects/sneeze.ogg'
|
||||
|
||||
BIN
sound/effects/mob_effects/f_scream_1.ogg
Normal file
BIN
sound/effects/mob_effects/f_scream_1.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/f_scream_2.ogg
Normal file
BIN
sound/effects/mob_effects/f_scream_2.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/f_scream_3.ogg
Normal file
BIN
sound/effects/mob_effects/f_scream_3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/f_scream_4.ogg
Normal file
BIN
sound/effects/mob_effects/f_scream_4.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/m_scream_1.ogg
Normal file
BIN
sound/effects/mob_effects/m_scream_1.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/m_scream_2.ogg
Normal file
BIN
sound/effects/mob_effects/m_scream_2.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/m_scream_3.ogg
Normal file
BIN
sound/effects/mob_effects/m_scream_3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/m_scream_4.ogg
Normal file
BIN
sound/effects/mob_effects/m_scream_4.ogg
Normal file
Binary file not shown.
BIN
sound/effects/mob_effects/wilhelm_scream.ogg
Normal file
BIN
sound/effects/mob_effects/wilhelm_scream.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user