From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:26:32 +0000 (+0300) Subject: Cutter machine & steel mozaic item tiles (#30431) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=27f3bea46d18125441cf84f841252f6b99997a41;p=space-station-14.git Cutter machine & steel mozaic item tiles (#30431) * no texture machine * done * delete wip * bug fixes * oops * CutterMachineCircuitboard Glass: 500 --- diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index 38267ebd69..83725f2b80 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -161,3 +161,8 @@ license: "CC-BY-SA-3.0" copyright: "Taken from TG station." source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0" + +- files: ["cutter.ogg"] + license: "CC0-1.0" + copyright: "by Ko4erga" + source: "https://github.com/space-wizards/space-station-14/pull/30431" diff --git a/Resources/Audio/Machines/cutter.ogg b/Resources/Audio/Machines/cutter.ogg new file mode 100644 index 0000000000..60f6df04f3 Binary files /dev/null and b/Resources/Audio/Machines/cutter.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index b25c394f82..f2c3ed15fb 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1253,3 +1253,16 @@ Steel: 2 Glass: 5 Cable: 2 + +- type: entity + parent: BaseMachineCircuitboard + id: CutterMachineCircuitboard + name: cutter machine board + components: + - type: MachineBoard + prototype: CutterMachine + stackRequirements: + Steel: 2 + Capacitor: 1 + Manipulator: 1 + Cable: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 7de91cbb63..1e5f2573fd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -41,6 +41,165 @@ types: Blunt: 5 +- type: entity + name: steel dark checker tile + parent: FloorTileItemSteel + id: FloorTileItemSteelCheckerDark + components: + - type: Sprite + state: checker-dark + - type: FloorTile + outputs: + - Plating + - FloorSteelCheckerDark + - type: Stack + stackType: FloorTileSteelCheckerDark + +- type: entity + name: steel light checker tile + parent: FloorTileItemSteel + id: FloorTileItemSteelCheckerLight + components: + - type: Sprite + state: checker-light + - type: FloorTile + outputs: + - Plating + - FloorSteelCheckerLight + - type: Stack + stackType: FloorTileSteelCheckerLight + +- type: entity + name: dark tile + parent: FloorTileItemBase + id: FloorTileItemDark + components: + - type: Sprite + state: dark + - type: Item + heldPrefix: dark + - type: FloorTile + outputs: + - Plating + - FloorDark + - type: Stack + stackType: FloorTileDark + - type: Construction + graph: TileDark + node: darktile + +- type: entity + name: dark steel diagonal mini tile + parent: FloorTileItemDark + id: FloorTileItemDarkDiagonalMini + components: + - type: Sprite + state: dark-diagonal-mini + - type: FloorTile + outputs: + - Plating + - FloorDarkDiagonalMini + - type: Stack + stackType: FloorTileDarkDiagonalMini + +- type: entity + name: dark steel diagonal tile + parent: FloorTileItemDark + id: FloorTileItemDarkDiagonal + components: + - type: Sprite + state: dark-diagonal + - type: FloorTile + outputs: + - Plating + - FloorDarkDiagonal + - type: Stack + stackType: FloorTileDarkDiagonal + +- type: entity + name: dark steel herringbone + parent: FloorTileItemDark + id: FloorTileItemDarkHerringbone + components: + - type: Sprite + state: dark-herringbone + - type: FloorTile + outputs: + - Plating + - FloorDarkHerringbone + - type: Stack + stackType: FloorTileDarkHerringbone + +- type: entity + name: dark steel mini tile + parent: FloorTileItemDark + id: FloorTileItemDarkMini + components: + - type: Sprite + state: dark-mini + - type: FloorTile + outputs: + - Plating + - FloorDarkMini + - type: Stack + stackType: FloorTileDarkMini + +- type: entity + name: dark steel mono tile + parent: FloorTileItemDark + id: FloorTileItemDarkMono + components: + - type: Sprite + state: dark-mono + - type: FloorTile + outputs: + - Plating + - FloorDarkMono + - type: Stack + stackType: FloorTileDarkMono + +- type: entity + name: dark steel pavement + parent: FloorTileItemDark + id: FloorTileItemDarkPavement + components: + - type: Sprite + state: dark-pavement + - type: FloorTile + outputs: + - Plating + - FloorDarkPavement + - type: Stack + stackType: FloorTileDarkPavement + +- type: entity + name: dark steel vertical pavement + parent: FloorTileItemDark + id: FloorTileItemDarkPavementVertical + components: + - type: Sprite + state: dark-pavement-vertical + - type: FloorTile + outputs: + - Plating + - FloorDarkPavementVertical + - type: Stack + stackType: FloorTileDarkPavementVertical + +- type: entity + name: offset dark steel tile + parent: FloorTileItemDark + id: FloorTileItemDarkOffset + components: + - type: Sprite + state: dark-offset + - type: FloorTile + outputs: + - Plating + - FloorDarkOffset + - type: Stack + stackType: FloorTileDarkOffset + - type: entity name: steel tile parent: FloorTileItemBase @@ -61,66 +220,116 @@ node: steeltile - type: entity - name: steel dark checker tile + name: offset steel tile parent: FloorTileItemSteel - id: FloorTileItemSteelCheckerDark + id: FloorTileItemSteelOffset components: - type: Sprite - state: checker-dark + state: steel-offset - type: FloorTile outputs: - Plating - - FloorSteelCheckerDark + - FloorSteelOffset + - type: Stack + stackType: FloorTileSteelOffset - type: entity - name: steel light checker tile + name: steel diagonal mini tile parent: FloorTileItemSteel - id: FloorTileItemSteelCheckerLight + id: FloorTileItemSteelDiagonalMini components: - type: Sprite - state: checker-light + state: steel-diagonal-mini - type: FloorTile outputs: - Plating - - FloorSteelCheckerLight + - FloorSteelDiagonalMini + - type: Stack + stackType: FloorTileSteelDiagonalMini - type: entity - name: steel tile - parent: FloorTileItemBase - id: FloorTileItemMetalDiamond + name: steel diagonal tile + parent: FloorTileItemSteel + id: FloorTileItemSteelDiagonal components: - type: Sprite - state: metaldiamond - - type: Item - heldPrefix: steel + state: steel-diagonal - type: FloorTile outputs: - Plating - - FloorMetalDiamond + - FloorSteelDiagonal - type: Stack - stackType: FloorTileMetalDiamond -# - type: Construction -# graph: TileSteel -# node: steeltile + stackType: FloorTileSteelDiagonal - type: entity - name: wood floor - parent: FloorTileItemBase - id: FloorTileItemWood + name: steel herringbone + parent: FloorTileItemSteel + id: FloorTileItemSteelHerringbone components: - type: Sprite - state: wood - - type: Item - heldPrefix: wood + state: steel-herringbone - type: FloorTile outputs: - Plating - - FloorWood + - FloorSteelHerringbone - type: Stack - stackType: FloorTileWood - - type: Construction - graph: TileWood - node: woodtile + stackType: FloorTileSteelHerringbone + +- type: entity + name: steel mini tile + parent: FloorTileItemSteel + id: FloorTileItemSteelMini + components: + - type: Sprite + state: steel-mini + - type: FloorTile + outputs: + - Plating + - FloorSteelMini + - type: Stack + stackType: FloorTileSteelMini + +- type: entity + name: steel mono tile + parent: FloorTileItemSteel + id: FloorTileItemSteelMono + components: + - type: Sprite + state: steel-mono + - type: FloorTile + outputs: + - Plating + - FloorSteelMono + - type: Stack + stackType: FloorTileSteelMono + +- type: entity + name: steel pavement + parent: FloorTileItemSteel + id: FloorTileItemSteelPavement + components: + - type: Sprite + state: steel-pavement + - type: FloorTile + outputs: + - Plating + - FloorSteelPavement + - type: Stack + stackType: FloorTileSteelPavement + +- type: entity + name: steel vertical pavement + parent: FloorTileItemSteel + id: FloorTileItemSteelPavementVertical + components: + - type: Sprite + state: steel-pavement-vertical + - type: FloorTile + outputs: + - Plating + - FloorSteelPavementVertical + - type: Stack + stackType: FloorTileSteelPavementVertical - type: entity name: white tile @@ -142,23 +351,154 @@ node: whitetile - type: entity - name: dark tile + name: offset white steel tile + parent: FloorTileItemWhite + id: FloorTileItemWhiteOffset + components: + - type: Sprite + state: white-offset + - type: FloorTile + outputs: + - Plating + - FloorWhiteOffset + - type: Stack + stackType: FloorTileWhiteOffset + +- type: entity + name: white steel diagonal mini tile + parent: FloorTileItemWhite + id: FloorTileItemWhiteDiagonalMini + components: + - type: Sprite + state: white-diagonal-mini + - type: FloorTile + outputs: + - Plating + - FloorWhiteDiagonalMini + - type: Stack + stackType: FloorTileWhiteDiagonalMini + +- type: entity + name: white steel diagonal tile + parent: FloorTileItemWhite + id: FloorTileItemWhiteDiagonal + components: + - type: Sprite + state: white-diagonal + - type: FloorTile + outputs: + - Plating + - FloorWhiteDiagonal + - type: Stack + stackType: FloorTileWhiteDiagonal + +- type: entity + name: white steel herringbone + parent: FloorTileItemWhite + id: FloorTileItemWhiteHerringbone + components: + - type: Sprite + state: white-herringbone + - type: FloorTile + outputs: + - Plating + - FloorWhiteHerringbone + - type: Stack + stackType: FloorTileWhiteHerringbone + +- type: entity + name: white steel mini tile + parent: FloorTileItemWhite + id: FloorTileItemWhiteMini + components: + - type: Sprite + state: white-mini + - type: FloorTile + outputs: + - Plating + - FloorWhiteMini + - type: Stack + stackType: FloorTileWhiteMini + +- type: entity + name: white steel mono tile + parent: FloorTileItemWhite + id: FloorTileItemWhiteMono + components: + - type: Sprite + state: white-mono + - type: FloorTile + outputs: + - Plating + - FloorWhiteMono + - type: Stack + stackType: FloorTileWhiteMono + +- type: entity + name: white steel pavement + parent: FloorTileItemWhite + id: FloorTileItemWhitePavement + components: + - type: Sprite + state: white-pavement + - type: FloorTile + outputs: + - Plating + - FloorWhitePavement + - type: Stack + stackType: FloorTileWhitePavement + +- type: entity + name: white steel vertical pavement + parent: FloorTileItemWhite + id: FloorTileItemWhitePavementVertical + components: + - type: Sprite + state: white-pavement-vertical + - type: FloorTile + outputs: + - Plating + - FloorWhitePavementVertical + - type: Stack + stackType: FloorTileWhitePavementVertical + +- type: entity + name: steel tile parent: FloorTileItemBase - id: FloorTileItemDark + id: FloorTileItemMetalDiamond components: - type: Sprite - state: dark + state: metaldiamond - type: Item - heldPrefix: dark + heldPrefix: steel - type: FloorTile outputs: - Plating - - FloorDark + - FloorMetalDiamond - type: Stack - stackType: FloorTileDark + stackType: FloorTileMetalDiamond +# - type: Construction +# graph: TileSteel +# node: steeltile + +- type: entity + name: wood floor + parent: FloorTileItemBase + id: FloorTileItemWood + components: + - type: Sprite + state: wood + - type: Item + heldPrefix: wood + - type: FloorTile + outputs: + - Plating + - FloorWood + - type: Stack + stackType: FloorTileWood - type: Construction - graph: TileDark - node: darktile + graph: TileWood + node: woodtile - type: entity name: techmaint floor @@ -522,6 +862,34 @@ - type: Stack stackType: FloorTileConcrete +- type: entity + name: concrete mono tile + parent: FloorTileItemConcrete + id: FloorTileItemConcreteMono + components: + - type: Sprite + state: concrete-mono + - type: FloorTile + outputs: + - Plating + - FloorConcreteMono + - type: Stack + stackType: FloorTileConcreteMono + +- type: entity + name: concrete smooth + parent: FloorTileItemConcrete + id: FloorTileItemConcreteSmooth + components: + - type: Sprite + state: concrete-smooth + - type: FloorTile + outputs: + - Plating + - FloorConcreteSmooth + - type: Stack + stackType: FloorTileConcreteSmooth + - type: entity parent: FloorTileItemBase id: FloorTileItemGrayConcrete @@ -538,6 +906,34 @@ - type: Stack stackType: FloorTileGrayConcrete +- type: entity + name: gray concrete mono tile + parent: FloorTileItemGrayConcrete + id: FloorTileItemGrayConcreteMono + components: + - type: Sprite + state: grayconcrete-mono + - type: FloorTile + outputs: + - Plating + - FloorGrayConcreteMono + - type: Stack + stackType: FloorTileGrayConcreteMono + +- type: entity + name: gray concrete smooth + parent: FloorTileItemGrayConcrete + id: FloorTileItemGrayConcreteSmooth + components: + - type: Sprite + state: grayconcrete-smooth + - type: FloorTile + outputs: + - Plating + - FloorGrayConcreteSmooth + - type: Stack + stackType: FloorTileGrayConcreteSmooth + - type: entity parent: FloorTileItemBase id: FloorTileItemOldConcrete @@ -554,6 +950,34 @@ - type: Stack stackType: FloorTileOldConcrete +- type: entity + name: old concrete mono tile + parent: FloorTileItemOldConcrete + id: FloorTileItemOldConcreteMono + components: + - type: Sprite + state: oldconcrete-mono + - type: FloorTile + outputs: + - Plating + - FloorOldConcreteMono + - type: Stack + stackType: FloorTileOldConcreteMono + +- type: entity + name: old concrete smooth + parent: FloorTileItemOldConcrete + id: FloorTileItemOldConcreteSmooth + components: + - type: Sprite + state: oldconcrete-smooth + - type: FloorTile + outputs: + - Plating + - FloorOldConcreteSmooth + - type: Stack + stackType: FloorTileOldConcreteSmooth + # Carpets - type: entity name: blue arcade floor diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b0bf0019b0..ed25fe514b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -434,6 +434,7 @@ - BoozeDispenserMachineCircuitboard - SodaDispenserMachineCircuitboard - SpaceHeaterMachineCircuitBoard + - CutterMachineCircuitboard dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard @@ -1240,3 +1241,82 @@ staticRecipes: - MaterialSheetMeat - SheetPaper + +- type: entity + parent: BaseLathe + id: CutterMachine + name: cutter machine + description: This is a cutter. It cuts. Add variety to your station floor with eye-pleasing patterns! Don't stick your fingers in. + components: + - type: Transform + noRot: false + - type: Sprite + sprite: Structures/Machines/cuttermachine.rsi + snapCardinals: true + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: CutterMachineCircuitboard + - type: Lathe + producingSound: /Audio/Machines/cutter.ogg + idleState: icon + runningState: building + staticRecipes: + - FloorTileItemDark + - FloorTileItemDarkDiagonalMini + - FloorTileItemDarkDiagonal + - FloorTileItemDarkHerringbone + - FloorTileItemDarkMini + - FloorTileItemDarkMono + - FloorTileItemDarkPavement + - FloorTileItemDarkPavementVertical + - FloorTileItemDarkOffset + - FloorTileItemSteelCheckerDark + - FloorTileItemSteel + - FloorTileItemSteelOffset + - FloorTileItemSteelDiagonalMini + - FloorTileItemSteelDiagonal + - FloorTileItemSteelHerringbone + - FloorTileItemSteelMini + - FloorTileItemSteelMono + - FloorTileItemSteelPavement + - FloorTileItemSteelPavementVertical + - FloorTileItemWhite + - FloorTileItemWhiteOffset + - FloorTileItemWhiteDiagonalMini + - FloorTileItemWhiteDiagonal + - FloorTileItemWhiteHerringbone + - FloorTileItemWhiteMini + - FloorTileItemWhiteMono + - FloorTileItemWhitePavement + - FloorTileItemWhitePavementVertical + - FloorTileItemSteelCheckerLight + - FloorTileItemGratingMaint + - FloorTileItemTechmaint + - FloorTileItemSteelMaint + - FloorTileItemWood + - FloorTileItemWoodLarge + - FloorTileItemWoodPattern + - FloorTileItemConcrete + - FloorTileItemConcreteMono + - FloorTileItemConcreteSmooth + - FloorTileItemGrayConcrete + - FloorTileItemGrayConcreteMono + - FloorTileItemGrayConcreteSmooth + - FloorTileItemOldConcrete + - FloorTileItemOldConcreteMono + - FloorTileItemOldConcreteSmooth + - type: MaterialStorage + whitelist: + tags: + - Sheet + - Metal + - Wooden + - RawMaterial + - Plastic diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index b78703942e..4690055a9f 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -974,4 +974,12 @@ completetime: 4 materials: Steel: 100 - Glass: 500 \ No newline at end of file + Glass: 500 + +- type: latheRecipe + id: CutterMachineCircuitboard + result: CutterMachineCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 500 diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml new file mode 100644 index 0000000000..8773dd245c --- /dev/null +++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml @@ -0,0 +1,363 @@ +- type: latheRecipe + id: FloorTileItemDark + result: FloorTileItemDark + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkDiagonalMini + result: FloorTileItemDarkDiagonalMini + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkDiagonal + result: FloorTileItemDarkDiagonal + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkHerringbone + result: FloorTileItemDarkHerringbone + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkMini + result: FloorTileItemDarkMini + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkMono + result: FloorTileItemDarkMono + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkPavement + result: FloorTileItemDarkPavement + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkPavementVertical + result: FloorTileItemDarkPavementVertical + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemDarkOffset + result: FloorTileItemDarkOffset + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelCheckerDark + result: FloorTileItemSteelCheckerDark + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteel + result: FloorTileItemSteel + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelOffset + result: FloorTileItemSteelOffset + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelDiagonalMini + result: FloorTileItemSteelDiagonalMini + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelDiagonal + result: FloorTileItemSteelDiagonal + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelHerringbone + result: FloorTileItemSteelHerringbone + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelMini + result: FloorTileItemSteelMini + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelMono + result: FloorTileItemSteelMono + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelPavement + result: FloorTileItemSteelPavement + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelPavementVertical + result: FloorTileItemSteelPavementVertical + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhite + result: FloorTileItemWhite + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhiteOffset + result: FloorTileItemWhiteOffset + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhiteDiagonalMini + result: FloorTileItemWhiteDiagonalMini + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhiteDiagonal + result: FloorTileItemWhiteDiagonal + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhiteHerringbone + result: FloorTileItemWhiteHerringbone + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhiteMini + result: FloorTileItemWhiteMini + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhiteMono + result: FloorTileItemWhiteMono + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhitePavement + result: FloorTileItemWhitePavement + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemWhitePavementVertical + result: FloorTileItemWhitePavementVertical + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelCheckerLight + result: FloorTileItemSteelCheckerLight + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +# Other steel +- type: latheRecipe + id: FloorTileItemGratingMaint + result: FloorTileItemGratingMaint + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemTechmaint + result: FloorTileItemTechmaint + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemSteelMaint + result: FloorTileItemSteelMaint + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + +# Wood +- type: latheRecipe + id: FloorTileItemWood + result: FloorTileItemWood + applyMaterialDiscount: false + completetime: 0.5 + materials: + Wood: 25 + +- type: latheRecipe + id: FloorTileItemWoodLarge + result: FloorTileItemWoodLarge + applyMaterialDiscount: false + completetime: 0.5 + materials: + Wood: 25 + +- type: latheRecipe + id: FloorTileItemWoodPattern + result: FloorTileItemWoodPattern + applyMaterialDiscount: false + completetime: 0.5 + materials: + Wood: 25 + +# Concrete +- type: latheRecipe + id: FloorTileItemConcrete + result: FloorTileItemConcrete + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemConcreteMono + result: FloorTileItemConcreteMono + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemConcreteSmooth + result: FloorTileItemConcreteSmooth + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemGrayConcrete + result: FloorTileItemGrayConcrete + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemGrayConcreteMono + result: FloorTileItemGrayConcreteMono + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemGrayConcreteSmooth + result: FloorTileItemGrayConcreteSmooth + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemOldConcrete + result: FloorTileItemOldConcrete + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemOldConcreteMono + result: FloorTileItemOldConcreteMono + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 + +- type: latheRecipe + id: FloorTileItemOldConcreteSmooth + result: FloorTileItemOldConcreteSmooth + applyMaterialDiscount: false + completetime: 0.5 + materials: + Steel: 25 + Plastic: 25 diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 01bd916a67..de03fcba19 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -1,19 +1,109 @@ - type: stack + id: FloorTileDark + name: dark tile + spawn: FloorTileItemDark + maxCount: 30 + +- type: stack + id: FloorTileDarkDiagonalMini + name: dark steel diagonal mini tile + spawn: FloorTileItemDarkDiagonalMini + maxCount: 30 + +- type: stack + id: FloorTileDarkDiagonal + name: dark steel diagonal tile + spawn: FloorTileItemDarkDiagonal + maxCount: 30 + +- type: stack + id: FloorTileDarkHerringbone + name: dark steel herringbone + spawn: FloorTileItemDarkHerringbone + maxCount: 30 + +- type: stack + id: FloorTileDarkMini + name: dark steel mini tile + spawn: FloorTileItemDarkMini + maxCount: 30 + +- type: stack + id: FloorTileDarkMono + name: dark steel mono tile + spawn: FloorTileItemDarkMono + maxCount: 30 + +- type: stack + id: FloorTileDarkPavement + name: dark steel pavement + spawn: FloorTileItemDarkPavement + maxCount: 30 + +- type: stack + id: FloorTileDarkPavementVertical + name: dark steel vertical pavement + spawn: FloorTileItemDarkPavementVertical + maxCount: 30 + +- type: stack + id: FloorTileDarkOffset + name: offset dark steel tile + spawn: FloorTileItemDarkOffset + maxCount: 30 + +- type: stack id: FloorTileSteel name: steel tile spawn: FloorTileItemSteel maxCount: 30 - type: stack - id: FloorTileMetalDiamond - name: steel tile - spawn: FloorTileItemMetalDiamond + id: FloorTileSteelOffset + name: offset steel tile + spawn: FloorTileItemSteelOffset maxCount: 30 - type: stack - id: FloorTileWood - name: wood floor - spawn: FloorTileItemWood + id: FloorTileSteelDiagonalMini + name: steel diagonal mini tile + spawn: FloorTileItemSteelDiagonalMini + maxCount: 30 + +- type: stack + id: FloorTileSteelDiagonal + name: steel diagonal tile + spawn: FloorTileItemSteelDiagonal + maxCount: 30 + +- type: stack + id: FloorTileSteelHerringbone + name: steel herringbone + spawn: FloorTileItemSteelHerringbone + maxCount: 30 + +- type: stack + id: FloorTileSteelMini + name: steel mini tile + spawn: FloorTileItemSteelMini + maxCount: 30 + +- type: stack + id: FloorTileSteelMono + name: steel mono tile + spawn: FloorTileItemSteelMono + maxCount: 30 + +- type: stack + id: FloorTileSteelPavement + name: steel pavement + spawn: FloorTileItemSteelPavement + maxCount: 30 + +- type: stack + id: FloorTileSteelPavementVertical + name: steel vertical pavement + spawn: FloorTileItemSteelPavementVertical maxCount: 30 - type: stack @@ -23,9 +113,75 @@ maxCount: 30 - type: stack - id: FloorTileDark - name: dark tile - spawn: FloorTileItemDark + id: FloorTileWhiteOffset + name: offset white steel tile + spawn: FloorTileItemWhiteOffset + maxCount: 30 + +- type: stack + id: FloorTileWhiteDiagonalMini + name: white steel diagonal mini tile + spawn: FloorTileItemWhiteDiagonalMini + maxCount: 30 + +- type: stack + id: FloorTileWhiteDiagonal + name: white steel diagonal tile + spawn: FloorTileItemWhiteDiagonal + maxCount: 30 + +- type: stack + id: FloorTileWhiteHerringbone + name: white steel herringbone + spawn: FloorTileItemWhiteHerringbone + maxCount: 30 + +- type: stack + id: FloorTileWhiteMini + name: white steel mini tile + spawn: FloorTileItemWhiteMini + maxCount: 30 + +- type: stack + id: FloorTileWhiteMono + name: white steel mono tile + spawn: FloorTileItemWhiteMono + maxCount: 30 + +- type: stack + id: FloorTileWhitePavement + name: white steel pavement + spawn: FloorTileItemWhitePavement + maxCount: 30 + +- type: stack + id: FloorTileWhitePavementVertical + name: white steel vertical pavement + spawn: FloorTileItemWhitePavementVertical + maxCount: 30 + +- type: stack + id: FloorTileSteelCheckerDark + name: steel dark checker tile + spawn: FloorTileItemSteelCheckerDark + maxCount: 30 + +- type: stack + id: FloorTileSteelCheckerLight + name: steel light checker tile + spawn: FloorTileItemSteelCheckerLight + maxCount: 30 + +- type: stack + id: FloorTileMetalDiamond + name: steel tile + spawn: FloorTileItemMetalDiamond + maxCount: 30 + +- type: stack + id: FloorTileWood + name: wood floor + spawn: FloorTileItemWood maxCount: 30 - type: stack @@ -322,10 +478,34 @@ spawn: FloorTileItemGrayConcrete maxCount: 30 +- type: stack + id: FloorTileConcreteMono + name: concrete mono tile + spawn: FloorTileItemConcreteMono + maxCount: 30 + +- type: stack + id: FloorTileConcreteSmooth + name: concrete smooth + spawn: FloorTileItemConcreteSmooth + maxCount: 30 + - type: stack id: FloorTileGrayConcrete name: gray concrete tile - spawn: FloorTileItemLaundry + spawn: FloorTileItemGrayConcrete + maxCount: 30 + +- type: stack + id: FloorTileGrayConcreteMono + name: gray concrete mono tile + spawn: FloorTileItemGrayConcreteMono + maxCount: 30 + +- type: stack + id: FloorTileGrayConcreteSmooth + name: gray concrete smooth + spawn: FloorTileItemGrayConcreteSmooth maxCount: 30 - type: stack @@ -334,6 +514,18 @@ spawn: FloorTileItemOldConcrete maxCount: 30 +- type: stack + id: FloorTileOldConcreteMono + name: old concrete mono tile + spawn: FloorTileItemOldConcreteMono + maxCount: 30 + +- type: stack + id: FloorTileOldConcreteSmooth + name: old concrete smooth + spawn: FloorTileItemOldConcreteSmooth + maxCount: 30 + - type: stack id: FloorTileSilver name: silver floor tile diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 91b61bec09..d3de8a31f2 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -67,7 +67,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepFloor - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelMini heatCapacity: 10000 - type: tile @@ -85,7 +85,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepFloor - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelPavement heatCapacity: 10000 - type: tile @@ -103,7 +103,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepFloor - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelDiagonal heatCapacity: 10000 - type: tile @@ -115,7 +115,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepFloor - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelOffset heatCapacity: 10000 - type: tile @@ -133,7 +133,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelMono heatCapacity: 10000 - type: tile @@ -151,7 +151,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelPavementVertical heatCapacity: 10000 - type: tile @@ -169,7 +169,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelHerringbone heatCapacity: 10000 - type: tile @@ -187,7 +187,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemSteel + itemDrop: FloorTileItemSteelDiagonalMini heatCapacity: 10000 - type: tile @@ -285,7 +285,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhiteMini heatCapacity: 10000 - type: tile @@ -303,7 +303,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhitePavement heatCapacity: 10000 - type: tile @@ -321,7 +321,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhiteDiagonal heatCapacity: 10000 - type: tile @@ -333,7 +333,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhiteOffset heatCapacity: 10000 - type: tile @@ -351,7 +351,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhiteMono heatCapacity: 10000 - type: tile @@ -369,7 +369,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhitePavementVertical heatCapacity: 10000 - type: tile @@ -387,7 +387,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhiteHerringbone heatCapacity: 10000 - type: tile @@ -405,7 +405,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemWhite + itemDrop: FloorTileItemWhiteDiagonalMini heatCapacity: 10000 - type: tile @@ -459,7 +459,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkMini heatCapacity: 10000 - type: tile @@ -477,7 +477,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkPavement heatCapacity: 10000 - type: tile @@ -495,7 +495,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkDiagonal heatCapacity: 10000 - type: tile @@ -507,7 +507,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkOffset heatCapacity: 10000 - type: tile @@ -525,7 +525,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkMono heatCapacity: 10000 - type: tile @@ -543,7 +543,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkPavementVertical heatCapacity: 10000 - type: tile @@ -561,7 +561,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkHerringbone heatCapacity: 10000 - type: tile @@ -579,7 +579,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemDark + itemDrop: FloorTileItemDarkDiagonalMini heatCapacity: 10000 - type: tile @@ -936,7 +936,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemConcrete + itemDrop: FloorTileItemConcreteMono heatCapacity: 10000 weather: true @@ -955,7 +955,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemConcrete + itemDrop: FloorTileItemConcreteSmooth heatCapacity: 10000 weather: true @@ -993,7 +993,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemGrayConcrete + itemDrop: FloorTileItemGrayConcreteMono heatCapacity: 10000 weather: true @@ -1012,7 +1012,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemGrayConcrete + itemDrop: FloorTileItemGrayConcreteSmooth heatCapacity: 10000 weather: true @@ -1050,7 +1050,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemOldConcrete + itemDrop: FloorTileItemOldConcreteMono heatCapacity: 10000 weather: true @@ -1069,7 +1069,7 @@ deconstructTools: [ Prying ] footstepSounds: collection: FootstepTile - itemDrop: FloorTileItemOldConcrete + itemDrop: FloorTileItemOldConcreteSmooth heatCapacity: 10000 weather: true diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png new file mode 100644 index 0000000000..c8300ff3e4 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png new file mode 100644 index 0000000000..a108ce8b4d Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png new file mode 100644 index 0000000000..a325052228 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png new file mode 100644 index 0000000000..c6b889a14a Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png new file mode 100644 index 0000000000..2ebda842b9 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png new file mode 100644 index 0000000000..1605945c16 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png new file mode 100644 index 0000000000..8e02358eb6 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png new file mode 100644 index 0000000000..e21176bf45 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png new file mode 100644 index 0000000000..66bfacb04b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png new file mode 100644 index 0000000000..b5311d5e36 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png index cd05817621..220a0cfdb6 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png new file mode 100644 index 0000000000..72445cc47e Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png new file mode 100644 index 0000000000..cc86c6edea Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 11992954f8..7db50200ed 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -10,6 +10,30 @@ { "name": "dark" }, + { + "name": "dark-diagonal-mini" + }, + { + "name": "dark-diagonal" + }, + { + "name": "dark-herringbone" + }, + { + "name": "dark-mini" + }, + { + "name": "dark-mono" + }, + { + "name": "dark-pavement" + }, + { + "name": "dark-pavement-vertical" + }, + { + "name": "dark-offset" + }, { "name": "dirty" }, @@ -22,12 +46,30 @@ { "name": "concrete" }, + { + "name": "concrete-mono" + }, + { + "name": "concrete-smooth" + }, { "name": "grayconcrete" }, + { + "name": "grayconcrete-mono" + }, + { + "name": "grayconcrete-smooth" + }, { "name": "oldconcrete" }, + { + "name": "oldconcrete-mono" + }, + { + "name": "oldconcrete-smooth" + }, { "name": "gcircuit" }, @@ -37,15 +79,15 @@ { "name": "blue" }, - { - "name": "brass" - }, - { - "name": "brass-filled" - }, - { - "name": "reebe" - }, + { + "name": "brass" + }, + { + "name": "brass-filled" + }, + { + "name": "reebe" + }, { "name": "lime" }, @@ -168,6 +210,30 @@ { "name": "steel" }, + { + "name": "steel-offset" + }, + { + "name": "steel-diagonal-mini" + }, + { + "name": "steel-diagonal" + }, + { + "name": "steel-herringbone" + }, + { + "name": "steel-mini" + }, + { + "name": "steel-mono" + }, + { + "name": "steel-pavement" + }, + { + "name": "steel-pavement-vertical" + }, { "name": "silver" }, @@ -177,6 +243,30 @@ { "name": "white" }, + { + "name": "white-offset" + }, + { + "name": "white-diagonal-mini" + }, + { + "name": "white-diagonal" + }, + { + "name": "white-herringbone" + }, + { + "name": "white-mini" + }, + { + "name": "white-mono" + }, + { + "name": "white-pavement" + }, + { + "name": "white-pavement-vertical" + }, { "name": "monofloor" }, diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png new file mode 100644 index 0000000000..c42fa801d9 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png new file mode 100644 index 0000000000..ef0e7012c9 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png new file mode 100644 index 0000000000..cbe178a00f Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png new file mode 100644 index 0000000000..752d17fa53 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png new file mode 100644 index 0000000000..0dd75de354 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png new file mode 100644 index 0000000000..277b658d32 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png new file mode 100644 index 0000000000..ff71f6e051 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png new file mode 100644 index 0000000000..679861267e Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png new file mode 100644 index 0000000000..a5c058085c Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png new file mode 100644 index 0000000000..e9559c1057 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png index 5ea3049f87..b39ca9aeb5 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png new file mode 100644 index 0000000000..109f89c1ab Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png new file mode 100644 index 0000000000..9bbe51b284 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png new file mode 100644 index 0000000000..316d36da02 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png new file mode 100644 index 0000000000..e413501ba3 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png new file mode 100644 index 0000000000..53361667dd Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png new file mode 100644 index 0000000000..b58aa94d6a Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png new file mode 100644 index 0000000000..42eec61381 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png new file mode 100644 index 0000000000..9800874d74 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white.png b/Resources/Textures/Objects/Tiles/tile.rsi/white.png index 28459f0cb7..20d44bde5a 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white.png differ diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png new file mode 100644 index 0000000000..7b710f4f74 Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png differ diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png new file mode 100644 index 0000000000..c718682539 Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json b/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json new file mode 100644 index 0000000000..fd5f81442a --- /dev/null +++ b/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042, + 0.042 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png new file mode 100644 index 0000000000..1081f6622f Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png new file mode 100644 index 0000000000..9155151481 Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png differ