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 b5202356142252a978288153df7b723538078e10..0263c447a012e70fd95688229f8d8540442800a8 100644 (file)
--- 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 c730c965462db6c94d8de56daf431c2124c46366..37a77acff1f0c5bd8dc5f12572dba6e371e00093 100644 (file)
--- 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 7fe291434199bc9e25bf49eea1c8fb4367fda20c..a3cb8c014c2e5912a393e2254fed5dbb2d67e032 100644 (file)
--- 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 19b02993b27ecbe5774a6e485e8ef06cda723ff8..b1e8cee32ded7303c86708524b798385334abb71 100644 (file)
--- 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 2bd8ee5fa23932f008d5b278bea4337a2d7480a6..cdb82255448e3f7663f4654c9c1d5d6b75b8eee5 100644 (file)
--- 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 65fd672e1aa816bc03fe79409cdbe6d2195e2610..b5d5fb7dc015a69e9012a7f3d18cf10b0909b99a 100644 (file)
--- 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 0a7d2c0af6e994dda424a80ddf84db9785b52268..6c8714be20325faf3da05741eaa1cfff2b2bc599 100644 (file)
--- 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 (file)
index 0000000..c252a03
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 (file)
index 0000000..90af3cb
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 (file)
index 0000000..76d87d4
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 e3c0948112e80d622009f7bbcf48f5ce991a5bdf..c57497a6ec8fa2f9c19a26b7f2b4f9ce5a507e9d 100644 (file)
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 7562d0f9b11bcbf98c81d2e21fe9c24e60d5bc74..a39ba782facc444f47b1011b0fb510901487045e 100644 (file)
--- 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 385e2d59ac24baf8588fb98f204cbb1330475e4d..1e27fec6762a0bc8c5836c8846577196bb343133 100644 (file)
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png and b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png differ