From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 30 Jan 2025 04:41:58 +0000 (-0500) Subject: Astro Asteroid Sand (#34463) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1af53b1e8d67bf35f6f354d0f17bcd7d8027bd64;p=space-station-14.git Astro Asteroid Sand (#34463) * Added astro asteroid sand * fixed the stack name * adjusted tile sprites for asteroid and ice * Adjusted meta.json * Realized the other tile sprites all have solid lines on their perimeters * Update Resources/Prototypes/Stacks/floor_tile_stacks.yml that works Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Update tiles.yml * Update Resources/Locale/en-US/tiles/tiles.ftl Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * adjusted the snow sprite * Update meta.json --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index b520235614..0263c447a0 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -128,4 +128,5 @@ tiles-mowed-astro-grass = mowed astro-grass 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-wood-large = large wood diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index c730c96546..37a77acff1 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1551,6 +1551,23 @@ - type: Stack stackType: FloorTileAstroSnow +- type: entity + id: FloorTileItemAstroAsteroidSand + parent: FloorTileItemBase + name: 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 + - FloorAstroAsteroidSand + - type: Stack + stackType: FloorTileAstroAsteroidSand + - type: entity name: large wood floor parent: FloorTileItemBase diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7fe2914341..a3cb8c014c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -349,6 +349,7 @@ - FauxTileJungleAstroGrass - FauxTileAstroIce - FauxTileAstroSnow + - FauxTileAstroAsteroidSand - OreBagOfHolding - DeviceQuantumSpinInverter - type: EmagLatheRecipes diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 19b02993b2..b1e8cee32d 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -190,6 +190,11 @@ id: FauxTileAstroSnow result: FloorTileItemAstroSnow +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroAsteroidSand + result: FloorTileItemAstroAsteroidSand + - type: latheRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit4 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 2bd8ee5fa2..cdb8225544 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -114,6 +114,7 @@ - FauxTileJungleAstroGrass - FauxTileAstroIce - FauxTileAstroSnow + - FauxTileAstroAsteroidSand - type: technology id: BiochemicalStasis diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 65fd672e1a..b5d5fb7dc0 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -623,6 +623,12 @@ spawn: FloorTileItemAstroSnow maxCount: 30 +- type: stack + id: FloorTileAstroAsteroidSand + name: asteroid astro-sand floor + spawn: FloorTileItemAstroAsteroidSand + maxCount: 30 + - type: stack id: FloorTileWoodLarge name: large wood floor diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 0a7d2c0af6..6c8714be20 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1915,6 +1915,17 @@ deconstructTools: [ Prying ] itemDrop: FloorTileItemAstroSnow +# Asteroid Sand +- type: tile + id: FloorAstroAsteroidSand + name: tiles-astro-asteroid-sand + parent: FloorAsteroidSand + 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/asteroid-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-left.png new file mode 100644 index 0000000000..c252a030f3 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-right.png new file mode 100644 index 0000000000..90af3cb11a Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png new file mode 100644 index 0000000000..76d87d4723 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png index e3c0948112..c57497a6ec 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 7562d0f9b1..a39ba782fa 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 copyrights see tiles folder.", + "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)", "size": { "x": 32, "y": 32 @@ -549,6 +549,17 @@ }, { "name": "wood-large" + }, + { + "name": "asteroid" + }, + { + "name": "asteroid-inhand-right", + "directions": 4 + }, + { + "name": "asteroid-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png index 385e2d59ac..1e27fec676 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png and b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png differ