diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs index b1d91cb0164..655cac18780 100644 --- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs +++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs @@ -11,6 +11,9 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager private static readonly Dictionary SmileyToEmote = new() { + // ADT-Localization-Start + { "??", "chatsan-questioned" }, + // ADT-Localization-End // Corvax-Localization-Start { "хд", "chatsan-laughs" }, { "о-о", "chatsan-wide-eyed" }, // cyrillic о diff --git a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl index d12f101aded..2a67a834eb7 100644 --- a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl +++ b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl @@ -21,3 +21,4 @@ chatsan-tearfully-salutes = tearfully salutes chatsan-shrugs = shrugs chatsan-tearfully-smiles = tearfully smiles chatsan-winks = winks +chatsan-questioned = gazes questioningly diff --git a/Resources/Locale/ru-RU/ADT/Chat/sanitizer-replacements.ftl b/Resources/Locale/ru-RU/ADT/Chat/sanitizer-replacements.ftl new file mode 100644 index 00000000000..e4001a73d18 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Chat/sanitizer-replacements.ftl @@ -0,0 +1 @@ +chatsan-questioned = вопросительно смотрит diff --git a/Resources/Locale/ru-RU/corvax/chat/emotes.ftl b/Resources/Locale/ru-RU/corvax/chat/emotes.ftl index 71085c91a0a..b58d92ac235 100644 --- a/Resources/Locale/ru-RU/corvax/chat/emotes.ftl +++ b/Resources/Locale/ru-RU/corvax/chat/emotes.ftl @@ -1,6 +1,6 @@ # Имена -chat-emote-name-howl = Выть -chat-emote-name-growl = Рычать +chat-emote-name-howl = выть +chat-emote-name-growl = рычать # Сообщение chat-emote-msg-howl = воет chat-emote-msg-growl = рычит diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index d93deb56a1f..032990c66b2 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -7,3 +7,19 @@ - type: Sprite sprite: ADT/Objects/Fun/toys.rsi state: plushie_ursus + +- type: entity + parent: BasePlushie + id: ADTBlackSharkPlushie + name: black shark plushie + description: Big and safe to have by your side if you want to discover the world below the surface of the ocean. + components: + - type: Sprite + sprite: ADT/Objects/Fun/sharkplushie.rsi + state: black + - type: Item + heldPrefix: black + - type: Tag + tags: + - PlushieSharkBlack + - Payload diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 78f4ef7077f..63f10c53ff9 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -27,3 +27,7 @@ - type: Tag id: SpaceCash + +- type: Tag + id: PlushieSharkBlack + diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml index 9fd05beaeea..cf5b92e019c 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml @@ -47,6 +47,10 @@ whitelist: tags: - PlushieSharkGrey + mopbucket_shark_black: + whitelist: + tags: + - PlushieSharkBlack sprite: Objects/Fun/sharkplush.rsi - type: Transform noRot: true @@ -59,6 +63,7 @@ - PlushieSharkBlue - PlushieSharkPink - PlushieSharkGrey + - PlushieSharkBlack priority: 3 # Higher than drinking priority - type: Drink solution: bucket diff --git a/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black-inhand-left.png b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black-inhand-left.png new file mode 100644 index 00000000000..9f300251cfa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black-inhand-right.png b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black-inhand-right.png new file mode 100644 index 00000000000..52194897cb9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black.png b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black.png new file mode 100644 index 00000000000..02e2f2125d7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/black.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/meta.json new file mode 100644 index 00000000000..71392398528 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by ADT team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black" + }, + { + "name": "black-inhand-left", + "directions": 4 + }, + { + "name": "black-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json index eca1964c4dd..b6f4f318113 100644 --- a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json @@ -48,6 +48,9 @@ }, { "name": "mopbucket_shark_grey" + }, + { + "name": "mopbucket_shark_black" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_black.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_black.png new file mode 100644 index 00000000000..06ee27944b1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_black.png differ