Skip to content

Commit

Permalink
adds forced scream emote after warrior lunge (#5273)
Browse files Browse the repository at this point in the history
# About the pull request

~~Created a new emote called panic, it's very similar to scream and
inherits virtually all of its properties and methods however the ogg
files are of course different.~~
Added a scream emote whenever a warrior lunges and grabs a human mob,
also added one more ogg audio file to the scream list.

# Explain why it's good for the game

~~Initially I just wanted to add a forced a scream emote whenever a
warrior lunged at a human mob, but I sort of found the existing scream
ogg sounds to be kind of lack luster. However, they are iconic in their
own right and removing them or modifying them would be a detriment to
the game. I chose to create a new emote entirely rather than adding
audio files to the existing one. The emote which is similar to scream
but the sounds are more "authentic" and erm, immersive. So far it's just
two sounds for each gender but this will be changed once I find more
audio files to add.~~

Warrior lunges at marines should be a traumatic experience that gives
them ptsd.

# Changelog

:cl:
add: human mobs now scream whenever they get lunged at by a warrior.
soundadd: added a new scream sound and put it into the existing scream
list.
/:cl:
  • Loading branch information
Cthulhu80 authored Dec 23, 2023
1 parent bf5ad6a commit 3dabf9c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
S = pick('sound/voice/alien_queen_command.ogg','sound/voice/alien_queen_command2.ogg','sound/voice/alien_queen_command3.ogg')
// Human
if("male_scream")
S = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg',5;'sound/voice/human_male_scream_5.ogg',5;'sound/voice/human_jackson_scream.ogg',5;'sound/voice/human_ack_scream.ogg')
S = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg',5;'sound/voice/human_male_scream_5.ogg',5;'sound/voice/human_jackson_scream.ogg',5;'sound/voice/human_ack_scream.ogg','sound/voice/human_male_scream_6.ogg')
if("male_pain")
S = pick('sound/voice/human_male_pain_1.ogg','sound/voice/human_male_pain_2.ogg','sound/voice/human_male_pain_3.ogg',5;'sound/voice/tomscream.ogg',5;'sound/voice/human_bobby_pain.ogg',5;'sound/voice/human_tantrum_scream.ogg', 5;'sound/voice/human_male_pain_rare_1.ogg')
if("male_fragout")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@

if (xeno.Adjacent(carbon))
xeno.start_pulling(carbon,1)
if(ishuman(carbon))
INVOKE_ASYNC(carbon, TYPE_PROC_REF(/mob, emote), "scream")
else
xeno.visible_message(SPAN_XENOWARNING("[xeno]'s claws twitch."), SPAN_XENOWARNING("Our claws twitch as we lunge but are unable to grab onto our target. Wait a moment to try again."))

Expand Down
Binary file added sound/voice/human_male_scream_6.ogg
Binary file not shown.

0 comments on commit 3dabf9c

Please sign in to comment.