diff --git a/Resources/Audio/_Impstation/Animals/Gorilla_Chuff.ogg b/Resources/Audio/_Impstation/Animals/Gorilla_Chuff.ogg new file mode 100644 index 00000000000..3b90e0292d4 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/Gorilla_Chuff.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/Gorilla_Gasp.ogg b/Resources/Audio/_Impstation/Animals/Gorilla_Gasp.ogg new file mode 100644 index 00000000000..8acaf32bbfe Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/Gorilla_Gasp.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/Gorilla_Laugh.ogg b/Resources/Audio/_Impstation/Animals/Gorilla_Laugh.ogg new file mode 100644 index 00000000000..550a4420e8a Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/Gorilla_Laugh.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/Gorilla_Scream.ogg b/Resources/Audio/_Impstation/Animals/Gorilla_Scream.ogg new file mode 100644 index 00000000000..ddcc5d6e20e Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/Gorilla_Scream.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/attributions.yml b/Resources/Audio/_Impstation/Animals/attributions.yml new file mode 100644 index 00000000000..bcdb41cc65a --- /dev/null +++ b/Resources/Audio/_Impstation/Animals/attributions.yml @@ -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/" diff --git a/Resources/Audio/_Impstation/Animals/bros_hit.ogg b/Resources/Audio/_Impstation/Animals/bros_hit.ogg new file mode 100644 index 00000000000..574832ed369 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/bros_hit.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/bros_hurt.ogg b/Resources/Audio/_Impstation/Animals/bros_hurt.ogg new file mode 100644 index 00000000000..4900e51a84e Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/bros_hurt.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/disgustingpig_f.ogg b/Resources/Audio/_Impstation/Animals/disgustingpig_f.ogg new file mode 100644 index 00000000000..fa3d2a27a48 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/disgustingpig_f.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/disgustingpig_m.ogg b/Resources/Audio/_Impstation/Animals/disgustingpig_m.ogg new file mode 100644 index 00000000000..4e41fab715f Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/disgustingpig_m.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/finfin1.ogg b/Resources/Audio/_Impstation/Animals/finfin1.ogg new file mode 100644 index 00000000000..ad923f515fb Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/finfin1.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/finfin2.ogg b/Resources/Audio/_Impstation/Animals/finfin2.ogg new file mode 100644 index 00000000000..3beb306afe7 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/finfin2.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/finfin3.ogg b/Resources/Audio/_Impstation/Animals/finfin3.ogg new file mode 100644 index 00000000000..b46ece8a0ad Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/finfin3.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/mwah.ogg b/Resources/Audio/_Impstation/Animals/mwah.ogg new file mode 100644 index 00000000000..fabf7842de8 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/mwah.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/pleebnar_scream.ogg b/Resources/Audio/_Impstation/Animals/pleebnar_scream.ogg new file mode 100644 index 00000000000..2c116d9629f Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/pleebnar_scream.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/pleebnar_speak.ogg b/Resources/Audio/_Impstation/Animals/pleebnar_speak.ogg new file mode 100644 index 00000000000..896541f6f95 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/pleebnar_speak.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/pleebnar_squeak.ogg b/Resources/Audio/_Impstation/Animals/pleebnar_squeak.ogg new file mode 100644 index 00000000000..ca36ef8786d Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/pleebnar_squeak.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/pleebnar_weird.ogg b/Resources/Audio/_Impstation/Animals/pleebnar_weird.ogg new file mode 100644 index 00000000000..2aabc3741e9 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/pleebnar_weird.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/spooky_horse.ogg b/Resources/Audio/_Impstation/Animals/spooky_horse.ogg new file mode 100644 index 00000000000..6127b1fd093 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/spooky_horse.ogg differ diff --git a/Resources/Audio/_Impstation/Animals/vrex_roar.ogg b/Resources/Audio/_Impstation/Animals/vrex_roar.ogg new file mode 100644 index 00000000000..289ec4357a1 Binary files /dev/null and b/Resources/Audio/_Impstation/Animals/vrex_roar.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml b/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml new file mode 100644 index 00000000000..fc1914d5d24 --- /dev/null +++ b/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml @@ -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/?" diff --git a/Resources/Audio/_Impstation/Effects/Emotes/blink.ogg b/Resources/Audio/_Impstation/Effects/Emotes/blink.ogg new file mode 100644 index 00000000000..7142205c6b0 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Emotes/blink.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Emotes/knuckles.ogg b/Resources/Audio/_Impstation/Effects/Emotes/knuckles.ogg new file mode 100644 index 00000000000..b61a50fb613 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Emotes/knuckles.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Emotes/wetblink.ogg b/Resources/Audio/_Impstation/Effects/Emotes/wetblink.ogg new file mode 100644 index 00000000000..ae087c31150 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Emotes/wetblink.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/attributions.yml b/Resources/Audio/_Impstation/Effects/Gasp/attributions.yml new file mode 100644 index 00000000000..5eb65fe4968 --- /dev/null +++ b/Resources/Audio/_Impstation/Effects/Gasp/attributions.yml @@ -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" diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_1.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_1.ogg new file mode 100644 index 00000000000..e9b33996910 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_1.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_2.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_2.ogg new file mode 100644 index 00000000000..5249a9505ef Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_deathgasp_2.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_1.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_1.ogg new file mode 100644 index 00000000000..87b9f2ffc43 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_1.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_2.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_2.ogg new file mode 100644 index 00000000000..fe38fe51832 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_2.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_3.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_3.ogg new file mode 100644 index 00000000000..42c9d35cf5c Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_3.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_4.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_4.ogg new file mode 100644 index 00000000000..ddb58aded20 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_4.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_5.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_5.ogg new file mode 100644 index 00000000000..6163bde90d1 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_female_deathgasp_5.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_1.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_1.ogg new file mode 100644 index 00000000000..e0d7c5d6acd Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_1.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_2.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_2.ogg new file mode 100644 index 00000000000..8509609cbf0 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_2.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_3.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_3.ogg new file mode 100644 index 00000000000..1f74c5e5414 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_female_3.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_1.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_1.ogg new file mode 100644 index 00000000000..d32a0bfd8d4 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_1.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_2.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_2.ogg new file mode 100644 index 00000000000..788d13d6137 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_gasp_male_2.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_1.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_1.ogg new file mode 100644 index 00000000000..0d61fd6c167 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_1.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_2.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_2.ogg new file mode 100644 index 00000000000..fbec22a2677 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_2.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_3.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_3.ogg new file mode 100644 index 00000000000..fec0c9630bb Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_3.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_4.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_4.ogg new file mode 100644 index 00000000000..91f7baa3fbc Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_4.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_5.ogg b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_5.ogg new file mode 100644 index 00000000000..6201f8b19c0 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Gasp/s_male_deathgasp_5.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/attributions.yml b/Resources/Audio/_Impstation/Effects/attributions.yml new file mode 100644 index 00000000000..dafafa5f93b --- /dev/null +++ b/Resources/Audio/_Impstation/Effects/attributions.yml @@ -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" diff --git a/Resources/Audio/_Impstation/Effects/gorilla_chest_beat.ogg b/Resources/Audio/_Impstation/Effects/gorilla_chest_beat.ogg new file mode 100644 index 00000000000..851035d4b70 Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/gorilla_chest_beat.ogg differ diff --git a/Resources/Audio/_Impstation/Voice/Misc/attributions.yml b/Resources/Audio/_Impstation/Voice/Misc/attributions.yml new file mode 100644 index 00000000000..d3c4d6ea73e --- /dev/null +++ b/Resources/Audio/_Impstation/Voice/Misc/attributions.yml @@ -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" diff --git a/Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg b/Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg new file mode 100644 index 00000000000..2a0febfc6a4 Binary files /dev/null and b/Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg differ diff --git a/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml b/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml index 254b73a3cd3..bec0b6ed9db 100644 --- a/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml +++ b/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml @@ -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" diff --git a/Resources/Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg b/Resources/Audio/_Impstation/Voice/Reptilian/reptilian_hiss1.ogg similarity index 100% rename from Resources/Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg rename to Resources/Audio/_Impstation/Voice/Reptilian/reptilian_hiss1.ogg diff --git a/Resources/Audio/_Impstation/Weapons/Guns/Melee/attributions.yml b/Resources/Audio/_Impstation/Weapons/Guns/Melee/attributions.yml new file mode 100644 index 00000000000..218f8e54bc4 --- /dev/null +++ b/Resources/Audio/_Impstation/Weapons/Guns/Melee/attributions.yml @@ -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" diff --git a/Resources/Audio/_Impstation/Weapons/Guns/Melee/shove_foley.ogg b/Resources/Audio/_Impstation/Weapons/Guns/Melee/shove_foley.ogg new file mode 100644 index 00000000000..95f8577f34c Binary files /dev/null and b/Resources/Audio/_Impstation/Weapons/Guns/Melee/shove_foley.ogg differ diff --git a/Resources/Audio/_QB/Jukebox/The_City_of_Lost_Hope_MONO.ogg b/Resources/Audio/_QB/Jukebox/The_City_Of_Lost_Hope_MONO.ogg similarity index 100% rename from Resources/Audio/_QB/Jukebox/The_City_of_Lost_Hope_MONO.ogg rename to Resources/Audio/_QB/Jukebox/The_City_Of_Lost_Hope_MONO.ogg diff --git a/Resources/Audio/_QB/Lobby/Aggravated.it.ogg b/Resources/Audio/_QB/Lobby/aggravated.it.ogg similarity index 100% rename from Resources/Audio/_QB/Lobby/Aggravated.it.ogg rename to Resources/Audio/_QB/Lobby/aggravated.it.ogg diff --git a/Resources/Changelog/QuantumBlueChangelog.yml b/Resources/Changelog/QuantumBlueChangelog.yml index e761ad614c1..ffbc139d636 100644 --- a/Resources/Changelog/QuantumBlueChangelog.yml +++ b/Resources/Changelog/QuantumBlueChangelog.yml @@ -1 +1 @@ -Entries: +Entries: [] diff --git a/Resources/Locale/en-US/_Impstation/chat/emotes.ftl b/Resources/Locale/en-US/_Impstation/chat/emotes.ftl new file mode 100644 index 00000000000..37627ec5aa2 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/chat/emotes.ftl @@ -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. \ No newline at end of file diff --git a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl index 0cbbdae553d..9f8e9373404 100644 --- a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl @@ -1 +1,2 @@ flavor-complex-cigarettes = like cigarettes +flavor-complex-radiation = like radiation diff --git a/Resources/Maps/elegance.yml b/Resources/Maps/elegance.yml index b07902f206c..4673c6e31d8 100644 --- a/Resources/Maps/elegance.yml +++ b/Resources/Maps/elegance.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index adf37635bb2..802d57c7c71 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -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 diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml index 739b93ca1f9..92ecb13a38b 100644 --- a/Resources/Prototypes/SoundCollections/NukeMusic.yml +++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml @@ -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 diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index c159194a35c..49e401249cb 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -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 diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 30e445a56b0..40c7eb3bda3 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -93,7 +93,7 @@ Laugh: path: /Audio/Animals/lizard_happy.ogg Hiss: - collection: ReptillianHiss # Impstation + collection: ReptilianHiss # Impstation Honk: collection: BikeHorn Whistle: @@ -129,7 +129,7 @@ Laugh: path: /Audio/Animals/lizard_happy.ogg Hiss: - collection: ReptillianHiss # Impstation + collection: ReptilianHiss # Impstation Honk: collection: BikeHorn Whistle: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7d7994a72bc..ecd9c427697 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -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 diff --git a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml index 7d898a11579..a856ff6787e 100644 --- a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml @@ -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] diff --git a/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml index d8f98c92781..7a435dda9c0 100644 --- a/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml @@ -1,62 +1,3 @@ -- type: listing - id: uplinkCleanerLakeUpgrade - name: uplink-cleaner-lake-upgrade-name - description: uplink-cleaner-lake-upgrade-desc - productEntity: WeaponCleanerLakeUpgradeKit - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 10 - cost: - Telecrystal: 12 # was 14, didn't realise that the real CL came w/ that many grenades so this probably deserves a buff - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - Janitor - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - -- type: listing - id: uplinkZipperAP - name: uplink-zipper-ap-name - description: uplink-zipper-ap-desc - productEntity: WeaponPistolZipperAP - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 18 - cost: - Telecrystal: 20 - categories: - - UplinkWeaponry - -- type: listing - id: uplinkNemesisBR - name: uplink-nemesis-br-name - description: uplink-nemesis-br-desc - icon: { sprite: /Textures/_Impstation/Objects/Weapons/Guns/Rifles/nemesis.rsi, state: icon } - productEntity: ClothingBackpackDuffelSyndicateFilledBR - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 13 - cost: - Telecrystal: 18 - categories: - - UplinkWeaponry - -- type: listing - id: UplinkMagazineRifleNemesis - name: uplink-rifle-magazine-nemesis-name - description: uplink-rifle-magazine-nemesis-desc - icon: { sprite: /Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/nemesismag.rsi, state: icon } - productEntity: MagazineBR - cost: - Telecrystal: 2 - categories: - - UplinkAmmo - - type: listing id: UplinkCaselessAmmo name: uplink-caseless-ammo-name @@ -67,92 +8,6 @@ categories: - UplinkAmmo -- type: listing - id: UplinkBulletcatcher - name: uplink-bulletcatcher-name - description: uplink-bulletcatcher-desc - icon: { sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi, state: bulletcatcher } - productEntity: BulletCatcherBox - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 3 - cost: - Telecrystal: 6 - conditions: - - !type:BuyerJobCondition - whitelist: - - Clown - categories: - - UplinkJob - -- type: listing - id: UplinkSpaceBlade - name: uplink-spaceblade-name - description: uplink-spaceblade-desc - icon: { sprite: /Textures/_NF/Objects/Fun/spaceblade.rsi, state: contraband } - productEntity: MysterySpaceBladeBoxSyndicate - cost: - Telecrystal: 1 - categories: - - UplinkPointless - -- type: listing - id: UplinkKaijuCloak - name: uplink-kaijucloak-name - description: uplink-kaijucloak-desc - icon: { sprite: /Textures/_Impstation/Clothing/Neck/Cloaks/kaijucloak.rsi, state: icon } - productEntity: ClothingNeckCloakKaijuCloak - cost: - Telecrystal: 1 - categories: - - UplinkDeception - -- type: listing - id: UplinkJuggernautCloak - name: uplink-juggernautcloak-name - description: uplink-juggernautcloak-desc - icon: { sprite: _Impstation/Clothing/Neck/Cloaks/juggernautcloak.rsi, state: icon } - productEntity: ClothingNeckCloakJuggernaut - cost: - Telecrystal: 2 - categories: - - UplinkPointless - -- type: listing - id: UplinkSatchelSyndicate - name: uplink-satchel-syndicate-name - description: uplink-satchel-syndicate-desc - productEntity: ClothingBackpackSatchelSyndicate - cost: - Telecrystal: 2 - categories: - - UplinkWearables - -- type: listing - id: UplinkFugitiveCloak - name: uplink-fugitivecloak-name - description: uplink-fugitivecloak-desc - icon: { sprite: /Textures/_Impstation/Clothing/Neck/Cloaks/fugitivecloak.rsi, state: icon } - productEntity: ClothingNeckCloakFugitiveCloak - cost: - Telecrystal: 1 - categories: - - UplinkDeception - -- type: listing - id: UplinkBloodRedRoseBox - name: uplink-bloodredrosekit-name - description: uplink-bloodredrosekit-desc - icon: { sprite: /Textures/_Impstation/Objects/Storage/boxes.rsi, state: syndicaterosebox } - productEntity: BloodRedRoseBox - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 4 - cost: - Telecrystal: 7 - categories: - - UplinkWeaponry - - type: listing id: UplinkSawAmmo name: uplink-saw-ammo-name @@ -231,51 +86,6 @@ categories: - UplinkWeaponry -- type: listing - id: UplinkMixedRejects - name: uplink-mixed-rejects-name - description: uplink-mixed-rejects-desc - productEntity: CigPackMixedRejects - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 1 - cost: - Telecrystal: 2 - categories: - - UplinkChemicals - -- type: listing - id: UplinkMixedRejectsCarton - name: uplink-mixed-rejects-carton-name - description: uplink-mixed-rejects-carton-desc - productEntity: CigCartonMixedRejects - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 3 - cost: - Telecrystal: 5 - categories: - - UplinkChemicals - -- type: listing - id: UplinkPoisonAuto-Injector - name: uplink-poison-injector-name - description: uplink-poison-injector-desc - productEntity: PoisonAutoInjector - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 6 - cost: - Telecrystal: 8 - categories: - - UplinkChemicals - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - - type: listing id: uplinkLeviathanBundle name: uplink-leviathan-name @@ -362,84 +172,3 @@ Telecrystal: 2 categories: - UplinkAmmo - -- type: listing - id: UplinkNukiePoisonAuto-Injector - name: uplink-poison-injector-name - description: uplink-poison-injector-desc - productEntity: PoisonAutoInjector - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 10 - cost: - Telecrystal: 12 - categories: - - UplinkChemicals - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - -- type: listing - id: UplinkMascotCindySuitBundle - name: uplink-mascot-cindy-suit-bundle-name - description: uplink-mascot-cindy-suit-bundle-desc - icon: { sprite: _Impstation/Clothing/OuterClothing/Hardsuits/cindysuit.rsi, state: full } - productEntity: ClothingBackpackDuffelSyndicateFilledMascotCindy - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 10 - cost: - Telecrystal: 15 - categories: - - UplinkPointless - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - -- type: listing - id: uplinkNullrodUpgrade - name: uplink-nullrod-upgrade-name - description: uplink-nullrod-upgrade-desc - icon: { sprite: /Textures/_Impstation/Objects/Misc/profane_censer.rsi, state: icon } - productEntity: NullrodUpgradeKit - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 6 - cost: - Telecrystal: 8 - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - Chaplain - -# implanters - -- type: listing - id: UplinkGayImplanter - name: uplink-gay-implanter-name - description: uplink-gay-implanter-desc - icon: { sprite: /Textures/Clothing/Back/Backpacks/backpack.rsi, state: icon } - productEntity: GayStorageImplanter - cost: - Telecrystal: 50 - categories: - - UplinkImplants - conditions: # i want this to only show up in surplus crates - - !type:BuyerWhitelistCondition - whitelist: - components: - - SurplusBundle diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/ponchos.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/ponchos.yml new file mode 100644 index 00000000000..7cf1f5ca3f8 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/ponchos.yml @@ -0,0 +1,107 @@ +- type: entity + parent: [ ClothingOuterBase, ClothingNeckBase ] + id: ClothingOuterRainCape + name: rain cape + description: Surplus gear made from durable canvas. + components: + - type: Sprite + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + layers: + - state: GREEN-icon + - type: Item + inhandVisuals: + left: + - state: GREEN-inhand-left + right: + - state: GREEN-inhand-right + - type: Clothing + slots: + - OUTERCLOTHING + - NECK + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + clothingVisuals: + neck: + - state: GREEN-equipped-OUTERCLOTHING + outerClothing: + - state: GREEN-equipped-OUTERCLOTHING + +- type: entity + parent: [ ClothingOuterBase, ClothingNeckBase ] + id: ClothingOuterWhitePoncho + name: white poncho + description: Waterproof! + components: + - type: Sprite + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + layers: + - state: WHITE-icon + - type: Item + inhandVisuals: + left: + - state: WHITE-inhand-left + right: + - state: WHITE-inhand-right + - type: Clothing + slots: + - OUTERCLOTHING + - NECK + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + clothingVisuals: + neck: + - state: WHITE-equipped-OUTERCLOTHING + outerClothing: + - state: WHITE-equipped-OUTERCLOTHING + +- type: entity + parent: [ ClothingOuterBase, ClothingNeckBase ] + id: ClothingOuterQMPoncho + name: quartermaster's poncho + description: A warm, worn poncho. It's very comfortable. + components: + - type: Sprite + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + layers: + - state: QM-icon + - type: Item + inhandVisuals: + left: + - state: QM-inhand-left + right: + - state: QM-inhand-right + - type: Clothing + slots: + - OUTERCLOTHING + - NECK + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + clothingVisuals: + neck: + - state: QM-equipped-OUTERCLOTHING + outerClothing: + - state: QM-equipped-OUTERCLOTHING + +- type: entity + parent: [ ClothingOuterBase, ClothingNeckBase ] + id: ClothingOuterBlackPoncho + name: black poncho + description: Waterproof (sinister)! + components: + - type: Sprite + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + layers: + - state: BLACK-icon + - type: Item + inhandVisuals: + left: + - state: BLACK-inhand-left + right: + - state: BLACK-inhand-right + - type: Clothing + slots: + - OUTERCLOTHING + - NECK + sprite: _Impstation/Clothing/OuterClothing/Misc/poncho.rsi + clothingVisuals: + neck: + - state: BLACK-equipped-OUTERCLOTHING + outerClothing: + - state: BLACK-equipped-OUTERCLOTHING diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/sniper.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/sniper.yml new file mode 100644 index 00000000000..e46b3246d23 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/sniper.yml @@ -0,0 +1,32 @@ +- type: entity + id: SpeedLoaderAnaconda + name: "speed loader (.60 anti-materiel)" + description: It's amazing that anyone thought this would be a good idea. + parent: [ BaseItem ] + components: + - type: Tag + tags: + - SpeedLoaderAM + - type: SpeedLoader + - type: BallisticAmmoProvider + proto: CartridgeAntiMateriel + whitelist: + tags: + - CartridgeAntiMateriel + capacity: 3 + - type: Sprite + sprite: _Impstation/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/sniper.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-3 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 4 + zeroVisible: false + - type: Appearance + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Launchers/leviathan.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Launchers/leviathan.yml index f763ad1f3e5..a47cdb96e48 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Launchers/leviathan.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Launchers/leviathan.yml @@ -57,7 +57,7 @@ - type: AltFireMelee attackType: Heavy - type: DamageOtherOnHit #for throwing - staminaCost: 50 +# staminaCost: 50 # QB: Commented this out till imp throwing damage is ported damage: types: Blunt: 20 diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Revolvers/anaconda.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Revolvers/anaconda.yml index bac4a53fb43..472095bfde8 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Revolvers/anaconda.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Revolvers/anaconda.yml @@ -64,7 +64,7 @@ - type: AltFireMelee attackType: Heavy - type: DamageOtherOnHit #for throwing - staminaCost: 10 +# staminaCost: 10 # QB: Commented this out till imp throwing damage is ported damage: types: Blunt: 12 diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Special/ouroboros.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Special/ouroboros.yml index 07488547348..2fe2d660aba 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Special/ouroboros.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Special/ouroboros.yml @@ -65,7 +65,7 @@ - type: AltFireMelee attackType: Heavy - type: DamageOtherOnHit #for throwing - staminaCost: 15 #heavy +# staminaCost: 15 #heavy # QB: Commented this out till imp throwing damage is ported damage: types: Blunt: 12 diff --git a/Resources/Prototypes/_Impstation/Flavors/flavors.yml b/Resources/Prototypes/_Impstation/Flavors/flavors.yml index cc25ccdd20a..40c43a5c588 100644 --- a/Resources/Prototypes/_Impstation/Flavors/flavors.yml +++ b/Resources/Prototypes/_Impstation/Flavors/flavors.yml @@ -2,3 +2,8 @@ id: cigarettes flavorType: Complex description: flavor-complex-cigarettes + +- type: flavor + id: radiation + flavorType: Complex + description: flavor-complex-radiation diff --git a/Resources/Prototypes/_Impstation/Reagents/pyrotechnic.yml b/Resources/Prototypes/_Impstation/Reagents/pyrotechnic.yml index 4e7fbbc5119..4083f90c07e 100644 --- a/Resources/Prototypes/_Impstation/Reagents/pyrotechnic.yml +++ b/Resources/Prototypes/_Impstation/Reagents/pyrotechnic.yml @@ -9,7 +9,6 @@ flavor: radiation flavorMinimum: 0.01 color: "#83db2b" - contraband: Major recognizable: true boilingPoint: -127.3 meltingPoint: -186.4 diff --git a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml index a5018bc8e7a..806815f90a1 100644 --- a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml +++ b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml @@ -108,7 +108,7 @@ - type: soundCollection id: ReptilianHiss files: - - /Audio/_Impstation/Voice/Reptillian/reptillian_hiss1.ogg + - /Audio/_Impstation/Voice/Reptilian/reptilian_hiss1.ogg - type: soundCollection id: VoxHiss diff --git a/Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml b/Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml deleted file mode 100644 index 3c95aea037f..00000000000 --- a/Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: soundCollection - id: ReptillianHiss - files: - - /Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml new file mode 100644 index 00000000000..a1e52de62c6 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml @@ -0,0 +1,80 @@ +# vocal emotes +- type: emote + id: Bubble + name: chat-emote-name-bubble + category: Vocal + available: false + icon: _Impstation/Interface/Emotes/bubble.png + whitelist: + components: + - Vocal + blacklist: + tags: + - SiliconEmotes + chatMessages: ["chat-emote-msg-bubble"] + chatTriggers: + - bubbles + - bubbling + +- type: emote + id: Pop + name: chat-emote-name-pop + category: Vocal + available: false + icon: _Impstation/Interface/Emotes/pop.png + whitelist: + components: + - Vocal + blacklist: + tags: + - SiliconEmotes + chatMessages: ["chat-emote-msg-pop"] + chatTriggers: + - pops + - popping + +- type: emote + id: Wuhey + name: chat-emote-name-wuhey + category: Vocal + icon: _Impstation/Interface/Emotes/wuhey.png + chatMessages: ["chat-emote-msg-wuhey"] + +- type: emote + id: Ungh + name: chat-emote-name-weh + category: Vocal + chatMessages: [UNGHs!] + +- type: emote + id: Crack + name: chat-emote-name-crack + category: Hands + icon: _Impstation/Interface/Emotes/knucklecrack.png + whitelist: + components: + - Hands + blacklist: + tags: + - SiliconEmotes + chatMessages: ["chat-emote-msg-crack"] + chatTriggers: + - crack knuckles + - cracks knuckles + - cracking knuckles + - cracked knuckles + - cracks their knuckles + - cracks her knuckles + - cracks his knuckles + - cracks its knuckles + +- type: emote + id: Blink + name: chat-emote-name-blink + category: General + icon: _Impstation/Interface/Emotes/blink.png + chatMessages: ["chat-emote-msg-blink"] + chatTriggers: + - blink + - blinks + - blinked diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-equipped-OUTERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..dd6105d15c3 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-icon.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-icon.png new file mode 100644 index 00000000000..1b65e43a192 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-icon.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-inhand-left.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-inhand-left.png new file mode 100644 index 00000000000..0ef72aa6139 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-inhand-right.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-inhand-right.png new file mode 100644 index 00000000000..31ce964ef9e Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/BLACK-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-equipped-OUTERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..51262245d95 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-icon.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-icon.png new file mode 100644 index 00000000000..8a9d056c3dd Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-icon.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-inhand-left.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-inhand-left.png new file mode 100644 index 00000000000..5c9ec2358a1 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-inhand-right.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-inhand-right.png new file mode 100644 index 00000000000..1631a9c6e6f Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/GREEN-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..71aaa958b36 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-equipped-OUTERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d1d3b13d708 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-icon.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-icon.png new file mode 100644 index 00000000000..799876a474b Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-icon.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-inhand-left.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-inhand-left.png new file mode 100644 index 00000000000..c4b6df83a91 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-inhand-right.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-inhand-right.png new file mode 100644 index 00000000000..75642604bf3 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/QM-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-equipped-OUTERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4dace3b60cb Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-icon.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-icon.png new file mode 100644 index 00000000000..c3450d1a7d4 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-icon.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-inhand-left.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-inhand-left.png new file mode 100644 index 00000000000..f396d0f14f2 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-inhand-right.png b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-inhand-right.png new file mode 100644 index 00000000000..309cfdebc68 Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/WHITE-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/meta.json new file mode 100644 index 00000000000..6f9a2c77698 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/OuterClothing/Misc/poncho.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Colorful poncho taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by rainyatrium", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "GREEN-icon" + }, + { + "name": "GREEN-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "GREEN-inhand-left", + "directions": 4 + }, + { + "name": "GREEN-inhand-right", + "directions": 4 + }, + { + "name": "WHITE-icon" + }, + { + "name": "WHITE-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "WHITE-inhand-left", + "directions": 4 + }, + { + "name": "WHITE-inhand-right", + "directions": 4 + }, + { + "name": "QM-icon" + }, + { + "name": "QM-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "QM-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "QM-inhand-left", + "directions": 4 + }, + { + "name": "QM-inhand-right", + "directions": 4 + }, + { + "name": "BLACK-icon" + }, + { + "name": "BLACK-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "BLACK-inhand-left", + "directions": 4 + }, + { + "name": "BLACK-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml index 191043e5c59..660688fac43 100644 --- a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml +++ b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml @@ -1,7 +1,66 @@ - files: + - backflip.png + - beep.png + - buzz.png + - buzztwo.png + - chime.png + - chirp.png + - chitter.png + - clap.png + - cough.png + - cry.png + - deathgasp.png + - general.png + - hand.png + - hiss.png + - honk.png - jump.png + - knucklecrack.png + - laugh.png + - ping.png + - salute.png + - scream.png + - sigh.png + - snap.png - spin.png - - backflip.png + - squeak.png + - squish.png + - tailslap.png + - vocal.png + - voxhiss.png + - whistle.png + - yawn.png + license: "CC-BY-SA-4.0" + copyright: "Created by crocodilecarousel (github) for Impstation" + source: "https://github.com/impstation/imp-station-14" + +- files: ["wuhey.png"] + license: "Custom" + copyright: "Barry, 63" + source: "https://en.wikipedia.org/wiki/Pub" + +- files: ["blink.png"] + license: "CC0-1.0" + copyright: "Created by Rarenth for Impstation" + source: "https://github.com/impstation/imp-station-14" + +- files: + - caw.png + - pop.png + - revs.png + - ring.png + license: "CC-BY-SA-4.0" + copyright: "Created by LazyRiverfolk for Impstation" + source: "https://github.com/impstation/imp-station-14" + +- files: + - bang.png + - boom.png + - bubble.png + - coo.png + - kodehonk.png + - pew.png + - snarl.png license: "CC-BY-SA-4.0" - copyright: "Created by Carousel for Impstation" + copyright: "Created by UndertaleSex for Impstation" source: "https://github.com/impstation/imp-station-14" diff --git a/Resources/Textures/_Impstation/Interface/Emotes/bang.png b/Resources/Textures/_Impstation/Interface/Emotes/bang.png new file mode 100644 index 00000000000..a70d24edb7c Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/bang.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/beep.png b/Resources/Textures/_Impstation/Interface/Emotes/beep.png new file mode 100644 index 00000000000..9c83c43cc28 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/beep.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/blink.png b/Resources/Textures/_Impstation/Interface/Emotes/blink.png new file mode 100644 index 00000000000..8966c114ec8 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/blink.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/boom.png b/Resources/Textures/_Impstation/Interface/Emotes/boom.png new file mode 100644 index 00000000000..5b499c8615f Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/boom.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/bubble.png b/Resources/Textures/_Impstation/Interface/Emotes/bubble.png new file mode 100644 index 00000000000..a010764cb4a Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/bubble.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/buzz.png b/Resources/Textures/_Impstation/Interface/Emotes/buzz.png new file mode 100644 index 00000000000..2ecd482c7f9 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/buzz.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/buzztwo.png b/Resources/Textures/_Impstation/Interface/Emotes/buzztwo.png new file mode 100644 index 00000000000..3597294a9b3 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/buzztwo.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/caw.png b/Resources/Textures/_Impstation/Interface/Emotes/caw.png new file mode 100644 index 00000000000..a4658512a85 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/caw.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/chime.png b/Resources/Textures/_Impstation/Interface/Emotes/chime.png new file mode 100644 index 00000000000..01d68205149 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/chime.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/chirp.png b/Resources/Textures/_Impstation/Interface/Emotes/chirp.png new file mode 100644 index 00000000000..185bdce7ddf Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/chirp.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/chitter.png b/Resources/Textures/_Impstation/Interface/Emotes/chitter.png new file mode 100644 index 00000000000..50ca1586c9d Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/chitter.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/clap.png b/Resources/Textures/_Impstation/Interface/Emotes/clap.png new file mode 100644 index 00000000000..086e5f3e9e4 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/clap.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/click.png b/Resources/Textures/_Impstation/Interface/Emotes/click.png new file mode 100644 index 00000000000..de187d341cd Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/click.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/coo.png b/Resources/Textures/_Impstation/Interface/Emotes/coo.png new file mode 100644 index 00000000000..cd080df1e20 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/coo.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/cough.png b/Resources/Textures/_Impstation/Interface/Emotes/cough.png new file mode 100644 index 00000000000..4d6c4d77f45 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/cough.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/cry.png b/Resources/Textures/_Impstation/Interface/Emotes/cry.png new file mode 100644 index 00000000000..4cce132ecf0 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/cry.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/deathgasp.png b/Resources/Textures/_Impstation/Interface/Emotes/deathgasp.png new file mode 100644 index 00000000000..ae9c83fc532 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/deathgasp.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/general.png b/Resources/Textures/_Impstation/Interface/Emotes/general.png new file mode 100644 index 00000000000..d938ce96e0e Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/general.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/hand.png b/Resources/Textures/_Impstation/Interface/Emotes/hand.png new file mode 100644 index 00000000000..f661022585c Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/hand.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/hiss.png b/Resources/Textures/_Impstation/Interface/Emotes/hiss.png new file mode 100644 index 00000000000..906c47b945e Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/hiss.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/honk.png b/Resources/Textures/_Impstation/Interface/Emotes/honk.png new file mode 100644 index 00000000000..5c58ef3c26f Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/honk.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/knucklecrack.png b/Resources/Textures/_Impstation/Interface/Emotes/knucklecrack.png new file mode 100644 index 00000000000..861f227f165 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/knucklecrack.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/kodehonk.png b/Resources/Textures/_Impstation/Interface/Emotes/kodehonk.png new file mode 100644 index 00000000000..b67faa19014 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/kodehonk.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/laugh.png b/Resources/Textures/_Impstation/Interface/Emotes/laugh.png new file mode 100644 index 00000000000..4b1206d152f Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/laugh.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/pew.png b/Resources/Textures/_Impstation/Interface/Emotes/pew.png new file mode 100644 index 00000000000..eed5e489c4d Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/pew.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/ping.png b/Resources/Textures/_Impstation/Interface/Emotes/ping.png new file mode 100644 index 00000000000..29f9b5c50a8 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/ping.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/pop.png b/Resources/Textures/_Impstation/Interface/Emotes/pop.png new file mode 100644 index 00000000000..a6c1b2a15da Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/pop.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/revs.png b/Resources/Textures/_Impstation/Interface/Emotes/revs.png new file mode 100644 index 00000000000..5b46ab34562 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/revs.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/ring.png b/Resources/Textures/_Impstation/Interface/Emotes/ring.png new file mode 100644 index 00000000000..1ec90ba9b8d Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/ring.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/salute.png b/Resources/Textures/_Impstation/Interface/Emotes/salute.png new file mode 100644 index 00000000000..8c38b9fb2bf Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/salute.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/scream.png b/Resources/Textures/_Impstation/Interface/Emotes/scream.png new file mode 100644 index 00000000000..973ff909e5c Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/scream.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/sigh.png b/Resources/Textures/_Impstation/Interface/Emotes/sigh.png new file mode 100644 index 00000000000..ef7cc30cd9f Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/sigh.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/snap.png b/Resources/Textures/_Impstation/Interface/Emotes/snap.png new file mode 100644 index 00000000000..67a8fda5428 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/snap.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/snarl.png b/Resources/Textures/_Impstation/Interface/Emotes/snarl.png new file mode 100644 index 00000000000..b1e6c5f9f1f Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/snarl.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/squeak.png b/Resources/Textures/_Impstation/Interface/Emotes/squeak.png new file mode 100644 index 00000000000..c550b9154cd Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/squeak.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/squish.png b/Resources/Textures/_Impstation/Interface/Emotes/squish.png new file mode 100644 index 00000000000..e262b4bfa80 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/squish.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/tailslap.png b/Resources/Textures/_Impstation/Interface/Emotes/tailslap.png new file mode 100644 index 00000000000..04c517fa5bc Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/tailslap.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/vocal.png b/Resources/Textures/_Impstation/Interface/Emotes/vocal.png new file mode 100644 index 00000000000..49926b9910a Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/vocal.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/voxhiss.png b/Resources/Textures/_Impstation/Interface/Emotes/voxhiss.png new file mode 100644 index 00000000000..094fbbb9b64 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/voxhiss.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/whistle.png b/Resources/Textures/_Impstation/Interface/Emotes/whistle.png new file mode 100644 index 00000000000..97385204247 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/whistle.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/wuhey.png b/Resources/Textures/_Impstation/Interface/Emotes/wuhey.png new file mode 100644 index 00000000000..5ce6f80965e Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/wuhey.png differ diff --git a/Resources/Textures/_Impstation/Interface/Emotes/yawn.png b/Resources/Textures/_Impstation/Interface/Emotes/yawn.png new file mode 100644 index 00000000000..2dd31df6641 Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/yawn.png differ