From a7a7db5ff1d7fde35a779e541102d9e481f71714 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 30 Aug 2025 00:40:24 +0200
Subject: [PATCH 1/2] Don't network ZombifyOnDeathComponent and
 ZombieImmuneComponent (#39963)

no networking
---
 Content.Shared/Zombies/ZombieImmuneComponent.cs   | 2 +-
 Content.Shared/Zombies/ZombifyOnDeathComponent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Zombies/ZombieImmuneComponent.cs b/Content.Shared/Zombies/ZombieImmuneComponent.cs
index 18ad228363..483b1810f2 100644
--- a/Content.Shared/Zombies/ZombieImmuneComponent.cs
+++ b/Content.Shared/Zombies/ZombieImmuneComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Zombies;
 /// <summary>
 /// Entities with this component cannot be zombified.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent]
 public sealed partial class ZombieImmuneComponent : Component
 {
     //still no
diff --git a/Content.Shared/Zombies/ZombifyOnDeathComponent.cs b/Content.Shared/Zombies/ZombifyOnDeathComponent.cs
index 138ea6e409..60029aca6f 100644
--- a/Content.Shared/Zombies/ZombifyOnDeathComponent.cs
+++ b/Content.Shared/Zombies/ZombifyOnDeathComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Zombies;
 /// <summary>
 /// Entities with this component zombify on death.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent]
 public sealed partial class ZombifyOnDeathComponent : Component
 {
     //this is not the component you are looking for

From 3d2877f3534da2119da5b5bd7f0ac00674410793 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Fri, 29 Aug 2025 16:28:28 -0700
Subject: [PATCH 2/2] [STAGING] 1984 Derelict Syndicate Borgs (#39978)

1984

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Mobs/Cyborgs/base_borg_chassis.yml        | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 4b170af6be..dd6f5a570b 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -389,7 +389,7 @@
 
 - type: entity
   id: BaseBorgChassisSyndicateDerelict #For assault borg and maybe others in time
-  parent: BaseBorgChassisSyndicate
+  parent: BaseBorgChassis # We don't want them to see Nukies or have syndi comms, their database is out of date
   abstract: true
   components:
   - type: SiliconLawProvider
@@ -399,6 +399,31 @@
   - type: IonStormTarget
     chance: 1
   - type: ShowJobIcons
+  - type: NpcFactionMember # They're still syndicate even if they can't listen to the radio or see icons
+    factions:
+    - Syndicate
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+  - type: AccessReader
+    access: [ [ "SyndicateAgent" ], [ "NuclearOperative" ] ]
+  - type: IntrinsicRadioTransmitter # Copy components from base SyndiBorg but without the stuff we don't want
+    channels:
+    - Binary #1984
+  - type: ActiveRadio
+    channels:
+    - Binary
+  - type: MovementAlwaysTouching
+  - type: Speech
+    speechSounds: SyndieBorg
+    allowedEmotes:
+    - Laugh
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconSyndicate
+  - type: PointLight
+    color: "#dd200b"
 
 - type: entity
   parent: BaseBorgChassisNotIonStormable