cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sound Update: Pain/Scream/Gasp/Death Sounds

Browse Source 
This PR adds the following sounds;
Death sounds
Scream sounds
Pain sounds
Gasp sounds

The sounds are organized into a category under character setup - navigate to the VORE tab and select one based on your preference. If Unset, or not chosen, it will default to whatever the icon base is for your species - for instance, Vulpkanin will get the Canine sounds.

Sounds are grouped into 4 major lists so far, with plans for more once I get more files;
Canine (Scream/Gasp/Death/Pain)
Feline (Scream/Gasp/Death/Pain)
Cervine (Scream/Death only)
Generic/Human (Scream/Gasp/Death/Pain)

Vulpkanin use Canine sounds. Tajaran use Feline. Humans get Generic/Human. Cervine is unset on any species, allowed to be taken by customs.
Vox have a pain sound.

This also enables **pain** emotes. These can be manually done with *pain, or triggered automatically on taking an injury. The pain trigger respects species pain mods - for instance, if you have Major Pain Tolerance, you'll hear yourself growl in pain far less than someone who has Intolerance.

Pain is **not** triggered by spicy food or hallucinations, as those two add halloss on directly. Only effects that apply damage will add on pain.

You can test out these sounds in the Character Setup panel. See [here](https://streamable.com/o9wr9g), and here:
![](https://i.imgur.com/JhbH6r3.png)

A demonstration of human sounds is available [here](https://streamable.com/hqwpel).
Canine sounds [here](https://streamable.com/41d0oj)
Demonstrations of it during combat [here](https://streamable.com/y4nxea) and [here](https://streamable.com/gj2gl3).

These can be muted by navigating to Sound and setting the Mob Injury Sounds variable, seen here:
![](https://i.imgur.com/4zblNmd.png)

Species that currently lack sounds have had their audible sounds disabled to prevent jarring human noises from playing on non-human species. This can be overridden upon request, but for now, it will serve as hopeful inspiration to encourage additional files.
This commit is contained in:
Rykka Stormheart
2023-02-27 19:28:05 -08:00
parent 65637c3fc9
commit 6a837244da
94 changed files with 609 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/emotes/definitions/audible_scream_ch.dm
View File

@@ -4,10 +4,14 @@
if(H.get_gender() == FEMALE)
return list(
"sound" = H.species.female_scream_sound,
"vol" = emote_volume
"vol" = 60,
"exr" = 20,
"volchannel" = VOLUME_CHANNEL_INJ_DEATH
)
else
return list(
"sound" = H.species.male_scream_sound,
"vol" = emote_volume
)
"vol" = 60,
"exr" = 20,
"volchannel" = VOLUME_CHANNEL_INJ_DEATH
)

12
code/modules/emotes/emote_define.dm
View File

@@ -29,8 +29,8 @@ var/global/list/emotes_by_key
var/emote_message_radio_synthetic // As above, but for synthetics.
var/emote_message_muffled // A message to show if the emote is audible and the user is muzzled.
var/list/emote_sound // A sound for the emote to play.
// Can either be a single sound, a list of sounds to pick from, or an
var/list/emote_sound // A sound for the emote to play.
// Can either be a single sound, a list of sounds to pick from, or an
// associative array of gender to single sounds/a list of sounds.
var/list/emote_sound_synthetic // As above, but used when check_synthetic() is true.
var/emote_volume = 50 // Volume of sound to play.
@@ -42,7 +42,7 @@ var/global/list/emotes_by_key
var/check_range // falsy, or a range outside which the emote will not work
var/conscious = TRUE // Do we need to be awake to emote this?
var/emote_range = 0 // If >0, restricts emote visibility to viewers within range.
var/sound_preferences = list(/datum/client_preference/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks.
var/sound_vary = FALSE
@@ -187,12 +187,12 @@ var/global/list/emotes_by_key
if(islist(sound_to_play) && length(sound_to_play))
sound_to_play = pick(sound_to_play)
if(sound_to_play)
//CHOMPEdit Add - Preference for variable pitch
//CHOMPEdit Add - Preference for variable pitch + Extra range argument
if(istype(user, /mob))
var/mob/u = user
playsound(user.loc, sound_to_play, use_sound["vol"], u.is_preference_enabled(/datum/client_preference/random_emote_pitch) && sound_vary, frequency = u.voice_freq, preference = sound_preferences) //CHOMPEdit
playsound(user.loc, sound_to_play, use_sound["vol"], u.is_preference_enabled(/datum/client_preference/random_emote_pitch) && sound_vary, extrarange = use_sound["exr"], frequency = u.voice_freq, preference = sound_preferences, volume_channel = use_sound["volchannel"]) //CHOMPEdit
else
playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, frequency = null, preference = sound_preferences) //VOREStation Add - Preference
playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, extrarange = use_sound["exr"], frequency = null, preference = sound_preferences, volume_channel = use_sound["volchannel"]) //VOREStation Add - Preference // CHOMPEdit: volume channel + range
//CHOMPEdit End - Previous line used to be outside an if/else before the edit.
/decl/emote/proc/mob_can_use(var/mob/user)