Merge remote-tracking branch 'origin/master'

Author: VigersRay

Content.Server/Speech/EntitySystems/OwOAccentSystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.Speech.Components;
-using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
 {
@@ -8,9 +7,24 @@ public sealed class OwOAccentSystem : EntitySystem
         private static readonly IReadOnlyDictionary<string, string> SpecialWords = new Dictionary<string, string>()
         {
             { "you", "wu" },
+            { "You", "Wu"},
+            { "cute", "kawaii" },
+            { "Cute", "Kawaii" },
+            { "cat", "kitty" },
+            { "Cat", "Kitty" },
+            { "kiss", "mwah" },
+            { "Kiss", "Mwah" },
+            { "good", "guwd" },
+            { "Good", "Guwd" },
+            { "no", "nuu" },
+            { "No", "Nuu" },
             { "ты", "ти" }, // Russian-Localization
+            { "Ты", "Ти" },
+            { "маленький", "мавенки" },
+            { "Маленький", "Мавенки" },
         };
 
+
         public override void Initialize()
         {
             SubscribeLocalEvent<OwOAccentComponent, AccentGetEvent>(OnAccent);

Resources/Changelog/ChangelogSunrise.yml

@@ -1979,3 +1979,16 @@
   id: 149
   time: '2024-07-24T23:01:01.0000000+00:00'
   url: https://github.com/space-sunrise/space-station-14/pull/239
+- author: Focstor
+  changes:
+  - message: "\u0428\u043B\u0435\u043C\u044B \u0441\u043A\u0430\u0444\u0430\u043D\u0434\
+      \u0440\u043E\u0432 \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043E\u0432, \u041E\
+      \u0411\u0420, \u0421\u0411, \u044D\u0441\u043A\u0430\u0434\u0440\u043E\u043D\
+      \u0430, \u0430\u0442\u043C\u043E\u0441\u043E\u0432 \u0438 \u0421\u0418 \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u0438\u043C\u0435\u044E\u0442 \u0437\u0430\u0449\
+      \u0438\u0442\u0443 \u043E\u0442 \u0441\u0432\u0430\u0440\u043A\u0438 \u0438\
+      \ \u0432\u0441\u043F\u044B\u0448\u0435\u043A"
+    type: Tweak
+  id: 150
+  time: '2024-07-26T01:30:53.0000000+00:00'
+  url: https://github.com/space-sunrise/space-station-14/pull/241

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -63,6 +63,8 @@
     coefficient: 0.005
   - type: FireProtection
     reduction: 0.2
+  - type: EyeProtection
+  - type: FlashImmunity
 
 #Engineering Hardsuit
 - type: entity
@@ -80,6 +82,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.1
     lowPressureMultiplier: 1000
+  - type: EyeProtection
+  - type: FlashImmunity
 
 #Spationaut Hardsuit
 - type: entity
@@ -180,6 +184,7 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: FlashImmunity
 
 #Brigmedic Hardsuit
 - type: entity
@@ -206,6 +211,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
+  - type: FlashImmunity
 
 #Warden's Hardsuit
 - type: entity
@@ -230,6 +236,7 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: FlashImmunity
 
 #Captain's Hardsuit
 - type: entity
@@ -264,6 +271,8 @@
     lowPressureMultiplier: 1000
   - type: FireProtection
     reduction: 0.2
+  - type: EyeProtection
+  - type: FlashImmunity
 
 #Chief Medical Officer's Hardsuit
 - type: entity
@@ -322,6 +331,7 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: FlashImmunity
 
 #Luxury Mining Hardsuit
 - type: entity
@@ -558,6 +568,7 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: FlashImmunity
 
 #ERT Chaplain Hardsuit
 - type: entity
@@ -572,6 +583,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
   - type: PointLight
     color: "#ffffff"
+  - type: FlashImmunity
 
 #ERT Engineer Hardsuit
 - type: entity
@@ -593,6 +605,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: FlashImmunity
+  - type: EyeProtection
 
 #ERT Medical Hardsuit
 - type: entity
@@ -607,6 +621,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
   - type: PointLight
     color: "#adffec"
+  - type: FlashImmunity
 
 #ERT Security Hardsuit
 - type: entity
@@ -628,6 +643,7 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: FlashImmunity
 
 #ERT Janitor Hardsuit
 - type: entity
@@ -642,6 +658,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
   - type: PointLight
     color: "#cbadff"
+  - type: FlashImmunity
 
 #CBURN Hardsuit
 - type: entity
@@ -709,6 +726,8 @@
         Heat: 0.80
         Radiation: 0.80
         Caustic: 0.95
+  - type: FlashImmunity
+  - type: EyeProtection
 
 #MISC. HARDSUITS
 #Clown Hardsuit

Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml

@@ -5,11 +5,12 @@
   id: MobFelinidBase
   abstract: true
   components:
+  - type: OwOAccent
   - type: Speech
     speechVerb: Felinid
     allowedEmotes: ['Mew', 'Meow', 'Hisses', 'Purr']
   - type: Sprite
-    scale: 0.75, 0.75
+    scale: 0.95, 0.95
   - type: HumanoidAppearance
     species: Felinid
   - type: Fixtures
@@ -29,15 +30,6 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Felinid
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      50: Critical
-      100: Dead
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      30: 0.7
-      40: 0.5
   - type: MeleeWeapon
     hidden: true
     soundHit:
@@ -56,7 +48,7 @@
     soundHit:
       path: /Audio/Effects/hit_kick.ogg
   - type: Stamina
-    critThreshold: 50
+    critThreshold: 100
   - type: Vocal
     sounds:
       Male: MaleFelinid
@@ -89,9 +81,6 @@
       - !type:Emote
         emote: Hisses
         showInChat: true
-  - type: MovementSpeedModifier
-    baseSprintSpeed: 4.0
-    baseWalkSpeed: 2.0
 
 - type: entity
   save: false

Resources/Prototypes/_Sunrise/Species/felinid.yml

@@ -7,9 +7,6 @@
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
   skinColoration: HumanToned
-  YoungAge: 23
-  OldAge: 25
-  MaxAge: 27
 
 - type: markingPoints
   id: MobFelinidMarkingLimits

Resources/Prototypes/_Sunrise/Traits/speech.yml

@@ -0,0 +1 @@
+