From 84f7e91f50677c9d09c588b8bacac509dd584656 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 12 Oct 2017 22:45:09 -0500 Subject: [PATCH] Robotic lungs have a robotic coughing sound --- code/modules/mob/living/carbon/human/emote.dm | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 55d82ef2ce..896c699777 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -232,14 +232,28 @@ m_type = 1 else if(!muzzled) - message = "coughs!" + var/robotic = 0 m_type = 2 - if(gender == FEMALE) - if(species.female_cough_sounds) - playsound(src, pick(species.female_cough_sounds), 120) + 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(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 - if(species.male_cough_sounds) - playsound(src, pick(species.male_cough_sounds), 120) + 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 message = "makes a strong noise." m_type = 2 @@ -492,12 +506,27 @@ m_type = 1 else if(!muzzled) - message = "sneezes." - if(gender == FEMALE) - playsound(src, species.female_sneeze_sound, 70) - else - playsound(src, species.male_sneeze_sound, 70) + 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." + if(gender == FEMALE) + playsound(src, species.female_sneeze_sound, 70) + else + playsound(src, species.male_sneeze_sound, 70) + 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 message = "makes a strange noise." m_type = 2