diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml b/Content.Client/Chat/UI/EmotesMenu.xaml
index cc4d5bb77e9f67..eb2b280963fa89 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml
@@ -7,15 +7,16 @@
MinSize="450 450">
+
-
+
-
+
-
+
diff --git a/Content.Shared/Chat/Prototypes/EmotePrototype.cs b/Content.Shared/Chat/Prototypes/EmotePrototype.cs
index 34d54bc3600bde..60bfd20727eba7 100644
--- a/Content.Shared/Chat/Prototypes/EmotePrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmotePrototype.cs
@@ -40,7 +40,7 @@ public sealed partial class EmotePrototype : IPrototype
/// An icon used to visually represent the emote in radial UI.
///
[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
///
/// Determines conditions to this emote be available to use
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index eab4b0bc33e32a..bc50ceb0cb693a 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -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:
@@ -19,7 +19,7 @@
chatTriggers:
- cough
- coughs
- - coughed
+ - coughed
- cough.
- coughs.
- coughed.
@@ -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:
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index a0071bfaa016a9..37832644253a2d 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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:
@@ -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:
@@ -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:
@@ -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:
diff --git a/Resources/Prototypes/_Goobstation/Actions/emotes.yml b/Resources/Prototypes/_Goobstation/Actions/emotes.yml
index 6a268e0bec82b6..3dcdf2ce49dc26 100644
--- a/Resources/Prototypes/_Goobstation/Actions/emotes.yml
+++ b/Resources/Prototypes/_Goobstation/Actions/emotes.yml
@@ -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
@@ -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
@@ -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
diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml
index bfa3512551fe49..cd485bbcd4e5fb 100644
--- a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml
@@ -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
@@ -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
@@ -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!]
diff --git a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml
index 4f022942de2972..9320cac18c6ac4 100644
--- a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml
+++ b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml
@@ -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"
diff --git a/Resources/Textures/_Impstation/Interface/Emotes/backflip.png b/Resources/Textures/_Impstation/Interface/Emotes/backflip.png
new file mode 100644
index 00000000000000..f5d9ecb848f7ac
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/backflip.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 00000000000000..9c83c43cc283c8
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/beep.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 00000000000000..2ecd482c7f916b
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 00000000000000..3597294a9b3f91
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/buzztwo.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 00000000000000..01d68205149c62
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 00000000000000..185bdce7ddf326
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 00000000000000..50ca1586c9dc4f
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 00000000000000..086e5f3e9e4641
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 00000000000000..de187d341cd516
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/click.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 00000000000000..4d6c4d77f4508b
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/cough.png differ
diff --git a/Resources/Textures/_Impstation/Interface/Emotes/crack.png b/Resources/Textures/_Impstation/Interface/Emotes/crack.png
deleted file mode 100644
index dbec2b2ea1c1e7..00000000000000
Binary files a/Resources/Textures/_Impstation/Interface/Emotes/crack.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Interface/Emotes/cry.png b/Resources/Textures/_Impstation/Interface/Emotes/cry.png
new file mode 100644
index 00000000000000..4cce132ecf0c60
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 00000000000000..ae9c83fc5328d8
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 00000000000000..d938ce96e0e52e
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 00000000000000..f661022585cf85
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
index 97257c1e0976da..906c47b945e964 100644
Binary files a/Resources/Textures/_Impstation/Interface/Emotes/hiss.png 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 00000000000000..5c58ef3c26fce0
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/honk.png differ
diff --git a/Resources/Textures/_Impstation/Interface/Emotes/jump.png b/Resources/Textures/_Impstation/Interface/Emotes/jump.png
new file mode 100644
index 00000000000000..d0de87ef6170b3
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/jump.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 00000000000000..861f227f165deb
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/knucklecrack.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 00000000000000..4b1206d152f430
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/laugh.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 00000000000000..29f9b5c50a8759
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/ping.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 00000000000000..8c38b9fb2bfa7e
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 00000000000000..973ff909e5cafe
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 00000000000000..ef7cc30cd9f463
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 00000000000000..67a8fda5428e3f
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/snap.png differ
diff --git a/Resources/Textures/_Impstation/Interface/Emotes/spin.png b/Resources/Textures/_Impstation/Interface/Emotes/spin.png
new file mode 100644
index 00000000000000..c5de318e63b256
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/spin.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 00000000000000..c550b9154cdeed
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 00000000000000..e262b4bfa80d97
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 00000000000000..04c517fa5bc0dd
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 00000000000000..49926b9910a9e1
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
index 89604c446116c2..094fbbb9b64868 100644
Binary files a/Resources/Textures/_Impstation/Interface/Emotes/voxhiss.png 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 00000000000000..97385204247f5e
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/whistle.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 00000000000000..2dd31df664163b
Binary files /dev/null and b/Resources/Textures/_Impstation/Interface/Emotes/yawn.png differ