Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds forced scream emote after warrior lunge #5273

Merged
merged 5 commits into from Dec 23, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@
// 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')
if("male_panic_scream")
S = pick('sound/voice/human_male_panic_scream_1.ogg','sound/voice/human_male_panic_scream_2.ogg')
if("female_panic_scream")
S = pick('sound/voice/human_female_panic_scream_1.ogg','sound/voice/human_female_panic_scream_2.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
14 changes: 14 additions & 0 deletions code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,20 @@
if(isyautja(user))
return get_sfx("pred_pain")

/datum/emote/living/carbon/human/scream/panic
key = "panic"
key_third_person = "panics"
message = "panics!"

/datum/emote/living/carbon/human/scream/panic/get_sound(mob/living/user)
if(ishuman_strict(user))
if(user.gender == MALE)
return get_sfx("male_panic_scream")
else
return get_sfx("female_panic_scream")
if(isyautja(user))

Check failure on line 259 in code/modules/mob/living/carbon/human/emote.dm

View workflow job for this annotation

GitHub Actions / Run Linters

possible unreachable code here
return get_sfx("pred_pain")
This conversation was marked as resolved.
Show resolved Hide resolved

/datum/emote/living/carbon/human/scream/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(!.)
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), "panic")
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_female_panic_scream_1.ogg
Binary file not shown.
Binary file added sound/voice/human_female_panic_scream_2.ogg
Binary file not shown.
Binary file added sound/voice/human_male_panic_scream_1.ogg
Binary file not shown.
Binary file added sound/voice/human_male_panic_scream_2.ogg
Binary file not shown.
Loading