From: TakoDragon <69509841+BackeTako@users.noreply.github.com> Date: Wed, 2 Oct 2024 05:35:48 +0000 (+0200) Subject: Red circuit floor (#32557) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=542817807dbcf2b482623b776811a2c9eee0d0cb;p=space-station-14.git 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 35cea19f78..b520235614 100644 --- 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 1e5f2573fd..9032268958 100644 --- 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 666550cd8a..846441cb39 100644 --- 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 0f043df9f8..a0e74fc34e 100644 --- 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 de03fcba19..65fd672e1a 100644 --- 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 2d552cc33e..c98ee6d582 100644 --- 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 7db50200ed..7562d0f9b1 100644 --- 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 index 0000000000..06a279199c 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 index 0000000000..44703f72f7 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 index 0000000000..be9dc0c20f 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 6a6f545d1e..652947cb53 100644 --- 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 021c5363d6..0a95b49aa5 100644 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 1628c20ae7..0638d7bde5 100644 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 index 0000000000..44e33bdee3 Binary files /dev/null and b/Resources/Textures/Tiles/red_circuit.png differ