Dark/Light Grass & Desert Astrotiles (#37867)

* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle

* Fixed postmapinittest issues (Hopefully)

* Actually fixed the afformentioned issue.

* Added Warden Spawnpoint which I forgot

* Named APCs, Substations, & Cameras, added some more decals

* Decorated some more, notably the bar.

* Minor adjustments, added cans, slightly reworked salv and maints bar

* Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly)

* Added 2 new astrotiles, dark grass and desert sand.

* Removed map. Fixing issue. Please hold.

* Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches.

* Added localization for stacks.

* Actually fixed the loc. issue. Maybe. Please.

* Hopefully fixed the last localization issue.

* Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant

* Fixed some issues caused by another PR I made, added more maints stuff

* Made some small decorative and practical changes

* Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly.

* Removed shields to try to fix an issue with the test

* Hopefully fixed issues relating to a failed test.

* Replaced grass/flora decals with randomized ones, readded shields to armory

* Fixed some YML issues, whitelisted files for flora decal spawners

* Added a bridge-beach, added some misc. items and objects.

* Small changes to buttons, fixed wires and flooring

* Fixed AME-Holopad issue.

* Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map

* Fixed an accidental adjustment to CoreStation's parallax prototype YML

* Changed some Salvage and Cargo stuff

* Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug

* Fixed some stuff, added docking arm near evac

* meta json fix tiles

* fixed again

* fixed once more

* Removed all the waterjug stuff.

* fix spacing

* fix unnecessary formatting

---------

Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

Resources/Locale/en-US/stack/stacks.ftl

@@ -224,6 +224,8 @@ stack-steel-maint-floor = steel maint floor
 stack-grating-maint-floor = grating maint floor
 stack-web-tile = web tile
 stack-astro-grass-floor = astro-grass floor
+stack-dark-astro-grass-floor = dark astro-grass floor
+stack-light-astro-grass-floor = light astro-grass floor
 stack-mowed-astro-grass-floor = mowed astro-grass floor
 stack-jungle-astro-grass-floor = jungle astro-grass floor
 stack-astro-ice-floor = astro-ice floor
@@ -231,6 +233,7 @@ stack-astro-snow-floor = astro-snow floor
 stack-large-wood-floor = large wood floor
 stack-red-circuit-floor = red-circuit floor
 stack-asteroid-astro-sand-floor = asteroid astro-sand floor
+stack-desert-astro-sand-floor = desert astro-sand floor
 stack-xeno-floor = xeno floor
 stack-xeno-steel = xeno steel tile
 stack-xeno-steel-corner = xeno steel corner tile

Resources/Locale/en-US/tiles/tiles.ftl

@@ -128,12 +128,15 @@ tiles-hull-reinforced = exterior reinforced hull plating
 tiles-web = web tile
 tiles-chromite = chromite
 tiles-astro-grass = astro-grass
+tiles-dark-astro-grass = dark astro-grass
+tiles-light-astro-grass = light astro-grass
 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-astro-asteroid-sand-borderless = borderless asteroid astro-sand
+tiles-desert-astro-sand = desert astro-sand
 tiles-wood-large = large wood
 tiles-xeno-floor = xeno floor
 tiles-xeno-steel = xeno steel tile

Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml

@@ -11,6 +11,9 @@
     - FloorAstroGrass
     - FloorMowedAstroGrass
     - FloorJungleAstroGrass
+    - FloorDarkAstroGrass
+    - FloorLightAstroGrass
+    - FloorDesertAstroSand
     - FloorAstroIce
     - FloorAstroSnow
     - FloorAstroAsteroidSand

Resources/Prototypes/Entities/Objects/Misc/tiles.yml

@@ -1533,6 +1533,40 @@
   - type: Stack
     stackType: FloorTileAstroGrass
 
+- type: entity
+  parent: FloorTileItemBase
+  id: FloorTileItemDarkAstroGrass
+  name: dark astro-grass
+  description: Fake grass that covers up wires and even comes with realistic NanoTrimmings!
+  components:
+  - type: Sprite
+    state: grassdark
+  - type: Item
+    heldPrefix: darkgrass
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorDarkAstroGrass
+  - type: Stack
+    stackType: FloorTileDarkAstroGrass
+
+- type: entity
+  parent: FloorTileItemBase
+  id: FloorTileItemLightAstroGrass
+  name: light astro-grass
+  description: Fake grass that covers up wires and even comes with realistic NanoTrimmings!
+  components:
+  - type: Sprite
+    state: grasslight
+  - type: Item
+    heldPrefix: lightgrass
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorLightAstroGrass
+  - type: Stack
+    stackType: FloorTileLightAstroGrass
+
 - type: entity
   id: FloorTileItemAstroIce
   parent: FloorTileItemBase
@@ -1601,6 +1635,23 @@
   - type: Stack
     stackType: FloorTileAstroAsteroidSand
 
+- type: entity
+  parent: FloorTileItemBase
+  id: FloorTileItemDesertAstroSand
+  name: desert astro-sand
+  description: Fake sand, designed to be fine.
+  components:
+  - type: Sprite
+    state: desertsand
+  - type: Item
+    heldPrefix: desertsand
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorDesertAstroSand
+  - type: Stack
+    stackType: FloorTileDesertAstroSand
+
 - type: entity
   name: large wood floor
   parent: FloorTileItemBase

Resources/Prototypes/Recipes/Lathes/Packs/science.yml

@@ -68,9 +68,12 @@
   - FauxTileAstroGrass
   - FauxTileMowedAstroGrass
   - FauxTileJungleAstroGrass
+  - FauxTileDarkAstroGrass
+  - FauxTileLightAstroGrass
   - FauxTileAstroIce
   - FauxTileAstroSnow
   - FauxTileAstroAsteroidSand
+  - FauxTileDesertAstroSand
 
 # Only contains parts for making basic modular grenades, no actual explosives
 - type: latheRecipePack

Resources/Prototypes/Recipes/Lathes/misc.yml

@@ -200,6 +200,16 @@
   id: FauxTileJungleAstroGrass
   result: FloorTileItemJungleAstroGrass
 
+- type: latheRecipe
+  parent: BaseFauxTileRecipe
+  id: FauxTileDarkAstroGrass
+  result: FloorTileItemDarkAstroGrass
+
+- type: latheRecipe
+  parent: BaseFauxTileRecipe
+  id: FauxTileLightAstroGrass
+  result: FloorTileItemLightAstroGrass
+
 - type: latheRecipe
   parent: BaseFauxTileRecipe
   id: FauxTileAstroIce
@@ -220,6 +230,11 @@
   id: FauxTileAstroAsteroidSandBorderless
   result: FloorTileItemAstroAsteroidSandBorderless
 
+- type: latheRecipe
+  parent: BaseFauxTileRecipe
+  id: FauxTileDesertAstroSand
+  result: FloorTileItemDesertAstroSand
+
 - type: latheRecipe
   id: FloorGreenCircuit
   result: FloorTileItemGCircuit4

Resources/Prototypes/Research/civilianservices.yml

@@ -98,9 +98,12 @@
   - FauxTileAstroGrass
   - FauxTileMowedAstroGrass
   - FauxTileJungleAstroGrass
+  - FauxTileDarkAstroGrass
+  - FauxTileLightAstroGrass
   - FauxTileAstroIce
   - FauxTileAstroSnow
   - FauxTileAstroAsteroidSand
+  - FauxTileDesertAstroSand
 
 - type: technology
   id: BiochemicalStasis

Resources/Prototypes/Stacks/floor_tile_stacks.yml

@@ -617,6 +617,18 @@
   spawn: FloorTileItemJungleAstroGrass
   maxCount: 30
 
+- type: stack
+  id: FloorTileDarkAstroGrass
+  name: stack-dark-astro-grass-floor
+  spawn: FloorTileItemDarkAstroGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileLightAstroGrass
+  name: stack-light-astro-grass-floor
+  spawn: FloorTileItemLightAstroGrass
+  maxCount: 30
+
 - type: stack
   id: FloorTileAstroIce
   name: stack-astro-ice-floor
@@ -635,6 +647,12 @@
   spawn: FloorTileItemAstroAsteroidSand
   maxCount: 30
 
+- type: stack
+  id: FloorTileDesertAstroSand
+  name: stack-desert-astro-sand-floor
+  spawn: FloorTileItemDesertAstroSand
+  maxCount: 30
+
 - type: stack
   id: FloorTileWoodLarge
   name: stack-large-wood-floor

Resources/Prototypes/Tiles/floors.yml

@@ -1999,6 +1999,24 @@
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemJungleAstroGrass
 
+- type: tile
+  parent: FloorGrassDark
+  id: FloorDarkAstroGrass
+  name: tiles-dark-astro-grass
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Cutting ]
+  itemDrop: FloorTileItemDarkAstroGrass
+
+- type: tile
+  parent: FloorGrassLight
+  id: FloorLightAstroGrass
+  name: tiles-light-astro-grass
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Cutting ]
+  itemDrop: FloorTileItemLightAstroGrass
+
 # Ice
 - type: tile
   id: FloorAstroIce
@@ -2043,6 +2061,16 @@
   itemDrop: FloorTileItemAstroAsteroidSand
   weather: false
 
+- type: tile
+  parent: FloorDesert
+  id: FloorDesertAstroSand
+  name: tiles-desert-astro-sand
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  itemDrop: FloorTileItemDesertAstroSand
+  weather: false
+
 - type: tile
   id: FloorWoodLarge
   name: tiles-wood-large

Resources/Textures/Objects/Tiles/tile.rsi/meta.json

@@ -34,6 +34,9 @@
         {
             "name": "dark-offset"
         },
+        {
+            "name": "desertsand"
+        },
         {
             "name": "dirty"
         },
@@ -130,6 +133,12 @@
         {
             "name": "grass"
         },
+        {
+            "name": "grassdark"
+        },
+        {
+            "name": "grasslight"
+        },
         {
             "name": "grassjungle"
         },
@@ -438,6 +447,14 @@
             "name": "grass-inhand-right",
             "directions": 4
         },
+        {
+            "name": "grasslight-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "grasslight-inhand-right",
+            "directions": 4
+        },
         {
             "name": "snow-inhand-left",
             "directions": 4
@@ -446,6 +463,22 @@
             "name": "snow-inhand-right",
             "directions": 4
         },
+        {
+            "name": "grassdark-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "grassdark-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "desertsand-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "desertsand-inhand-right",
+            "directions": 4
+        },
         {
             "name": "dirty-inhand-left",
             "directions": 4