From: Ty Ashley <42426760+TyAshley@users.noreply.github.com>
Date: Mon, 6 May 2024 01:12:30 +0000 (-0500)
Subject: Added new icons for the emote wheel (#27541)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b8144df7a5f2c264a36ce33fd7585a5539d65332;p=space-station-14.git

Added new icons for the emote wheel (#27541)

* Added new icons for the emote wheel

* Corrected weh path

* Changed whistle to better match other vocal emotes. Modified honk icon to match dimensions of box. Corrected chirp and chitter emote icons.

* Cleaned up edges of icons

* Added attributions.yml to emotes folder
---

diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml b/Content.Client/Chat/UI/EmotesMenu.xaml
index 819a6543c4..cc4d5bb77e 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml
@@ -12,7 +12,7 @@
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"/>
         </ui:RadialMenuTextureButton>
         <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
-            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Actions/scream.png"/>
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Emotes/vocal.png"/>
         </ui:RadialMenuTextureButton>
         <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"/>
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index 54330133d7..73b36c137b 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -7,6 +7,7 @@
 - type: emote
   id: Cough
   name: chat-emote-name-cough
+  icon: Interface/Emotes/cough.png
   category: Vocal
   whitelist:
     components:
@@ -46,6 +47,7 @@
 - type: emote
   id: Yawn
   name: chat-emote-name-yawn
+  icon: Interface/Emotes/yawn.png
   category: Vocal
   whitelist:
     components:
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 29a09c03cb..84e48c1c23 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -41,7 +41,7 @@
   id: Laugh
   name: chat-emote-name-laugh
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/laugh.png
   whitelist:
     components:
     - Vocal
@@ -82,7 +82,7 @@
   id: Honk
   name: chat-emote-name-honk
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/honk.png
   whitelist:
     requireAll: true
     components:
@@ -107,7 +107,7 @@
   id: Sigh
   name: chat-emote-name-sigh
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/sigh.png
   whitelist:
     components:
     - Vocal
@@ -127,7 +127,7 @@
   id: Whistle
   name: chat-emote-name-whistle
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/whistle.png
   whitelist:
     components:
     - Vocal
@@ -150,7 +150,7 @@
   id: Crying
   name: chat-emote-name-crying
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/cry.png
   whitelist:
     components:
     - Vocal
@@ -182,7 +182,7 @@
   name: chat-emote-name-squish
   category: Vocal
   available: false
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/squish.png
   whitelist:
     components:
     - Vocal
@@ -206,7 +206,7 @@
   name: chat-emote-name-chitter
   category: Vocal
   available: false
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/chitter.png
   whitelist:
     components:
     - Vocal
@@ -230,6 +230,7 @@
   name: chat-emote-name-squeak
   category: Vocal
   available: false
+  icon: Interface/Emotes/squeak.png
   whitelist:
     components:
       - Vocal
@@ -253,7 +254,7 @@
   name: chat-emote-name-click
   category: Vocal
   available: false
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/click.png
   whitelist:
     components:
     - Vocal
@@ -274,7 +275,7 @@
   id: Clap
   name: chat-emote-name-clap
   category: Hands
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/clap.png
   whitelist:
     components:
     - Hands
@@ -294,7 +295,7 @@
   id: Snap
   name: chat-emote-name-snap
   category: Hands
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/snap.png
   whitelist:
     components:
     - Hands
@@ -321,7 +322,7 @@
   id: Salute
   name: chat-emote-name-salute
   category: Hands
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/salute.png
   whitelist:
     components:
     - Hands
@@ -340,7 +341,7 @@
 - type: emote
   id: DefaultDeathgasp
   name: chat-emote-name-deathgasp
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/deathgasp.png
   whitelist:
     components:
     - MobState
@@ -351,14 +352,14 @@
 - type: emote
   id: MonkeyDeathgasp
   name: chat-emote-name-deathgasp
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/deathgasp.png
   chatMessages: ["chat-emote-msg-deathgasp-monkey"]
 
 - type: emote
   id: Buzz
   name: chat-emote-name-buzz
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/buzz.png
   whitelist:
     requireAll: true
     components:
@@ -383,13 +384,14 @@
   id: Weh
   name: chat-emote-name-weh
   category: Vocal
+  icon: Interface/Emotes/weh.png
   chatMessages: [Wehs!]
 
 - type: emote
   id: Chirp
   name: chat-emote-name-chirp
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/chirp.png
   whitelist:
     requireAll: true
     components:
@@ -414,7 +416,7 @@
   id: Beep
   name: chat-emote-name-beep
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/beep.png
   whitelist:
     requireAll: true
     components:
@@ -439,7 +441,7 @@
   id: Chime
   name: chat-emote-name-chime
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/chime.png
   whitelist:
     requireAll: true
     components:
@@ -464,7 +466,7 @@
   id: Buzz-Two
   name: chat-emote-name-buzztwo
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/buzztwo.png
   whitelist:
     requireAll: true
     components:
@@ -507,7 +509,7 @@
   id: Ping
   name: chat-emote-name-ping
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/ping.png
   whitelist:
     requireAll: true
     components:
diff --git a/Resources/Textures/Interface/Emotes/attributions.yml b/Resources/Textures/Interface/Emotes/attributions.yml
new file mode 100644
index 0000000000..125651e419
--- /dev/null
+++ b/Resources/Textures/Interface/Emotes/attributions.yml
@@ -0,0 +1,117 @@
+# Attempted to keep the files in alphabetical order so its easier to audit.
+# Finding individual authors is an unfeasible task. If you can reference the author please do so.
+
+- files: ["beep.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from borg_chest.png and borg_head.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["buzz.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bee texture (0.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["buzztwo.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bee texture (0.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chime.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing desk bell texture (normal.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chirp.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing nymph texture (icon.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chitter.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from mothroach.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["clap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["click.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing crab.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["cough.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["cry.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["deathgasp.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["honk.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["laugh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["ping.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["salute.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["sigh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["snap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["squeak.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from mouse-0.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["squish.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from blue_adult_slime.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["vocal.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["weh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from plushie_lizard.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["whistle.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["yawn.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
diff --git a/Resources/Textures/Interface/Emotes/beep.png b/Resources/Textures/Interface/Emotes/beep.png
new file mode 100644
index 0000000000..f59b0925ab
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/beep.png differ
diff --git a/Resources/Textures/Interface/Emotes/buzz.png b/Resources/Textures/Interface/Emotes/buzz.png
new file mode 100644
index 0000000000..da7ac363a4
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/buzz.png differ
diff --git a/Resources/Textures/Interface/Emotes/buzztwo.png b/Resources/Textures/Interface/Emotes/buzztwo.png
new file mode 100644
index 0000000000..460a8868a5
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/buzztwo.png differ
diff --git a/Resources/Textures/Interface/Emotes/chime.png b/Resources/Textures/Interface/Emotes/chime.png
new file mode 100644
index 0000000000..ca595be5d3
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/chime.png differ
diff --git a/Resources/Textures/Interface/Emotes/chirp.png b/Resources/Textures/Interface/Emotes/chirp.png
new file mode 100644
index 0000000000..57e8b67143
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/chirp.png differ
diff --git a/Resources/Textures/Interface/Emotes/chitter.png b/Resources/Textures/Interface/Emotes/chitter.png
new file mode 100644
index 0000000000..f6e1101223
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/chitter.png differ
diff --git a/Resources/Textures/Interface/Emotes/clap.png b/Resources/Textures/Interface/Emotes/clap.png
new file mode 100644
index 0000000000..a0ef9e1316
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/clap.png differ
diff --git a/Resources/Textures/Interface/Emotes/click.png b/Resources/Textures/Interface/Emotes/click.png
new file mode 100644
index 0000000000..539aea7b92
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/click.png differ
diff --git a/Resources/Textures/Interface/Emotes/cough.png b/Resources/Textures/Interface/Emotes/cough.png
new file mode 100644
index 0000000000..cb1c2832ac
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/cough.png differ
diff --git a/Resources/Textures/Interface/Emotes/cry.png b/Resources/Textures/Interface/Emotes/cry.png
new file mode 100644
index 0000000000..2793a11b9d
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/cry.png differ
diff --git a/Resources/Textures/Interface/Emotes/deathgasp.png b/Resources/Textures/Interface/Emotes/deathgasp.png
new file mode 100644
index 0000000000..e27d0bb573
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/deathgasp.png differ
diff --git a/Resources/Textures/Interface/Emotes/honk.png b/Resources/Textures/Interface/Emotes/honk.png
new file mode 100644
index 0000000000..19441e4a0e
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/honk.png differ
diff --git a/Resources/Textures/Interface/Emotes/laugh.png b/Resources/Textures/Interface/Emotes/laugh.png
new file mode 100644
index 0000000000..a688fdb443
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/laugh.png differ
diff --git a/Resources/Textures/Interface/Emotes/ping.png b/Resources/Textures/Interface/Emotes/ping.png
new file mode 100644
index 0000000000..7408eb1f28
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/ping.png differ
diff --git a/Resources/Textures/Interface/Emotes/salute.png b/Resources/Textures/Interface/Emotes/salute.png
new file mode 100644
index 0000000000..5727d8fd85
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/salute.png differ
diff --git a/Resources/Textures/Interface/Emotes/sigh.png b/Resources/Textures/Interface/Emotes/sigh.png
new file mode 100644
index 0000000000..ff49a56360
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/sigh.png differ
diff --git a/Resources/Textures/Interface/Emotes/snap.png b/Resources/Textures/Interface/Emotes/snap.png
new file mode 100644
index 0000000000..ae6d81c19d
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/snap.png differ
diff --git a/Resources/Textures/Interface/Emotes/squeak.png b/Resources/Textures/Interface/Emotes/squeak.png
new file mode 100644
index 0000000000..e32a89f598
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/squeak.png differ
diff --git a/Resources/Textures/Interface/Emotes/squish.png b/Resources/Textures/Interface/Emotes/squish.png
new file mode 100644
index 0000000000..efa1ce6c5e
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/squish.png differ
diff --git a/Resources/Textures/Interface/Emotes/vocal.png b/Resources/Textures/Interface/Emotes/vocal.png
new file mode 100644
index 0000000000..9b129ec466
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/vocal.png differ
diff --git a/Resources/Textures/Interface/Emotes/weh.png b/Resources/Textures/Interface/Emotes/weh.png
new file mode 100644
index 0000000000..fea5ad3b73
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/weh.png differ
diff --git a/Resources/Textures/Interface/Emotes/whistle.png b/Resources/Textures/Interface/Emotes/whistle.png
new file mode 100644
index 0000000000..029a52af23
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/whistle.png differ
diff --git a/Resources/Textures/Interface/Emotes/yawn.png b/Resources/Textures/Interface/Emotes/yawn.png
new file mode 100644
index 0000000000..8130fc9ab4
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/yawn.png differ