Quadborg Collars

Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml

@@ -4,10 +4,20 @@
   abstract: true
   components:
   - type: Clothing
-    slots: [neck , accessory, accessoryalt]
+    # HardLight start
+    slots: [ neck, accessory, accessoryalt ]
+    clothingVisuals:
+      neck:
+      - state: equipped-NECK
+      neck-quadborg:
+      - state: equipped-NECK-quadborg
+    # HardLight end
   - type: LeashAnchor
     offset: 0, 0.22
     kind: Clothing
+  - type: Tag # HardLight
+    tags:
+    - BorgWearable
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -19,6 +29,10 @@
     sprite: Floof/Clothing/Neck/collar_blue.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_blue.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_blue_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -30,6 +44,10 @@
     sprite: Floof/Clothing/Neck/collar_black.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_black.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_black_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -41,6 +59,10 @@
     sprite: Floof/Clothing/Neck/collar_pink.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_pink.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_pink_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -52,6 +74,10 @@
     sprite: Floof/Clothing/Neck/collar_epi.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_epi.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_epi_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -63,6 +89,10 @@
     sprite: Floof/Clothing/Neck/collar_engi.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_engi.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_engi_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -74,8 +104,12 @@
     sprite: Floof/Clothing/Neck/collar_logi.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_logi.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_logi_quad.rsi
+        state: equipped-NECK-quadborg
 
-#HL Start
+# HardLight start
 - type: entity
   parent: ClothingNeckCollarBase
   id: ClothingNeckCollarMed
@@ -86,7 +120,11 @@
     sprite: Floof/Clothing/Neck/collar_med.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_med.rsi
-#HL End
+    clothingVisuals:
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_med_quad.rsi
+        state: equipped-NECK-quadborg
+# HardLight end
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -98,6 +136,10 @@
     sprite: Floof/Clothing/Neck/collar_sec.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_sec.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_sec_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -109,6 +151,10 @@
     sprite: Floof/Clothing/Neck/collar_cmd.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_cmd.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_cmd_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -120,6 +166,10 @@
     sprite: Floof/Clothing/Neck/collar_cc.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_cc.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_cc_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingNeckCollarBase
@@ -131,3 +181,7 @@
     sprite: Floof/Clothing/Neck/collar_syndi.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_syndi.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_syndi_quad.rsi
+        state: equipped-NECK-quadborg

Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml

@@ -5,6 +5,7 @@
   - type: Body
     prototype: Quadborg
   - type: Inventory
+    speciesId: quadborg
     templateId: borgquad #Hardlight - Changes Quadborgs over to use our armor slots
   - type: Sprite
     sprite: Floof/Mobs/Silicon/quad.rsi

Resources/Prototypes/Floof/Entities/Objects/Devices/shock_collar.yml

@@ -1,14 +1,18 @@
-# Floofstation - port from EE, which got it from Delta-V, which got it from Nyanotrasen
+# Floofstation: Port from EE, which got it from Delta-V, which got it from Nyanotrasen
 - type: entity
   parent: ClothingNeckCollarBase
   id: ClothingNeckShockCollar
   name: shock collar
-  description: Shocking. # DeltaV: sprite is fine
+  description: Shocking. # DeltaV: Sprite is fine
   components:
   - type: Sprite
     sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_shock_quad.rsi
+        state: equipped-NECK-quadborg
     equipDelay: 1
     unequipDelay: 10 # It's a collar meant to be used on prisoners (or not), so it probably has some sort of safety.
   - type: ShockOnTrigger
@@ -24,6 +28,6 @@
   - type: DeviceLinkSink
     ports:
     - Trigger
-  - type: LeashAnchor # floofstation
+  - type: LeashAnchor # Floofstation
     offset: 0, 0.22
     kind: Clothing

Resources/Prototypes/_HL/Entities/Objects/Nanotrasen/clothing.yml

@@ -90,6 +90,10 @@
     sprite: _HL/Nanotrasen/collar_nano.rsi
   - type: Clothing
     sprite: _HL/Nanotrasen/collar_nano.rsi
+    clothingVisuals:
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_nt_quad.rsi
+        state: equipped-NECK-quadborg
 
 - type: entity
   parent: ClothingUniformBaseThongs

Resources/Prototypes/_HL/InventoryTemplates/borgs.yml

@@ -6,6 +6,15 @@
 - type: inventoryTemplate
   id: borgquad
   slots:
+  - name: neck
+    slotTexture: neck
+    slotFlags: NECK
+    uiWindowPos: 0,2
+    strippingWindowPos: 0,1
+    displayName: Neck
+    whitelist:
+      tags:
+        - BorgWearable
   - name: id
     slotTexture: id
     slotFlags: IDCARD

Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml

@@ -20,7 +20,7 @@
     - Crucifix
 
 - type: entity
-  parent: ClothingNeckCollarBase # Floofstation - changed from ClothingNeckBase
+  parent: ClothingNeckCollarBase # Floofstation: Changed from ClothingNeckBase
   id: ClothingNeckBellCollar
   name: bell collar
   description: A way to inform others about your presence, or just to annoy everyone around you!
@@ -29,6 +29,10 @@
     sprite: _NF/Clothing/Neck/bellcollar.rsi
   - type: Clothing
     sprite: _NF/Clothing/Neck/bellcollar.rsi
+    clothingVisuals: # HardLight
+      neck-quadborg:
+      - sprite: _HL/Clothing/Neck/QuadCollars/collar_bell_quad.rsi
+        state: equipped-NECK-quadborg
   - type: EmitsSoundOnMove
     soundCollection:
       collection: FootstepJester

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_bell_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_black_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_blue_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_cc_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_cmd_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_engi_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_epi_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_logi_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_med_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_nt_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_pink_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_sec_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_shock_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}

Resources/Textures/_HL/Clothing/Neck/QuadCollars/collar_syndi_quad.rsi/meta.json

@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by GitHub NotLivyathan / Discord livyathan (298907041198637067)",
+  "size": { "x": 64, "y": 64 },
+  "states": [
+    { "name": "equipped-NECK-quadborg", "directions": 4 }
+  ]
+}