Merge remote-tracking branch 'refs/remotes/sunrise_public/master'

space-sunrise · Jan 20, 2025 · 464480b · 464480b
2 parents e3c6240 + e295eb5
commit 464480b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -10947,3 +10947,12 @@
   id: 760
   time: '2025-01-20T02:34:08.0000000+00:00'
   url: https://github.com/space-sunrise/space-station-14/pull/1138
+- author: VigersRay
+  changes:
+  - message: "\u0422\u0435\u0440\u043C\u0438\u043D\u0430\u0442\u043E\u0440\u0430 \u0431\
+      \u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F \u0432\u0432\
+      \u0435\u0441\u0442\u0438 \u0432 \u0441\u0442\u0430\u043D \u043A\u0440\u0438\u0442\
+      ."
+    type: Tweak
+  id: 761
+  time: '2025-01-20T03:49:26.010199+00:00'
diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
@@ -22,9 +22,9 @@
         Blunt: 0.1
   # 4x stamina, faster recovery
   - type: Stamina
-    decay: 6
+    decay: 50
     cooldown: 1
-    critThreshold: 400
+    critThreshold: 1000
   # immune to space drugs, pax, temporary blindness
   - type: StatusEffects
     allowed: