Merge pull request #227 from Schrodinger71/update

Мелкая обнова.
AdventureTimeSS14 · Dec 18, 2023 · 20afcad · 20afcad
2 parents 5a985c0 + 3df6aff
commit 20afcad
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 3 deletions.
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -150,7 +150,8 @@ private string GetRandomSoundEffect() //функция рандомизации
         // Список звуковых эффектов
         var soundEffects = new List<string>
         {
-        "/Audio/Effects/adminhelp.ogg"
+        "/Audio/Effects/adminhelp.ogg",
+        "/Audio/Effects/adminhelpbread4.ogg"
         };
 
         // Получение случайного звукового эффекта из списка

diff --git a/Content.Server/Corvax/ChatFilter/ChatSystem.cs b/Content.Server/Corvax/ChatFilter/ChatSystem.cs
@@ -112,8 +112,13 @@ public sealed partial class ChatSystem
         { "шатл", "шаттл" },
         { "т.д", "так далее" },
         { "тд", "так далее" },
-        // { "сщ", "синий щит" },
+        { "сщ", "синий щит" },
+        { "осщ", "синий щит" },
         { "пр", "привет" },
+        { "кринж", "стыдоба" },
+        { "пздц", "пиздец" },
+        { "пон ", "понятно" },
+        { "брух", "безумие" },
         // { "меда", "медицинского отсека" },
         // { "меду", "медицинскому отсеку" },
         // { "ио", "инженерный отдел" },

diff --git a/Resources/Audio/Effects/adminhelpbread4.ogg b/Resources/Audio/Effects/adminhelpbread4.ogg
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl
@@ -133,3 +133,11 @@ ent-ADTPlushieAzalia = плюшевая Азалия
 ent-ADTPlushieSofy = Софи
     .desc = Милая плюшевая игрушка, так и хочется её обнять.
     .suffix = { "" }
+
+ent-ADTPlushieLiexer = Плюшевая Кетуя
+    .desc = Мягкая и пушистая игрушка... О боже! У нее топор! Пахнет мандаринами.
+    .suffix = { "" }
+
+ent-ADTPlushieMa = Ма-Роут
+    .desc = Дружелюбный Кобольд музыкант. Если нажать на него, он произнёс слова поддержки. Всё тело в царапинах. Пахнет отчаянием.
+    .suffix = { "" }
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
@@ -424,3 +424,23 @@
     sprite: ADT/Objects/Fun/toys.rsi
     state: plushie_sofy
 
+- type: entity
+  parent: BasePlushie
+  id: ADTPlushieLiexer
+  name: Ketua
+  description: It looks like a soft and cute blondie.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
+    state: plushie_liexer
+
+- type: entity
+  parent: BasePlushie
+  id: ADTPlushieMa
+  name: Ma
+  description: It looks like a soft and cute blondie.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
+    state: plushie_ma
+
diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/tree/f83a6bb2ab5623f700d7732a432e7e50f1f4a571; inhand-left, inhand-right, imera, aurora by discord:Van#1931; sisa, slarsha, nukie, rocker, red by discord:SMN - SAY MY NAME, not SeMeN#8129",
+    "copyright": "Created ADT team",
     "size": {
         "x": 32,
         "y": 32
@@ -108,6 +108,12 @@
         },
         {
             "name": "plushie_sofy"
+        },
+        {
+            "name": "plushie_liexer"
+        },
+        {
+            "name": "plushie_ma"
         }
     ]
 }

diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_liexer.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_liexer.png
diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_ma.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_ma.png