cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4057 from Anewbe/robocough

Browse Source 
Robotic lungs have a robotic coughing sound
This commit is contained in:
Neerti
2017-10-14 01:42:23 -04:00
committed by GitHub
parent e8edcfb40e 84f7e91f50
commit 0f041f6661
1 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -232,14 +232,28 @@
m_type = 1 m_type = 1
else else
if(!muzzled) if(!muzzled)
message = "coughs!" var/robotic = 0
m_type = 2 m_type = 2
if(should_have_organ(O_LUNGS))
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(L && L.robotic == 2) //Hard-coded to 2, incase we add lifelike robotic lungs
robotic = 1
if(!robotic)
message = "coughs!"
if(gender == FEMALE) if(gender == FEMALE)
if(species.female_cough_sounds) if(species.female_cough_sounds)
playsound(src, pick(species.female_cough_sounds), 120) playsound(src, pick(species.female_cough_sounds), 120)
else else
if(species.male_cough_sounds) if(species.male_cough_sounds)
playsound(src, pick(species.male_cough_sounds), 120) playsound(src, pick(species.male_cough_sounds), 120)
else
message = "emits a robotic cough"
var/use_sound
if(gender == FEMALE)
use_sound = pick('sound/effects/mob_effects/f_machine_cougha.ogg','sound/effects/mob_effects/f_machine_coughb.ogg')
else
use_sound = pick('sound/effects/mob_effects/m_machine_cougha.ogg','sound/effects/mob_effects/m_machine_coughb.ogg', 'sound/effects/mob_effects/m_machine_coughc.ogg')
playsound(src.loc, use_sound, 50, 0)
else else
message = "makes a strong noise." message = "makes a strong noise."
m_type = 2 m_type = 2
@@ -492,12 +506,27 @@
m_type = 1 m_type = 1
else else
if(!muzzled) if(!muzzled)
var/robotic = 0
m_type = 2
if(should_have_organ(O_LUNGS))
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(L && L.robotic == 2) //Hard-coded to 2, incase we add lifelike robotic lungs
robotic = 1
if(!robotic)
message = "sneezes." message = "sneezes."
if(gender == FEMALE) if(gender == FEMALE)
playsound(src, species.female_sneeze_sound, 70) playsound(src, species.female_sneeze_sound, 70)
else else
playsound(src, species.male_sneeze_sound, 70) playsound(src, species.male_sneeze_sound, 70)
m_type = 2 m_type = 2
else
message = "emits a robotic sneeze"
var/use_sound
if(gender == FEMALE)
use_sound = 'sound/effects/mob_effects/machine_sneeze.ogg'
else
use_sound = 'sound/effects/mob_effects/f_machine_sneeze.ogg'
playsound(src.loc, use_sound, 50, 0)
else else
message = "makes a strange noise." message = "makes a strange noise."
m_type = 2 m_type = 2