diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 0263c447a0..c6aeeacf99 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -103,10 +103,12 @@ tiles-dark-grass-floor = dark grass floor tiles-light-grass-floor = light grass floor tiles-dirt-floor = dirt floor tiles-asteroid-sand = asteroid sand +tiles-asteroid-sand-borderless = borderless asteroid sand tiles-asteroid-sand-dug = dug asteroid sand tiles-asteroid-tile = asteroid tile tiles-asteroid-plating = asteroid plating tiles-asteroid-ironsand = asteroid ironsand +tiles-asteroid-ironsand-borderless = borderless asteroid ironsand tiles-cave = cave tiles-cave-drought = cave drought tiles-flesh-floor = flesh floor @@ -129,4 +131,5 @@ tiles-jungle-astro-grass = jungle astro-grass tiles-astro-ice = astro-ice tiles-astro-snow = astro-snow tiles-astro-asteroid-sand = asteroid astro-sand +tiles-astro-asteroid-sand-borderless = borderless asteroid astro-sand tiles-wood-large = large wood diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 37a77acff1..4593219d9b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1558,7 +1558,7 @@ description: Fake sand. Luckily, it's not as coarse as the real thing. components: - type: Sprite - state: asteroid + state: astro-asteroid - type: Item heldPrefix: asteroid - type: FloorTile @@ -1568,6 +1568,23 @@ - type: Stack stackType: FloorTileAstroAsteroidSand +- type: entity + id: FloorTileItemAstroAsteroidSandBorderless + parent: FloorTileItemBase + name: borderless asteroid astro-sand + description: Fake sand. Luckily, it's not as coarse as the real thing. + components: + - type: Sprite + state: asteroid + - type: Item + heldPrefix: asteroid + - type: FloorTile + outputs: + - Plating + - FloorAstroAsteroidSandBorderless + - type: Stack + stackType: FloorTileAstroAsteroidSand + - type: entity name: large wood floor parent: FloorTileItemBase diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 7d4c80b795..5cf10fb570 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -196,6 +196,11 @@ id: FauxTileAstroAsteroidSand result: FloorTileItemAstroAsteroidSand +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroAsteroidSandBorderless + result: FloorTileItemAstroAsteroidSandBorderless + - type: latheRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit4 diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 6c8714be20..55e4a9a8af 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1519,8 +1519,8 @@ # Asteroid - type: tile - id: FloorAsteroidSand - name: tiles-asteroid-sand + id: FloorAsteroidSandBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid.png variants: 13 placementVariants: @@ -1545,8 +1545,22 @@ weather: true - type: tile - id: FloorAsteroidSandDug + id: FloorAsteroidSand + parent: FloorAsteroidSandBorderless name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + +- type: tile + id: FloorAsteroidSandDugBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid_dug.png baseTurf: Space isSubfloor: true @@ -1556,8 +1570,22 @@ weather: true - type: tile - id: FloorAsteroidSandRed + id: FloorAsteroidSandDug + parent: FloorAsteroidSandDugBorderless name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + +- type: tile + id: FloorAsteroidSandRedBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid_red.png variants: 13 placementVariants: @@ -1581,6 +1609,20 @@ heatCapacity: 10000 weather: true +- type: tile + id: FloorAsteroidSandRed + parent: FloorAsteroidSandRedBorderless + name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + - type: tile id: FloorAsteroidTile name: tiles-asteroid-tile @@ -1594,8 +1636,8 @@ weather: true - type: tile - id: FloorAsteroidIronsand - name: tiles-asteroid-ironsand + id: FloorAsteroidIronsandBorderless + name: tiles-asteroid-ironsand-borderless sprite: /Textures/Tiles/Asteroid/ironsand.png variants: 15 placementVariants: @@ -1622,8 +1664,22 @@ weather: true - type: tile - id: FloorAsteroidSandUnvariantized - name: tiles-asteroid-sand + id: FloorAsteroidIronsand + parent: FloorAsteroidIronsandBorderless + name: tiles-asteroid-ironsand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + South: /Textures/Tiles/Asteroid/iron_double_edge.png + East: /Textures/Tiles/Asteroid/iron_double_edge.png + North: /Textures/Tiles/Asteroid/iron_double_edge.png + West: /Textures/Tiles/Asteroid/iron_double_edge.png + +- type: tile + id: FloorAsteroidSandUnvariantizedBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid0.png baseTurf: Space isSubfloor: true @@ -1633,8 +1689,22 @@ weather: true - type: tile - id: FloorAsteroidIronsandUnvariantized - name: tiles-asteroid-ironsand + id: FloorAsteroidSandUnvariantized + parent: FloorAsteroidSandUnvariantizedBorderless + name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + +- type: tile + id: FloorAsteroidIronsandUnvariantizedBorderless + name: tiles-asteroid-ironsand-borderless sprite: /Textures/Tiles/Asteroid/ironsand0.png baseTurf: Space isSubfloor: true @@ -1643,6 +1713,20 @@ heatCapacity: 10000 weather: true +- type: tile + id: FloorAsteroidIronsandUnvariantized + parent: FloorAsteroidIronsandUnvariantizedBorderless + name: tiles-asteroid-ironsand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + South: /Textures/Tiles/Asteroid/iron_double_edge.png + East: /Textures/Tiles/Asteroid/iron_double_edge.png + North: /Textures/Tiles/Asteroid/iron_double_edge.png + West: /Textures/Tiles/Asteroid/iron_double_edge.png + # Caves - type: tile id: FloorCave @@ -1926,6 +2010,16 @@ itemDrop: FloorTileItemAstroAsteroidSand weather: false +- type: tile + id: FloorAstroAsteroidSandBorderless + name: tiles-astro-asteroid-sand-borderless + parent: FloorAsteroidSandBorderless + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: FloorTileItemAstroAsteroidSand + weather: false + - type: tile id: FloorWoodLarge name: tiles-wood-large diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astro-asteroid.png b/Resources/Textures/Objects/Tiles/tile.rsi/astro-asteroid.png new file mode 100644 index 0000000000..5f2e387e35 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/astro-asteroid.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index a39ba782fa..a25eed061b 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github)", "size": { "x": 32, "y": 32 @@ -553,6 +553,9 @@ { "name": "asteroid" }, + { + "name": "astro-asteroid" + }, { "name": "asteroid-inhand-right", "directions": 4 diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_double_edge.png b/Resources/Textures/Tiles/Asteroid/asteroid_double_edge.png new file mode 100644 index 0000000000..ce4ead4d9a Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_double_edge.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_single_edge.png b/Resources/Textures/Tiles/Asteroid/asteroid_single_edge.png new file mode 100644 index 0000000000..1450554089 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_single_edge.png differ diff --git a/Resources/Textures/Tiles/Asteroid/iron_double_edge.png b/Resources/Textures/Tiles/Asteroid/iron_double_edge.png new file mode 100644 index 0000000000..22a376ba68 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/iron_double_edge.png differ diff --git a/Resources/Textures/Tiles/Asteroid/iron_single_edge.png b/Resources/Textures/Tiles/Asteroid/iron_single_edge.png new file mode 100644 index 0000000000..a3d4575ad4 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/iron_single_edge.png differ