Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)

* replace the grass sprites. again

* Fix dirt

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml
index 5a158bdcfc84231fe35a3448043b5eb5ba8bdb0f..ccb3fb61dacdc966e298e39282846a363aeede00 100644 (file)
--- a/Resources/Prototypes/Tiles/planet.yml
+++ b/Resources/Prototypes/Tiles/planet.yml
@@ -2,6 +2,12 @@
   id: FloorPlanetDirt
   name: tiles-dirt-floor
   sprite: /Textures/Tiles/Planet/dirt.rsi/dirt.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   isSubfloor: true
   footstepSounds:
     collection: FootstepAsteroid

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png
index f548ef7ace97cfefdb8f052cba32c53c36d67631..1b2d76a3e485a9c07514fd63ac95c60a63e41cb4 100644 (file)
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png
index 696d0eb5432202496fbb4c2859ba86cb87ff2a0f..e866fb2cd92e605704bdccdc6e0b5c3bd25d1a9c 100644 (file)
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png and b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png differ

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png
index 8f3407369ba34bb363a2aa72ba6894af5ae5bb12..e78f89273fbdac00c9ea549767bd0cd8411c5ea8 100644 (file)
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png and b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png differ

diff --git a/Resources/Textures/Tiles/Planet/Grass/attributions.yml b/Resources/Textures/Tiles/Planet/Grass/attributions.yml
index e7d9481b8acc0e6b8571c99a624b1b7d7efbe8d9..1749225e1a95946e408b2f627d933dc9948c0916 100644 (file)
--- a/Resources/Textures/Tiles/Planet/Grass/attributions.yml
+++ b/Resources/Textures/Tiles/Planet/Grass/attributions.yml
@@ -1,7 +1,4 @@
-- files:
-  - grass.png
-  - double_edge.png
-  - single_edge.png
+- files: ["grass.png", "triple_edge.png", "double_edge.png", "single_edge.png"]
   license: "CC-BY-SA-3.0"
-  copyright: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82"
-  source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82"
+  copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49. double_edge, single_edge, and triple_edge modified from grass by github user @Flareguy"
+  source: "https://github.com/space-wizards/space-station-14/pull/27912"
\ No newline at end of file

diff --git a/Resources/Textures/Tiles/Planet/Grass/double_edge.png b/Resources/Textures/Tiles/Planet/Grass/double_edge.png
index b41e55af7c56979368a5ecd16096fc8c308745b4..218751211c6ec519a2a0ec9eaeec8ce64d297180 100644 (file)
Binary files a/Resources/Textures/Tiles/Planet/Grass/double_edge.png and b/Resources/Textures/Tiles/Planet/Grass/double_edge.png differ

diff --git a/Resources/Textures/Tiles/Planet/Grass/grass.png b/Resources/Textures/Tiles/Planet/Grass/grass.png
index 006a76e64ed0d0ff6520c9e21cef9cce5a18efb8..b6d6e8b4dbbd01edfaaddde0b76e5bbdb1f5e9bf 100644 (file)
Binary files a/Resources/Textures/Tiles/Planet/Grass/grass.png and b/Resources/Textures/Tiles/Planet/Grass/grass.png differ

diff --git a/Resources/Textures/Tiles/Planet/Grass/single_edge.png b/Resources/Textures/Tiles/Planet/Grass/single_edge.png
index 437c0907709db10afd936c0d3652225d4282ea66..60bbf65c79d6c67bf89ad0ddb9ec704902ae9d5d 100644 (file)
Binary files a/Resources/Textures/Tiles/Planet/Grass/single_edge.png and b/Resources/Textures/Tiles/Planet/Grass/single_edge.png differ

diff --git a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png
index 3fd2a39a8f5ccd6922c8c5b475e6a192263a2512..d19d64ba363eb2caede1f85f96da6e334748ab5c 100644 (file)
Binary files a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png and b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png differ

diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png
index 28d1862456e4bec146b4b6aebce88deaa75f81b6..653614fc41d8b655d54389e41cacd4a6c6e45eb3 100644 (file)
Binary files a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png and b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png differ

diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
index c70bafbd1b602ed8d9dea3fa09a13f12a6b4b5e4..57ea3f50a51dfb86bf1bbfa950aae0f50404411a 100644 (file)
--- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/20d0b1fab9002c32e5267f16ba2b5cbf4b6f1e07/icons/turf/flooring/dirt.dmi",
+  "copyright": "https://github.com/FortunaSS13/Fortuna Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt.",
   "size": {
     "x": 32,
     "y": 32
@@ -11,4 +11,4 @@
       "name": "dirt"
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/Resources/Textures/Tiles/grassjungle.png b/Resources/Textures/Tiles/grassjungle.png
index 31e75cd6742a0c9492510ddd3f91835ff7c5324d..3cd34ffb64a03b2025057f55bb6775401aa10dde 100644 (file)
Binary files a/Resources/Textures/Tiles/grassjungle.png and b/Resources/Textures/Tiles/grassjungle.png differ