From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Wed, 12 Jun 2024 06:04:43 +0000 (-0500)
Subject: Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9a32a1949c57d9b22583ff345c64a2c0f622e805;p=space-station-14.git

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 5a158bdcfc..ccb3fb61da 100644
--- 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 f548ef7ace..1b2d76a3e4 100644
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 696d0eb543..e866fb2cd9 100644
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 8f3407369b..e78f89273f 100644
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 e7d9481b8a..1749225e1a 100644
--- 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 b41e55af7c..218751211c 100644
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 006a76e64e..b6d6e8b4db 100644
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 437c090770..60bbf65c79 100644
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 3fd2a39a8f..d19d64ba36 100644
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 28d1862456..653614fc41 100644
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 c70bafbd1b..57ea3f50a5 100644
--- 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 31e75cd674..3cd34ffb64 100644
Binary files a/Resources/Textures/Tiles/grassjungle.png and b/Resources/Textures/Tiles/grassjungle.png differ