]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Dark/Light Grass & Desert Astrotiles (#37867)
authorSharkSnake98 <peanutbuttersharky@gmail.com>
Mon, 15 Sep 2025 01:30:12 +0000 (21:30 -0400)
committerGitHub <noreply@github.com>
Mon, 15 Sep 2025 01:30:12 +0000 (18:30 -0700)
* 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>
19 files changed:
Resources/Locale/en-US/stack/stacks.ftl
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Recipes/Lathes/Packs/science.yml
Resources/Prototypes/Recipes/Lathes/misc.yml
Resources/Prototypes/Research/civilianservices.yml
Resources/Prototypes/Stacks/floor_tile_stacks.yml
Resources/Prototypes/Tiles/floors.yml
Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/meta.json

index 818ac954c5388ad5650f9d992be1a48b441ac3fd..acc7cdba64f06f2c3380238a71cdb9a75eb4be0c 100644 (file)
@@ -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
index 6295712722f72c59393fd9e7bbf10d4888fd5bc5..d9fe984c511c9b6cec85f79399d92b553c59c3b7 100644 (file)
@@ -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
index aacad99bddce1e9c42bdde4f18e94571b5784d89..313a27ae95b3207c18818e73afdb33c393a1c18a 100644 (file)
@@ -11,6 +11,9 @@
     - FloorAstroGrass
     - FloorMowedAstroGrass
     - FloorJungleAstroGrass
+    - FloorDarkAstroGrass
+    - FloorLightAstroGrass
+    - FloorDesertAstroSand
     - FloorAstroIce
     - FloorAstroSnow
     - FloorAstroAsteroidSand
index 6670114bdf403024935e62848f62c43e8fcb41c0..b92626e6a16fd22f2f403afdc141de9a8d3a77c0 100644 (file)
   - 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
   - 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
index 164a85dc4456d79832f7ae726b4f4bfdfe0c3193..ae8dab762d6b6bf0e76c8db4e37737f8ef0518b8 100644 (file)
   - FauxTileAstroGrass
   - FauxTileMowedAstroGrass
   - FauxTileJungleAstroGrass
+  - FauxTileDarkAstroGrass
+  - FauxTileLightAstroGrass
   - FauxTileAstroIce
   - FauxTileAstroSnow
   - FauxTileAstroAsteroidSand
+  - FauxTileDesertAstroSand
 
 # Only contains parts for making basic modular grenades, no actual explosives
 - type: latheRecipePack
index 53b5f4a4e7fa6144e6c7e775653128bafac2d9b0..163381112462137f354486f8277fbf9cda5b9e5c 100644 (file)
   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
   id: FauxTileAstroAsteroidSandBorderless
   result: FloorTileItemAstroAsteroidSandBorderless
 
+- type: latheRecipe
+  parent: BaseFauxTileRecipe
+  id: FauxTileDesertAstroSand
+  result: FloorTileItemDesertAstroSand
+
 - type: latheRecipe
   id: FloorGreenCircuit
   result: FloorTileItemGCircuit4
index c32169051c85669ef881945899c2f73991cacf5f..50bfcc0f5743ff417289d8732c6068ed67bdf484 100644 (file)
   - FauxTileAstroGrass
   - FauxTileMowedAstroGrass
   - FauxTileJungleAstroGrass
+  - FauxTileDarkAstroGrass
+  - FauxTileLightAstroGrass
   - FauxTileAstroIce
   - FauxTileAstroSnow
   - FauxTileAstroAsteroidSand
+  - FauxTileDesertAstroSand
 
 - type: technology
   id: BiochemicalStasis
index 6e1ccd45bcec04351571f527e3d87c2ae170bf00..a41282ff71901e96251edfc12ef1a21f6c78527e 100644 (file)
   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
   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
index 7c1f39aa54b0c4a83061b37745bb07c4225eb2e4..d0d9f403b3302d5b1112ad92d7d0110615fae211 100644 (file)
   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
   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
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png
new file mode 100644 (file)
index 0000000..1d96f69
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png
new file mode 100644 (file)
index 0000000..69031fb
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png
new file mode 100644 (file)
index 0000000..37f9874
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png
new file mode 100644 (file)
index 0000000..a11017f
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png
new file mode 100644 (file)
index 0000000..2aba5a4
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png
new file mode 100644 (file)
index 0000000..8ffe2c5
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png
new file mode 100644 (file)
index 0000000..da71a54
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png
new file mode 100644 (file)
index 0000000..83d901b
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png
new file mode 100644 (file)
index 0000000..6dc00a2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png differ
index 2b01db5ab5d68f2ebf7bab4f81b91ab78c659bb5..b1fb0057d7084bd5fad0ab59f5127ae16bce8e26 100644 (file)
@@ -34,6 +34,9 @@
         {
             "name": "dark-offset"
         },
+        {
+            "name": "desertsand"
+        },
         {
             "name": "dirty"
         },
         {
             "name": "grass"
         },
+        {
+            "name": "grassdark"
+        },
+        {
+            "name": "grasslight"
+        },
         {
             "name": "grassjungle"
         },
             "name": "grass-inhand-right",
             "directions": 4
         },
+        {
+            "name": "grasslight-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "grasslight-inhand-right",
+            "directions": 4
+        },
         {
             "name": "snow-inhand-left",
             "directions": 4
             "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