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

Ports slime person sounds from Impstation #2693

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
129 changes: 129 additions & 0 deletions Resources/Audio/_Impstation/Voice/Slime/attributions.yml
Tomce795 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
- files: ["female_sigh.ogg", "male_sigh.ogg"]
license: "CC-BY-3.0"
copyright: "https://github.com/ss220-space/Paradise/"
source: "https://github.com/ss220-space/Paradise/commit/89943a231ced9fc8db0aef65ff87093efee16b4e"

- files:
- whistle_1.ogg
- whistle_2.ogg
- whistle_3.ogg
license: "CC0-1.0"
copyright: "Taken from https://freesound.org/"
source: "https://freesound.org/people/taure/sounds/411638/"

- files:
- whistle_4.ogg
license: "Custom"
copyright: "Sampling Plus 1.0 license. Taken from https://freesound.org/"
source: "https://freesound.org/people/jackstrebor/sounds/34782/"

- files:
- cry_male_1
- cry_male_2
license: "CC-BY-4.0"
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts."
source: "https://freesound.org/people/jacobmathiassen/sounds/254869/"

- files:
- cry_male_3.ogg
license: "CC0-1.0"
copyright: "Taken from https://freesound.org/"
source: "https://freesound.org/people/scottemoil/sounds/263776/"

- files:
- cry_male_4.ogg
license: "CC-BY-4.0"
copyright: "Taken from https://freesound.org/. Converted from FLAC to OGG, some part of the sound is taken."
source: "https://freesound.org/people/qubodup/sounds/200428/"

- files:
- cry_female_1.ogg
- cry_female_2.ogg
license: "CC-BY-NC-3.0"
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts."
source: "https://freesound.org/people/Luzanne0/sounds/445299/"

- files:
- cry_female_3.ogg
- cry_female_4.ogg
license: "CC-BY-NC-4.0"
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts."
source: "https://freesound.org/people/Idalize/sounds/408211/"

- files:
- femalescream_1.ogg
- femalescream_2.ogg
- femalescream_3.ogg
- femalescream_4.ogg
- femalescream_5.ogg
- malescream_1.ogg
- malescream_2.ogg
- malescream_3.ogg
- malescream_4.ogg
- malescream_5.ogg
- malescream_6.ogg
- manlaugh_1.ogg
- manlaugh_2.ogg
- wilhelm_scream.ogg
- womanlaugh.ogg
license: "CC-BY-SA-3.0"
copyright: "/tg/station"
source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"

- files: ["female_cough_1.ogg"]
license: "CC0-1.0"
copyright: "Ashe Kirk"
source: "https://freesound.org/people/OwlStorm/sounds/151213/"

- files: ["female_cough_2.ogg"]
license: "CC0-1.0"
copyright: "thatkellytrna on freesound.org"
source: "https://freesound.org/people/thatkellytrna/sounds/425777/"

- files: ["male_cough_1.ogg"]
license: "CC0-1.0"
copyright: "dastudiospr on freesound.org"
source: "https://freesound.org/people/dastudiospr/sounds/537150/"

- files: ["male_cough_2.ogg"]
license: "CC0-1.0"
copyright: "qubodup on freesound.org"
source: "https://freesound.org/people/qubodup/sounds/743360/"

- files: ["female_sneeze_1.ogg"]
license: "CC0-1.0"
copyright: "sherby168 on freesound.org"
source: "https://freesound.org/people/sherby168/sounds/540771/"

- files: ["male_sneeze_1.ogg"]
license: "CC-BY-4.0"
copyright: "InspectorJ (www.jshaw.co.uk) of Freesound.org"
source: "https://freesound.org/people/InspectorJ/sounds/352177/"

- files: ["male_yawn_1.ogg"]
license: "CC-BY-4.0"
copyright: "ckvoiceover on freesound.org"
source: "https://freesound.org/people/ckvoiceover/sounds/401338/"

- files: ["female_yawn_1.ogg"]
license: "CC0-1.0"
copyright: "Reitanna on freesound.org"
source: "https://freesound.org/people/Reitanna/sounds/252239/"

- files:
- snore1.ogg
- snore2.ogg
- snore3.ogg
license: "CC0-1.0"
copyright: "mattyharm on freesound.org"
source: "https://freesound.org/people/mattyharm/sounds/432995/"

- files: ["s_bubble.ogg"]
license: "CC-BY-4.0"
copyright: "Audiolarx on freesound.org"
source: "https://freesound.org/people/audiolarx/sounds/263945/"

- files: ["s_pop.ogg"]
license: "CC0-1.0"
copyright: "greenvwbeetle on freesound.org"
source: "https://freesound.org/people/greenvwbeetle/sounds/244653/"
1 change: 1 addition & 0 deletions Resources/Audio/_Impstation/Voice/Slime/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
male_cough_1.ogg taken from freesound (deleted user)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_Impstation/chat/emotes.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
chat-emote-name-bubble = Bubble
chat-emote-name-pop = Pop

chat-emote-msg-bubble = bubbles.
chat-emote-msg-pop = pops!
9 changes: 7 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: blue_adult_slime
- type: Carriable # DeltaV
- type: Carriable # DeltaV
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -139,9 +139,14 @@
- type: Speech
speechVerb: Slime
speechSounds: Slime
allowedEmotes: ['Squish']
allowedEmotes: ['Squish', 'Bubble', 'Pop'] # Impstation
- type: TypingIndicator
proto: slime
- type: Vocal # Impstation starts here
sounds:
Male: AnimalSlime
Female: AnimalSlime
Unsexed: AnimalSlime # Impstation ends here
- type: NpcFactionMember
factions:
- SimpleNeutral
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- type: Speech
speechVerb: Slime
speechSounds: Slime
allowedEmotes: ['Squish']
allowedEmotes: ['Squish', 'Bubble', 'Pop']
- type: TypingIndicator
proto: slime
- type: Vocal
Expand Down
52 changes: 30 additions & 22 deletions Resources/Prototypes/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,18 @@
sounds:
Squish:
collection: Squishes
Bubble: # Impstation
collection: Bubbles
Pop: # Impstation
collection: Pops
Scream:
collection: MaleScreams
collection: MaleSlimeScreams # Impstation
Laugh:
collection: MaleLaugh
collection: MaleSlimeLaugh # Impstation
Sneeze:
collection: MaleSneezes
collection: MaleSlimeSneezes # Impstation
Cough:
collection: MaleCoughs
collection: MaleSlimeCoughs # Impstation
CatMeow:
collection: CatMeows
CatHisses:
Expand All @@ -157,25 +161,25 @@
RobotBeep:
collection: RobotBeeps
Yawn:
collection: MaleYawn
collection: MaleSlimeYawn # Impstation
Snore:
collection: Snores
collection: SlimeSnores # Impstation
Honk:
collection: BikeHorn
Sigh:
collection: MaleSigh
collection: MaleSlimeSigh # Impstation
Crying:
collection: MaleCry
collection: MaleSlimeCry # Impstation
Whistle:
collection: Whistles
collection: SlimeWhistles # Impstation
Weh:
collection: Weh
Hew:
collection: Hew
Gasp:
collection: MaleGasp
collection: MaleSlimeGasp # Impstation
DefaultDeathgasp:
collection: MaleDeathGasp
collection: MaleSlimeDeathGasp # Impstation
params:
variation: 0.125

Expand All @@ -184,14 +188,18 @@
sounds:
Squish:
collection: Squishes
Bubble: # Impstation
collection: Bubbles
Pop: # Impstation
collection: Pops
Scream:
collection: FemaleScreams
collection: FemaleSlimeScreams # Impstation
Laugh:
collection: FemaleLaugh
collection: FemaleSlimeLaugh # Impstation
Sneeze:
collection: FemaleSneezes
collection: FemaleSlimeSneezes # Impstation
Cough:
collection: FemaleCoughs
collection: FemaleSlimeCoughs # Impstation
CatMeow:
collection: CatMeows
CatHisses:
Expand All @@ -201,25 +209,25 @@
RobotBeep:
collection: RobotBeeps
Yawn:
collection: FemaleYawn
collection: FemaleSlimeYawn # Impstation
Snore:
collection: Snores
collection: SlimeSnores # Impstation
Honk:
collection: CluwneHorn
Sigh:
collection: FemaleSigh
collection: FemaleSlimeSigh # Impstation
Crying:
collection: FemaleCry
collection: FemaleSlimeCry # Impstation
Whistle:
collection: Whistles
collection: SlimeWhistles # Impstation
Weh:
collection: Weh
Hew:
collection: Hew
Gasp:
collection: FemaleGasp
collection: FemaleSlimeGasp # Impstation
DefaultDeathgasp:
collection: FemaleDeathGasp
collection: FemaleSlimeDeathGasp # Impstation
params:
variation: 0.125

Expand Down
Loading
Loading