From 3e7ee0c2ca7efd64311e97312a60e1b50a1a6927 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Sun, 7 Jan 2024 22:48:57 -0500
Subject: [PATCH] Syndicate cyborg changes/fixes (#23710)

---
 .../Mobs/Cyborgs/base_borg_chassis.yml        | 29 +++++++------------
 .../Entities/Mobs/Cyborgs/borg_chassis.yml    |  2 +-
 .../Specific/Robotics/borg_modules.yml        |  8 ++---
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 67323b4640..2f2a42388f 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -136,6 +136,9 @@
     containers:
     - part-container
     - cell_slot
+  - type: Lock
+    locked: true
+  - type: ActivatableUIRequiresLock
   - type: Flashable
   - type: Damageable
     damageContainer: Silicon
@@ -218,9 +221,6 @@
     enabled: false
     groups:
     - AllAccess
-  - type: Lock
-    locked: true
-  - type: ActivatableUIRequiresLock
   - type: AccessReader
     access: [["Command"], ["Research"]]
   - type: ShowSecurityIcons
@@ -230,24 +230,15 @@
   parent: BaseBorgChassis
   abstract: true
   components:
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:PlaySoundBehavior
-              sound: /Audio/Effects/metalbreak.ogg
-            - !type:EmptyContainersBehaviour
-              containers:
-                - borg_brain
-                - borg_module
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
     - type: NpcFactionMember
       factions:
         - Syndicate
     - type: Access
+      tags:
+       - NuclearOperative
+       - SyndicateAgent
+    - type: AccessReader
+      access: [["SyndicateAgent"], ["NuclearOperative"]]
     - type: SiliconLawProvider
       laws: SyndicateStatic
     - type: IntrinsicRadioTransmitter
@@ -257,5 +248,5 @@
     - type: ActiveRadio
       channels:
         - Syndicate
-    - type: NoSlip
-    - type: MovementAlwaysTouching
+    - type: ShowSyndicateIcons
+    - type: MovementAlwaysTouching
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 19783e205d..967e866c36 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -268,7 +268,7 @@
   id: BorgChassisSyndicateAssault
   parent: BaseBorgChassisSyndicate
   name: syndicate assault cyborg
-  description: A lean, mean killing machine with access to a varity of deadly modules.
+  description: A lean, mean killing machine with access to a variety of deadly modules.
   components:
     - type: Sprite
       layers:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index b3c0a779b8..eb8c90fc95 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -517,7 +517,7 @@
   id: BorgModuleOperative
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
   name: operative cyborg module
-  description: A module that comes with a crowbar, a Cobra pistol, an Emag and a pinpointer.
+  description: A module that comes with a crowbar, a Cobra pistol, an Emag and a syndicate pinpointer.
   components:
     - type: Sprite
       layers:
@@ -528,7 +528,7 @@
         - Crowbar
         - WeaponPistolCobra
         - Emag
-        - PinpointerNuclear
+        - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleEsword
@@ -543,7 +543,7 @@
     - type: ItemBorgModule
       items:
         - EnergySword
-        - PinpointerNuclear
+        - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleL6C
@@ -558,4 +558,4 @@
     - type: ItemBorgModule
       items:
         - WeaponLightMachineGunL6C
-        - PinpointerNuclear
+        - PinpointerSyndicateNuclear
-- 
2.51.2