Merge remote-tracking branch 'upstream/master' into logitechdrip

DeltaV-Station · Jan 30, 2025 · f4468a9 · f4468a9
2 parents e1c9c13 + 91de609
commit f4468a9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
@@ -30,7 +30,8 @@ protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);
 
-        if (state is not SiliconLawBuiState msg)
+        // DeltaV: add _menu is null check because apparently state gets sent before UI opens
+        if (_menu is null || state is not SiliconLawBuiState msg)
             return;
 
         if (_laws != null && _laws.Count == msg.Laws.Count)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,19 +1,4 @@
 Entries:
-- author: WarMechanic
-  changes:
-  - message: Fixed senior job titles not displaying properly
-    type: Fix
-  id: 463
-  time: '2024-08-06T21:20:49.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1425
-- author: Colin-Tel
-  changes:
-  - message: Added some alternate job titles that you're able to join the game as.
-      Check certain role loadouts to see if they have a different PDA you can wear!
-    type: Add
-  id: 464
-  time: '2024-08-08T15:07:01.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1584
 - author: Fox
   changes:
   - message: Nuclear Operative teams have started sending brazen war declarations
@@ -3870,3 +3855,17 @@
   id: 962
   time: '2025-01-30T04:17:25.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2770
+- author: kushbreth
+  changes:
+  - message: Added new uniforms for cargo techs
+    type: Add
+  id: 963
+  time: '2025-01-30T07:21:40.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2782
+- author: Toby222
+  changes:
+  - message: Fixed Silicon Law UI being blank
+    type: Fix
+  id: 964
+  time: '2025-01-30T20:49:14.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2818
diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml
@@ -124,6 +124,6 @@
     - UplinkAntimovObjectiveBoard
   - type: CodeCondition
   - type: AILawsUpdatedRequirement
-    lawset: AntimovLawset
+    lawset: SyndicateLawset
   - type: ObjectiveLimit
     limit: 1