Skip to content

Commit

Permalink
Merge pull request #1372 from hivehum/emotes
Browse files Browse the repository at this point in the history
new emote sprites
  • Loading branch information
formlessnameless authored Jan 15, 2025
2 parents c9708d4 + 425990d commit bda9f43
Show file tree
Hide file tree
Showing 40 changed files with 86 additions and 49 deletions.
7 changes: 4 additions & 3 deletions Content.Client/Chat/UI/EmotesMenu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
MinSize="450 450">

<!-- Main -->
<!-- Impstation edit - changed all pngs to new assets-->
<ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64" ReserveSpaceForHiddenChildren="False">
<ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-general'}" TargetLayer="General" Visible="False">
<TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"/>
<TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/_Impstation/Interface/Emotes/general.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/Emotes/vocal.png"/>
<TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/_Impstation/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"/>
<TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/_Impstation/Interface/Emotes/hand.png"/>
</ui:RadialMenuTextureButton>
</ui:RadialContainer>

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Chat/Prototypes/EmotePrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public sealed partial class EmotePrototype : IPrototype
/// An icon used to visually represent the emote in radial UI.
/// </summary>
[DataField]
public SpriteSpecifier Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/Actions/scream.png"));
public SpriteSpecifier Icon = new SpriteSpecifier.Texture(new("/Textures/_Impstation/Interface/Emotes/general.png")); // imp edit - changed the fallback emote icon

/// <summary>
/// Determines conditions to this emote be available to use
Expand Down
7 changes: 4 additions & 3 deletions Resources/Prototypes/Voice/disease_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: emote
id: Cough
name: chat-emote-name-cough
icon: Interface/Emotes/cough.png
icon: _Impstation/Interface/Emotes/cough.png #imp
category: Vocal
whitelist:
components:
Expand All @@ -19,7 +19,7 @@
chatTriggers:
- cough
- coughs
- coughed
- coughed
- cough.
- coughs.
- coughed.
Expand Down Expand Up @@ -48,13 +48,14 @@
- type: emote
id: RobotBeep
name: chat-emote-name-robotbeep
icon: _Impstation/Interface/Emotes/beep.png #imp
category: Vocal
chatMessages: ["chat-emote-msg-beep"]

- type: emote
id: Yawn
name: chat-emote-name-yawn
icon: Interface/Emotes/yawn.png
icon: _Impstation/Interface/Emotes/yawn.png #imp
category: Vocal
whitelist:
components:
Expand Down
52 changes: 23 additions & 29 deletions Resources/Prototypes/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
id: Scream
name: chat-emote-name-scream
category: Vocal
icon: Interface/Emotes/scream.png
icon: _Impstation/Interface/Emotes/scream.png #imp
whitelist:
components:
- Vocal
Expand Down Expand Up @@ -33,7 +33,7 @@
id: Laugh
name: chat-emote-name-laugh
category: Vocal
icon: Interface/Emotes/laugh.png
icon: _Impstation/Interface/Emotes/laugh.png #imp
whitelist:
components:
- Vocal
Expand Down Expand Up @@ -62,7 +62,7 @@
id: Honk
name: chat-emote-name-honk
category: Vocal
icon: Interface/Emotes/honk.png
icon: _Impstation/Interface/Emotes/honk.png #imp
whitelist:
requireAll: true
components:
Expand All @@ -79,7 +79,7 @@
id: Sigh
name: chat-emote-name-sigh
category: Vocal
icon: Interface/Emotes/sigh.png
icon: _Impstation/Interface/Emotes/sigh.png #imp
whitelist:
components:
- Vocal
Expand All @@ -96,7 +96,7 @@
id: Whistle
name: chat-emote-name-whistle
category: Vocal
icon: Interface/Emotes/whistle.png
icon: _Impstation/Interface/Emotes/whistle.png #imp
whitelist:
components:
- Vocal
Expand All @@ -113,7 +113,7 @@
id: Crying
name: chat-emote-name-crying
category: Vocal
icon: Interface/Emotes/cry.png
icon: _Impstation/Interface/Emotes/cry.png #imp
whitelist:
components:
- Vocal
Expand All @@ -134,7 +134,7 @@
name: chat-emote-name-squish
category: Vocal
available: false
icon: Interface/Emotes/squish.png
icon: _Impstation/Interface/Emotes/squish.png #imp
whitelist:
components:
- Vocal
Expand All @@ -152,7 +152,7 @@
name: chat-emote-name-chitter
category: Vocal
available: false
icon: Interface/Emotes/chitter.png
icon: _Impstation/Interface/Emotes/chitter.png #imp
whitelist:
components:
- Vocal
Expand All @@ -170,7 +170,7 @@
name: chat-emote-name-squeak
category: Vocal
available: false
icon: Interface/Emotes/squeak.png
icon: _Impstation/Interface/Emotes/squeak.png #imp
whitelist:
components:
- Vocal
Expand All @@ -188,7 +188,7 @@
name: chat-emote-name-click
category: Vocal
available: false
icon: Interface/Emotes/click.png
icon: _Impstation/Interface/Emotes/click.png #imp
whitelist:
components:
- Vocal
Expand All @@ -205,7 +205,7 @@
id: Clap
name: chat-emote-name-clap
category: Hands
icon: Interface/Emotes/clap.png
icon: _Impstation/Interface/Emotes/clap.png #imp
whitelist:
components:
- Hands
Expand All @@ -223,7 +223,7 @@
id: Snap
name: chat-emote-name-snap
category: Hands
icon: Interface/Emotes/snap.png
icon: _Impstation/Interface/Emotes/snap.png #imp
whitelist:
components:
- Hands
Expand All @@ -247,7 +247,7 @@
name: chat-emote-name-thump
category: Hands
available: false
icon: Interface/Emotes/tailslap.png
icon: _Impstation/Interface/Emotes/tailslap.png #imp
whitelist:
components:
- Hands
Expand All @@ -271,7 +271,7 @@
id: Salute
name: chat-emote-name-salute
category: Hands
icon: Interface/Emotes/salute.png
icon: _Impstation/Interface/Emotes/salute.png #imp
whitelist:
components:
- Hands
Expand All @@ -287,7 +287,7 @@
id: Crack
name: chat-emote-name-crack
category: Hands
icon: _Impstation/Interface/Emotes/crack.png
icon: _Impstation/Interface/Emotes/knucklecrack.png #imp
whitelist:
components:
- Hands
Expand Down Expand Up @@ -320,7 +320,7 @@
- type: emote
id: DefaultDeathgasp
name: chat-emote-name-deathgasp
icon: Interface/Emotes/deathgasp.png
icon: _Impstation/Interface/Emotes/deathgasp.png #imp
whitelist:
components:
- MobState
Expand All @@ -331,14 +331,14 @@
- type: emote
id: MonkeyDeathgasp
name: chat-emote-name-deathgasp
icon: Interface/Emotes/deathgasp.png
icon: _Impstation/Interface/Emotes/deathgasp.png #imp
chatMessages: ["chat-emote-msg-deathgasp-monkey"]

- type: emote
id: Buzz
name: chat-emote-name-buzz
category: Vocal
icon: Interface/Emotes/buzz.png
icon: _Impstation/Interface/Emotes/buzz.png #imp
whitelist:
requireAll: true
components:
Expand All @@ -365,18 +365,12 @@
icon: Interface/Emotes/hew.png
chatMessages: ["chat-emote-msg-hew"]

- type: emote
id: Ungh
name: chat-emote-name-weh
category: Vocal
chatMessages: [UNGHs!]

- type: emote
id: Chirp
name: chat-emote-name-chirp
category: Vocal
available: false
icon: Interface/Emotes/chirp.png
icon: _Impstation/Interface/Emotes/chirp.png #imp
whitelist:
components:
- Nymph
Expand All @@ -396,7 +390,7 @@
id: Beep
name: chat-emote-name-beep
category: Vocal
icon: Interface/Emotes/beep.png
icon: _Impstation/Interface/Emotes/beep.png #imp
whitelist:
requireAll: true
components:
Expand All @@ -413,7 +407,7 @@
id: Chime
name: chat-emote-name-chime
category: Vocal
icon: Interface/Emotes/chime.png
icon: _Impstation/Interface/Emotes/chime.png #imp
whitelist:
requireAll: true
components:
Expand All @@ -430,7 +424,7 @@
id: Buzz-Two
name: chat-emote-name-buzztwo
category: Vocal
icon: Interface/Emotes/buzztwo.png
icon: _Impstation/Interface/Emotes/buzztwo.png #imp
whitelist:
requireAll: true
components:
Expand All @@ -453,7 +447,7 @@
id: Ping
name: chat-emote-name-ping
category: Vocal
icon: Interface/Emotes/ping.png
icon: _Impstation/Interface/Emotes/ping.png #imp
whitelist:
requireAll: true
components:
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/_Goobstation/Actions/emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
id: Flip
name: chat-emote-name-flip
chatMessages: ["chat-emote-msg-flip"]
icon: _Impstation/Interface/Emotes/backflip.png #imp
chatTriggers:
- flip
- flips
Expand All @@ -16,6 +17,7 @@
id: Spin
name: chat-emote-name-spin
chatMessages: ["chat-emote-msg-spin"]
icon: _Impstation/Interface/Emotes/spin.png #imp
chatTriggers:
- spin
- spins
Expand All @@ -27,9 +29,14 @@
id: Jump
name: chat-emote-name-jump
chatMessages: ["chat-emote-msg-jump"]
icon: _Impstation/Interface/Emotes/jump.png #imp
chatTriggers:
- jump
- jumps
- jumps.
- jumps!
- bounce
- bounces
- bounces.
- bounces!
event: !type:AnimationJumpEmoteEvent
10 changes: 8 additions & 2 deletions Resources/Prototypes/_Impstation/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: chat-emote-name-bubble
category: Vocal
available: false
icon: Interface/Emotes/squish.png
icon: _Impstation/Interface/Emotes/squish.png
whitelist:
components:
- Vocal
Expand All @@ -22,7 +22,7 @@
name: chat-emote-name-pop
category: Vocal
available: false
icon: Interface/Emotes/squish.png
icon: _Impstation/Interface/Emotes/squish.png
whitelist:
components:
- Vocal
Expand Down Expand Up @@ -62,3 +62,9 @@
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!]
50 changes: 39 additions & 11 deletions Resources/Textures/_Impstation/Interface/Emotes/attributions.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
# 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: ["hiss.png"]
license: "CC-BY-SA-3.0"
copyright: "Modified from existing lizard texture (lizard.png) and chirp.png by Pinkbat5"
source: "https://github.com/Pinkbat5"

- files: ["crack.png"]
- 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
- squeak.png
- squish.png
- tailslap.png
- vocal.png
- voxhiss.png
- whistle.png
- yawn.png
license: "CC-BY-SA-4.0"
copyright: "Spritework by Pinkbat5"
source: "https://github.com/Pinkbat5"
copyright: "Created by Carousel 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"
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/_Impstation/Interface/Emotes/hiss.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/_Impstation/Interface/Emotes/voxhiss.png

0 comments on commit bda9f43

Please sign in to comment.