Red circuit floor (#32557)

* red circuit added

* index colour begone

diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 35cea19f7862e6f0a1b192abff759ffb8244995c..b5202356142252a978288153df7b723538078e10 100644 (file)
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -90,6 +90,7 @@ tiles-reinforced-glass-floor = reinforced glass floor
 tiles-metal-foam = metal foam floor
 tiles-green-circuit-floor = green circuit floor
 tiles-blue-circuit-floor = blue circuit floor
+tiles-red-circuit-floor = red circuit floor
 tiles-snow = snow
 tiles-snow-plating = snowed plating
 tiles-snow-dug = dug snow

diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 1e5f2573fda9065d1b3cd3ca648a2037e56132ae..903226895890969b40d42be4f1acde4d150560f2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -1286,6 +1286,22 @@
   - type: Stack
     stackType: FloorTileBCircuit
 
+- type: entity
+  name: red circuit floor
+  parent: FloorTileItemBase
+  id: FloorTileItemRCircuit
+  components:
+  - type: Sprite
+    state: rcircuit
+  - type: Item
+    heldPrefix: rcircuit
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorRedCircuit
+  - type: Stack
+    stackType: FloorTileRCircuit
+
 # Circuits stacks
 
 - type: entity
@@ -1304,6 +1320,14 @@
   - type: Stack
     count: 4
 
+- type: entity
+  parent: FloorTileItemRCircuit
+  id: FloorTileItemRCircuit4
+  suffix: 4
+  components:
+  - type: Stack
+    count: 4
+
 # Terrain
 - type: entity
   name: grass tile

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 666550cd8a17af8eb60d20fe6380643027f5b843..846441cb395d8e1b95edd1db25ec66da9852e27e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -442,6 +442,7 @@
     - UniformPrinterMachineCircuitboard
     - FloorGreenCircuit
     - FloorBlueCircuit
+    - FloorRedCircuit
     - MicrowaveMachineCircuitboard
     - ReagentGrinderMachineCircuitboard
     - ElectricGrillMachineCircuitboard

diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 0f043df9f8fd8f8b7c6a3466b7f972f1eced2ac1..a0e74fc34e2f2a524d64df52d75abced1d3438c6 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -199,6 +199,13 @@
   materials:
     Steel: 100
 
+- type: latheRecipe
+  id: FloorRedCircuit
+  result: FloorTileItemRCircuit4
+  completetime: 2
+  materials:
+    Steel: 100
+
 - type: latheRecipe
   id: HandheldStationMap
   result: HandheldStationMapEmpty

diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index de03fcba19640d87c23d247896b205f16326e319..65fd672e1aa816bc03fe79409cdbe6d2195e2610 100644 (file)
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -538,6 +538,12 @@
   spawn: FloorTileItemBCircuit
   maxCount: 30
 
+- type: stack
+  id: FloorTileRCircuit
+  name: red-circuit floor
+  spawn: FloorTileItemRCircuit
+  maxCount: 30
+
 - type: stack
   id: FloorTileGrass
   name: grass floor tile

diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 2d552cc33e04b2cd05d0dfb93da5bc0895d3d0a2..c98ee6d582ccc5e3ef3f4d913150e747ef034f6f 100644 (file)
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1422,6 +1422,18 @@
   itemDrop: FloorTileItemBCircuit
   heatCapacity: 10000
 
+- type: tile
+  id: FloorRedCircuit
+  name: tiles-red-circuit-floor
+  sprite: /Textures/Tiles/red_circuit.png
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemRCircuit
+  heatCapacity: 10000
+
 # Terrain
 - type: tile
   id: FloorAsphalt

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 7db50200ed6890ffaaaaad516b6722079a170655..7562d0f9b11bcbf98c81d2e21fe9c24e60d5bc74 100644 (file)
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -159,6 +159,9 @@
     {
       "name": "bcircuit"
     },
+    {
+      "name": "rcircuit"
+    },
     {
       "name": "carpet-black"
     },
@@ -472,6 +475,14 @@
       "name": "gold-inhand-left",
       "directions": 4
     },
+    {
+      "name": "rcircuit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "rcircuit-inhand-left",
+      "directions": 4
+    },
     {
       "name": "reinforced-inhand-right",
       "directions": 4

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png
new file mode 100644 (file)
index 0000000..06a2791
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png
new file mode 100644 (file)
index 0000000..44703f7
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png
new file mode 100644 (file)
index 0000000..be9dc0c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png differ

diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 6a6f545d1e9fea52485a62c982296a62353468d4..652947cb53c094a6c065e62ac78be342bb583e31 100644 (file)
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -26,7 +26,7 @@
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
+- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "red_circuit.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
   license: "CC-BY-SA-3.0"
   copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
   source: "https://github.com/tgstation/tgstation/"

diff --git a/Resources/Textures/Tiles/blue_circuit.png b/Resources/Textures/Tiles/blue_circuit.png
index 021c5363d6ece3de600a6fe274eb34937345dd0f..0a95b49aa50479e1103e475b9a6be36843d39c3d 100644 (file)
Binary files a/Resources/Textures/Tiles/blue_circuit.png and b/Resources/Textures/Tiles/blue_circuit.png differ

diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png
index 1628c20ae775e19e5302c426977026e22dd425d0..0638d7bde5c123877451a89155723f532bd9f837 100644 (file)
Binary files a/Resources/Textures/Tiles/green_circuit.png and b/Resources/Textures/Tiles/green_circuit.png differ

diff --git a/Resources/Textures/Tiles/red_circuit.png b/Resources/Textures/Tiles/red_circuit.png
new file mode 100644 (file)
index 0000000..44e33bd
Binary files /dev/null and b/Resources/Textures/Tiles/red_circuit.png differ