rework but real

Author: ThatGuyUSA

Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml

@@ -37,10 +37,8 @@
       - MMIFilled
       borg_module:
       - XenoborgModuleBasic
-      - BorgModuleAdvancedTool
-      - BorgModuleConstruction
-      - XenoborgModuleRCD
-      - BorgModuleCable
+      - XenoborgModuleAdvancedTool
+      - XenoborgModuleConstruction
       - XenoborgModuleAccessBreaker
   - type: ShowElectrocutionHUD
   - type: ShowHealthBars
@@ -266,10 +264,8 @@
       - MMI
       borg_module:
       - XenoborgModuleBasic
-      - BorgModuleAdvancedTool
-      - BorgModuleConstruction
-      - XenoborgModuleRCD
-      - BorgModuleCable
+      - XenoborgModuleAdvancedTool
+      - XenoborgModuleConstruction
       - XenoborgModuleAccessBreaker
   - type: ItemSlots
     slots:

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -1473,40 +1473,87 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-tool-module }
 
+- type: entity
+  id: XenoborgModuleAdvancedTool
+  parent: [ BaseXenoborgModuleEngi, BaseProviderBorgModule, BaseXenoborgContraband ]
+  name: advanced tool xenoborg module
+  description: Advanced engineering module containing advanced xenoborg technology.
+  components:
+  - type: Sprite
+    layers:
+    - state: xenoborg_engi
+    - state: icon-xenoborg-construction
+  - type: ItemBorgModule
+    hands:
+    - item: XenoborgJawsOfLife
+    - item: PowerDrill
+    - item: WelderExperimental
+    - item: Multitool
+    - item: trayScanner
+    - item: RCDXenoborg
+    - item: SelfRechargingFireExtinguisher
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-adv-tools-module }
+
 - type: entity
   parent: [ BaseXenoborgModuleEngi, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleAccessBreaker
   name: access breaker xenoborg module
-  description: Module with a access breaker.
+  description: Module with an access breaker.
   components:
   - type: Sprite
     layers:
     - state: xenoborg_engi
     - state: icon-xenoborg-access-breaker
   - type: ItemBorgModule
     hands:
-    - item: AccessBreaker
+    - item: XenoborgAccessBreaker
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-access-breaker-module }
 
 - type: entity
+  id: XenoborgModuleConstruction
   parent: [ BaseXenoborgModuleEngi, BaseProviderBorgModule, BaseXenoborgContraband ]
-  id: XenoborgModuleRCD
-  name: RCD xenoborg module
-  description: Module with a xenoborg RCD.
+  name: construction xenoborg module
   components:
   - type: Sprite
     layers:
     - state: xenoborg_engi
-    - state: icon-xenoborg-rcd
+    - state: icon-xenoborg-construction
   - type: ItemBorgModule
     hands:
-    - item: RCDXenoborg
-    - item: SelfRechargingFireExtinguisher
-    - item: BorgHandheldGPSBasic
-    - item: PinpointerMothership
+    - hand:
+        emptyRepresentative: BorgModuleConstructionMaterialPlaceholder
+        emptyLabel: borg-slot-construction-empty
+        whitelist:
+          tags:
+          - ConstructionMaterial
+    - hand:
+        emptyRepresentative: CableApcStack10
+        emptyLabel: borg-slot-cables-empty
+        whitelist:
+          tags:
+          - CableCoil
+    - hand:
+        emptyRepresentative: FloorTileItemXenoborg
+        emptyLabel: borg-slot-tiles-empty
+        whitelist:
+          components:
+          - FloorTile
+    - hand:
+        emptyRepresentative: MicroManipulatorStockPart
+        emptyLabel: borg-slot-construction-empty
+        whitelist:
+          tags:
+          - ConstructionMaterial
+    - hand:
+        emptyRepresentative: SpaceHeaterFlatpack
+        emptyLabel: borg-slot-flatpacks-empty
+        whitelist:
+          components:
+          - Flatpack
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-rcd-module }
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-construction-module }
 
 - type: entity
   parent: [ BaseXenoborgModuleEngi, BaseProviderBorgModule, BaseXenoborgContraband ]

Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml

@@ -10,7 +10,7 @@
     emagType: Access
   - type: Sprite
     sprite: Objects/Tools/access_breaker.rsi
-    state: icon
+    state: syndi-icon
   - type: Item
     sprite: Objects/Tools/access_breaker.rsi
 
@@ -23,3 +23,19 @@
   - type: AutoRecharge
   - type: StaticPrice
     price: 2000
+
+- type: entity
+  parent: [BaseItem, BaseXenoborgContraband]
+  id: XenoborgAccessBreaker
+  suffix: Limited
+  name: xenoborg authentication disruptor
+  description: An access scrubbing device, engineered by xenoborgs for disrupting digital locks.
+  components:
+  - type: Emag
+    emagImmuneTag: AccessBreakerImmune
+    emagType: Access
+  - type: LimitedCharges
+  - type: AutoRecharge
+  - type: Sprite
+    sprite: Objects/Tools/access_breaker.rsi
+    state: xorg-icon

Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml

@@ -89,3 +89,41 @@
         Blunt: 14
   - type: StaticPrice
     price: 1000
+
+- type: entity
+  name: xenoborg jaws of death
+  parent: [JawsOfLife, BaseXenoborgContraband ]
+  id: XenoborgJawsOfLife
+  description: Useful for prying open bolted doors where organics are hiding.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/jaws_of_life.rsi
+    state: xorg_jaws_pry
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: xorg_inhand-left
+      right:
+      - state: xorg_inhand-right
+    size: Normal
+  - type: Prying
+    force: true
+    speedModifier: 3.0
+  - type: MultipleTool
+    entries:
+    - behavior: Prying
+      sprite:
+        sprite: Objects/Tools/jaws_of_life.rsi
+        state: xorg_jaws_pry
+      useSound: /Audio/Items/jaws_pry.ogg
+      changeSound: /Audio/Items/change_jaws.ogg
+    - behavior: Cutting
+      sprite:
+        sprite: Objects/Tools/jaws_of_life.rsi
+        state: xorg_jaws_cutter
+      useSound: /Audio/Items/jaws_cut.ogg
+      changeSound: /Audio/Items/change_jaws.ogg
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 14

Resources/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml

@@ -61,17 +61,12 @@
   [bold]Starting exclusive modules:[/bold]
   <Box>
     <GuideEntityEmbed Entity="XenoborgModuleAccessBreaker" Caption="access breaker xenoborg module"/>
-    <GuideEntityEmbed Entity="XenoborgModuleRCD" Caption="xenoborg RCD module"/>
   </Box>
 
   [bold]The Engineer Xenoborg also starts with some engineering modules, such as:[/bold]
   <Box>
-    <GuideEntityEmbed Entity="BorgModuleAdvancedTool" Caption="advanced tool cyborg module"/>
-    <GuideEntityEmbed Entity="BorgModuleConstruction" Caption="construction cyborg module"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="BorgModuleRCD" Caption="engineering cyborg module"/>
-    <GuideEntityEmbed Entity="BorgModuleCable" Caption="cable cyborg module"/>
+    <GuideEntityEmbed Entity="XenoborgModuleAdvancedTool" Caption="advanced tool cyborg module"/>
+    <GuideEntityEmbed Entity="XenoborgModuleConstruction" Caption="construction cyborg module"/>
   </Box>
 
   ### The Heavy Xenoborg

Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json

@@ -130,12 +130,18 @@
         {
             "name":"xenoborg-access-breaker-module"
         },
+        {
+            "name":"xenoborg-adv-tools-module"
+        },
         {
             "name":"xenoborg-basic-module"
         },
         {
             "name":"xenoborg-camera-computer"
         },
+        {
+            "name":"xenoborg-construction-module"
+        },
         {
             "name":"xenoborg-control-computer"
         },
@@ -166,9 +172,6 @@
         {
             "name":"xenoborg-projector-module"
         },
-        {
-            "name":"xenoborg-rcd-module"
-        },
         {
             "name":"xenoborg-space-movement-module"
         },