Adds crates for LV MV HV + Bulk to cargo (#3466)

* Initial

* Adds to cargo console

* Wires RSI sorted

* Deleted unused wire RSI

Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml

@@ -0,0 +1,47 @@
+- type: cargoProduct
+  name: "LV cables crate"
+  id: cargo.engineeringcablelv
+  description: "3 coils of LV cables."
+  icon:
+    sprite: Objects/Tools/cable-coils.rsi
+    state: coillv-30
+  product: CrateEngineeringCableLV
+  cost: 1000
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  name: "MV cables crate"
+  id: cargo.engineeringcablemv
+  description: "3 coils of MV cables."
+  icon:
+    sprite: Objects/Tools/cable-coils.rsi
+    state: coilmv-30
+  product: CrateEngineeringCableMV
+  cost: 1500
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  name: "HV cables crate"
+  id: cargo.engineeringcablehv
+  description: "3 coils of HV cables."
+  icon:
+    sprite: Objects/Tools/cable-coils.rsi
+    state: coilhv-30
+  product: CrateEngineeringCableHV
+  cost: 2000
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  name: "bulk cables crate"
+  id: cargo.engineeringcablebulk
+  description: "2 coils each for every cable type."
+  icon:
+    sprite: Objects/Tools/cable-coils.rsi
+    state: coilall-30
+  product: CrateEngineeringCableBulk
+  cost: 3000
+  category: Engineering
+  group: market

Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml

@@ -43,3 +43,47 @@
 #        amount: 3
 #      - name: PowerCellSmallAutorecharge
 #        amount: 3
+
+- type: entity
+  id: CrateEngineeringCableLV
+  name: LV cable crate
+  parent: CrateElectrical
+  components:
+  - type: StorageFill
+    contents:
+      - name: ApcExtensionCableStack
+        amount: 3
+
+- type: entity
+  id: CrateEngineeringCableMV
+  name: MV cable crate
+  parent: CrateElectrical
+  components:
+  - type: StorageFill
+    contents:
+      - name: MVWireStack
+        amount: 3
+
+- type: entity
+  id: CrateEngineeringCableHV
+  name: HV cable crate
+  parent: CrateElectrical
+  components:
+  - type: StorageFill
+    contents:
+      - name: HVWireStack
+        amount: 3
+
+- type: entity
+  id: CrateEngineeringCableBulk
+  name: bulk cable crate
+  parent: CrateElectrical
+  components:
+  - type: StorageFill
+    contents:
+      - name: HVWireStack
+        amount: 2
+      - name: MVWireStack
+        amount: 2
+      - name: ApcExtensionCableStack
+        amount: 2

Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml

@@ -31,6 +31,10 @@
       - cargo.hydroponicsseedsexotic
       - cargo.servicejanitorial
       - cargo.servicelightsreplacement
+      - cargo.engineeringcablelv
+      - cargo.engineeringcablemv
+      - cargo.engineeringcablehv
+      - cargo.engineeringcablebulk
       - cargo.engineameshielding
       - cargo.engineamejar
       - cargo.engineamecontrol

Resources/Prototypes/Entities/Constructible/Power/wires.yml

@@ -36,10 +36,10 @@
   decription: "An orange high voltage power cable."
   components:
   - type: Sprite
-    sprite: Constructible/Power/hv_cable.rsi
+    sprite: Constructible/Power/Wires/hv_cable.rsi
     state: hvcable_0
   - type: Icon
-    sprite: Constructible/Power/hv_cable.rsi
+    sprite: Constructible/Power/Wires/hv_cable.rsi
     state: hvcable_4
   - type: IconSmooth
     base: hvcable_
@@ -75,11 +75,11 @@
   components:
   - type: Sprite
     color: Yellow
-    sprite: Constructible/Power/mv_cable.rsi
+    sprite: Constructible/Power/Wires/mv_cable.rsi
     state: mvcable_0
   - type: Icon
     color: Yellow
-    sprite: Constructible/Power/mv_cable.rsi
+    sprite: Constructible/Power/Wires/mv_cable.rsi
     state: mvcable_4
   - type: IconSmooth
     base: mvcable_
@@ -115,11 +115,11 @@
   components:
   - type: Sprite
     color: Green
-    sprite: Constructible/Power/lv_cable.rsi
+    sprite: Constructible/Power/Wires/lv_cable.rsi
     state: lvcable_0
   - type: Icon
     color: Green
-    sprite: Constructible/Power/lv_cable.rsi
+    sprite: Constructible/Power/Wires/lv_cable.rsi
     state: lvcable_4
   - type: IconSmooth
     base: lvcable_
@@ -172,7 +172,7 @@
   name: HV Connector Wire
   components:
   - type: Sprite
-    sprite: Constructible/Power/hv_cable.rsi
+    sprite: Constructible/Power/Wires/hv_cable.rsi
     state: hvcable_0
   - type: IconSmooth
     base: hvcable_
@@ -185,7 +185,7 @@
   name: MV Connector Wire
   components:
   - type: Sprite
-    sprite: Constructible/Power/mv_cable.rsi
+    sprite: Constructible/Power/Wires/mv_cable.rsi
     state: mvcable_0
     color: Yellow
   - type: IconSmooth
@@ -199,7 +199,7 @@
   name: LV Connector Wire
   components:
   - type: Sprite
-    sprite: Constructible/Power/lv_cable.rsi
+    sprite: Constructible/Power/Wires/lv_cable.rsi
     state: lvcable_0
     color: Green
   - type: IconSmooth

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

@@ -1,6 +1,6 @@
 # If you're looking at the rsi for this file, you'll probably be confused why
 # I didn't just use an alpha for most of this stuff. Well icons don't have the
-# ability to have applied colors yet in GUIs. -Swept
+# ability to have applied colors yet in GUIs. And also inhands... -Swept
 
 - type: entity
   id: CableStack
@@ -12,10 +12,10 @@
     - type: Stack
       stackType: Cable
     - type: Sprite
-      sprite: Objects/Tools/cables.rsi
+      sprite: Objects/Tools/cable-coils.rsi
       netsync: false
     - type: Item
-      sprite: Objects/Tools/cables.rsi
+      sprite: Objects/Tools/cable-coils.rsi
     - type: WirePlacer
     - type: Clickable
 

Resources/Textures/Constructible/Power/power_cable.rsi/meta.json

@@ -1,59 +0,0 @@
-{
-	"version": 1,
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fcf375d7d9ce6ceed5c7face899725e5655ab640",
-	"states": [
-		{
-			"name": "cable_0"
-		},
-		{
-			"name": "cable_1"
-		},
-		{
-			"name": "cable_2"
-		},
-		{
-			"name": "cable_3"
-		},
-		{
-			"name": "cable_4"
-		},
-		{
-			"name": "cable_5"
-		},
-		{
-			"name": "cable_6"
-		},
-		{
-			"name": "cable_7"
-		},
-		{
-			"name": "cable_8"
-		},
-		{
-			"name": "cable_9"
-		},
-		{
-			"name": "cable_10"
-		},
-		{
-			"name": "cable_11"
-		},
-		{
-			"name": "cable_12"
-		},
-		{
-			"name": "cable_13"
-		},
-		{
-			"name": "cable_14"
-		},
-		{
-			"name": "cable_15"
-		},
-	]
-}

Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "license": "CC BY-SA 3.0",
+  "copyright": "Taken from tgstation and modified by SweptWasTaken at commit https://github.com/tgstation/tgstation/commit/77608a9f46b06a46f0f6b1be061755f68cc255a3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "coilhv-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coilhv-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "coilmv-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coilmv-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "coillv-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coillv-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "coil-30"
+    },
+    {
+      "name": "coil-20"
+    },
+    {
+      "name": "coil-10"
+    },
+    {
+      "name": "coilhv-30"
+    },
+    {
+      "name": "coilhv-20"
+    },
+    {
+      "name": "coilhv-10"
+    },
+    {
+      "name": "coilmv-30"
+    },
+    {
+      "name": "coilmv-20"
+    },
+    {
+      "name": "coilmv-10"
+    },
+    {
+      "name": "coillv-30"
+    },
+    {
+      "name": "coillv-20"
+    },
+    {
+      "name": "coillv-10"
+    },
+    {
+      "name": "coilall-30"
+    }
+  ]
+}

Resources/Textures/Objects/Tools/cables.rsi/meta.json

@@ -1,223 +0,0 @@
-{
-  "version": 1,
-  "license": "CC BY-SA 3.0",
-  "copyright": "Taken from tgstation and modified by SweptWasTaken at commit https://github.com/tgstation/tgstation/commit/77608a9f46b06a46f0f6b1be061755f68cc255a3",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "coilhv-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilhv-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilmv-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilmv-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coillv-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coillv-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coil-30",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coil-20",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coil-10",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilhv-30",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilhv-20",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilhv-10",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilmv-30",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilmv-20",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilmv-10",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coillv-30",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coillv-20",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coillv-10",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "coilall-30",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    }
-  ]
-}