Куча мелких фиксов

space-sunrise · Nov 15, 2024 · 39bb452 · 39bb452
1 parent 9e38ce3
commit 39bb452
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 2 deletions.
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -26,7 +26,6 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { "рофл", "chatsan-laughs" },
         { "яхз", "chatsan-shrugs" },
         { ":0", "chatsan-surprised" },
-        { ":р", "chatsan-stick-out-tongue" }, // cyrillic р
         { "кек", "chatsan-laughs" },
         { "T_T", "chatsan-cries" },
         { "Т_Т", "chatsan-cries" }, // cyrillic T

diff --git a/Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl b/Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl
@@ -9,3 +9,4 @@ chat-emote-name-meows = Мяукать
 chat-emote-name-vomit = Тошнота
 chat-emote-name-headache = Головная боль
 chat-emote-name-insult = Инсульт
+chat-emote-name-whines = Скулить
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
@@ -4,6 +4,7 @@
     ClothingBackpackDuffelAtmospherics: 2
     ClothingBackpackSatchelAtmospherics: 2
     ClothingBackpackAtmospherics: 2
+    MaterialBag: 3 # Sunrise-edit
     ClothingUniformJumpsuitAtmos: 3
     ClothingUniformJumpskirtAtmos: 3
     ClothingUniformJumpsuitAtmosCasual: 3

diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml
@@ -10,6 +10,8 @@
   - type: Accentless
     removes:
     - type: OwOAccent  # Sunrise-traits
+    - type: VulpaAccent # Sunrise-traits
+    - type: TajaranAccent # Sunrise-traits
     - type: LizardAccent
     - type: MothAccent
     - type: ReplacementAccent

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -365,6 +365,9 @@
    - gasp
    - gasps
    - gasped
+#Sunrise-start
+   - задыхается
+#Sunrise-end
 
 - type: emote
   id: DefaultDeathgasp

diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml
@@ -8,7 +8,7 @@
   - type: Absorbable
   - type: Speech
     speechVerb: Vulpkanin
-    allowedEmotes: ['Growl', 'Bark', 'Howl']
+    allowedEmotes: ['Growl', 'Bark', 'Howl', 'Whines']
   - type: HumanoidAppearance
     species: Vulpkanin
   - type: Icon

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml
@@ -29,6 +29,10 @@
         - RawMaterial
         - Tile
         - PowerCell
+        - PowerCellSmall
+        - Ingot
+        - DoorElectronics
+        - AirAlarmElectronics
         - CapacitorStockPart
         - MicroManipulatorStockPart
         - MatterBinStockPart

diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml
@@ -11,6 +11,8 @@
       collection: MaleSneezes
     Cough:
       collection: MaleCoughs
+    Sigh:
+      collection: MaleSigh
     Crying:
       collection: MaleCry
     Whistle:
@@ -39,6 +41,8 @@
       collection: FemaleSneezes
     Cough:
       collection: FemaleCoughs
+    Sigh:
+      collection: FemaleSigh
     Crying:
       collection: FemaleCry
     Whistle:

diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml
@@ -207,3 +207,24 @@
   name: chat-emote-name-insult
   category: Vocal
   chatMessages: [инсульт]
+
+- type: emote
+  id: Whines
+  name: chat-emote-name-whines
+  category: Vocal
+  available: false
+  icon: Interface/Emotes/cry.png
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-whines"]
+  chatTriggers:
+  - скулит.
+  - скулит!
+  - скулить.
+  - скулить!
+  - скулит
+  - скулить