mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
Merge pull request #14264 from dzahlus/pain-emote-updates
Pain emote is now added to getting wounded! As well as more pain sounds
This commit is contained in:
@@ -134,6 +134,7 @@
|
||||
if(status_effect_type)
|
||||
linked_status_effect = victim.apply_status_effect(status_effect_type, src)
|
||||
SEND_SIGNAL(victim, COMSIG_CARBON_GAIN_WOUND, src, limb)
|
||||
victim.emote("pain")
|
||||
if(!victim.alerts["wound"]) // only one alert is shared between all of the wounds
|
||||
victim.throw_alert("wound", /obj/screen/alert/status_effect/wound)
|
||||
|
||||
|
||||
@@ -317,7 +317,7 @@
|
||||
user.nextsoundemote = world.time + 7
|
||||
var/sound
|
||||
if(user.gender == MALE)
|
||||
sound = pick('modular_citadel/sound/voice/human_male_pain_1.ogg', 'modular_citadel/sound/voice/human_male_pain_2.ogg', 'modular_citadel/sound/voice/human_male_pain_3.ogg', 'modular_citadel/sound/voice/human_male_pain_rare.ogg')
|
||||
sound = pick('modular_citadel/sound/voice/human_male_pain_1.ogg', 'modular_citadel/sound/voice/human_male_pain_2.ogg', 'modular_citadel/sound/voice/human_male_pain_3.ogg', 'modular_citadel/sound/voice/human_male_pain_rare.ogg', 'modular_citadel/sound/voice/human_male_scream_1.ogg', 'modular_citadel/sound/voice/human_male_scream_2.ogg', 'modular_citadel/sound/voice/human_male_scream_3.ogg', 'modular_citadel/sound/voice/human_male_scream_4.ogg')
|
||||
else
|
||||
sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg')
|
||||
sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg', 'modular_citadel/sound/voice/human_female_scream_2.ogg', 'modular_citadel/sound/voice/human_female_scream_3.ogg', 'modular_citadel/sound/voice/human_female_scream_4.ogg')
|
||||
playsound(user, sound, 50, 0, 0)
|
||||
|
||||
BIN
modular_citadel/sound/voice/human_female_scream_2.ogg
Normal file
BIN
modular_citadel/sound/voice/human_female_scream_2.ogg
Normal file
Binary file not shown.
BIN
modular_citadel/sound/voice/human_female_scream_3.ogg
Normal file
BIN
modular_citadel/sound/voice/human_female_scream_3.ogg
Normal file
Binary file not shown.
BIN
modular_citadel/sound/voice/human_female_scream_4.ogg
Normal file
BIN
modular_citadel/sound/voice/human_female_scream_4.ogg
Normal file
Binary file not shown.
BIN
modular_citadel/sound/voice/human_male_scream_1.ogg
Normal file
BIN
modular_citadel/sound/voice/human_male_scream_1.ogg
Normal file
Binary file not shown.
BIN
modular_citadel/sound/voice/human_male_scream_2.ogg
Normal file
BIN
modular_citadel/sound/voice/human_male_scream_2.ogg
Normal file
Binary file not shown.
BIN
modular_citadel/sound/voice/human_male_scream_3.ogg
Normal file
BIN
modular_citadel/sound/voice/human_male_scream_3.ogg
Normal file
Binary file not shown.
BIN
modular_citadel/sound/voice/human_male_scream_4.ogg
Normal file
BIN
modular_citadel/sound/voice/human_male_scream_4.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user