diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 987b633a95..a53fa1988f 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -82,3 +82,6 @@ tiles-asteroid-ironsand-pebbles = asteroid ironsand pebbles tiles-asteroid-ironsand-rock = asteroid ironsand rock tiles-cave = cave tiles-cave-drought = cave drought +tiles-techmaint3-floor = grated maintenance floor +tiles-techmaint2-floor = steel maintenance floor +tiles-wood2 = wood pattern floor diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index acf3266a9f..5a4861e631 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -713,3 +713,52 @@ - FloorSnow - type: Stack stackType: FloorTileSnow + +- type: entity + name: wood pattern floor + parent: FloorTileItemBase + id: FloorTileItemWoodPattern + components: + - type: Sprite + state: woodpatternfloor + - type: Item + heldPrefix: wood + - type: FloorTile + outputs: + - Plating + - FloorWoodTile + - type: Stack + stackType: FloorTileWoodPattern + +- type: entity + name: steel maint floor + parent: FloorTileItemBase + id: FloorTileItemSteelMaint + components: + - type: Sprite + state: steelmaintfloor + - type: Item + heldPrefix: steel + - type: FloorTile + outputs: + - Plating + - FloorTechMaint2 + - type: Stack + stackType: FloorTileSteelMaint + +- type: entity + name: grating maint floor + parent: FloorTileItemBase + id: FloorTileItemGratingMaint + components: + - type: Sprite + state: gratingmaintfloor + - type: Item + heldPrefix: steel + - type: FloorTile + outputs: + - Plating + - FloorTechMaint3 + - type: Stack + stackType: FloorTileGratingMaint + diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 39f2d98431..012c825b83 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -247,3 +247,18 @@ id: FloorTileSnow name: snow floor tile spawn: FloorTileItemSnow + +- type: stack + id: FloorTileWoodPattern + name: wood pattern floor + spawn: FloorTileItemWoodPattern + +- type: stack + id: FloorTileSteelMaint + name: steel maint floor + spawn: FloorTileItemSteelMaint + +- type: stack + id: FloorTileGratingMaint + name: grating maint floor + spawn: FloorTileItemGratingMaint diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index d3ade0e8be..7f994edc0e 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1340,3 +1340,54 @@ friction: 0.30 thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorTechMaint2 + name: tiles-techmaint2-floor + sprite: /Textures/Tiles/steel_maint.png + baseTurfs: + - Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepHull + friction: 0.30 + itemDrop: FloorTileItemSteelMaint + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorTechMaint3 + name: tiles-techmaint3-floor + sprite: /Textures/Tiles/grating_maint.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurfs: + - Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepHull + friction: 0.30 + itemDrop: FloorTileItemGratingMaint + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorWoodTile + name: tiles-wood2 + sprite: /Textures/Tiles/wood_tile.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurfs: + - Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepWood + barestepSounds: + collection: BarestepWood + friction: 0.30 + itemDrop: FloorTileItemWoodPattern + thermalConductivity: 0.04 + heatCapacity: 10000 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/gratingmaintfloor.png b/Resources/Textures/Objects/Tiles/tile.rsi/gratingmaintfloor.png new file mode 100644 index 0000000000..d14b4b6536 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/gratingmaintfloor.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 5e76d93009..f19df39b22 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -148,6 +148,15 @@ { "name": "metaldiamond" }, + { + "name": "steelmaintfloor" + }, + { + "name": "gratingmaintfloor" + }, + { + "name": "woodpatternfloor" + }, { "name": "bcircuit-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steelmaintfloor.png b/Resources/Textures/Objects/Tiles/tile.rsi/steelmaintfloor.png new file mode 100644 index 0000000000..ab1b87bc6a Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steelmaintfloor.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/woodpatternfloor.png b/Resources/Textures/Objects/Tiles/tile.rsi/woodpatternfloor.png new file mode 100644 index 0000000000..bf18a85def Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/woodpatternfloor.png differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 41948bf478..9fec6d6c0e 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -50,3 +50,9 @@ license: "CC-BY-SA-3.0" copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt." source: "https://github.com/FortunaSS13/Fortuna" + +- files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] + license: "CC-BY-SA-3.0" + copyright: "by brainfood for space-station-14, ." + source: "https://github.com/space-wizards/space-station-14/pull/12193" + diff --git a/Resources/Textures/Tiles/grating_maint.png b/Resources/Textures/Tiles/grating_maint.png new file mode 100644 index 0000000000..586d826521 Binary files /dev/null and b/Resources/Textures/Tiles/grating_maint.png differ diff --git a/Resources/Textures/Tiles/steel_maint.png b/Resources/Textures/Tiles/steel_maint.png new file mode 100644 index 0000000000..db912fe892 Binary files /dev/null and b/Resources/Textures/Tiles/steel_maint.png differ diff --git a/Resources/Textures/Tiles/wood_tile.png b/Resources/Textures/Tiles/wood_tile.png new file mode 100644 index 0000000000..db0209ed5b Binary files /dev/null and b/Resources/Textures/Tiles/wood_tile.png differ