Merge branch 'space-wizards:master' into looper2

space-wizards · Dec 19, 2024 · 9b1965c · 9b1965c
2 parents e86d47d + efa76be
commit 9b1965c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
@@ -44,7 +44,7 @@ public override void Update(float deltaTime)
             }
             if (comp.StateB == SignalState.Momentary)
             {
-                comp.StateB = SignalState.High;
+                comp.StateB = SignalState.Low;
             }
 
             // output most likely changed so update it

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: saintmuntzer
-  changes:
-  - message: Riot helmet now matches security helmet colors.
-    type: Fix
-  id: 7235
-  time: '2024-08-28T11:27:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31530
 - author: coolboy911
   changes:
   - message: wide-spectrum anomaly locator is now included in cyborg's anomaly module
@@ -3936,3 +3929,11 @@
   id: 7734
   time: '2024-12-19T09:38:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33697
+- author: Centronias
+  changes:
+  - message: Fixed a bug where the B input on logic gates would get stuck in a high
+      state
+    type: Fix
+  id: 7735
+  time: '2024-12-19T11:31:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33792