Skip to content
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
21 changes: 21 additions & 0 deletions Resources/Audio/_Impstation/Animals/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- files: ["spooky_horse.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Recorded by user Faithhollow1 on Freesound.org"
source: "https://freesound.org/people/Faithhollow1/sounds/186577/"

- files:
- disgustingpig_f.ogg
- disgustingpig_m.ogg
license: "Custom"
copyright: "Ripped from Wurm Online, owned by Code Club AB."
source: "NA"

- files: ["pleebnar_weird.ogg"]
license: "Custom"
copyright: "gotten off youtube from A & A studios offering it with no copyright"
source: "https://www.youtube.com/watch?v=j8LfA9Bykq8"

- files: ["vrex_roar.ogg"]
license: "CC0-1.0"
copyright: "Audio is recorded/created by craigsmith 'FreeSound.org'. The original audio was trimmed, renamed, and modified."
source: "https://freesound.org/s/675514/"
Binary file added Resources/Audio/_Impstation/Animals/bros_hit.ogg
Binary file not shown.
Binary file added Resources/Audio/_Impstation/Animals/bros_hurt.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/_Impstation/Animals/finfin1.ogg
Binary file not shown.
Binary file added Resources/Audio/_Impstation/Animals/finfin2.ogg
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/_Impstation/Animals/mwah.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 added Resources/Audio/_Impstation/Animals/vrex_roar.ogg
Binary file not shown.
17 changes: 17 additions & 0 deletions Resources/Audio/_Impstation/Effects/Emotes/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- files:
- knuckles.ogg
license: "CC-BY-4.0"
copyright: "Made by CGEffex on freesound.org. Shortened and cut."
source: "https://freesound.org/people/CGEffex/sounds/93981/"

- files:
- blink.ogg
license: "CC0-1.0"
copyright: "Made by Rarenth on freesound.org."
source: "https://freesound.org/people/Rarenth/sounds/787959/"

- files:
- wetblink.ogg
license: "CC0-1.0"
copyright: "Made by zevcuk on freesound.org."
source: "https://freesound.org/people/zevcuk/sounds/348845/?"
Binary file not shown.
Binary file not shown.
Binary file not shown.
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 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.
4 changes: 4 additions & 0 deletions Resources/Audio/_Impstation/Effects/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["gorilla_chest_beat"]
license: "CC-BY-SA-3.0"
copyright: "cleaned up audio from a video by @likesadia on youtube."
source: "https://www.youtube.com/shorts/4a9OvikVpoA"
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/_Impstation/Voice/Misc/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["wuhey.ogg"]
license: "Custom"
copyright: "middle aged men ordering a greggs by theboski"
source: "https://www.tiktok.com/@theboski/video/7074212516699606278"
Binary file added Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- files: ["reptillian_hiss1.ogg"]
- files: ["reptilian_hiss1.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Taken from https://github.com/ss220-space/Paradise/commit/6572a5f522e32cb5e0af7fb3ca3e45a725e2e992. Downmixed to 1 channel, volume edited"
source: "https://github.com/ss220-space/Paradise/blob/4bbfb9eb00771b3fae7108fca1a1ba5879926e3e/sound/effects/unathihiss.ogg"
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["shove_foley.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Made by AvianMaiden for Impstation"
source: "https://github.com/impstation/imp-station-14/pull/1956"
Binary file not shown.
2 changes: 1 addition & 1 deletion Resources/Changelog/QuantumBlueChangelog.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Entries:
Entries: []
21 changes: 21 additions & 0 deletions Resources/Locale/en-US/_Impstation/chat/emotes.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Names
chat-emote-name-ungh = Ungh
chat-emote-name-bubble = Bubble
chat-emote-name-pop = Pop
chat-emote-name-crack = Crack Knuckles
chat-emote-name-hiss = Hiss
chat-emote-name-wuhey = Wuhey
chat-emote-name-coo = Coo
chat-emote-name-blink = Blink
chat-emote-name-boom = Boom!

# Message
chat-emote-msg-bubble = bubbles.
chat-emote-msg-pop = pops!
chat-emote-msg-crack = cracks {POSS-ADJ($entity)} knuckles.
chat-emote-msg-hiss = hisses.
chat-emote-msg-wuhey = wuheys!
chat-emote-msg-coo = coos.
chat-emote-msg-blink = blinks.
chat-emote-msg-boom = booms.
chat-emote-msg-beatingchest = beats {POSS-ADJ($entity)} chest.
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
flavor-complex-cigarettes = like cigarettes
flavor-complex-radiation = like radiation
2 changes: 1 addition & 1 deletion Resources/Maps/elegance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243430,7 +243430,7 @@ entities:
- uid: 33105
components:
- type: MetaData
desc: A figurine depicting a reptillian Cargo Technican. A much needed change to the Chief Justice's bedroom.
desc: A figurine depicting a reptilian Cargo Technican. A much needed change to the Chief Justice's bedroom.
- type: Transform
pos: 18.40171,35.75912
parent: 2
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Fun/figurines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
parent: BaseFigurine
id: ToyFigurineCargoTech
name: cargo technican figure
description: A figurine depicting a reptillian Cargo Technican.
description: A figurine depicting a reptilian Cargo Technican.
components:
- type: Sprite
state: cargotech
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SoundCollections/NukeMusic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
- /Audio/StationEvents/running_out.ogg
- /Audio/StationEvents/countdown.ogg
- /Audio/StationEvents/sound_station_14.ogg
- /Audio/StationEvents/blatantly_nuclear.ogg
- /Audio/StationEvents/Clearly_Nuclear.ogg
2 changes: 1 addition & 1 deletion Resources/Prototypes/SoundCollections/lobby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- /Audio/_QB/Lobby/Chipshop.ogg
- /Audio/_QB/Lobby/Confederate_Battle.ogg
- /Audio/_QB/Lobby/Conundrum.it.ogg
- /Audio/_QB/Lobby/Cyperpunk.it.ogg
- /Audio/_QB/Lobby/Cyberpunk.it.ogg
- /Audio/_QB/Lobby/Daydreaming_At_Night.ogg
- /Audio/_QB/Lobby/Devil_Fish.ogg
- /Audio/_QB/Lobby/Dont_Drink_It.ogg
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
Laugh:
path: /Audio/Animals/lizard_happy.ogg
Hiss:
collection: ReptillianHiss # Impstation
collection: ReptilianHiss # Impstation
Honk:
collection: BikeHorn
Whistle:
Expand Down Expand Up @@ -129,7 +129,7 @@
Laugh:
path: /Audio/Animals/lizard_happy.ogg
Hiss:
collection: ReptillianHiss # Impstation
collection: ReptilianHiss # Impstation
Honk:
collection: BikeHorn
Whistle:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,14 @@
proto: BulletEnergyGunLightImmolator
count: 6
spread: 20

- type: entity
parent: BaseBullet
id: BulletBuccaneer
name: buccaneer bullet
categories: [ HideSpawnMenu ]
components:
- type: Projectile
damage:
types:
Piercing: 20
37 changes: 20 additions & 17 deletions Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
- type: entity
parent: [BoxCardboard]
id: BloodRedRoseBox
name: blood-red roses box
description: A set of 4 blood-red roses, perfect to create a stunning display of violence.
components:
- type: Storage
grid:
- 0,0,3,1
- type: StorageFill
contents:
- id: RoseSyndicate
amount: 4
- type: Sprite
sprite: /Textures/_Impstation/Objects/Storage/boxes.rsi
layers:
- state: syndicaterosebox
# QB - Commented out for now as roses aren't ported. I think we plan to port them later though.
#- type: entity
# parent: [BoxCardboard]
# id: BloodRedRoseBox
# name: blood-red roses box
# description: A set of 4 blood-red roses, perfect to create a stunning display of violence.
# components:
# - type: Storage
# grid:
# - 0,0,3,1
# - type: StorageFill
# contents:
# - id: RoseSyndicate
# amount: 4
# - type: Sprite
# sprite: /Textures/_Impstation/Objects/Storage/boxes.rsi
# layers:
# - state: syndicaterosebox



- type: entity
parent: [BoxCardboard]
Expand Down
Loading
Loading