diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index f9315966d27..ac1d98e848f 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -57,6 +57,10 @@
on_CD = handle_emote_CD(50) //longer cooldown
if("fart", "farts", "flip", "flips", "snap", "snaps")
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
+ if("cough", "coughs")
+ on_CD = handle_emote_CD()
+ if("sneeze", "sneezes")
+ on_CD = handle_emote_CD()
//Everything else, including typos of the above emotes
else
on_CD = 0 //If it doesn't induce the cooldown, we won't check for the cooldown
@@ -399,6 +403,12 @@
if(!muzzled)
message = "[src] coughs!"
m_type = 2
+ if(gender == FEMALE)
+ if(species.female_cough_sounds)
+ playsound(src, pick(species.female_cough_sounds), 120)
+ else
+ if(species.male_cough_sounds)
+ playsound(src, pick(species.male_cough_sounds), 120)
else
message = "[src] makes a strong noise."
m_type = 2
@@ -654,6 +664,10 @@
else
if(!muzzled)
message = "[src] sneezes."
+ if(gender == FEMALE)
+ playsound(src, species.female_sneeze_sound, 70)
+ else
+ playsound(src, species.male_sneeze_sound, 70)
m_type = 2
else
message = "[src] makes a strange noise."
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index d8769a3acea..54f68f2b101 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -128,6 +128,10 @@
var/scream_verb = "screams"
var/male_scream_sound = 'sound/goonstation/voice/male_scream.ogg'
var/female_scream_sound = 'sound/goonstation/voice/female_scream.ogg'
+ 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'
+ var/female_sneeze_sound = 'sound/effects/mob_effects/f_sneeze.ogg'
//Default hair/headacc style vars.
var/default_hair //Default hair style for newly created humans unless otherwise set.
@@ -676,4 +680,4 @@ It'll return null if the organ doesn't correspond, so include null checks when u
H.see_invisible = SEE_INVISIBLE_MINIMUM
if(H.see_override) //Override all
- H.see_invisible = H.see_override
\ No newline at end of file
+ H.see_invisible = H.see_override
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 5b346575263..c07a3667a02 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -520,6 +520,11 @@
butt_sprite = "slime"
//Has default darksight of 2.
+ male_cough_sounds = null //slime people don't have lungs
+ female_cough_sounds = null
+ male_sneeze_sound = null
+ female_sneeze_sound = null
+
has_organ = list(
"brain" = /obj/item/organ/internal/brain/slime
)
@@ -739,6 +744,12 @@
slowdown = 5
remains_type = /obj/effect/decal/cleanable/ash
+ male_cough_sounds = null //diona don't have lungs
+ female_cough_sounds = null
+ male_sneeze_sound = null
+ female_sneeze_sound = null
+
+
warning_low_pressure = 50
hazard_low_pressure = -1
@@ -882,6 +893,10 @@
reagent_tag = PROCESS_SYN
male_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
female_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
+ male_cough_sounds = list('sound/effects/mob_effects/m_machine_cougha.ogg','sound/effects/mob_effects/m_machine_coughb.ogg', 'sound/effects/mob_effects/m_machine_coughc.ogg')
+ female_cough_sounds = list('sound/effects/mob_effects/f_machine_cougha.ogg','sound/effects/mob_effects/f_machine_coughb.ogg')
+ male_sneeze_sound = 'sound/effects/mob_effects/machine_sneeze.ogg'
+ female_sneeze_sound = 'sound/effects/mob_effects/f_machine_sneeze.ogg'
butt_sprite = "machine"
has_organ = list(
@@ -941,6 +956,10 @@
speech_chance = 20
male_scream_sound = 'sound/voice/DraskTalk2.ogg'
female_scream_sound = 'sound/voice/DraskTalk2.ogg'
+ male_cough_sounds = null //whale cough when
+ female_cough_sounds = null
+ male_sneeze_sound = null
+ female_sneeze_sound = null
burn_mod = 2
//exotic_blood = "cryoxadone"
@@ -1023,4 +1042,4 @@
H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
if(heat_level_3_breathe to INFINITY)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
\ No newline at end of file
+ H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
diff --git a/sound/effects/mob_effects/f_cougha.ogg b/sound/effects/mob_effects/f_cougha.ogg
new file mode 100644
index 00000000000..f53e0f5bd2c
Binary files /dev/null and b/sound/effects/mob_effects/f_cougha.ogg differ
diff --git a/sound/effects/mob_effects/f_coughb.ogg b/sound/effects/mob_effects/f_coughb.ogg
new file mode 100644
index 00000000000..2626f8d6621
Binary files /dev/null and b/sound/effects/mob_effects/f_coughb.ogg differ
diff --git a/sound/effects/mob_effects/f_machine_cougha.ogg b/sound/effects/mob_effects/f_machine_cougha.ogg
new file mode 100644
index 00000000000..e0a8441e3d4
Binary files /dev/null and b/sound/effects/mob_effects/f_machine_cougha.ogg differ
diff --git a/sound/effects/mob_effects/f_machine_coughb.ogg b/sound/effects/mob_effects/f_machine_coughb.ogg
new file mode 100644
index 00000000000..b70b6d16c14
Binary files /dev/null and b/sound/effects/mob_effects/f_machine_coughb.ogg differ
diff --git a/sound/effects/mob_effects/f_machine_sneeze.ogg b/sound/effects/mob_effects/f_machine_sneeze.ogg
new file mode 100644
index 00000000000..9649c862449
Binary files /dev/null and b/sound/effects/mob_effects/f_machine_sneeze.ogg differ
diff --git a/sound/effects/mob_effects/f_sneeze.ogg b/sound/effects/mob_effects/f_sneeze.ogg
new file mode 100644
index 00000000000..e6c4a49ade8
Binary files /dev/null and b/sound/effects/mob_effects/f_sneeze.ogg differ
diff --git a/sound/effects/mob_effects/m_cougha.ogg b/sound/effects/mob_effects/m_cougha.ogg
new file mode 100644
index 00000000000..146beefdf87
Binary files /dev/null and b/sound/effects/mob_effects/m_cougha.ogg differ
diff --git a/sound/effects/mob_effects/m_coughb.ogg b/sound/effects/mob_effects/m_coughb.ogg
new file mode 100644
index 00000000000..745fb50e19c
Binary files /dev/null and b/sound/effects/mob_effects/m_coughb.ogg differ
diff --git a/sound/effects/mob_effects/m_coughc.ogg b/sound/effects/mob_effects/m_coughc.ogg
new file mode 100644
index 00000000000..abfe70d2769
Binary files /dev/null and b/sound/effects/mob_effects/m_coughc.ogg differ
diff --git a/sound/effects/mob_effects/m_machine_cougha.ogg b/sound/effects/mob_effects/m_machine_cougha.ogg
new file mode 100644
index 00000000000..3e803f64b1e
Binary files /dev/null and b/sound/effects/mob_effects/m_machine_cougha.ogg differ
diff --git a/sound/effects/mob_effects/m_machine_coughb.ogg b/sound/effects/mob_effects/m_machine_coughb.ogg
new file mode 100644
index 00000000000..d1287070922
Binary files /dev/null and b/sound/effects/mob_effects/m_machine_coughb.ogg differ
diff --git a/sound/effects/mob_effects/m_machine_coughc.ogg b/sound/effects/mob_effects/m_machine_coughc.ogg
new file mode 100644
index 00000000000..67e13314934
Binary files /dev/null and b/sound/effects/mob_effects/m_machine_coughc.ogg differ
diff --git a/sound/effects/mob_effects/machine_sneeze.ogg b/sound/effects/mob_effects/machine_sneeze.ogg
new file mode 100644
index 00000000000..f0ba0ab8170
Binary files /dev/null and b/sound/effects/mob_effects/machine_sneeze.ogg differ
diff --git a/sound/effects/mob_effects/sneeze.ogg b/sound/effects/mob_effects/sneeze.ogg
new file mode 100644
index 00000000000..e7587bab20f
Binary files /dev/null and b/sound/effects/mob_effects/sneeze.ogg differ