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

new slime gasp and whistle #1438

Merged
merged 2 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
26 changes: 26 additions & 0 deletions Resources/Audio/_Impstation/Effects/Gasp/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- files:
- s_deathgasp_1.ogg
- s_deathgasp_2.ogg
- s_female_deathgasp_1.ogg
- s_female_deathgasp_2.ogg
- s_female_deathgasp_3.ogg
- s_female_deathgasp_4.ogg
- s_female_deathgasp_5.ogg
- s_male_deathgasp_1.ogg
- s_male_deathgasp_2.ogg
- s_male_deathgasp_3.ogg
- s_male_deathgasp_4.ogg
- s_male_deathgasp_5.ogg
license: "CC-BY-SA-3.0"
copyright: "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/4397f13c72998aa7e6ce192215c9f77b9d62eee2. Original modified by harpy and fiend."
source: "https://github.com/ParadiseSS13/Paradise/tree/4397f13c72998aa7e6ce192215c9f77b9d62eee2/sound/goonstation/voice"

- files:
- s_gasp_female_1.ogg
- s_gasp_female_2.ogg
- s_gasp_female_3.ogg
- s_gasp_male_1.ogg
- s_gasp_male_2.ogg
license: "CC-BY-SA-3.0"
copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f7a49c4068f1277e6857baf0892d355f1c055974. Original modified by harpy and fiend."
source: "https://github.com/tgstation/tgstation/tree/f7a49c4068f1277e6857baf0892d355f1c055974/sound/voice/human"
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_1.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_2.ogg
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 modified Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_1.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_2.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_3.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_1.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_2.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_1.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_2.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_3.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_4.ogg
Binary file not shown.
Binary file modified Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_5.ogg
Binary file not shown.
Binary file added Resources/Audio/_Impstation/Effects/gon.ogg
Binary file not shown.
114 changes: 53 additions & 61 deletions Resources/Audio/_Impstation/Voice/Slime/attributions.yml
Original file line number Diff line number Diff line change
@@ -1,121 +1,113 @@
- files: ["female_sigh.ogg", "male_sigh.ogg"]
- files: ["s_female_sigh.ogg", "s_male_sigh.ogg"]
license: "CC-BY-3.0"
copyright: "https://github.com/ss220-space/Paradise/"
copyright: "https://github.com/ss220-space/Paradise/. Original modified by harpy and fiend."
source: "https://github.com/ss220-space/Paradise/commit/89943a231ced9fc8db0aef65ff87093efee16b4e"

- files:
- whistle_1.ogg
- whistle_2.ogg
- whistle_3.ogg
- slimewhistle.ogg
license: "CC0-1.0"
copyright: "Taken from https://freesound.org/"
copyright: "Taken from https://freesound.org/. Original modified by harpy and fiend."
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
- s_cry_male_1
- s_cry_male_2
license: "CC-BY-4.0"
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts."
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts. Original modified by harpy and fiend."
source: "https://freesound.org/people/jacobmathiassen/sounds/254869/"

- files:
- cry_male_3.ogg
- s_cry_male_3.ogg
license: "CC0-1.0"
copyright: "Taken from https://freesound.org/"
copyright: "Taken from https://freesound.org/. Original modified by harpy and fiend."
source: "https://freesound.org/people/scottemoil/sounds/263776/"

- files:
- cry_male_4.ogg
- s_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."
copyright: "Taken from https://freesound.org/. Converted from FLAC to OGG, some part of the sound is taken. Original modified by harpy and fiend."
source: "https://freesound.org/people/qubodup/sounds/200428/"

- files:
- cry_female_1.ogg
- cry_female_2.ogg
- s_cry_female_1.ogg
- s_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."
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts. Original modified by harpy and fiend."
source: "https://freesound.org/people/Luzanne0/sounds/445299/"

- files:
- cry_female_3.ogg
- cry_female_4.ogg
- s_cry_female_3.ogg
- s_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."
copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts. Original modified by harpy and fiend."
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
- s_femalescream_1.ogg
- s_femalescream_2.ogg
- s_femalescream_3.ogg
- s_femalescream_4.ogg
- s_femalescream_5.ogg
- s_malescream_1.ogg
- s_malescream_2.ogg
- s_malescream_3.ogg
- s_malescream_4.ogg
- s_malescream_5.ogg
- s_malescream_6.ogg
- s_manlaugh_1.ogg
- s_manlaugh_2.ogg
- s_wilhelm_scream.ogg
- s_womanlaugh.ogg
license: "CC-BY-SA-3.0"
copyright: "/tg/station"
copyright: "/tg/station. Original modified by harpy and fiend."
source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"

- files: ["female_cough_1.ogg"]
- files: ["s_female_cough_1.ogg"]
license: "CC0-1.0"
copyright: "Ashe Kirk"
copyright: "Ashe Kirk. Original modified by harpy and fiend."
source: "https://freesound.org/people/OwlStorm/sounds/151213/"

- files: ["female_cough_2.ogg"]
- files: ["s_female_cough_2.ogg"]
license: "CC0-1.0"
copyright: "thatkellytrna on freesound.org"
copyright: "thatkellytrna on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/thatkellytrna/sounds/425777/"

- files: ["male_cough_1.ogg"]
- files: ["s_male_cough_1.ogg"]
license: "CC0-1.0"
copyright: "dastudiospr on freesound.org"
copyright: "dastudiospr on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/dastudiospr/sounds/537150/"

- files: ["male_cough_2.ogg"]
- files: ["s_male_cough_2.ogg"]
license: "CC0-1.0"
copyright: "qubodup on freesound.org"
copyright: "qubodup on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/qubodup/sounds/743360/"

- files: ["female_sneeze_1.ogg"]
- files: ["s_female_sneeze_1.ogg"]
license: "CC0-1.0"
copyright: "sherby168 on freesound.org"
copyright: "sherby168 on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/sherby168/sounds/540771/"

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

- files: ["male_yawn_1.ogg"]
- files: ["s_male_yawn_1.ogg"]
license: "CC-BY-4.0"
copyright: "ckvoiceover on freesound.org"
copyright: "ckvoiceover on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/ckvoiceover/sounds/401338/"

- files: ["female_yawn_1.ogg"]
- files: ["s_female_yawn_1.ogg"]
license: "CC0-1.0"
copyright: "Reitanna on freesound.org"
copyright: "Reitanna on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/Reitanna/sounds/252239/"

- files:
- snore1.ogg
- snore2.ogg
- snore3.ogg
- s_snore1.ogg
- s_snore2.ogg
- s_snore3.ogg
license: "CC0-1.0"
copyright: "mattyharm on freesound.org"
copyright: "mattyharm on freesound.org. Original modified by harpy and fiend."
source: "https://freesound.org/people/mattyharm/sounds/432995/"

- files: ["s_bubble.ogg"]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
radius: 3
color: white
energy: 2.0
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepGondal

- type: entity
parent: ImmovableRodKeepTilesStill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_2.ogg
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_3.ogg
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_4.ogg
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_5.ogg

- type: soundCollection
id: SlimeDeathGasp
Expand All @@ -33,5 +34,6 @@
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_2.ogg
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_3.ogg
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_4.ogg
- /Audio/_Impstation/Effects/Gasp/s_female_deathgasp_5.ogg
- /Audio/_Impstation/Effects/Gasp/s_deathgasp_1.ogg
- /Audio/_Impstation/Effects/Gasp/s_deathgasp_2.ogg
5 changes: 1 addition & 4 deletions Resources/Prototypes/_Impstation/SoundCollections/emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@
- type: soundCollection
id: SlimeWhistles
files:
- /Audio/_Impstation/Voice/Slime/s_whistle_1.ogg
- /Audio/_Impstation/Voice/Slime/s_whistle_2.ogg
- /Audio/_Impstation/Voice/Slime/s_whistle_3.ogg
- /Audio/_Impstation/Voice/Slime/s_whistle_4.ogg
- /Audio/_Impstation/Voice/Slime/slimewhistle.ogg

- type: soundCollection
id: Bubbles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
- /Audio/_Impstation/Effects/Footsteps/highheels4.ogg
- /Audio/_Impstation/Effects/Footsteps/highheels5.ogg

- type: soundCollection
id: FootstepGondal
files:
- /Audio/_Impstation/Effects/gon.ogg

- type: soundCollection
id: FootstepExplosion
files:
Expand Down
Loading