give more borg modules hands

Content.Shared/_DV/Whitelist/ElectronicsComponent.cs

@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Whitelist;
+
+/// <summary>
+/// Marker component for any electronics whitelisting without having to copy paste infinite tags.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ElectronicsComponent : Component;

Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml

@@ -17,3 +17,4 @@
       Glass: 200
     chemicalComposition:
       Silicon: 20
+  - type: Electronics # DeltaV

Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml

@@ -15,6 +15,7 @@
   - type: Tag
     tags:
     - Sheet
+    - BorgMaterial # DeltaV
   - type: Material
   - type: Damageable
     damageContainer: Inorganic

Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml

@@ -15,6 +15,7 @@
     tags:
     - Sheet
     - Metal
+    - BorgMaterial # DeltaV
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml

@@ -149,6 +149,7 @@
     tags:
     - Plastic
     - Sheet
+    - BorgMaterial # DeltaV
   - type: Material
   - type: PhysicalComposition
     materialComposition:

Resources/Prototypes/Entities/Objects/Materials/parts.yml

@@ -71,6 +71,10 @@
   - type: GuideHelp
     guides:
     - ExpandingRepairingStation
+  - type: Tag # DeltaV
+    tags:
+    # no RodMetal 1 because ???
+    - BorgMaterial
 
 - type: entity
   parent: PartRodMetal
@@ -81,6 +85,7 @@
   - type: Tag
     tags:
     - RodMetal1
+    - BorgMaterial # DeltaV
   - type: Sprite
     state: rods
   - type: Stack
@@ -95,6 +100,7 @@
   - type: Tag
     tags:
     - RodMetal1
+    - BorgMaterial # DeltaV
   - type: Sprite
     state: rods
   - type: Stack

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

@@ -121,6 +121,19 @@
     - CableHVStackLingering10
     - Wirecutter
     - trayScanner
+    # Begin DeltaV Additions - wires module can assemble electronics
+    droppableItems:
+    - id: APCElectronics
+      whitelist:
+        components:
+        - Electronics
+        - MachineBoard
+    - id: DoorElectronics
+      whitelist:
+        components:
+        - Electronics
+        - MachineBoard
+    # End DeltaV Additions
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module }
 
@@ -304,11 +317,32 @@
     - state: engineering
     - state: icon-construction
   - type: ItemBorgModule
-    items:
-    - SheetSteelLingering0
-    - SheetGlassLingering0
-    - PartRodMetalLingering0
-    - FloorTileItemSteelLingering0
+    # Begin DeltaV Removals - replaced by hands
+    #items:
+    #- SheetSteelLingering0
+    #- SheetGlassLingering0
+    #- PartRodMetalLingering0
+    #- FloorTileItemSteelLingering0
+    # End DeltaV Removals
+    # Begin DeltaV Additions
+    droppableItems:
+    - id: SheetSteel1
+      whitelist:
+        tags:
+        - BorgMaterial
+    - id: SheetGlass1
+      whitelist:
+        tags:
+        - BorgMaterial
+    - id: PartRodMetal1
+      whitelist:
+        tags:
+        - BorgMaterial
+    - id: FloorTileItemSteel
+      whitelist:
+        components:
+        - FloorTile
+    # End DeltaV Additions
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: construction-module }
 
@@ -417,11 +451,32 @@
   - type: ItemBorgModule
     items:
     - HandheldHealthAnalyzerUnpowered
-    - Brutepack10Lingering
-    - Ointment10Lingering
-    - Gauze10Lingering
-    - Bloodpack10Lingering
+    # Begin DeltaV Removals - replaced by hands
+    #- Brutepack10Lingering
+    #- Ointment10Lingering
+    #- Gauze10Lingering
+    #- Bloodpack10Lingering
+    # End DeltaV Removals
     - Syringe
+    # Begin DeltaV Additions
+    droppableItems:
+    - id: Brutepack
+      whitelist:
+        components:
+        - Healing # these include ANY healing item, including tourniquets and oilpacks/lv for ipcs
+    - id: Ointment
+      whitelist:
+        components:
+        - Healing
+    - id: Gauze
+      whitelist:
+        components:
+        - Healing
+    - id: Bloodpack
+      whitelist:
+        components:
+        - Healing
+    # End DeltaV Additions
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
 
@@ -552,10 +607,33 @@
     - state: service
     - state: icon-musique
   - type: ItemBorgModule
-    items:
-    - SynthesizerInstrument
-    - ElectricGuitarInstrument
-    - SaxophoneInstrument
+    # Begin DeltaV Removals - replaced by hands
+    #items:
+    #- SynthesizerInstrument
+    #- ElectricGuitarInstrument
+    #- SaxophoneInstrument
+    # End DeltaV Removals
+    # Begin DeltaV Additions
+    droppableItems:
+    - id: SynthesizerInstrument
+      whitelist:
+        requireAll: true # no picking up harpies or grand pianos
+        components:
+        - Instrument
+        - Item
+    - id: ElectricGuitarInstrument
+      whitelist:
+        requireAll: true
+        components:
+        - Instrument
+        - Item
+    - id: SaxophoneInstrument
+      whitelist:
+        requireAll: true
+        components:
+        - Instrument
+        - Item
+    # End DeltaV Additions
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: musical-module }
 

Resources/Prototypes/_DV/tags.yml

@@ -13,22 +13,7 @@
   id: BorgSecurityArmour
 
 - type: Tag
-  id: BorgSecurityHead
-
-- type: Tag
-  id: BorgSecurityLArm
-
-- type: Tag
-  id: BorgSecurityLLeg
-
-- type: Tag
-  id: BorgSecurityRArm
-
-- type: Tag
-  id: BorgSecurityRLeg
-
-- type: Tag
-  id: BorgSecurityTorso
+  id: BorgMaterial # for materials that can be used in a borg construction module
 
 - type: Tag
   id: BulletBB