From ef93ebbeefbf53c232872a77a6f9e14680fdd870 Mon Sep 17 00:00:00 2001 From: KOTOB <59124164+kotobdev@users.noreply.github.com> Date: Thu, 14 Aug 2025 13:57:09 -0700 Subject: [PATCH] *blinks (#4155) * Port #1583 from Imp too dumb to cherrypick so hopefully coauthor works well enough Co-Authored-By: wafehling * newline ops * newline ops AGAIN! * how did this even HAPPEN --------- Co-authored-by: wafehling --- .../_Impstation/Effects/Emotes/attributions.yml | 5 +++++ .../Audio/_Impstation/Effects/Emotes/blink.ogg | Bin 0 -> 7448 bytes .../Locale/en-US/_Impstation/chat/emotes.ftl | 4 ++++ .../Prototypes/Voice/speech_emote_sounds.yml | 6 ++++++ .../_Impstation/SoundCollections/emotes.yml | 4 ++++ .../_Impstation/Voice/speech_emotes.yml | 10 ++++++++++ .../Interface/Emotes/attributions.yml | 6 ++++++ .../_Impstation/Interface/Emotes/blink.png | Bin 0 -> 234 bytes 8 files changed, 35 insertions(+) create mode 100644 Resources/Audio/_Impstation/Effects/Emotes/attributions.yml create mode 100644 Resources/Audio/_Impstation/Effects/Emotes/blink.ogg create mode 100644 Resources/Locale/en-US/_Impstation/chat/emotes.ftl create mode 100644 Resources/Prototypes/_Impstation/SoundCollections/emotes.yml create mode 100644 Resources/Prototypes/_Impstation/Voice/speech_emotes.yml create mode 100644 Resources/Textures/_Impstation/Interface/Emotes/blink.png diff --git a/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml b/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml new file mode 100644 index 0000000000..c75a230139 --- /dev/null +++ b/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml @@ -0,0 +1,5 @@ +- files: + - blink.ogg + license: "CC0-1.0" + copyright: "Made by Rarenth on freesound.org." + source: "https://freesound.org/people/Rarenth/sounds/787959/" diff --git a/Resources/Audio/_Impstation/Effects/Emotes/blink.ogg b/Resources/Audio/_Impstation/Effects/Emotes/blink.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7142205c6b058f50e82d9c52aad8062b4c0655ed GIT binary patch literal 7448 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 RH;(HUyDTVq4kq$<`yb^Byn_G$ literal 0 HcmV?d00001 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 0000000000..bb4421411e --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/chat/emotes.ftl @@ -0,0 +1,4 @@ +# Names +chat-emote-name-blink = Blink +# Message +chat-emote-msg-blink = blinks diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index b5353f6ca5..0fb974d141 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -502,6 +502,8 @@ volume: -6 Salute: collection: Salutes + Blink: # Imp + collection: Blinks # Imp - type: emoteSounds id: DionaBodyEmotes @@ -519,6 +521,8 @@ path: /Audio/Voice/Diona/diona_salute.ogg params: volume: -5 + Blink: # Imp + collection: Blinks # Imp - type: emoteSounds id: ReptilianBodyEmotes @@ -537,6 +541,8 @@ volume: -6 Salute: collection: Salutes + Blink: # Imp + collection: Blinks # Imp # mobs - type: emoteSounds diff --git a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml new file mode 100644 index 0000000000..7d9e3a19f0 --- /dev/null +++ b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: Blinks + files: + - /Audio/_Impstation/Effects/Emotes/blink.ogg diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml new file mode 100644 index 0000000000..a6b438a2a9 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml @@ -0,0 +1,10 @@ +- type: emote + id: Blink + name: chat-emote-name-blink + category: General + icon: _Impstation/Interface/Emotes/blink.png #imp + chatMessages: ["chat-emote-msg-blink"] + chatTriggers: + - blink + - blinks + - blinked diff --git a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml index dc86ad5ba9..d2aa6cf9c1 100644 --- a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml +++ b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml @@ -4,3 +4,9 @@ license: "CC-BY-SA-4.0" copyright: "Created by Carousel for Impstation" source: "https://github.com/impstation/imp-station-14" + +- files: + - blink.png + license: "CC0-1.0" + copyright: "Created by Rarenth for Impstation" + source: "https://github.com/impstation/imp-station-14" diff --git a/Resources/Textures/_Impstation/Interface/Emotes/blink.png b/Resources/Textures/_Impstation/Interface/Emotes/blink.png new file mode 100644 index 0000000000000000000000000000000000000000..8966c114ec8ef022ee806cdc8dffaa8ce84ed5fa GIT binary patch literal 234 zcmVh-WrPy|!!Qiv?R>aG zNV&9Y(K~kkUG6oYd#K=9x9cjTT%vaX0Py>6|Mhi0u+E-F<5n*iaFtuu{UC$1?m~4x zB6?Td^NhQ+8>ADA>KeCe0Pl-Ks%zY;fsnEoAnnt-;M1&07*qoM6N<$g4(TQVgLXD literal 0 HcmV?d00001