Cherry-Pick Antag Refactor (Simple-Station#734)

This cherry-pick's Wizden's Antag Refactor, which is needed for all future antag updates, as well as for me to cherry-pick over Cultists(Who are going to need some editing to fit the antag refactor), Changelings, Heretics, and Wizards. I actually selected the White-Dream-Public version of the Antag Refactor, due to it having commits made tailored to our repository, so it comes prepackaged with all the changes necessary for our repo-specific content. https://github.com/frosty-dev/ss14-wwdp/pull/10 Signed-off-by: Timemaster99 <[email protected]> Co-authored-by: ThereDrD <[email protected]> Co-authored-by: Jeff <[email protected]> Co-authored-by: Timemaster99 <[email protected]> Co-authored-by: Timemaster99 <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Danger Revolution! <[email protected]> Co-authored-by: Azzy <[email protected]>
tmcqueen · Aug 24, 2024 · 0a7189b · 0a7189b
1 parent 1c5ae47
commit 0a7189b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -15,6 +15,8 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
+using Content.Server.GameTicking.Components;
+using Content.Server.Traitor.Components;
 
 namespace Content.Server.GameTicking.Rules;
 

diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -60,7 +60,6 @@ public sealed partial class ZombieSystem
         [Dependency] private readonly MindSystem _mind = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies
 
         /// <summary>
         /// Handles an entity turning into a zombie when they die or go into crit

diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -40,3 +40,23 @@
     department: Command
     min: 36000 # DeltaV - 10 hours
   - !type:CharacterWhitelistRequirement
+
+#Lone Operative Gear
+- type: startingGear
+  id: SyndicateLoneOperativeGearFull
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackDuffelSyndicateOperative
+    mask: ClothingMaskGasSyndicate
+    eyes: ClothingEyesHudSyndicate
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitSyndie
+    shoes: ClothingShoesBootsCombatFilled
+    id: SyndiPDA
+    pocket1: DoubleEmergencyOxygenTankFilled
+    pocket2: BaseUplinkRadio40TC
+    belt: ClothingBeltMilitaryWebbing
+  innerClothingSkirt: ClothingUniformJumpskirtOperative
+  satchel: ClothingBackpackDuffelSyndicateOperative
+  duffelbag: ClothingBackpackDuffelSyndicateOperative