cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6300 from Alexshreds/disease_effects

Browse Source 
Adds Cough and Sneeze Sounds
This commit is contained in:
Crazy Lemon
2017-02-14 23:38:23 -08:00
committed by GitHub
parent 312886ccfd dd4a64ea6a
commit 4366ba550e
17 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+14
View File
@@ -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 = "<B>[src]</B> 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 = "<B>[src]</B> makes a strong noise."
m_type = 2
@@ -654,6 +664,10 @@
else
if(!muzzled)
message = "<B>[src]</B> sneezes."
if(gender == FEMALE)
playsound(src, species.female_sneeze_sound, 70)
else
playsound(src, species.male_sneeze_sound, 70)
m_type = 2
else
message = "<B>[src]</B> makes a strange noise."
code/modules/mob/living/carbon/human/species/species.dm
+5 -1
View File
@@ -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
H.see_invisible = H.see_override
code/modules/mob/living/carbon/human/species/station.dm
+20 -1
View File
@@ -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")
H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")