Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new icons for the emote wheel #27541

Merged
merged 5 commits into from
May 6, 2024
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
2 changes: 1 addition & 1 deletion Content.Client/Chat/UI/EmotesMenu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Voice/disease_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- type: emote
id: Cough
name: chat-emote-name-cough
icon: Interface/Emotes/cough.png
category: Vocal
whitelist:
components:
Expand Down Expand Up @@ -46,6 +47,7 @@
- type: emote
id: Yawn
name: chat-emote-name-yawn
icon: Interface/Emotes/yawn.png
category: Vocal
whitelist:
components:
Expand Down
40 changes: 21 additions & 19 deletions Resources/Prototypes/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -230,6 +230,7 @@
name: chat-emote-name-squeak
category: Vocal
available: false
icon: Interface/Emotes/squeak.png
whitelist:
components:
- Vocal
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
117 changes: 117 additions & 0 deletions Resources/Textures/Interface/Emotes/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file added Resources/Textures/Interface/Emotes/beep.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/buzz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/buzztwo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/chime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/chirp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/chitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/clap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/click.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/cough.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/cry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/deathgasp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/honk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/laugh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/ping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/salute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/sigh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/snap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/squeak.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/squish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/vocal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/weh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/whistle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/yawn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading