Skip to content

Commit

Permalink
Sigh and sniff sounds (again). (tgstation#85281)
Browse files Browse the repository at this point in the history
## About The Pull Request


https://github.com/user-attachments/assets/fa4ca127-e81e-4bfc-b49c-4f39a9f5b3d8



https://github.com/user-attachments/assets/244180e1-4181-447b-9e59-d9f5ef58a029
## Why It's Good For The Game
Emotes allow to express yourself in more ways than words, sighing is
great for expressing your frustration with someone, sniff gives more
feedback about someone's sickly status, including allowing people to rp
as if something stinks.
## Changelog
:cl: grungussuss
sound: added sniff sounds
sound: added sigh sounds
/:cl:
  • Loading branch information
Sadboysuss authored Jul 29, 2024
1 parent 7563b1b commit e7a734a
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/modules/mob/living/carbon/human/_species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,14 @@ GLOBAL_LIST_EMPTY(features_by_species)
/datum/species/proc/get_cry_sound(mob/living/carbon/human/human)
return

/// Returns the species' sigh sound.
/datum/species/proc/get_sigh_sound(mob/living/carbon/human/human)
return

/// Returns the species' sniff sound.
/datum/species/proc/get_sniff_sound(mob/living/carbon/human/human)
return

/// Returns the species' cough sound.
/datum/species/proc/get_cough_sound(mob/living/carbon/human/human)
return
Expand Down
11 changes: 11 additions & 0 deletions code/modules/mob/living/carbon/human/species_types/felinid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@
return 'sound/voice/human/female_sneeze1.ogg'
return 'sound/voice/human/male_sneeze1.ogg'

/datum/species/human/felinid/get_sigh_sound(mob/living/carbon/human/felinid)
if(felinid.physique == FEMALE)
return 'sound/voice/human/female_sigh.ogg'
return 'sound/voice/human/male_sigh.ogg'

/datum/species/human/felinid/get_sniff_sound(mob/living/carbon/human/felinid)
if(felinid.physique == FEMALE)
return 'sound/voice/human/female_sniff.ogg'
return 'sound/voice/human/male_sniff.ogg'



/proc/mass_purrbation()
for(var/mob in GLOB.human_list)
Expand Down
10 changes: 10 additions & 0 deletions code/modules/mob/living/carbon/human/species_types/humans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
'sound/voice/human/manlaugh2.ogg',
)

/datum/species/human/get_sigh_sound(mob/living/carbon/human/human)
if(human.physique == FEMALE)
return 'sound/voice/human/female_sigh.ogg'
return 'sound/voice/human/male_sigh.ogg'

/datum/species/human/get_sniff_sound(mob/living/carbon/human/human)
if(human.physique == FEMALE)
return 'sound/voice/human/female_sniff.ogg'
return 'sound/voice/human/male_sniff.ogg'

/datum/species/human/get_species_description()
return "Humans are the dominant species in the known galaxy. \
Their kind extend from old Earth to the edges of known space."
Expand Down
10 changes: 10 additions & 0 deletions code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@
/datum/species/lizard/get_laugh_sound(mob/living/carbon/human/lizard)
return 'sound/voice/lizard/lizard_laugh1.ogg'

/datum/species/lizard/get_sigh_sound(mob/living/carbon/human/lizard)
if(lizard.physique == FEMALE)
return 'sound/voice/human/female_sigh.ogg'
return 'sound/voice/human/male_sigh.ogg'

/datum/species/lizard/get_sniff_sound(mob/living/carbon/human/lizard)
if(lizard.physique == FEMALE)
return 'sound/voice/human/female_sniff.ogg'
return 'sound/voice/human/male_sniff.ogg'

/datum/species/lizard/get_physical_attributes()
return "Lizardpeople can withstand slightly higher temperatures than most species, but they are very vulnerable to the cold \
and can't regulate their body-temperature internally, making the vacuum of space extremely deadly to them."
Expand Down
10 changes: 10 additions & 0 deletions code/modules/mob/living/carbon/human/species_types/mothmen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,16 @@
/datum/species/moth/get_laugh_sound(mob/living/carbon/human/moth)
return 'sound/voice/moth/moth_laugh1.ogg'

/datum/species/moth/get_sigh_sound(mob/living/carbon/human/moth)
if(moth.physique == FEMALE)
return 'sound/voice/human/female_sigh.ogg'
return 'sound/voice/human/male_sigh.ogg'

/datum/species/moth/get_sniff_sound(mob/living/carbon/human/moth)
if(moth.physique == FEMALE)
return 'sound/voice/human/female_sniff.ogg'
return 'sound/voice/human/male_sniff.ogg'

/datum/species/moth/get_physical_attributes()
return "Moths have large and fluffy wings, which help them navigate the station if gravity is offline by pushing the air around them. \
Due to that, it isn't of much use out in space. Their eyes are very sensitive."
Expand Down
13 changes: 13 additions & 0 deletions code/modules/mob/living/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@
message = "sighs."
message_mime = "acts out an exaggerated silent sigh."
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/sigh/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
Expand All @@ -403,6 +404,11 @@
var/image/emote_animation = image('icons/mob/human/emote_visuals.dmi', user, "sigh")
flick_overlay_global(emote_animation, GLOB.clients, 2.0 SECONDS)

/datum/emote/living/sigh/get_sound(mob/living/carbon/human/user)
if(!istype(user))
return
return user.dna.species.get_sigh_sound(user)

/datum/emote/living/sit
key = "sit"
key_third_person = "sits"
Expand All @@ -424,6 +430,13 @@
message = "sniffs."
message_mime = "sniffs silently."
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/sniff/get_sound(mob/living/carbon/human/user)
if(!istype(user))
return
return user.dna.species.get_sniff_sound(user)


/datum/emote/living/snore
key = "snore"
Expand Down
7 changes: 7 additions & 0 deletions sound/voice/credits.txt → sound/voice/attribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ borg_deathsound.ogg is spliced from two clips, both of which are under the CC At
all complianator sounds are licensed under CC-BY-SA by Michael Haugh (supermichael)

The male sharp gasps in /sound/voice/human/ are from https://freesound.org/people/bacruz666/sounds/341908/ and https://freesound.org/people/nettoi/sounds/677540/, the female sharp gasps are from https://freesound.org/people/drotzruhn/sounds/405203/

{
human/male_sniff.ogg - https://freesound.org/people/Fluffayfish/sounds/327799/ , License: CC BY-NC 3.0
human/male_sigh.ogg - https://freesound.org/people/giddster/sounds/336540/ , License: CC0
human/female_sniff.ogg - https://freesound.org/people/SpliceSound/sounds/218307/ , License: CC0
human/female_sigh.ogg - https://freesound.org/people/biawinter/sounds/408090/ , License: CC BY-NC 4.0
} modified by grungussuss
Binary file added sound/voice/human/female_sigh.ogg
Binary file not shown.
Binary file added sound/voice/human/female_sniff.ogg
Binary file not shown.
Binary file added sound/voice/human/male_sigh.ogg
Binary file not shown.
Binary file added sound/voice/human/male_sniff.ogg
Binary file not shown.

0 comments on commit e7a734a

Please sign in to comment.