Merge branch 'new-frontiers-14:master' into master

Corvax-Frontier · Apr 8, 2024 · 7d6019d · 7d6019d
2 parents b1e110e + f6291b7
commit 7d6019d
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 570 deletions.
diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
@@ -38,7 +38,7 @@ private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent
             _actionsSystem.AddAction(uid, ref component.WakeAction, WakeActionId, uid);
 
             // TODO remove hardcoded time.
-            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15));
+            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(5));
 
             if (TryComp<AutoWakeUpComponent>(uid, out var autoWakeUp))  // Frontier
             {

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3956,3 +3956,15 @@ Entries:
       message: Added the SBB Bookworm, a medium-sized library ship.
   id: 4903
   time: '2024-04-08T05:42:23.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: Tranquilizer shells now come with with less amount of CH.
+  id: 4904
+  time: '2024-04-08T19:57:02.0000000+00:00'
+- author: GreaseMonk
+  changes:
+    - type: Fix
+      message: Fixed missing HV cable on Stratos SMES unit.
+  id: 4905
+  time: '2024-04-08T19:59:32.0000000+00:00'