Fixes

Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs

@@ -4,8 +4,6 @@
 using Content.Client.UserInterface.ControlExtensions;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
-using Content.Client.UserInterface.Systems.Info; /// For the RuleEntry Check
-using Content.Client.Guidebook; /// For the RuleEntry Check
 using JetBrains.Annotations;
 using Content.Client.UserInterface.Systems.Info;
 using Robust.Client.AutoGenerated;

Content.Client/Guidebook/GuideEntry.cs

@@ -36,12 +36,6 @@ public class GuideEntry
 
     [DataField] public bool RuleEntry;
 
-    /// <summary>
-    ///     This enables the ability to remove a rule entry from the guidebook.
-    ///     When enabled in the yml guide entry, it will remove the guide entry from the guidebook.
-    /// </summary>
-    [DataField] public bool RuleEntry;
-
     /// <summary>
     ///     Priority for sorting top-level guides when shown in a tree / table of contents.
     ///     If the guide is the child of some other guide, the order simply determined by the order of children in <see cref="Children"/>.

Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs

@@ -23,6 +23,7 @@ public sealed partial class WarDeclaratorWindow : FancyWindow
     public WarDeclaratorWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
         WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope));
 

Resources/Changelog/Changelog.yml

@@ -12050,3 +12050,10 @@ Entries:
   id: 6881
   time: '2025-02-24T00:21:05.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1840
+- author: Timfa2112
+  changes:
+    - type: Add
+      message: Added cloth wraps to hands loadouts
+  id: 6882
+  time: '2025-02-25T02:16:52.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1841

Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml

@@ -19,3 +19,5 @@
       id: LoadoutHandsGlovesEnviroglovesColor
     - type: loadout
       id: LoadoutHandsGlovesEnviroglovesEvening
+    - type: loadout
+      id: LoadoutHandsClothWrap

Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml

@@ -29,6 +29,8 @@
       id: LoadoutBSOEnergyShield
     - type: loadout
       id: LoadoutBSORifleBRDIR25
+    - type: loadout
+      id: LoadoutBSOEnergyShotgun
 
 #- type: characterItemGroup
 #  id: LoadoutJOBEyes
@@ -98,23 +100,3 @@
       id: LoadoutClothingUniformJumpskirtBlueshieldOfficer
     - type: loadout
       id: LoadoutClothingUniformJumpsuitBlueshieldOfficer
-
-- type: characterItemGroup
-  id: LoadoutBlueshieldOfficerHats
-  maxItems: 1
-  items:
-    - type: loadout
-      id: LoadoutClothingBlueshieldBeretNavy
-    - type: loadout
-      id: LoadoutClothingBlueshieldBeretOfficer
-    - type: loadout
-      id: LoadoutClothingBlueshieldCowboyHat
-
-- type: characterItemGroup
-  id: LoadoutBlueshieldOfficerPrimaries
-  maxItems: 1
-  items:
-    - type: loadout
-      id: LoadoutBSORifleChester
-    - type: loadout
-      id: LoadoutBSOEnergyShotgun

Resources/Prototypes/Guidebook/security.yml

@@ -6,7 +6,6 @@
   - Forensics
   - Defusal
   - CriminalRecords
-  - SpaceLaw
 
 - type: guideEntry
   id: Forensics

Resources/Prototypes/Loadouts/Generic/hands.yml

@@ -95,3 +95,15 @@
       inverted: true
       species:
         - Plasmaman
+
+- type: loadout
+  id: LoadoutHandsClothWrap
+  category: Hands
+  cost: 0
+  exclusive: false
+  customColorTint: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutGloves
+  items:
+    - ClothingClothWrap