diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm index 2d0f25cb58a..3ff97baec37 100644 --- a/code/game/objects/alien/facehugger.dm +++ b/code/game/objects/alien/facehugger.dm @@ -239,7 +239,7 @@ for(var/mob/O in viewers(world.view,src)) O.show_message("\red [src.target] has been leapt on by [lamarr ? src.name : "the alien"]!", 1, "\red You hear someone fall", 2) if (!lamarr) - target:bruteloss += 10 + target:bruteloss += 5 if(prob(70)) target:paralysis = max(target:paralysis, 5) src.loc = target.loc diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index 650ea7e0b0b..68767b7c3ba 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -80,6 +80,7 @@ for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) O << text("\red [] mangles the grille.", usr) + playsound(src.loc, 'grillehit.ogg', 80, 1) src.health -= 3 healthcheck() return diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index b5298fb636b..aecd3cc9784 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -132,6 +132,7 @@ for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) O << text("\red [] smashes against the window.", usr) + playsound(src.loc, 'Glasshit.ogg', 100, 1) src.health -= 15 if(src.health <= 0) usr << text("\green You smash through the window.") diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index ec30ab96f38..c4aca2d7eb3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -129,7 +129,7 @@ Doesn't work on silicon mobs or other aliens.*/ src.toxloss -= 10 log_say("AlienWhisper: [key_name(src)]->[M.key] : [msg]") - M << "\green You hear a strange alien voice in your head... \italic [msg]" + M << "\green You hear a strange, alien voice in your head... \italic [msg]" src << {"\green You said: "[msg]" to [M]"} else src << "\green Not enough plasma stored." diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 0c371f617b8..caf8642e9a6 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -93,10 +93,12 @@ message = text("[] collapses!", src) m_type = 2 if("help") - src << "choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper" + src << "burp, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper" else src << text("Invalid Emote: []", act) if ((message && src.stat == 0)) + if (act == "roar") + playsound(src.loc, 'hiss5.ogg', 40, 1, 1) if (m_type & 1) for(var/mob/O in viewers(src, null)) O.show_message(message, m_type) diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index bba4aed121d..a01cadc361d 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -90,7 +90,7 @@ message = text("[] collapses!", src) m_type = 2 if("help") - src << "choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper" + src << "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper" else src << text("Invalid Emote: []", act) if ((message && src.stat == 0)) diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index c430328ef28..410d270fbfa 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -11,6 +11,7 @@ message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) src.alien_talk(message) else + playsound(src.loc, "hiss", 25, 1, 1)//So aliens can hiss while they hiss yo/N return ..(message) else @@ -23,7 +24,6 @@ /mob/living/proc/alien_talk(var/message) log_say("[key_name(src)] : [message]") - message = trim(message) if (!message) diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 0278d731c73..22241eaf355 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/screen1_alien.dmi b/icons/mob/screen1_alien.dmi index 546c77e4fce..a8fddfc2a44 100644 Binary files a/icons/mob/screen1_alien.dmi and b/icons/mob/screen1_alien.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 094be40719f..45e7619d73f 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/sound/ambience/hiss1.ogg b/sound/voice/hiss1.ogg similarity index 100% rename from sound/ambience/hiss1.ogg rename to sound/voice/hiss1.ogg diff --git a/sound/ambience/hiss2.ogg b/sound/voice/hiss2.ogg similarity index 100% rename from sound/ambience/hiss2.ogg rename to sound/voice/hiss2.ogg diff --git a/sound/ambience/hiss3.ogg b/sound/voice/hiss3.ogg similarity index 100% rename from sound/ambience/hiss3.ogg rename to sound/voice/hiss3.ogg diff --git a/sound/ambience/hiss4.ogg b/sound/voice/hiss4.ogg similarity index 100% rename from sound/ambience/hiss4.ogg rename to sound/voice/hiss4.ogg diff --git a/sound/ambience/hiss5.ogg b/sound/voice/hiss5.ogg similarity index 100% rename from sound/ambience/hiss5.ogg rename to sound/voice/hiss5.ogg diff --git a/sound/ambience/bite.ogg b/sound/weapons/bite.ogg similarity index 100% rename from sound/ambience/bite.ogg rename to sound/weapons/bite.ogg